recognize structures with rotation

swarm-game · Dec 10, 2023 · abc7a12 · abc7a12
1 parent 938aa2c
commit abc7a12
Show file tree

Hide file tree

Showing 33 changed files with 254 additions and 69 deletions.
diff --git a/data/scenarios/Challenges/Ranching/beekeeping.yaml b/data/scenarios/Challenges/Ranching/beekeeping.yaml
@@ -125,7 +125,7 @@ solution: |
    run "scenarios/Challenges/Ranching/_beekeeping/solution.sw"
 structures:
   - name: beehive
-    recognize: true
+    recognize: [north]
     structure:
       palette:
         '-': [dirt, honey frame]
@@ -137,7 +137,7 @@ structures:
         b---b
         bbbbb
   - name: mead hall
-    recognize: true
+    recognize: [north]
     structure:
       palette:
         'w': [dirt, wall]

diff --git a/data/scenarios/Testing/1575-structure-recognizer/00-ORDER.txt b/data/scenarios/Testing/1575-structure-recognizer/00-ORDER.txt
@@ -12,3 +12,5 @@
 1575-interior-entity-placement.yaml
 1575-floorplan-command.yaml
 1575-bounding-box-overlap.yaml
+1644-rotated-recognition.yaml
+1644-rotated-preplacement-recognition.yaml
diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-bounding-box-overlap.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-bounding-box-overlap.yaml
@@ -53,7 +53,7 @@ solution: |
   doN 3 (place "boulder"; move;);
 structures:
   - name: chevron
-    recognize: true
+    recognize: [north]
     structure:
       palette:
         'g': [stone, boulder]

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-browse-structures.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-browse-structures.yaml
@@ -4,7 +4,7 @@ description: |
   Hit *F6* to view the recognizable structures.
 
   Only the subset of the structures marked with
-  *recognize: true* are browseable.
+  *recognize: [north]* are browseable.
   In particular, the `donut`{=structure} structure is placed
   in the map but not displayed in the *F6* dialog.
 creative: false
@@ -53,7 +53,7 @@ structures:
         @@@@@
         .@@@.
   - name: diamond
-    recognize: true
+    recognize: [north]
     description: "A diamond pattern of flowers"
     structure:
       mask: '.'
@@ -68,7 +68,7 @@ structures:
         ..xxx..
         ...x...
   - name: contraption
-    recognize: true
+    recognize: [north]
     description: "A device for assembling useful widgets"
     structure:
       mask: '.'
@@ -83,7 +83,7 @@ structures:
        lIIIgg
        rlllgg
   - name: precious
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:
@@ -96,7 +96,7 @@ structures:
        gsq
        qqm
   - name: smallish
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-construction-count.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-construction-count.yaml
@@ -37,7 +37,7 @@ solution: |
   );
 structures:
   - name: green_jewel
-    recognize: true
+    recognize: [north]
     structure:
       palette:
         'g': [stone, pixel (G)]

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-ensure-disjoint.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-ensure-disjoint.yaml
@@ -54,7 +54,7 @@ solution: |
    place "silver";
 structures:
   - name: chessboard
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-ensure-single-recognition.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-ensure-single-recognition.yaml
@@ -51,7 +51,7 @@ solution: |
    place "gold";
 structures:
   - name: chessboard
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-floorplan-command.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-floorplan-command.yaml
@@ -47,7 +47,7 @@ solution: |
   mkRows height width;
 structures:
   - name: wooden box
-    recognize: true
+    recognize: [north]
     structure:
       palette:
         'b': [stone, board]

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-handle-overlapping.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-handle-overlapping.yaml
@@ -33,7 +33,7 @@ solution: |
    place "mithril";
 structures:
   - name: precious
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:
@@ -46,7 +46,7 @@ structures:
        gsq
        qqm
   - name: smallish
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-interior-entity-placement.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-interior-entity-placement.yaml
@@ -76,7 +76,7 @@ solution: |
   place x;
 structures:
   - name: pigpen
-    recognize: true
+    recognize: [north]
     structure:
       palette:
         'b': [stone, board]

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-nested-structure-definition.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-nested-structure-definition.yaml
@@ -46,7 +46,7 @@ robots:
       - treads
 structures:
   - name: double ring
-    recognize: true
+    recognize: [north]
     structure:
       palette:
         's': [ice, tree]
@@ -68,7 +68,7 @@ structures:
         .s.
         ...
   - name: flowerbox
-    recognize: true
+    recognize: [north]
     structure:
       palette:
         'f': [ice, flower]

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-overlapping-tiebreaker-by-largest.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-overlapping-tiebreaker-by-largest.yaml
@@ -36,7 +36,7 @@ solution: |
    place "gold";
 structures:
   - name: large
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:
@@ -47,7 +47,7 @@ structures:
        ggs
        ggs
   - name: small
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:

diff --git a/.../scenarios/Testing/1575-structure-recognizer/1575-overlapping-tiebreaker-by-location.yaml b/.../scenarios/Testing/1575-structure-recognizer/1575-overlapping-tiebreaker-by-location.yaml
@@ -37,7 +37,7 @@ solution: |
    place "gold";
 structures:
   - name: topleft
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:
@@ -48,7 +48,7 @@ structures:
        gg
        gg
   - name: bottomright
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-placement-occlusion.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-placement-occlusion.yaml
@@ -40,7 +40,7 @@ solution: |
    noop;
 structures:
   - name: red_jewel
