From bceca194efa142f5456453af7b01a1fc389e56e8 Mon Sep 17 00:00:00 2001 From: Karl Ostmo Date: Fri, 5 Jan 2024 11:34:55 -0800 Subject: [PATCH] rename 'pickable' property to 'portable' in scenario files --- data/scenarios/Challenges/2048.yaml | 24 ++++----- .../Challenges/Mazes/easy_cave_maze.yaml | 2 +- .../Challenges/Mazes/easy_spiral_maze.yaml | 2 +- .../Challenges/Mazes/invisible_maze.yaml | 2 +- .../Challenges/Mazes/loopy_maze.yaml | 2 +- .../Challenges/Ranching/beekeeping.yaml | 36 ++++++------- .../Challenges/Ranching/capture.yaml | 2 +- .../Challenges/Ranching/gated-paddock.yaml | 22 ++++---- .../Challenges/Ranching/powerset.yaml | 18 +++---- .../Challenges/Sliding Puzzles/3x3.yaml | 52 +++++++++---------- .../Sokoban/Gadgets/no-reverse.yaml | 2 +- .../Challenges/Sokoban/Gadgets/one-way.yaml | 2 +- .../Challenges/Sokoban/Simple/trapdoor.yaml | 2 +- .../Challenges/Sokoban/foresight.yaml | 4 +- data/scenarios/Challenges/arbitrage.yaml | 30 +++++------ data/scenarios/Challenges/blender.yaml | 4 +- .../scenarios/Challenges/bridge-building.yaml | 42 +++++++-------- data/scenarios/Challenges/bucket-brigade.yaml | 12 ++--- data/scenarios/Challenges/dimsum.yaml | 6 +-- data/scenarios/Challenges/friend.yaml | 2 +- data/scenarios/Challenges/gopher.yaml | 4 +- data/scenarios/Challenges/hackman.yaml | 8 +-- data/scenarios/Challenges/hanoi.yaml | 6 +-- data/scenarios/Challenges/ice-cream.yaml | 20 +++---- data/scenarios/Challenges/maypole.yaml | 2 +- .../Challenges/pack-tetrominoes.yaml | 10 ++-- .../Challenges/wolf-goat-cabbage.yaml | 6 +-- data/scenarios/Challenges/word-search.yaml | 4 +- data/scenarios/Fun/horton.yaml | 2 +- data/scenarios/Fun/snake.yaml | 6 +-- data/scenarios/Testing/1007-use-command.yaml | 2 +- .../Testing/1157-drill-return-value.yaml | 2 +- .../Testing/1218-stride-command.yaml | 2 +- data/scenarios/Testing/1234-push-command.yaml | 2 +- data/scenarios/Testing/1355-combustion.yaml | 6 +-- .../Testing/1535-ping/1535-in-range.yaml | 4 +- .../Testing/1535-ping/1535-out-of-range.yaml | 2 +- ...569-cache-invalidation-distance-limit.yaml | 8 +-- .../1569-cache-invalidation-modes.yaml | 8 +-- .../1569-harvest-batch.yaml | 2 +- data/scenarios/Testing/1631-tags.yaml | 10 ++-- .../201-require-device-creative1.yaml | 2 +- data/scenarios/Testing/479-atomic-race.yaml | 4 +- data/scenarios/Testing/479-atomic.yaml | 2 +- .../Testing/508-capability-subset.yaml | 4 +- .../836-automatic-waypoint-navigation.yaml | 6 +-- .../836-pathfinding/836-no-path-exists1.yaml | 2 +- .../836-pathfinding/836-no-path-exists2.yaml | 2 +- ...36-path-exists-find-entity-unwalkable.yaml | 2 +- .../836-path-exists-find-entity.yaml | 2 +- .../836-path-exists-find-location.yaml | 2 +- data/scenarios/Testing/958-isempty.yaml | 2 +- .../Testing/961-custom-capabilities.yaml | 2 +- data/scenarios/Tutorials/backstory.yaml | 2 +- data/scenarios/Tutorials/bind2.yaml | 2 +- data/scenarios/Tutorials/conditionals.yaml | 2 +- data/scenarios/Tutorials/crash.yaml | 2 +- data/scenarios/Tutorials/place.yaml | 2 +- data/scenarios/Tutorials/require.yaml | 2 +- data/scenarios/Tutorials/type-errors.yaml | 2 +- data/scenarios/Tutorials/types.yaml | 2 +- 61 files changed, 216 insertions(+), 216 deletions(-) diff --git a/data/scenarios/Challenges/2048.yaml b/data/scenarios/Challenges/2048.yaml index 7d3f945ac2..887d6fce08 100644 --- a/data/scenarios/Challenges/2048.yaml +++ b/data/scenarios/Challenges/2048.yaml @@ -25,84 +25,84 @@ entities: char: "#" description: - This is a one. Maybe you can combine it with other ones somehow. - properties: [growable, portable, infinite] + properties: [growable, pickable, infinite] - name: "2" display: attr: gold char: "#" description: - This is a two. Maybe you can combine it with other twos somehow. - properties: [portable] + properties: [pickable] - name: "4" display: attr: gold char: "#" description: - This is a four. You get the idea. - properties: [portable] + properties: [pickable] - name: "8" display: attr: gold char: "#" description: - An eight. - properties: [portable] + properties: [pickable] - name: "16" display: attr: gold char: "#" description: - A 16. - properties: [portable] + properties: [pickable] - name: "32" display: attr: gold char: "#" description: - A 32. - properties: [portable] + properties: [pickable] - name: "64" display: attr: gold char: "#" description: - A 64. - properties: [portable] + properties: [pickable] - name: "128" display: attr: gold char: "#" description: - A 128. - properties: [portable] + properties: [pickable] - name: "256" display: attr: gold char: "#" description: - A 256. - properties: [portable] + properties: [pickable] - name: "512" display: attr: gold char: "#" description: - A 512. - properties: [portable] + properties: [pickable] - name: "1024" display: attr: gold char: "#" description: - A 1024. - properties: [portable] + properties: [pickable] - name: "2048" display: attr: gold char: "#" description: - A 2048. - properties: [portable] + properties: [pickable] recipes: - in: - [2, "1"] diff --git a/data/scenarios/Challenges/Mazes/easy_cave_maze.yaml b/data/scenarios/Challenges/Mazes/easy_cave_maze.yaml index a9c8627403..7cf6c4300f 100644 --- a/data/scenarios/Challenges/Mazes/easy_cave_maze.yaml +++ b/data/scenarios/Challenges/Mazes/easy_cave_maze.yaml @@ -63,7 +63,7 @@ entities: attr: device description: - The place you're trying to reach! You win by executing `grab` on this item. - properties: [known, portable] + properties: [known, pickable] world: dsl: | {ice} diff --git a/data/scenarios/Challenges/Mazes/easy_spiral_maze.yaml b/data/scenarios/Challenges/Mazes/easy_spiral_maze.yaml index 84aadd17de..954cbf542c 100644 --- a/data/scenarios/Challenges/Mazes/easy_spiral_maze.yaml +++ b/data/scenarios/Challenges/Mazes/easy_spiral_maze.yaml @@ -62,7 +62,7 @@ entities: attr: device description: - The place you're trying to reach! You win by executing `grab` on this item. - properties: [known, portable] + properties: [known, pickable] world: dsl: | {ice} diff --git a/data/scenarios/Challenges/Mazes/invisible_maze.yaml b/data/scenarios/Challenges/Mazes/invisible_maze.yaml index 4a254d99cc..bb6b1afd6d 100644 --- a/data/scenarios/Challenges/Mazes/invisible_maze.yaml +++ b/data/scenarios/Challenges/Mazes/invisible_maze.yaml @@ -58,7 +58,7 @@ entities: attr: device description: - The place you're trying to reach! You win by executing `grab` on this item. - properties: [known, portable] + properties: [known, pickable] world: dsl: | {grass} diff --git a/data/scenarios/Challenges/Mazes/loopy_maze.yaml b/data/scenarios/Challenges/Mazes/loopy_maze.yaml index 951d4f43bd..0c22cffb0e 100644 --- a/data/scenarios/Challenges/Mazes/loopy_maze.yaml +++ b/data/scenarios/Challenges/Mazes/loopy_maze.yaml @@ -51,7 +51,7 @@ entities: attr: device description: - The place you're trying to reach! You win by executing `grab` on this item. - properties: [known, portable] + properties: [known, pickable] world: dsl: | {grass} diff --git a/data/scenarios/Challenges/Ranching/beekeeping.yaml b/data/scenarios/Challenges/Ranching/beekeeping.yaml index 31421809e0..4872dc0670 100644 --- a/data/scenarios/Challenges/Ranching/beekeeping.yaml +++ b/data/scenarios/Challenges/Ranching/beekeeping.yaml @@ -171,28 +171,28 @@ entities: char: 'k' description: - All the essentials to equip your own "worker bee" - properties: [known, portable] + properties: [known, pickable] - name: reed display: attr: plant char: 'r' description: - Reeds, grow near water - properties: [known, portable, growable] + properties: [known, pickable, growable] - name: honeycomb display: char: 'x' attr: gold description: - Product of bees that have consumed nectar - properties: [known, portable] + properties: [known, pickable] - name: proboscis display: char: 'p' attr: device description: - Senses direction to nectar-producing flowers - properties: [known, portable] + properties: [known, pickable] capabilities: [detectdirection, structure] - name: honey display: @@ -200,26 +200,26 @@ entities: attr: gold description: - Pure liquid honey - properties: [known, portable] + properties: [known, pickable] - name: mead display: char: 'm' description: - Honey-based alcoholic beverage - properties: [known, portable] + properties: [known, pickable] - name: honey extractor display: char: 'e' attr: device description: - Device for extracting honey from the comb - properties: [known, portable] + properties: [known, pickable] - name: buzz display: char: 'z' description: - Result of discarding surplus honeycomb - properties: [known, portable] + properties: [known, pickable] - name: wax gland display: char: 'g' @@ -232,35 +232,35 @@ entities: attr: gold description: - Obtained from wildflowers - properties: [known, portable] + properties: [known, pickable] - name: honey frame display: char: '-' attr: iceblue description: - Internal component of a beehive - properties: [known, portable] + properties: [known, pickable] - name: stave display: char: 'l' attr: wood description: - Wooden plank comprising the sides of a cask - properties: [known, portable] + properties: [known, pickable] - name: cask display: char: 'c' attr: wood description: - Wooden barrel for liquids - properties: [known, portable] + properties: [known, pickable] - name: water cask display: char: 'c' attr: water_cask description: - Water-filled cask - properties: [known, portable] + properties: [known, pickable] - name: lakewater display: attr: water @@ -274,14 +274,14 @@ entities: attr: device description: - Used to fill a cask with water - properties: [known, portable] + properties: [known, pickable] - name: steel hoop display: char: 'o' attr: iron description: - Binds staves into a cask - properties: [known, portable] + properties: [known, pickable] - name: wall display: char: 'w' @@ -295,7 +295,7 @@ entities: attr: wood description: - A segment of banquet table - properties: [known, portable] + properties: [known, pickable] - name: hearth display: char: 'h' @@ -309,14 +309,14 @@ entities: attr: rock description: - Grand entrance - properties: [known, portable] + properties: [known, pickable] - name: stone tile display: char: '.' attr: rock description: - Refined flooring - properties: [known, portable] + properties: [known, pickable] recipes: - in: - [1, botkit] diff --git a/data/scenarios/Challenges/Ranching/capture.yaml b/data/scenarios/Challenges/Ranching/capture.yaml index f878e67766..d65a4b5ce2 100644 --- a/data/scenarios/Challenges/Ranching/capture.yaml +++ b/data/scenarios/Challenges/Ranching/capture.yaml @@ -129,7 +129,7 @@ entities: char: '@' description: - Pushable rock - properties: [known, unwalkable, portable] + properties: [known, unwalkable, pickable] capabilities: [push] - name: bacon display: diff --git a/data/scenarios/Challenges/Ranching/gated-paddock.yaml b/data/scenarios/Challenges/Ranching/gated-paddock.yaml index badd1dea91..40bb5f70a7 100644 --- a/data/scenarios/Challenges/Ranching/gated-paddock.yaml +++ b/data/scenarios/Challenges/Ranching/gated-paddock.yaml @@ -234,7 +234,7 @@ entities: char: '#' description: - Keeps sheep in. And some other things out. - properties: [known, portable, unwalkable] + properties: [known, pickable, unwalkable] - name: post puller display: char: 'P' @@ -242,27 +242,27 @@ entities: capabilities: [drill] description: - Good for dismantling fences. - properties: [known, portable] + properties: [known, pickable] - name: scrap wood display: char: '\' description: - Scrap wood. Can be reconditioned into boards. - properties: [known, portable] + properties: [known, pickable] - name: sweater display: attr: gold char: 'S' description: - A warm wool sweater. Just in time for winter! - properties: [known, portable] + properties: [known, pickable] - name: clover display: attr: flower char: '%' description: - A tasty stack for fluffy ruminants. - properties: [portable, growable] + properties: [pickable, growable] growth: [80, 100] - name: gate display: @@ -277,7 +277,7 @@ entities: attr: rock description: - Facilitates swinging action. - properties: [known, portable] + properties: [known, pickable] - name: cabin display: char: Π @@ -297,19 +297,19 @@ entities: char: '.' description: - A marker that can be put down and found again. Used only by judge robot. - properties: [portable] + properties: [pickable] - name: treaded breadcrumb display: char: 'x' description: - A marker that can be put down and found again (for a second time). Used only by judge robot. - properties: [portable] + properties: [pickable] - name: evaporator display: char: 'E' description: - A tool that allows clearing a water tile. Used only by judge robot. - properties: [portable] + properties: [pickable] capabilities: [drill] - name: wool display: @@ -317,13 +317,13 @@ entities: attr: gold description: - A bundle of raw animal fiber. - properties: [portable] + properties: [pickable] - name: steam display: char: 'Z' description: - What's left after evaporating water. Used only by judge robot. - properties: [portable] + properties: [pickable] recipes: - in: - [2, board] diff --git a/data/scenarios/Challenges/Ranching/powerset.yaml b/data/scenarios/Challenges/Ranching/powerset.yaml index 20c854c63c..761a5ffb54 100644 --- a/data/scenarios/Challenges/Ranching/powerset.yaml +++ b/data/scenarios/Challenges/Ranching/powerset.yaml @@ -98,7 +98,7 @@ entities: char: 's' description: - Allows one to `stride` across multiple cells - properties: [known, portable] + properties: [known, pickable] capabilities: [movemultiple] - name: bell display: @@ -106,7 +106,7 @@ entities: attr: gold description: - A bell for Bill - properties: [known, portable] + properties: [known, pickable] - name: fruit picker display: char: 'P' @@ -127,7 +127,7 @@ entities: attr: fruit0 description: - Dragonfruits - properties: [known, growable, portable] + properties: [known, growable, pickable] growth: [10, 10] - name: grape display: @@ -136,7 +136,7 @@ entities: description: - Grapes growth: [10, 10] - properties: [known, growable, portable] + properties: [known, growable, pickable] - name: lemon display: char: 'Y' @@ -144,7 +144,7 @@ entities: description: - Lemons growth: [10, 10] - properties: [known, growable, portable] + properties: [known, growable, pickable] - name: apple display: char: 'Y' @@ -152,7 +152,7 @@ entities: description: - Apple growth: [10, 10] - properties: [known, growable, portable] + properties: [known, growable, pickable] - name: blueberry display: char: 'Y' @@ -160,7 +160,7 @@ entities: description: - Blueberries growth: [10, 10] - properties: [known, growable, portable] + properties: [known, growable, pickable] - name: watermelon display: char: 'Y' @@ -168,7 +168,7 @@ entities: description: - Watermelons growth: [10, 10] - properties: [known, growable, portable] + properties: [known, growable, pickable] - name: orange display: char: 'Y' @@ -176,7 +176,7 @@ entities: description: - Oranges growth: [10, 10] - properties: [known, growable, portable] + properties: [known, growable, pickable] known: [sand] world: dsl: | diff --git a/data/scenarios/Challenges/Sliding Puzzles/3x3.yaml b/data/scenarios/Challenges/Sliding Puzzles/3x3.yaml index 50e36e47dd..0854182d15 100644 --- a/data/scenarios/Challenges/Sliding Puzzles/3x3.yaml +++ b/data/scenarios/Challenges/Sliding Puzzles/3x3.yaml @@ -185,7 +185,7 @@ entities: char: '/' description: - Facilitates pushing - properties: [known, portable] + properties: [known, pickable] capabilities: [push] - name: sliding-tile display: @@ -199,175 +199,175 @@ entities: attr: oddtile description: - One - properties: [known, portable] + properties: [known, pickable] - name: b-tile display: char: 'b' attr: eventile description: - Two - properties: [known, portable] + properties: [known, pickable] - name: c-tile display: char: 'c' attr: oddtile description: - Three - properties: [known, portable] + properties: [known, pickable] - name: d-tile display: char: 'd' attr: eventile description: - Four - properties: [known, portable] + properties: [known, pickable] - name: e-tile display: char: 'e' attr: oddtile description: - Five - properties: [known, portable] + properties: [known, pickable] - name: f-tile display: char: 'f' attr: eventile description: - Six - properties: [known, portable] + properties: [known, pickable] - name: g-tile display: char: 'g' attr: oddtile description: - Seven - properties: [known, portable] + properties: [known, pickable] - name: h-tile display: char: 'h' attr: eventile description: - Eight - properties: [known, portable] + properties: [known, pickable] - name: i-tile display: char: 'i' attr: oddtile description: - Nine - properties: [known, portable] + properties: [known, pickable] - name: j-tile display: char: 'j' attr: eventile description: - Ten - properties: [known, portable] + properties: [known, pickable] - name: k-tile display: char: 'k' attr: oddtile description: - Eleven - properties: [known, portable] + properties: [known, pickable] - name: l-tile display: char: 'l' attr: eventile description: - Twelve - properties: [known, portable] + properties: [known, pickable] - name: m-tile display: char: 'm' attr: oddtile description: - Thirteen - properties: [known, portable] + properties: [known, pickable] - name: n-tile display: char: 'n' attr: eventile description: - Fourteen - properties: [known, portable] + properties: [known, pickable] - name: o-tile display: char: 'o' attr: oddtile description: - Fifteen - properties: [known, portable] + properties: [known, pickable] - name: p-tile display: char: 'p' attr: eventile description: - Sixteen - properties: [known, portable] + properties: [known, pickable] - name: q-tile display: char: 'q' attr: oddtile description: - Seventeen - properties: [known, portable] + properties: [known, pickable] - name: r-tile display: char: 'r' attr: eventile description: - Eighteen - properties: [known, portable] + properties: [known, pickable] - name: s-tile display: char: 's' attr: oddtile description: - Nineteen - properties: [known, portable] + properties: [known, pickable] - name: t-tile display: char: 't' attr: eventile description: - Twenty - properties: [known, portable] + properties: [known, pickable] - name: u-tile display: char: 'u' attr: oddtile description: - Twenty-one - properties: [known, portable] + properties: [known, pickable] - name: v-tile display: char: 'v' attr: eventile description: - Twenty-two - properties: [known, portable] + properties: [known, pickable] - name: w-tile display: char: 'w' attr: oddtile description: - Twenty-three - properties: [known, portable] + properties: [known, pickable] - name: x-tile display: char: 'x' attr: eventile description: - Twenty-four - properties: [known, portable] + properties: [known, pickable] - name: y-tile display: char: 'y' attr: oddtile description: - Twenty-five - properties: [known, portable] + properties: [known, pickable] - name: a-tile-ordinal display: char: 'a' diff --git a/data/scenarios/Challenges/Sokoban/Gadgets/no-reverse.yaml b/data/scenarios/Challenges/Sokoban/Gadgets/no-reverse.yaml index 13137d1d77..c9532854e5 100644 --- a/data/scenarios/Challenges/Sokoban/Gadgets/no-reverse.yaml +++ b/data/scenarios/Challenges/Sokoban/Gadgets/no-reverse.yaml @@ -63,7 +63,7 @@ entities: char: '@' description: - Pushable rock - properties: [known, unwalkable, portable] + properties: [known, unwalkable, pickable] known: [mountain, water, flower] world: dsl: | diff --git a/data/scenarios/Challenges/Sokoban/Gadgets/one-way.yaml b/data/scenarios/Challenges/Sokoban/Gadgets/one-way.yaml index 110d27a91f..16a094b607 100644 --- a/data/scenarios/Challenges/Sokoban/Gadgets/one-way.yaml +++ b/data/scenarios/Challenges/Sokoban/Gadgets/one-way.yaml @@ -46,7 +46,7 @@ entities: char: '@' description: - Pushable rock - properties: [known, unwalkable, portable] + properties: [known, unwalkable, pickable] known: [mountain, water, flower] world: dsl: | diff --git a/data/scenarios/Challenges/Sokoban/Simple/trapdoor.yaml b/data/scenarios/Challenges/Sokoban/Simple/trapdoor.yaml index cfc2197809..6e2a57ef20 100644 --- a/data/scenarios/Challenges/Sokoban/Simple/trapdoor.yaml +++ b/data/scenarios/Challenges/Sokoban/Simple/trapdoor.yaml @@ -98,7 +98,7 @@ entities: char: '@' description: - Pushable rock - properties: [known, unwalkable, portable] + properties: [known, unwalkable, pickable] known: [mountain, water, flower] world: dsl: | diff --git a/data/scenarios/Challenges/Sokoban/foresight.yaml b/data/scenarios/Challenges/Sokoban/foresight.yaml index 0a2a7986bf..67fcc18033 100644 --- a/data/scenarios/Challenges/Sokoban/foresight.yaml +++ b/data/scenarios/Challenges/Sokoban/foresight.yaml @@ -78,14 +78,14 @@ entities: attr: gold description: - Pushable rock - properties: [known, unwalkable, portable] + properties: [known, unwalkable, pickable] - name: crate display: attr: wood char: '▪' description: - Pushable crate - properties: [known, portable, unwalkable] + properties: [known, pickable, unwalkable] - name: wall display: attr: barrier diff --git a/data/scenarios/Challenges/arbitrage.yaml b/data/scenarios/Challenges/arbitrage.yaml index 43694d6b97..1243e94290 100644 --- a/data/scenarios/Challenges/arbitrage.yaml +++ b/data/scenarios/Challenges/arbitrage.yaml @@ -87,95 +87,95 @@ entities: description: - An ubiquitous office accoutrement. - Practically worthless as a single unit. - properties: [known, portable] + properties: [known, pickable] - name: pinwheel display: char: 'P' attr: gold description: - Watch it spin. Wheee! - properties: [portable] + properties: [pickable] - name: stapler display: char: 'S' attr: red description: - A shiny red stapler - properties: [portable] + properties: [pickable] - name: toothbrush display: char: 'b' attr: blue description: - Brushy brushy - properties: [portable] + properties: [pickable] - name: Pez dispenser display: char: 'P' description: - Classic collectible toy. Absent its chalky candy. - properties: [portable] + properties: [pickable] - name: shoehorn display: char: 'h' description: - Handheld apparatus for donning snug footwear - properties: [portable] + properties: [pickable] - name: trivet display: char: 'v' description: - Protective silicone mat for hot cookware - properties: [portable] + properties: [pickable] - name: coffee mug display: char: 'c' description: - Caffeine conveyance - properties: [portable] + properties: [pickable] - name: toaster display: char: 'A' description: - Bread warmer-upper - properties: [portable] + properties: [pickable] - name: blender display: char: 'B' description: - Essential for smoothie preparation - properties: [portable] + properties: [pickable] - name: electric can opener display: char: 'B' description: - | For when you can't be bothered to manually open a can - properties: [portable] + properties: [pickable] - name: wok display: char: 'w' description: - One must wok before one can run. - properties: [portable] + properties: [pickable] - name: sous vide cooker display: char: 's' description: - trendy gourmet cooking appliance - properties: [portable] + properties: [pickable] - name: french press display: char: 'f' description: - plunger-based coffee maker - properties: [portable] + properties: [pickable] - name: stand mixer display: char: 'm' description: - whips, kneads, and mixes - properties: [portable] + properties: [pickable] - name: shopA display: char: 'A' diff --git a/data/scenarios/Challenges/blender.yaml b/data/scenarios/Challenges/blender.yaml index b87f4a0646..236e63d45f 100644 --- a/data/scenarios/Challenges/blender.yaml +++ b/data/scenarios/Challenges/blender.yaml @@ -151,7 +151,7 @@ entities: attr: gold description: - used to unlock a door - properties: [known, portable] + properties: [known, pickable] capabilities: [drill] - name: bind gt display: @@ -173,7 +173,7 @@ entities: attr: snow description: - The figurative jewel of category theory - properties: [known, portable] + properties: [known, pickable] recipes: - in: - [1, locked door] diff --git a/data/scenarios/Challenges/bridge-building.yaml b/data/scenarios/Challenges/bridge-building.yaml index 3115ceea49..8308e89df1 100644 --- a/data/scenarios/Challenges/bridge-building.yaml +++ b/data/scenarios/Challenges/bridge-building.yaml @@ -190,21 +190,21 @@ entities: attr: 'magenta' description: - The map describes local points of interest, relative to your cabin. - properties: [portable, known] + properties: [pickable, known] - name: peat furnace display: char: 'F' attr: tan description: - Fueled by peat. - properties: [portable, known] + properties: [pickable, known] - name: clay display: char: 'c' attr: tan description: - Can be fired in a peat furnace into a vessel. - properties: [portable, known] + properties: [pickable, known] - name: lava display: char: 'w' @@ -218,21 +218,21 @@ entities: attr: tan description: - A tiny, inconsequential rock. - properties: [known, portable] + properties: [known, pickable] - name: machete display: char: '/' attr: cyan description: - Easily cuts through jungle overgrowth. - properties: [known, portable] + properties: [known, pickable] - name: painted plate display: char: 'o' attr: obsidian description: - Limited edition 1978 collectible Helix the Cat ornamental hand-painted dinner plate. - properties: [known, portable] + properties: [known, pickable] - name: oven mitts display: char: 'm' @@ -272,7 +272,7 @@ entities: attr: silver description: - Can break hard objects - properties: [known, portable] + properties: [known, pickable] - name: granite mountain display: char: 'A' @@ -298,35 +298,35 @@ entities: char: 'L' description: - Can be used to traverse down a cliff. - properties: [known, portable] + properties: [known, pickable] - name: hemp display: char: 'h' attr: plant description: - Can be used to make rope - properties: [known, portable, growable] + properties: [known, pickable, growable] - name: flimsy board display: char: 'b' attr: wood description: - Board made from a soft log. Has poor rigidity. - properties: [known, portable] + properties: [known, pickable] - name: soft log display: char: 'l' attr: wood description: - Log made from a palm tree. A bit flexible. - properties: [known, portable] + properties: [known, pickable] - name: coconut display: char: 'c' attr: wood description: - Spherical, buoyant husk - properties: [known, portable] + properties: [known, pickable] - name: floating boardwalk display: char: '▒' @@ -340,7 +340,7 @@ entities: attr: wood description: - Burnable plant material - properties: [known, portable] + properties: [known, pickable] - name: peat bog display: char: 'b' @@ -374,14 +374,14 @@ entities: char: 'c' description: - An empty crucible. Can carry lava. - properties: [known, portable] + properties: [known, pickable] - name: lava-filled crucible display: char: 'C' attr: lavaBG description: - Crucible filled with lava - properties: [known, portable] + properties: [known, pickable] - name: quarry display: char: 'Q' @@ -436,13 +436,13 @@ entities: char: 'r' description: - An empty container for rubble. - properties: [known, portable] + properties: [known, pickable] - name: rubble-filled skip display: char: 'R' description: - An full container of rubble. Can be dumped in the water as fill to form a causeway. - properties: [known, portable] + properties: [known, pickable] - name: causeway display: char: '▒' @@ -454,14 +454,14 @@ entities: char: 'k' description: - Tank with nothing in it - properties: [known, portable] + properties: [known, pickable] - name: water-filled tank display: char: 'K' attr: blueBG description: - Tank filled with water - properties: [known, portable] + properties: [known, pickable] - name: obsidian path display: char: '`' @@ -475,14 +475,14 @@ entities: attr: obsidian description: - Dislodged fragment of obsidian - properties: [known, portable] + properties: [known, pickable] - name: palm tree display: char: 'P' attr: beach description: - Palm tree. - properties: [known, portable, growable] + properties: [known, pickable, growable] recipes: - in: - [8, clay] diff --git a/data/scenarios/Challenges/bucket-brigade.yaml b/data/scenarios/Challenges/bucket-brigade.yaml index 204517b310..5e76ad00ec 100644 --- a/data/scenarios/Challenges/bucket-brigade.yaml +++ b/data/scenarios/Challenges/bucket-brigade.yaml @@ -84,7 +84,7 @@ entities: char: 'x' description: - A powerful machine designed to remove overburden in mining operations. - properties: [known, portable] + properties: [known, pickable] capabilities: [drill] - name: lignite mine display: @@ -98,31 +98,31 @@ entities: char: 'c' description: - Primitive, sooty fuel. - properties: [known, portable] + properties: [known, pickable] - name: coal briquette display: char: 'q' description: - A compressed, convenient form of coal for consumption and transport. - properties: [known, portable] + properties: [known, pickable] - name: briquette press display: char: 'P' description: - A device to compress coal lumps into briquettes. - properties: [known, portable] + properties: [known, pickable] - name: energy display: char: 'E' description: - The result of burning a coal briquettte. - properties: [portable] + properties: [pickable] - name: repro kit display: char: 'k' description: - Kit that can be unpacked into everything a robot needs to reproduce. - properties: [known, portable] + properties: [known, pickable] recipes: - in: - [1, repro kit] diff --git a/data/scenarios/Challenges/dimsum.yaml b/data/scenarios/Challenges/dimsum.yaml index c9ae401e35..ffeac0c905 100644 --- a/data/scenarios/Challenges/dimsum.yaml +++ b/data/scenarios/Challenges/dimsum.yaml @@ -85,19 +85,19 @@ entities: char: 's' description: - Serving utensil for the cart - properties: [known, portable] + properties: [known, pickable] - name: fork display: char: 'k' description: - Eating utensil for patron - properties: [known, portable] + properties: [known, pickable] - name: food display: char: 'f' description: - Food from the cart - properties: [known, portable] + properties: [known, pickable] - name: empty cart display: attr: copper diff --git a/data/scenarios/Challenges/friend.yaml b/data/scenarios/Challenges/friend.yaml index 008ccc1594..feb3a8d51a 100644 --- a/data/scenarios/Challenges/friend.yaml +++ b/data/scenarios/Challenges/friend.yaml @@ -72,7 +72,7 @@ entities: char: 'f' description: - A smelly fish. Rather unappetizing to a robot. - properties: [known, portable] + properties: [known, pickable] known: [fish] seed: 0 world: diff --git a/data/scenarios/Challenges/gopher.yaml b/data/scenarios/Challenges/gopher.yaml index 82e51044cd..0550360035 100644 --- a/data/scenarios/Challenges/gopher.yaml +++ b/data/scenarios/Challenges/gopher.yaml @@ -110,14 +110,14 @@ entities: capabilities: [turn] description: - Allows a robot to "turn" but not "move". - properties: [known, portable] + properties: [known, pickable] - name: uranium display: char: 'U' attr: silver description: - Unearthed by industrious gophers. - properties: [known, portable] + properties: [known, pickable] recipes: - in: - [1, mound] diff --git a/data/scenarios/Challenges/hackman.yaml b/data/scenarios/Challenges/hackman.yaml index d2271ed38f..0645488257 100644 --- a/data/scenarios/Challenges/hackman.yaml +++ b/data/scenarios/Challenges/hackman.yaml @@ -211,7 +211,7 @@ entities: description: - A caffeine pellet. - Helps Hackman produce more code. - properties: [known, portable] + properties: [known, pickable] - name: donut display: char: 'o' @@ -219,14 +219,14 @@ entities: description: - Breakfast of champions. - Fancied by ghosts. Will you share? - properties: [known, portable] + properties: [known, pickable] - name: den key display: char: 'k' attr: gold description: - Opens a gate - properties: [known, portable] + properties: [known, pickable] - name: strawberry display: char: 'v' @@ -234,7 +234,7 @@ entities: description: - A tart berry - Possessing this fruit gives you great satisfaction. - properties: [known, portable] + properties: [known, pickable] - name: gate display: char: '=' diff --git a/data/scenarios/Challenges/hanoi.yaml b/data/scenarios/Challenges/hanoi.yaml index 2564db678a..bbb99ff9a7 100644 --- a/data/scenarios/Challenges/hanoi.yaml +++ b/data/scenarios/Challenges/hanoi.yaml @@ -101,21 +101,21 @@ entities: attr: gold description: - A disk of radius 3. - properties: [portable] + properties: [pickable] - name: two display: char: '2' attr: gold description: - A disk of radius 2. - properties: [portable] + properties: [pickable] - name: one display: char: '1' attr: gold description: - A disk of radius 1. - properties: [portable] + properties: [pickable] - name: blocked one display: char: '1' diff --git a/data/scenarios/Challenges/ice-cream.yaml b/data/scenarios/Challenges/ice-cream.yaml index 535ad75408..18a9794ad0 100644 --- a/data/scenarios/Challenges/ice-cream.yaml +++ b/data/scenarios/Challenges/ice-cream.yaml @@ -77,19 +77,19 @@ entities: char: '@' description: - A single scoop of vanilla ice cream - properties: [portable] + properties: [pickable] - name: cherry display: char: '6' attr: 'red' - properties: [portable] + properties: [pickable] description: - A traditional ice cream garnish - name: Counter display: char: '▒' attr: 'sand' - properties: [portable, known] + properties: [pickable, known] capabilities: [count] description: - Where customers are served. @@ -98,42 +98,42 @@ entities: display: char: 'V' attr: 'sand' - properties: [portable] + properties: [pickable] description: - A conical, edible container for ice cream - name: egg display: char: 'e' attr: 'gold' - properties: [portable] + properties: [pickable] description: - Organic from local, free-range, meticulously pampered chickens. - name: milk display: char: 'm' attr: 'silver' - properties: [portable] + properties: [pickable] description: - Pasteurized, homogenized, commoditized, metabolized. - name: ice display: char: 'i' attr: 'snow' - properties: [portable] + properties: [pickable] description: - Ice cream is better cold, don't you think? - name: sugar display: char: 's' attr: 'snow' - properties: [portable] + properties: [pickable] description: - Basis of most desserts - name: vanilla display: char: 'v' attr: 'wood' - properties: [portable] + properties: [pickable] description: - Traditional ice cream flavoring - name: briefcase @@ -141,7 +141,7 @@ entities: char: 'B' attr: rubber capabilities: [sum, prod] - properties: [portable] + properties: [pickable] description: - Standard business accoutrement. - Particularly useful for `meet`-ings. diff --git a/data/scenarios/Challenges/maypole.yaml b/data/scenarios/Challenges/maypole.yaml index df2834890d..bdfcd95e85 100644 --- a/data/scenarios/Challenges/maypole.yaml +++ b/data/scenarios/Challenges/maypole.yaml @@ -63,7 +63,7 @@ entities: char: '@' description: - A disorienting vestibular affliction - properties: [portable] + properties: [pickable] - name: maypole display: char: 'M' diff --git a/data/scenarios/Challenges/pack-tetrominoes.yaml b/data/scenarios/Challenges/pack-tetrominoes.yaml index a5cbedce4e..2643ce7733 100644 --- a/data/scenarios/Challenges/pack-tetrominoes.yaml +++ b/data/scenarios/Challenges/pack-tetrominoes.yaml @@ -50,35 +50,35 @@ entities: attr: q-tile description: - q-tile - properties: [known, portable] + properties: [known, pickable] - name: j-tile display: char: 'j' attr: j-tile description: - j-tile - properties: [known, portable] + properties: [known, pickable] - name: i-tile display: char: 'i' attr: i-tile description: - i-tile - properties: [known, portable] + properties: [known, pickable] - name: t-tile display: char: 't' attr: t-tile description: - t-tile - properties: [known, portable] + properties: [known, pickable] - name: z-tile display: char: 'z' attr: z-tile description: - z-tile - properties: [known, portable] + properties: [known, pickable] solution: | run "scenarios/Challenges/_pack-tetrominoes/solution.sw" structures: diff --git a/data/scenarios/Challenges/wolf-goat-cabbage.yaml b/data/scenarios/Challenges/wolf-goat-cabbage.yaml index 814ecfedbd..fccdd7d9bc 100644 --- a/data/scenarios/Challenges/wolf-goat-cabbage.yaml +++ b/data/scenarios/Challenges/wolf-goat-cabbage.yaml @@ -80,21 +80,21 @@ entities: attr: silver description: - A wolf. Likes to eat goats. - properties: [known, portable] + properties: [known, pickable] - name: goat display: char: 'g' attr: sand description: - A goat. Likes to eat cabbage. - properties: [known, portable] + properties: [known, pickable] - name: cabbage display: char: 'c' attr: green description: - A cabbage. - properties: [known, portable] + properties: [known, pickable] known: [water, boulder] seed: 0 world: diff --git a/data/scenarios/Challenges/word-search.yaml b/data/scenarios/Challenges/word-search.yaml index d21a7a3b4a..1cafa1230e 100644 --- a/data/scenarios/Challenges/word-search.yaml +++ b/data/scenarios/Challenges/word-search.yaml @@ -293,14 +293,14 @@ entities: capabilities: [drill] description: - Instrument for marking found words - properties: [known, portable] + properties: [known, pickable] - name: ink display: char: 'K' attr: gold description: - Ink for marking found words - properties: [known, portable] + properties: [known, pickable] recipes: - in: - [1, capital C] diff --git a/data/scenarios/Fun/horton.yaml b/data/scenarios/Fun/horton.yaml index 37b05079d0..9de327493f 100644 --- a/data/scenarios/Fun/horton.yaml +++ b/data/scenarios/Fun/horton.yaml @@ -62,7 +62,7 @@ entities: - | `path (inL ()) (inR "tree");` - If a path exists, returns the direction to proceed along. - properties: [known, portable] + properties: [known, pickable] capabilities: [path] known: [water, boulder, flower] world: diff --git a/data/scenarios/Fun/snake.yaml b/data/scenarios/Fun/snake.yaml index 7fb47fc498..bf06e40be9 100644 --- a/data/scenarios/Fun/snake.yaml +++ b/data/scenarios/Fun/snake.yaml @@ -65,7 +65,7 @@ entities: description: - | Enables the `path` command - properties: [known, portable] + properties: [known, pickable] capabilities: [path] - name: apple display: @@ -74,7 +74,7 @@ entities: description: - | Tasty snack - properties: [known, portable] + properties: [known, pickable] - name: apple core display: char: 'I' @@ -82,7 +82,7 @@ entities: description: - | Remains of an eaten apple - properties: [known, portable] + properties: [known, pickable] - name: rattle display: char: 'r' diff --git a/data/scenarios/Testing/1007-use-command.yaml b/data/scenarios/Testing/1007-use-command.yaml index 6d75215732..3f6a3bd66b 100644 --- a/data/scenarios/Testing/1007-use-command.yaml +++ b/data/scenarios/Testing/1007-use-command.yaml @@ -41,7 +41,7 @@ entities: char: 'k' description: - Can open a closed gate - properties: [known, portable] + properties: [known, pickable] - name: closed gate display: attr: wood diff --git a/data/scenarios/Testing/1157-drill-return-value.yaml b/data/scenarios/Testing/1157-drill-return-value.yaml index f3e92fe425..773812e23f 100644 --- a/data/scenarios/Testing/1157-drill-return-value.yaml +++ b/data/scenarios/Testing/1157-drill-return-value.yaml @@ -46,7 +46,7 @@ entities: char: 'o' description: - Dispensed from a gumball machine - properties: [portable] + properties: [pickable] recipes: - in: - [1, gumball machine] diff --git a/data/scenarios/Testing/1218-stride-command.yaml b/data/scenarios/Testing/1218-stride-command.yaml index ebb9722967..3686116052 100644 --- a/data/scenarios/Testing/1218-stride-command.yaml +++ b/data/scenarios/Testing/1218-stride-command.yaml @@ -74,7 +74,7 @@ entities: char: 't' description: - Allows one to "stride" across multiple cells - properties: [known, portable] + properties: [known, pickable] capabilities: [movemultiple] known: [tree, flower, boulder, water] world: diff --git a/data/scenarios/Testing/1234-push-command.yaml b/data/scenarios/Testing/1234-push-command.yaml index e5ff8bbd7e..304f406dfd 100644 --- a/data/scenarios/Testing/1234-push-command.yaml +++ b/data/scenarios/Testing/1234-push-command.yaml @@ -48,7 +48,7 @@ entities: char: '▪' description: - Pushable crate - properties: [known, portable, unwalkable] + properties: [known, pickable, unwalkable] known: [tree, flower, boulder, water] world: palette: diff --git a/data/scenarios/Testing/1355-combustion.yaml b/data/scenarios/Testing/1355-combustion.yaml index 07d6261b20..9c5b96261f 100644 --- a/data/scenarios/Testing/1355-combustion.yaml +++ b/data/scenarios/Testing/1355-combustion.yaml @@ -62,7 +62,7 @@ entities: char: 't' description: - Can set things on fire - properties: [known, portable] + properties: [known, pickable] capabilities: [ignite] - name: fuse display: @@ -74,7 +74,7 @@ entities: ignition: 1 duration: [8, 8] product: null - properties: [known, portable, combustible] + properties: [known, pickable, combustible] - name: dynamite display: attr: red @@ -85,7 +85,7 @@ entities: ignition: 1 duration: [2, 2] product: crater - properties: [known, portable, combustible] + properties: [known, pickable, combustible] - name: crater display: attr: rock diff --git a/data/scenarios/Testing/1535-ping/1535-in-range.yaml b/data/scenarios/Testing/1535-ping/1535-in-range.yaml index eba08f7274..37bbb7acdf 100644 --- a/data/scenarios/Testing/1535-ping/1535-in-range.yaml +++ b/data/scenarios/Testing/1535-ping/1535-in-range.yaml @@ -22,14 +22,14 @@ entities: char: 'x' description: - Enables `ping` command - properties: [known, portable] + properties: [known, pickable] capabilities: [ping] - name: map piece display: char: 'm' description: - Half of a treasure map - properties: [known, portable] + properties: [known, pickable] robots: - name: base dir: east diff --git a/data/scenarios/Testing/1535-ping/1535-out-of-range.yaml b/data/scenarios/Testing/1535-ping/1535-out-of-range.yaml index 6d3a78c35a..fed61705d2 100644 --- a/data/scenarios/Testing/1535-ping/1535-out-of-range.yaml +++ b/data/scenarios/Testing/1535-ping/1535-out-of-range.yaml @@ -21,7 +21,7 @@ entities: char: 'x' description: - Enables `ping` command - properties: [known, portable] + properties: [known, pickable] capabilities: [ping] robots: - name: base diff --git a/data/scenarios/Testing/1569-pathfinding-cache/1569-cache-invalidation-distance-limit.yaml b/data/scenarios/Testing/1569-pathfinding-cache/1569-cache-invalidation-distance-limit.yaml index aa34c72232..c6772c0c0f 100644 --- a/data/scenarios/Testing/1569-pathfinding-cache/1569-cache-invalidation-distance-limit.yaml +++ b/data/scenarios/Testing/1569-pathfinding-cache/1569-cache-invalidation-distance-limit.yaml @@ -67,7 +67,7 @@ entities: char: 'w' description: - Enables `path` command - properties: [known, portable] + properties: [known, pickable] capabilities: [path] - name: monolith display: @@ -75,21 +75,21 @@ entities: attr: rock description: - Pushable rock - properties: [known, unwalkable, portable] + properties: [known, unwalkable, pickable] - name: lemon display: char: 'o' attr: gold description: - Sour fruit - properties: [known, portable] + properties: [known, pickable] - name: lemonade display: char: 'c' attr: gold description: - Sweet drink - properties: [known, portable] + properties: [known, pickable] recipes: - in: - [1, lemon] diff --git a/data/scenarios/Testing/1569-pathfinding-cache/1569-cache-invalidation-modes.yaml b/data/scenarios/Testing/1569-pathfinding-cache/1569-cache-invalidation-modes.yaml index 0f6bc62e36..c9378dba52 100644 --- a/data/scenarios/Testing/1569-pathfinding-cache/1569-cache-invalidation-modes.yaml +++ b/data/scenarios/Testing/1569-pathfinding-cache/1569-cache-invalidation-modes.yaml @@ -109,7 +109,7 @@ entities: char: 'w' description: - Enables `path` command - properties: [known, portable] + properties: [known, pickable] capabilities: [path] - name: monolith display: @@ -117,21 +117,21 @@ entities: attr: rock description: - Pushable rock - properties: [known, unwalkable, portable] + properties: [known, unwalkable, pickable] - name: lemon display: char: 'o' attr: gold description: - Sour fruit - properties: [known, portable] + properties: [known, pickable] - name: lemonade display: char: 'c' attr: gold description: - Sweet drink - properties: [known, portable] + properties: [known, pickable] recipes: - in: - [1, lemon] diff --git a/data/scenarios/Testing/1569-pathfinding-cache/1569-harvest-batch.yaml b/data/scenarios/Testing/1569-pathfinding-cache/1569-harvest-batch.yaml index 8254d98777..86dced56d0 100644 --- a/data/scenarios/Testing/1569-pathfinding-cache/1569-harvest-batch.yaml +++ b/data/scenarios/Testing/1569-pathfinding-cache/1569-harvest-batch.yaml @@ -32,7 +32,7 @@ entities: char: 'w' description: - Enables `path` command - properties: [known, portable] + properties: [known, pickable] capabilities: [path] robots: - name: base diff --git a/data/scenarios/Testing/1631-tags.yaml b/data/scenarios/Testing/1631-tags.yaml index ac209fb0e5..f12fb1f560 100644 --- a/data/scenarios/Testing/1631-tags.yaml +++ b/data/scenarios/Testing/1631-tags.yaml @@ -79,7 +79,7 @@ entities: char: 'S' description: - Reads the 'tag' of an item - properties: [portable] + properties: [pickable] capabilities: [hastag, tagmembers] - name: canteloupe display: @@ -87,20 +87,20 @@ entities: description: - Melon tags: [edible, fruit] - properties: [portable] + properties: [pickable] - name: mushroom display: char: 'm' description: - Nature's tiny umbrella. tags: [edible, fungus] - properties: [portable] + properties: [pickable] - name: gravel display: char: 'g' description: - Crushed rock - properties: [portable] + properties: [pickable] - name: strawberry display: char: 's' @@ -113,7 +113,7 @@ entities: description: - Just ripe tags: [edible, fruit] - properties: [portable] + properties: [pickable] world: palette: '.': [grass] diff --git a/data/scenarios/Testing/201-require/201-require-device-creative1.yaml b/data/scenarios/Testing/201-require/201-require-device-creative1.yaml index c36cc24efb..9fd363edab 100644 --- a/data/scenarios/Testing/201-require/201-require-device-creative1.yaml +++ b/data/scenarios/Testing/201-require/201-require-device-creative1.yaml @@ -47,6 +47,6 @@ entities: char: ' ' description: - An infinite ocean of water. - properties: [known, portable, growable, liquid] + properties: [known, pickable, growable, liquid] growth: [0, 0] yields: water diff --git a/data/scenarios/Testing/479-atomic-race.yaml b/data/scenarios/Testing/479-atomic-race.yaml index 1a898cd036..491bf02d95 100644 --- a/data/scenarios/Testing/479-atomic-race.yaml +++ b/data/scenarios/Testing/479-atomic-race.yaml @@ -67,7 +67,7 @@ entities: char: 'W' description: - A fast-growing weed. - properties: [known, portable, growable] + properties: [known, pickable, growable] growth: [1, 2] - name: Win display: @@ -75,7 +75,7 @@ entities: char: 'W' description: - You win! - properties: [known, portable] + properties: [known, pickable] world: palette: '.': [grass] diff --git a/data/scenarios/Testing/479-atomic.yaml b/data/scenarios/Testing/479-atomic.yaml index 4c995841cb..2d40084e2e 100644 --- a/data/scenarios/Testing/479-atomic.yaml +++ b/data/scenarios/Testing/479-atomic.yaml @@ -56,7 +56,7 @@ entities: char: 'W' description: - A fast-growing weed. - properties: [known, portable, growable] + properties: [known, pickable, growable] growth: [1, 2] world: palette: diff --git a/data/scenarios/Testing/508-capability-subset.yaml b/data/scenarios/Testing/508-capability-subset.yaml index 1657f135c1..8e77e48685 100644 --- a/data/scenarios/Testing/508-capability-subset.yaml +++ b/data/scenarios/Testing/508-capability-subset.yaml @@ -60,7 +60,7 @@ entities: char: 'G' description: - A satellite navigation device. - properties: [known, portable] + properties: [known, pickable] capabilities: [senseloc] - name: Tardis display: @@ -68,5 +68,5 @@ entities: char: '█' description: - Bigger on the inside. - properties: [known, portable] + properties: [known, pickable] capabilities: [senseloc, teleport] diff --git a/data/scenarios/Testing/836-pathfinding/836-automatic-waypoint-navigation.yaml b/data/scenarios/Testing/836-pathfinding/836-automatic-waypoint-navigation.yaml index d34167a7a1..04b826ffd3 100644 --- a/data/scenarios/Testing/836-pathfinding/836-automatic-waypoint-navigation.yaml +++ b/data/scenarios/Testing/836-pathfinding/836-automatic-waypoint-navigation.yaml @@ -23,14 +23,14 @@ entities: char: 'w' description: - Enables `path` command - properties: [known, portable] + properties: [known, pickable] capabilities: [path] - name: atlas display: char: 'a' description: - Enables `waypoint` command - properties: [known, portable] + properties: [known, pickable] capabilities: [waypoint] - name: kudzu display: @@ -46,7 +46,7 @@ entities: attr: easter_egg description: - A colorful egg laid by the rabbit - properties: [known, portable] + properties: [known, pickable] growth: [5, 10] robots: - name: base diff --git a/data/scenarios/Testing/836-pathfinding/836-no-path-exists1.yaml b/data/scenarios/Testing/836-pathfinding/836-no-path-exists1.yaml index e4a95418d2..68e6ae0328 100644 --- a/data/scenarios/Testing/836-pathfinding/836-no-path-exists1.yaml +++ b/data/scenarios/Testing/836-pathfinding/836-no-path-exists1.yaml @@ -20,7 +20,7 @@ entities: char: 'w' description: - Enables `path` command - properties: [known, portable] + properties: [known, pickable] capabilities: [path] robots: - name: base diff --git a/data/scenarios/Testing/836-pathfinding/836-no-path-exists2.yaml b/data/scenarios/Testing/836-pathfinding/836-no-path-exists2.yaml index 476f1d7a49..42d66372c8 100644 --- a/data/scenarios/Testing/836-pathfinding/836-no-path-exists2.yaml +++ b/data/scenarios/Testing/836-pathfinding/836-no-path-exists2.yaml @@ -26,7 +26,7 @@ entities: char: 'w' description: - Enables `path` command - properties: [known, portable] + properties: [known, pickable] capabilities: [path] robots: - name: base diff --git a/data/scenarios/Testing/836-pathfinding/836-path-exists-find-entity-unwalkable.yaml b/data/scenarios/Testing/836-pathfinding/836-path-exists-find-entity-unwalkable.yaml index 79cd779b89..3c25270c89 100644 --- a/data/scenarios/Testing/836-pathfinding/836-path-exists-find-entity-unwalkable.yaml +++ b/data/scenarios/Testing/836-pathfinding/836-path-exists-find-entity-unwalkable.yaml @@ -19,7 +19,7 @@ entities: char: 'w' description: - Enables `path` command - properties: [known, portable] + properties: [known, pickable] capabilities: [path] robots: - name: base diff --git a/data/scenarios/Testing/836-pathfinding/836-path-exists-find-entity.yaml b/data/scenarios/Testing/836-pathfinding/836-path-exists-find-entity.yaml index 3328c041e4..19f51c3dc2 100644 --- a/data/scenarios/Testing/836-pathfinding/836-path-exists-find-entity.yaml +++ b/data/scenarios/Testing/836-pathfinding/836-path-exists-find-entity.yaml @@ -16,7 +16,7 @@ entities: char: 'w' description: - Enables `path` command - properties: [known, portable] + properties: [known, pickable] capabilities: [path] robots: - name: base diff --git a/data/scenarios/Testing/836-pathfinding/836-path-exists-find-location.yaml b/data/scenarios/Testing/836-pathfinding/836-path-exists-find-location.yaml index 3a1e059b64..31938301d7 100644 --- a/data/scenarios/Testing/836-pathfinding/836-path-exists-find-location.yaml +++ b/data/scenarios/Testing/836-pathfinding/836-path-exists-find-location.yaml @@ -16,7 +16,7 @@ entities: char: 'w' description: - Enables `path` command - properties: [known, portable] + properties: [known, pickable] capabilities: [path] robots: - name: base diff --git a/data/scenarios/Testing/958-isempty.yaml b/data/scenarios/Testing/958-isempty.yaml index d5fdc69851..e36e20bcad 100644 --- a/data/scenarios/Testing/958-isempty.yaml +++ b/data/scenarios/Testing/958-isempty.yaml @@ -37,7 +37,7 @@ entities: char: 'Y' description: - A thing that everyone needs! - properties: [portable] + properties: [pickable] world: palette: '.': [grass] diff --git a/data/scenarios/Testing/961-custom-capabilities.yaml b/data/scenarios/Testing/961-custom-capabilities.yaml index 1bd613d078..3307048b55 100644 --- a/data/scenarios/Testing/961-custom-capabilities.yaml +++ b/data/scenarios/Testing/961-custom-capabilities.yaml @@ -20,7 +20,7 @@ entities: char: 'o' description: - A non-traditional means of locomotion. - properties: [known, portable] + properties: [known, pickable] capabilities: [move] robots: - name: base diff --git a/data/scenarios/Tutorials/backstory.yaml b/data/scenarios/Tutorials/backstory.yaml index 87a530cfd8..06e934d91d 100644 --- a/data/scenarios/Tutorials/backstory.yaml +++ b/data/scenarios/Tutorials/backstory.yaml @@ -35,7 +35,7 @@ entities: ``` - | To open the full goal text again, you can hit **Ctrl+G**. - properties: [known, portable] + properties: [known, pickable] robots: - name: base system: true diff --git a/data/scenarios/Tutorials/bind2.yaml b/data/scenarios/Tutorials/bind2.yaml index 1d83354683..d26c2bac6e 100644 --- a/data/scenarios/Tutorials/bind2.yaml +++ b/data/scenarios/Tutorials/bind2.yaml @@ -80,7 +80,7 @@ entities: char: 'H' description: - The Unspeakable One - properties: [portable] + properties: [pickable] robots: - name: base dir: north diff --git a/data/scenarios/Tutorials/conditionals.yaml b/data/scenarios/Tutorials/conditionals.yaml index 790498cdd9..08d00316ad 100644 --- a/data/scenarios/Tutorials/conditionals.yaml +++ b/data/scenarios/Tutorials/conditionals.yaml @@ -96,7 +96,7 @@ entities: invisible: true description: - A small rock. It is so small, it is practically invisible. - properties: [portable] + properties: [pickable] world: palette: 'Ω': [grass, null, base] diff --git a/data/scenarios/Tutorials/crash.yaml b/data/scenarios/Tutorials/crash.yaml index 3036ddc9ab..35862c65f5 100644 --- a/data/scenarios/Tutorials/crash.yaml +++ b/data/scenarios/Tutorials/crash.yaml @@ -34,7 +34,7 @@ entities: char: 'W' description: - If you have this, you win! - properties: [known, portable] + properties: [known, pickable] solution: | crasher <- build { turn east; move; move; move; log "bye"; move diff --git a/data/scenarios/Tutorials/place.yaml b/data/scenarios/Tutorials/place.yaml index 9b136122a8..67a6fe94b4 100644 --- a/data/scenarios/Tutorials/place.yaml +++ b/data/scenarios/Tutorials/place.yaml @@ -45,7 +45,7 @@ entities: in making many different devices. - | This one seems to grow a little faster. - properties: [portable, growable] + properties: [pickable, growable] growth: [100, 120] solution: | def t = move; place "spruce"; harvest; end; diff --git a/data/scenarios/Tutorials/require.yaml b/data/scenarios/Tutorials/require.yaml index d4b07c6a65..b33d5000ad 100644 --- a/data/scenarios/Tutorials/require.yaml +++ b/data/scenarios/Tutorials/require.yaml @@ -19,7 +19,7 @@ entities: char: '*' description: - A flower. - properties: [known, infinite, portable] + properties: [known, infinite, pickable] solution: | def m5 = move; move; move; move; move end; build { diff --git a/data/scenarios/Tutorials/type-errors.yaml b/data/scenarios/Tutorials/type-errors.yaml index 3ef94d4a55..f8c5ec0895 100644 --- a/data/scenarios/Tutorials/type-errors.yaml +++ b/data/scenarios/Tutorials/type-errors.yaml @@ -30,7 +30,7 @@ entities: char: 'W' description: - Do `place "Win"` once you are done with this challenge. - properties: [known, portable] + properties: [known, pickable] solution: | place "Win" robots: diff --git a/data/scenarios/Tutorials/types.yaml b/data/scenarios/Tutorials/types.yaml index 05c444260d..f6355e8a6e 100644 --- a/data/scenarios/Tutorials/types.yaml +++ b/data/scenarios/Tutorials/types.yaml @@ -34,7 +34,7 @@ entities: char: 'W' description: - Do `place "Win"` once you are done with this challenge. - properties: [known, portable] + properties: [known, pickable] solution: | place "Win" robots: