From b0231ad0c84c6cfb9d3dec8acdb8479f0a6a54c2 Mon Sep 17 00:00:00 2001 From: Hendursaga Date: Mon, 9 Oct 2023 22:07:58 -0400 Subject: [PATCH 1/2] Simplify pile drawing code in Aces Up example. --- examples/aces-up/aces-up.fs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/examples/aces-up/aces-up.fs b/examples/aces-up/aces-up.fs index 3ef2e40..5fbf22e 100644 --- a/examples/aces-up/aces-up.fs +++ b/examples/aces-up/aces-up.fs @@ -76,8 +76,7 @@ VARIABLE hand-ix 1 pile-1 size 1 + at-xy pile-1 peek .card 1 pile-1 size 2 + at-xy 8 emit 9 emit ELSE - 1 pile-1 size 1 + at-xy BL emit BL emit - 1 pile-1 size 2 + at-xy BL emit BL emit + 1 2 at-xy BL emit BL emit THEN 1 pile-1 size 3 + at-xy BL emit BL emit ; @@ -86,8 +85,7 @@ VARIABLE hand-ix 4 pile-2 size 1 + at-xy pile-2 peek .card 4 pile-2 size 2 + at-xy 8 emit 9 emit ELSE - 4 pile-2 size 1 + at-xy BL emit BL emit - 4 pile-2 size 2 + at-xy BL emit BL emit + 4 2 at-xy BL emit BL emit THEN 4 pile-2 size 3 + at-xy BL emit BL emit ; @@ -96,8 +94,7 @@ VARIABLE hand-ix 7 pile-3 size 1 + at-xy pile-3 peek .card 7 pile-3 size 2 + at-xy 8 emit 9 emit ELSE - 7 pile-3 size 1 + at-xy BL emit BL emit - 7 pile-3 size 2 + at-xy BL emit BL emit + 7 2 at-xy BL emit BL emit THEN 7 pile-3 size 3 + at-xy BL emit BL emit ; @@ -106,8 +103,7 @@ VARIABLE hand-ix 10 pile-4 size 1 + at-xy pile-4 peek .card 10 pile-4 size 2 + at-xy 8 emit 9 emit ELSE - 10 pile-4 size 1 + at-xy BL emit BL emit - 10 pile-4 size 2 + at-xy BL emit BL emit + 10 2 at-xy BL emit BL emit THEN 10 pile-4 size 3 + at-xy BL emit BL emit ; From 7311aa81bc4e9664a968c2132f1f3c3dffb18ae8 Mon Sep 17 00:00:00 2001 From: Hendursaga Date: Tue, 10 Oct 2023 21:13:41 -0400 Subject: [PATCH 2/2] Replace `1 +` with `1+` --- examples/aces-up/aces-up.fs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/aces-up/aces-up.fs b/examples/aces-up/aces-up.fs index 5fbf22e..ce1c740 100644 --- a/examples/aces-up/aces-up.fs +++ b/examples/aces-up/aces-up.fs @@ -73,7 +73,7 @@ VARIABLE hand-ix : .pile-1 pile-1 size IF - 1 pile-1 size 1 + at-xy pile-1 peek .card + 1 pile-1 size 1+ at-xy pile-1 peek .card 1 pile-1 size 2 + at-xy 8 emit 9 emit ELSE 1 2 at-xy BL emit BL emit @@ -82,7 +82,7 @@ VARIABLE hand-ix : .pile-2 pile-2 size IF - 4 pile-2 size 1 + at-xy pile-2 peek .card + 4 pile-2 size 1+ at-xy pile-2 peek .card 4 pile-2 size 2 + at-xy 8 emit 9 emit ELSE 4 2 at-xy BL emit BL emit @@ -91,7 +91,7 @@ VARIABLE hand-ix : .pile-3 pile-3 size IF - 7 pile-3 size 1 + at-xy pile-3 peek .card + 7 pile-3 size 1+ at-xy pile-3 peek .card 7 pile-3 size 2 + at-xy 8 emit 9 emit ELSE 7 2 at-xy BL emit BL emit @@ -100,7 +100,7 @@ VARIABLE hand-ix : .pile-4 pile-4 size IF - 10 pile-4 size 1 + at-xy pile-4 peek .card + 10 pile-4 size 1+ at-xy pile-4 peek .card 10 pile-4 size 2 + at-xy 8 emit 9 emit ELSE 10 2 at-xy BL emit BL emit