-    recognize: true
+    recognize: [north]
     structure:
       palette:
         'r': [stone, pixel (R)]
@@ -49,7 +49,7 @@ structures:
        rrr
        rrr
   - name: green_jewel
-    recognize: true
+    recognize: [north]
     structure:
       palette:
         'g': [stone, pixel (G)]

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-remove-structure.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-remove-structure.yaml
@@ -36,7 +36,7 @@ solution: |
    grab;
 structures:
   - name: chessboard
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-swap-structure.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-swap-structure.yaml
@@ -54,7 +54,7 @@ solution: |
    swap "pixel (B)";
 structures:
   - name: red_jewel
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:
@@ -68,7 +68,7 @@ structures:
        gsssg
        ggggg
   - name: green_jewel
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:
@@ -82,7 +82,7 @@ structures:
        gsssg
        ggggg
   - name: blue_jewel
-    recognize: true
+    recognize: [north]
     structure:
       mask: '.'
       palette:

diff --git a/data/scenarios/Testing/1575-structure-recognizer/1644-rotated-preplacement-recognition.yaml b/data/scenarios/Testing/1575-structure-recognizer/1644-rotated-preplacement-recognition.yaml
@@ -0,0 +1,53 @@
+version: 1
+name: Rotated pre-placed structure recognition
+description: |
+  Pre-placed structure recognition with rotation
+creative: false
+objectives:
+  - teaser: Have structure
+    goal:
+      - |
+        Have a `tee`{=structure} structure
+    condition: |
+      foundStructure <- structure "tee" 0;
+      return $ case foundStructure (\_. false) (\_. true);
+robots:
+  - name: base
+    dir: [1, 0]
+    devices:
+      - grabber
+      - treads
+    inventory:
+      - [4, flower]
+solution: |
+   noop;
+structures:
+  - name: tee
+    recognize: [north, south, east, west]
+    description: "A tee pattern of flowers"
+    structure:
+      mask: '.'
+      palette:
+        'x': [stone, flower]
+      map: |
+        .x.
+        xxx
+known: [flower]
+world:
+  name: root
+  dsl: |
+    {blank}
+  palette:
+    '.': [grass]
+    'x': [stone, flower]
+    'B': [grass, null, base]
+  upperleft: [0, 0]
+  placements:
+    - src: tee
+      offset: [2, 0]
+      orient:
+        up: east
+  map: |
+    B....
+    .....
+    .....
diff --git a/data/scenarios/Testing/1575-structure-recognizer/1644-rotated-recognition.yaml b/data/scenarios/Testing/1575-structure-recognizer/1644-rotated-recognition.yaml
@@ -0,0 +1,51 @@
+version: 1
+name: Rotated structure recognition
+description: |
+  Structure recognition with rotation
+creative: false
+objectives:
+  - teaser: Build structure
+    goal:
+      - |
+        Build a `tee`{=structure} structure
+    condition: |
+      foundStructure <- structure "tee" 0;
+      return $ case foundStructure (\_. false) (\_. true);
+robots:
+  - name: base
+    dir: [1, 0]
+    devices:
+      - grabber
+      - treads
+    inventory:
+      - [4, flower]
+solution: |
+   move; move;
+   turn right;
+   move; move;
+   place "flower";
+structures:
+  - name: tee
+    recognize: [north, south, east, west]
+    description: "A tee pattern of flowers"
+    structure:
+      mask: '.'
+      palette:
+        'x': [stone, flower]
+      map: |
+        .x.
+        xxx
+known: [flower]
+world:
+  name: root
+  dsl: |
+    {blank}
+  palette:
+    '.': [grass]
+    'x': [stone, flower]
+    'B': [grass, null, base]
+  upperleft: [0, 0]
+  map: |
+    B.x..
+    ..xx.
+    .....
diff --git a/data/scenarios/Testing/_Validation/1575-recognized-placements-disallow-reorientation.yaml b/data/scenarios/Testing/_Validation/1575-recognized-placements-disallow-reorientation.yaml
@@ -10,7 +10,7 @@ robots:
       - treads
 structures:
   - name: red_jewel
-    recognize: true
+    recognize: [east]
     structure:
       mask: '.'
       palette:

diff --git a/data/schema/named-structure.json b/data/schema/named-structure.json
@@ -15,7 +15,7 @@
             "description": "Description of this substructure"
         },
         "recognize": {
-            "type": "boolean",
+            "type": "array",
             "description": "Whether this structure participates in automatic recognition when constructed"
         },
         "structure": {

diff --git a/src/Swarm/Game/Scenario.hs b/src/Swarm/Game/Scenario.hs
@@ -227,7 +227,7 @@ instance FromJSONE (EntityMap, WorldMap) Scenario where
 
       let mergedNavigation = Navigation mergedWaypoints mergedPortals
           structureInfo =
-            StaticStructureInfo (filter Structure.recognize namedGrids)
+            StaticStructureInfo (filter Structure.isRecognizable namedGrids)
               . M.fromList
               . NE.toList
               $ NE.map (worldName &&& placedStructures) allWorlds