World description DSL

bench/Benchmark.hs

@@ -26,6 +26,7 @@ import Swarm.Language.Pipeline (ProcessedTerm)
 import Swarm.Language.Pipeline.QQ (tmQ)
 import Swarm.TUI.Model (gameState)
 import Swarm.TUI.Model.StateUpdate (classicGame0)
+import Swarm.Util.Erasable
 
 -- | The program of a robot that does nothing.
 idleProgram :: ProcessedTerm
@@ -87,7 +88,7 @@ mkGameState robotMaker numRobots = do
     (mapM addTRobot robots)
     ( (initAppState ^. gameState)
         & creativeMode .~ True
-        & multiWorld .~ M.singleton DefaultRootSubworld (newWorld (WF $ const (fromEnum DirtT, Nothing)))
+        & multiWorld .~ M.singleton DefaultRootSubworld (newWorld (WF $ const (fromEnum DirtT, ENothing)))
     )
 
 -- | Runs numGameTicks ticks of the game.

data/scenarios/Challenges/2048.yaml

@@ -179,7 +179,8 @@ robots:
       - [1, "1"]
 known: [water, wavy water, flower, tree]
 world:
-  default: [stone]
+  dsl: |
+    {stone}
   palette:
     "Ω": [grass, null, base]
     "┌": [stone, upper left corner]

data/scenarios/Challenges/Mazes/easy_cave_maze.yaml

@@ -65,7 +65,8 @@ entities:
     - The place you're trying to reach!  You win by executing `grab` on this item.
     properties: [known, portable]
 world:
-  default: [ice]
+  dsl: |
+    {ice}
   palette:
     'Ω': [stone, null, base]
     ' ': [stone, null]

data/scenarios/Challenges/Mazes/easy_spiral_maze.yaml

@@ -65,7 +65,8 @@ entities:
     - The place you're trying to reach!  You win by executing `grab` on this item.
     properties: [known, portable]
 world:
-  default: [ice]
+  dsl: |
+    {ice}
   palette:
     'Ω': [stone, null, base]
     ' ': [stone, null]

data/scenarios/Challenges/Mazes/invisible_maze.yaml

@@ -65,7 +65,8 @@ entities:
     - The place you're trying to reach!  You win by executing `grab` on this item.
     properties: [known, portable]
 world:
-  default: [grass]
+  dsl: |
+    {grass}
   palette:
     'Ω': [grass, null, base]
     '.': [grass, null]

data/scenarios/Challenges/Mazes/loopy_maze.yaml

@@ -58,7 +58,8 @@ entities:
     - The place you're trying to reach!  You win by executing `grab` on this item.
     properties: [known, portable]
 world:
-  default: [grass]
+  dsl: |
+    {grass}
   palette:
     'Ω': [grass, null, base]
     '.': [grass, null]

data/scenarios/Challenges/Ranching/capture.yaml

@@ -140,7 +140,8 @@ entities:
     properties: [known]
 known: [flower, tree]
 world:
-  default: [grass]
+  dsl: |
+    {grass}
   upperleft: [0, 0]
   offset: false
   palette:

data/scenarios/Challenges/Ranching/gated-paddock.yaml

@@ -506,14 +506,15 @@ seed: 0
 solution: |
   run "scenarios/Challenges/Ranching/_gated-paddock/fence-construction.sw"
 world:
-  default: [dirt, water]
+  dsl: |
+    {dirt, water}
   palette:
-    'B': [grass, null, base]
-    '.': [grass]
+    'B': [grass, erase, base]
+    '.': [grass, erase]
     't': [dirt, tree]
     'x': [stone, mountain]
     'c': [stone, cabin]
-    's': [grass, null, sheep]
+    's': [grass, erase, sheep]
     '%': [grass, clover, null]
     'H': [stone, pier, null]
     '~': [dirt, water]

data/scenarios/Challenges/Ranching/powerset.yaml

@@ -179,7 +179,8 @@ entities:
     properties: [known, growable, portable]
 known: [sand]
 world:
-  default: [grass]
+  dsl: |
+    {grass}
   upperleft: [-1, -1]
   offset: false
   palette:

data/scenarios/Challenges/Sliding Puzzles/3x3.yaml

@@ -721,7 +721,8 @@ recipes:
     time: 0
 known: []
 world:
-  default: [grass]
+  dsl: |
+    {grass}
   upperleft: [-3, 2]
   offset: false
   palette:
@@ -739,4 +740,4 @@ world:
     ..x....x..........
     ..xxxxxx..........
     ..................
-    zy................
+    zy................

data/scenarios/Challenges/Sokoban/Gadgets/no-reverse.yaml

@@ -66,12 +66,13 @@ entities:
     properties: [known, unwalkable, portable]
 known: [mountain, water, flower]
 world:
-  default: [grass, water]
+  dsl: |
+    {grass, water}
   upperleft: [-1, 1]
   offset: false
   palette:
-    'B': [grass, null, base]
-    '.': [grass]
+    'B': [grass, erase, base]
+    '.': [grass, erase]
     '@': [grass, monolith]
     'A': [grass, mountain]
     '*': [grass, flower]

data/scenarios/Challenges/Sokoban/Gadgets/one-way.yaml

@@ -49,12 +49,13 @@ entities:
     properties: [known, unwalkable, portable]
 known: [mountain, water, flower]
 world:
-  default: [grass, water]
+  dsl: |
+    {grass, water}
   upperleft: [-1, 1]
   offset: false
   palette:
-    'B': [grass, null, base]
-    '.': [grass]
+    'B': [grass, erase, base]
+    '.': [grass, erase]
     '@': [grass, monolith]
     'A': [grass, mountain]
     '*': [grass, flower]

data/scenarios/Challenges/Sokoban/Simple/trapdoor.yaml

@@ -101,13 +101,14 @@ entities:
     properties: [known, unwalkable, portable]
 known: [mountain, water, flower]
 world:
-  default: [grass, water]
+  dsl: |
+    {grass, water}
   upperleft: [-1, 1]
   offset: false
   palette:
-    'B': [ice, null, base]
-    '.': [grass]
-    'x': [dirt]
+    'B': [ice, erase, base]
+    '.': [grass, erase]
+    'x': [dirt, erase]
     '@': [grass, monolith]
     'A': [grass, mountain]
     '*': [grass, flower]

data/scenarios/Challenges/Sokoban/foresight.yaml

@@ -95,21 +95,22 @@ entities:
     properties: [known, unwalkable]
 known: [mountain, water, 3D printer, flower]
 world:
-  default: [grass, water]
+  dsl: |
+    {grass, water}
   upperleft: [-21, 10]
   offset: false
   palette:
-    'B': [ice, null, base]
-    '.': [grass]
+    'B': [ice, erase, base]
+    '.': [grass, erase]
     '*': [grass, flower]
     'b': [grass, boat]
     '3': [grass, 3D printer]
     '@': [grass, monolith]
     'c': [grass, crate]
     'A': [grass, wall]
     'w': [dirt, water]
-    'x': [stone]
-    'z': [dirt]
+    'x': [stone, erase]
+    'z': [dirt, erase]
   map: |
     ..................3...A.
     .................AAAA.A*

data/scenarios/Challenges/arbitrage.yaml

@@ -378,7 +378,8 @@ recipes:
       - [1, drill]
 known: []
 world:
-  default: [dirt]
+  dsl: |
+    {dirt}
   upperleft: [0, 0]
   offset: false
   palette:
@@ -413,4 +414,4 @@ world:
     ...X****7****1...
     ........*........
     B....p.p.p.p.p...
-    /.............../
+    /.............../

data/scenarios/Challenges/blender.yaml

@@ -190,22 +190,23 @@ recipes:
 known: [water]
 seed: 0
 world:
-  default: [stone, water]
+  dsl: |
+    {stone, water}
   upperleft: [0, 0]
   offset: false
   palette:
     '0': [stone, water]
     '@': [stone, granite boulder]
-    '.': [grass]
-    'L': [stone]
+    '.': [grass, erase]
+    'L': [stone, erase]
     '>': [stone, bind gt]
     '=': [stone, bind eq]
-    H: [dirt]
+    H: [dirt, erase]
     A: [grass, water, ccw_robot]
     a: [grass, water, ccw_robot_down]
-    B: [grass, null, cw_robot]
-    b: [grass, null, cw_robot_down]
-    Ω: [grass, null, base]
+    B: [grass, erase, cw_robot]
+    b: [grass, erase, cw_robot_down]
+    Ω: [grass, erase, base]
     f: [stone, Amulet of Yoneda]
     x: [stone, locked door]
     k: [grass, door key]
@@ -225,4 +226,4 @@ world:
     ..@@@@@@@@@.@@@@@@@.@@@@@@@.@..
     ..Ω.........@.....@.........@..
     @@@@@@@@@@@@@.>>=.@@@@@@@@@@@..
-    ...............................
+    ...............................

data/scenarios/Challenges/bridge-building.yaml

@@ -615,7 +615,6 @@ recipes:
 known: [water, sand, flower, iron mine]
 seed: 0
 world:
-  default: [blank]
   palette:
     '.': [blank]
     '/': [blank, left roof]

data/scenarios/Challenges/bucket-brigade.yaml

@@ -179,7 +179,8 @@ recipes:
 known: [boulder, lignite mine]
 seed: 0
 world:
-  default: [grass]
+  dsl: |
+    {grass}
   palette:
     'B': [dirt, null, base]
     '.': [dirt]

data/scenarios/Challenges/chess_horse.yaml

@@ -34,10 +34,11 @@ robots:
       char: '♚'
 known: [water]
 world:
-  default: [ice, water]
+  dsl: |
+    {ice, water}
   palette:
-    '.': [grass]
-    '#': [ice]
+    '.': [grass, erase]
+    '#': [ice, erase]
     '┌': [stone, upper left corner]
     '┐': [stone, upper right corner]
     '└': [stone, lower left corner]

data/scenarios/Challenges/hackman.yaml

@@ -264,7 +264,6 @@ solution:
 known: []
 seed: 0
 world:
-  default: [blank]
   palette:
     'B': [blank]
     'Ω': [blank, null, base]
@@ -307,4 +306,4 @@ world:
     x.....x....x....x.....x
     x.xxxxxxxx.x.xxxxxxxx.x
     x.....................x
-    xxxxxxxxxxxxxxxxxxxxxxx
+    xxxxxxxxxxxxxxxxxxxxxxx

data/scenarios/Challenges/hanoi.yaml

@@ -155,7 +155,8 @@ known:
   - blocked two
   - blocked three
 world:
-  default: [grass, null]
+  dsl: |
+    {grass}
   palette:
     ',': [grass]
     '_': [stone]

data/scenarios/Challenges/ice-cream.yaml

@@ -206,7 +206,8 @@ recipes:
       - [1, scoop]
 known: []
 world:
-  default: [grass]
+  dsl: |
+    {grass}
   upperleft: [0, 0]
   offset: false
   palette:

data/scenarios/Challenges/lights-out.yaml

@@ -143,7 +143,6 @@ recipes:
     time: 0
 known: []
 world:
-  default: [blank]
   upperleft: [-1, 1]
   offset: false
   palette:
@@ -160,4 +159,4 @@ world:
     .xxxxx.
     .xxxxx.
     z......
-
+

data/scenarios/Challenges/maypole.yaml

@@ -100,7 +100,8 @@ entities:
     properties: [known, unwalkable]
 known: [bitcoin]
 world:
-  default: [grass]
+  dsl: |
+    {grass}
   upperleft: [0, 0]
   offset: false
   palette:

data/scenarios/Challenges/teleport.yaml

@@ -56,15 +56,16 @@ robots:
       );
 known: [water, wavy water, flower, tree]
 world:
-  default: [ice, water]
+  dsl: |
+    {ice, water}
   palette:
     ',': [ice, water]
     ' ': [ice, water]
     '~': [ice, wavy water]
     '*': [grass, flower]
     'T': [grass, tree]
-    '.': [grass]
-    '_': [stone]
+    '.': [grass, erase]
+    '_': [stone, erase]
     '┌': [stone, upper left corner]
     '┐': [stone, upper right corner]
     '└': [stone, lower left corner]

data/scenarios/Challenges/wolf-goat-cabbage.yaml

@@ -98,7 +98,6 @@ entities:
 known: [water, boulder]
 seed: 0
 world:
-  default: [blank]
   palette:
     'A': [stone, boulder]
     'B': [stone, boulder, base]
@@ -122,4 +121,4 @@ world:
     AAA~~~~~~~~~~~~~~~AAA
     AAAAA~~~~~~~~~~~AAAAA
     AAAAAAAA~~~~~AAAAAAAA
-    AAAAAAAAAAAAAAAAAAAAA
+    AAAAAAAAAAAAAAAAAAAAA

data/scenarios/Challenges/word-search.yaml

@@ -349,7 +349,8 @@ recipes:
       - [1, highlighter]
 known: [boulder]
 world:
-  default: [dirt]
+  dsl: |
+    {dirt}
   upperleft: [0, 0]
   offset: false
   palette: