get rid of initial fence/gate, fix water bug in loop checker

swarm-game · Nov 7, 2022 · 3d67357 · 3d67357
1 parent 83edd88
commit 3d67357
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/data/scenarios/Challenges/Ranching/_gated-paddock/enclosure-checking.sw b/data/scenarios/Challenges/Ranching/_gated-paddock/enclosure-checking.sw
@@ -51,7 +51,13 @@ def leaveBreadcrumbs =
             // Make sure nothing's in the way before we place
             // our breadcrumb:
             x <- scan down;
-            case x return (\_. grab; return ());
+            case x return (\y.
+                // If we're on a water tile, get rid of
+                // it with our special "drilling" recipe
+                if (y == "water") {drill down} {};
+                grab;
+                return ();
+            );
 
             make bc1;
             place bc1;

diff --git a/data/scenarios/Challenges/Ranching/_gated-paddock/fence-construction.sw b/data/scenarios/Challenges/Ranching/_gated-paddock/fence-construction.sw
@@ -53,7 +53,7 @@ def buildFence =
     turn left;
     doN 30 (place "fence"; move);
     turn left;
-    doN 7 (place "fence"; move);
+    doN 10 (place "fence"; move);
     place "fence";
     turn right;
     doN 6 move;

diff --git a/data/scenarios/Challenges/Ranching/gated-paddock.yaml b/data/scenarios/Challenges/Ranching/gated-paddock.yaml
@@ -100,13 +100,25 @@ entities:
     display:
       char: '.'
     description:
-    - A marker that can be put down and found again.
+    - A marker that can be put down and found again. Used only by judge robot.
     properties: [portable]
   - name: treaded breadcrumb
     display:
       char: 'x'
     description:
-    - A marker that can be put down and found again (for a second time).
+    - A marker that can be put down and found again (for a second time). Used only by judge robot.
+    properties: [portable]
+  - name: evaporator
+    display:
+      char: 'E'
+    description:
+    - A tool that allows clearing a water tile. Used only by judge robot.
+    properties: [portable]
+  - name: steam
+    display:
+      char: 'Z'
+    description:
+    - What's left after evaporating water. Used only by judge robot.
     properties: [portable]
 recipes:
   - in:
@@ -127,6 +139,12 @@ recipes:
     - [1, scrap wood]
     required:
     - [1, post puller]
+  - in:
+    - [1, water]
+    out:
+    - [1, steam]
+    required:
+    - [1, evaporator]
   - in:
     - [1, hinge]
     - [1, fence]
@@ -141,8 +159,6 @@ world:
   palette:
     'B': [grass, null, base]
     '.': [grass]
-    'G': [grass, gate]
-    'f': [grass, fence]
     't': [dirt, tree]
     'x': [stone, mountain]
     'c': [stone, cabin]
@@ -159,10 +175,10 @@ world:
     ..............................x..........tttttttt...
     .........................................tttttttt...
     .........s...............................tttttttt...
-    .........................................tttttttt...
-    ...................................f................
-    ..xx...............................G.....B......c...
-    ...x...............................f................
+    ....x....................................tttttttt...
+    ...xx...............................................
+    ..xx.....................................B......c...
+    ...x................................................
     ..............................s.....................
     ....................................................
     ....................................................