Skip to content

Commit

Permalink
robot cardinal direction literals (#1685)
Browse files Browse the repository at this point in the history
Closes #1679.

Split into two commits:
1. Parser and JSON schema changes
2. Update all scenario files (except `chess_horse.yaml`)
  • Loading branch information
kostmo authored Dec 14, 2023
1 parent b158251 commit eaa5551
Show file tree
Hide file tree
Showing 183 changed files with 291 additions and 277 deletions.
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/2048.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ recipes:
- [1, "2048"]
robots:
- name: base
dir: [1,0]
dir: east
display:
attr: robot
char: "Ω"
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Mazes/easy_cave_maze.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ solution: |
}
robots:
- name: base
dir: [0,1]
dir: north
display:
char: 'Ω'
attr: robot
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Mazes/easy_spiral_maze.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ solution: |
}
robots:
- name: base
dir: [0,1]
dir: north
display:
char: 'Ω'
attr: robot
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Mazes/invisible_maze.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ solution: |
}
robots:
- name: base
dir: [0,1]
dir: north
display:
char: 'Ω'
attr: robot
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Mazes/loopy_maze.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ solution: |
run "scenarios/Challenges/Mazes/loopy_maze_sol.sw"
robots:
- name: base
dir: [0,1]
dir: north
display:
char: 'Ω'
attr: robot
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Challenges/Ranching/beekeeping.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ robots:
- name: base
display:
attr: mybase
dir: [1, 0]
dir: east
devices:
- 3D printer
- blueprint
Expand Down Expand Up @@ -113,7 +113,7 @@ robots:
- [20, iron plate]
- [4, botkit]
- name: queenbee
dir: [1, 0]
dir: east
system: true
display:
invisible: true
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Challenges/Ranching/capture.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ objectives:
};
robots:
- name: base
dir: [1, 0]
dir: east
devices:
- 3D printer
- branch predictor
Expand Down Expand Up @@ -114,7 +114,7 @@ robots:
- [6, welder]
- name: opponent
system: true
dir: [0, 1]
dir: north
display:
char: P
attr: pig
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Challenges/Ranching/gated-paddock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ objectives:
prerequisite: feed_sheep
robots:
- name: base
dir: [0, 1]
dir: north
devices:
- treads
- scanner
Expand Down Expand Up @@ -221,7 +221,7 @@ robots:
invisible: false
char: '@'
system: true
dir: [0, 1]
dir: north
inventory:
- [4, wool]
unwalkable:
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Challenges/Ranching/powerset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ objectives:
as r {has "bit (0)"};
robots:
- name: base
dir: [1, 0]
dir: east
devices:
- ADT calculator
- branch predictor
Expand All @@ -75,7 +75,7 @@ robots:
- treads
- name: setup
system: true
dir: [1, 0]
dir: east
display:
invisible: true
inventory:
Expand Down
6 changes: 3 additions & 3 deletions data/scenarios/Challenges/Sliding Puzzles/3x3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ objectives:
as j {run "scenarios/Challenges/Sliding Puzzles/_sliding-puzzle/validate-board.sw"};
robots:
- name: base
dir: [1, 0]
dir: east
devices:
- ADT calculator
- branch predictor
Expand Down Expand Up @@ -84,7 +84,7 @@ robots:
- [25, y-tile-ordinal]
- name: maintainer
system: true
dir: [1, 0]
dir: east
display:
invisible: true
attr: 'gold'
Expand Down Expand Up @@ -118,7 +118,7 @@ robots:
run "scenarios/Challenges/Sliding Puzzles/_sliding-puzzle/maintainer.sw";
- name: setup
system: true
dir: [1, 0]
dir: east
display:
invisible: true
attr: 'iron'
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Sokoban/Gadgets/no-reverse.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ objectives:
};
robots:
- name: base
dir: [0, -1]
dir: south
display:
attr: gold
devices:
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Sokoban/Gadgets/one-way.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ objectives:
};
robots:
- name: base
dir: [1, 0]
dir: east
display:
attr: gold
devices:
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Sokoban/Simple/trapdoor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ objectives:
};
robots:
- name: base
dir: [1, 0]
dir: east
display:
attr: gold
devices:
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Sokoban/foresight.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ robots:
- name: base
display:
attr: bluish
dir: [0, 1]
dir: north
devices:
- branch predictor
- ADT calculator
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/arbitrage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ attrs:
bg: '#000000'
robots:
- name: base
dir: [1, 0]
dir: east
devices:
- ADT calculator
- antenna
Expand Down
10 changes: 5 additions & 5 deletions data/scenarios/Challenges/blender.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ objectives:
anyHasMetBase 1;
robots:
- name: base
dir: [1, 0]
dir: east
devices:
- ADT calculator
- binoculars
Expand All @@ -87,7 +87,7 @@ robots:
- welder
- name: cw_robot
system: true
dir: [0, 1]
dir: north
display:
invisible: false
char: 'X'
Expand All @@ -96,7 +96,7 @@ robots:
run "scenarios/Challenges/_blender/patrol-clockwise.sw"
- name: cw_robot_down
system: true
dir: [0, -1]
dir: south
display:
invisible: false
char: 'X'
Expand All @@ -105,7 +105,7 @@ robots:
run "scenarios/Challenges/_blender/patrol-clockwise.sw"
- name: ccw_robot
system: true
dir: [0, 1]
dir: north
display:
invisible: false
char: 'X'
Expand All @@ -114,7 +114,7 @@ robots:
run "scenarios/Challenges/_blender/patrol-counter-clockwise.sw"
- name: ccw_robot_down
system: true
dir: [0, -1]
dir: south
display:
invisible: false
char: 'X'
Expand Down
6 changes: 3 additions & 3 deletions data/scenarios/Challenges/bridge-building.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ objectives:
};
robots:
- name: base
dir: [1, 0]
dir: east
devices:
- ADT calculator
- branch predictor
Expand Down Expand Up @@ -181,7 +181,7 @@ robots:
- [0, jungle]
- name: flowercheck
system: true
dir: [0, 1]
dir: north
display:
invisible: true
devices:
Expand All @@ -192,7 +192,7 @@ robots:
run "scenarios/Challenges/_bridge-building/flower-ring-check.sw"
- name: platecheck
system: true
dir: [0, 1]
dir: north
display:
invisible: true
solution: |
Expand Down
6 changes: 3 additions & 3 deletions data/scenarios/Challenges/bucket-brigade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ robots:
char: 'Ω'
attr: robot
heavy: true
dir: [0, 1]
dir: north
devices:
- 3D printer
- ADT calculator
Expand All @@ -35,7 +35,7 @@ robots:
- [1, treads]
- name: hauler
system: true
dir: [-1, 0]
dir: west
devices:
- furnace
display:
Expand All @@ -46,7 +46,7 @@ robots:
run "scenarios/Challenges/_bucket-brigade/hauler.sw"
- name: powerplant
system: true
dir: [1, 0]
dir: east
display:
invisible: false
char: ''
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Challenges/combo-lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ objectives:
as base {has "bitcoin"};
robots:
- name: base
dir: [1, 0]
dir: east
display:
invisible: false
devices:
Expand All @@ -44,7 +44,7 @@ robots:
- treads
- name: lockbot
system: true
dir: [1, 0]
dir: east
display:
invisible: true
program: |
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Challenges/friend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ robots:
char: 'Ω'
attr: robot
heavy: true
dir: [0, 1]
dir: north
devices:
- 3D printer
- ADT calculator
Expand Down Expand Up @@ -47,7 +47,7 @@ robots:
- [10, calculator]
- name: cat
system: true
dir: [-1, 0]
dir: west
display:
invisible: false
char: 'c'
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Challenges/gopher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ robots:
loc: [-1, 1]
display:
attr: blue
dir: [1, 0]
dir: east
devices:
- ADT calculator
- 3D printer
Expand Down Expand Up @@ -77,7 +77,7 @@ robots:
- [120, flower]
- name: gopher
system: true
dir: [0, 1]
dir: north
display:
char: 'G'
invisible: false
Expand Down
Loading

0 comments on commit eaa5551

Please sign in to comment.