From 4f8516ff194769ef0118fd1ec00af8ab00079032 Mon Sep 17 00:00:00 2001 From: Karl Ostmo Date: Fri, 5 Jan 2024 10:28:47 -0800 Subject: [PATCH] rename 'pickable' property to 'portable' in YAML files --- data/entities.yaml | 208 +++++++++--------- 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 | 43 ++-- data/scenarios/Challenges/bucket-brigade.yaml | 12 +- data/scenarios/Challenges/chess_horse.yaml | 1 + 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 | 7 +- data/scenarios/Challenges/ice-cream.yaml | 20 +- data/scenarios/Challenges/maypole.yaml | 2 +- .../Challenges/pack-tetrominoes.yaml | 10 +- data/scenarios/Challenges/teleport.yaml | 1 + .../Challenges/wolf-goat-cabbage.yaml | 6 +- data/scenarios/Challenges/word-search.yaml | 10 +- data/scenarios/Fun/GoL.yaml | 1 + data/scenarios/Fun/horton.yaml | 2 +- data/scenarios/Fun/logo-burst.yaml | 1 + data/scenarios/Fun/snake.yaml | 6 +- data/scenarios/Mechanics/active-trapdoor.yaml | 1 + data/scenarios/Speedruns/curry.yaml | 1 + data/scenarios/Speedruns/forester.yaml | 1 + data/scenarios/Speedruns/mithril.yaml | 1 + data/scenarios/Testing/1007-use-command.yaml | 2 +- data/scenarios/Testing/1024-sand.yaml | 1 + .../1138-structures/flip-and-rotate.yaml | 1 + .../1138-structures/nested-structure.yaml | 1 + .../1138-structures/sibling-precedence.yaml | 1 + .../Testing/1140-detect-command.yaml | 1 + .../Testing/1157-drill-return-value.yaml | 2 +- .../scenarios/Testing/1171-chirp-command.yaml | 1 + .../Testing/1171-resonate-command.yaml | 1 + .../scenarios/Testing/1171-sniff-command.yaml | 1 + .../scenarios/Testing/1207-scout-command.yaml | 1 + .../Testing/1218-stride-command.yaml | 2 +- data/scenarios/Testing/1234-push-command.yaml | 2 +- data/scenarios/Testing/1256-halt-command.yaml | 1 + .../Testing/1295-density-command.yaml | 1 + .../Testing/1320-world-DSL/constant.yaml | 1 + .../Testing/1320-world-DSL/erase.yaml | 1 + .../Testing/1320-world-DSL/override.yaml | 1 + .../scenarios/Testing/1341-command-count.yaml | 1 + data/scenarios/Testing/1355-combustion.yaml | 6 +- .../automatic-waypoint-patrol.yaml | 1 + .../Testing/1399-backup-command.yaml | 1 + .../Testing/1430-built-robot-ownership.yaml | 1 + .../Testing/1535-ping/1535-in-range.yaml | 4 +- .../Testing/1535-ping/1535-out-of-range.yaml | 2 +- .../1536-custom-unwalkable-entities.yaml | 1 + ...569-cache-invalidation-distance-limit.yaml | 8 +- .../1569-cache-invalidation-modes.yaml | 8 +- .../1569-harvest-batch.yaml | 2 +- .../1575-bounding-box-overlap.yaml | 1 + .../1575-browse-structures.yaml | 1 + .../1575-construction-count.yaml | 1 + .../1575-ensure-disjoint.yaml | 1 + .../1575-ensure-single-recognition.yaml | 1 + .../1575-floorplan-command.yaml | 1 + .../1575-handle-overlapping.yaml | 1 + .../1575-interior-entity-placement.yaml | 1 + .../1575-nested-structure-definition.yaml | 1 + ...575-overlapping-tiebreaker-by-largest.yaml | 1 + ...75-overlapping-tiebreaker-by-location.yaml | 1 + .../1575-placement-occlusion.yaml | 1 + .../1575-remove-structure.yaml | 1 + .../1575-swap-structure.yaml | 1 + ...1644-rotated-preplacement-recognition.yaml | 1 + .../1644-rotated-recognition.yaml | 1 + data/scenarios/Testing/1631-tags.yaml | 11 +- .../Testing/1634-message-colors.yaml | 1 + .../1664-require-system-robot-children.yaml | 1 + .../201-require-device-creative.yaml | 1 + .../201-require-device-creative1.yaml | 2 +- .../201-require/201-require-device.yaml | 1 + .../201-require/201-require-entities-def.yaml | 1 + .../201-require/201-require-entities.yaml | 1 + .../201-require/533-reprogram-simple.yaml | 1 + .../Testing/201-require/533-reprogram.yaml | 1 + data/scenarios/Testing/378-objectives.yaml | 1 + data/scenarios/Testing/394-build-drill.yaml | 1 + data/scenarios/Testing/397-wrong-missing.yaml | 1 + .../Testing/428-drowning-destroy.yaml | 1 + data/scenarios/Testing/475-wait-one.yaml | 1 + data/scenarios/Testing/479-atomic-race.yaml | 4 +- data/scenarios/Testing/479-atomic.yaml | 2 +- data/scenarios/Testing/490-harvest.yaml | 1 + data/scenarios/Testing/504-teleport-self.yaml | 1 + .../Testing/508-capability-subset.yaml | 4 +- .../Testing/555-teleport-location.yaml | 1 + data/scenarios/Testing/684-swap.yaml | 1 + data/scenarios/Testing/687-watch-command.yaml | 1 + .../699-movement-fail/699-move-blocked.yaml | 1 + .../699-movement-fail/699-move-liquid.yaml | 1 + .../699-teleport-blocked.yaml | 1 + data/scenarios/Testing/710-multi-robot.yaml | 3 + .../795-prerequisite-and.yaml | 1 + .../795-prerequisite-cycle-with-not.yaml | 1 + .../795-prerequisite-mutually-exclusive.yaml | 1 + .../795-prerequisite/795-prerequisite-or.yaml | 1 + .../836-automatic-waypoint-navigation.yaml | 6 +- .../836-pathfinding/836-no-path-exists1.yaml | 2 +- .../836-pathfinding/836-no-path-exists2.yaml | 2 +- ...-path-exists-distance-limit-reachable.yaml | 1 + ...ath-exists-distance-limit-unreachable.yaml | 1 + ...36-path-exists-find-entity-unwalkable.yaml | 2 +- .../836-path-exists-find-entity.yaml | 2 +- .../836-path-exists-find-location.yaml | 2 +- .../858-inventory/858-counting-objective.yaml | 1 + .../858-nonpossession-objective.yaml | 1 + .../858-possession-objective.yaml | 1 + data/scenarios/Testing/920-meet.yaml | 1 + data/scenarios/Testing/955-heading.yaml | 1 + data/scenarios/Testing/956-GPS.yaml | 1 + data/scenarios/Testing/958-isempty.yaml | 2 +- .../Testing/961-custom-capabilities.yaml | 2 +- .../Testing/Achievements/RobotIntoWater.yaml | 1 + .../1138-nonexistent-nested-structure.yaml | 1 + .../_Validation/1221-duplicate-entities.yaml | 2 + ...zed-placements-disallow-reorientation.yaml | 1 + .../_Validation/1632-entity-attributes.yaml | 1 + .../_Validation/1655-display-characters.yaml | 1 + ...dant-structure-recognition-symmetries.yaml | 1 + .../_Validation/795-prerequisite-cycle.yaml | 1 + ...95-prerequisite-nonexistent-reference.yaml | 1 + .../795-prerequisite-self-reference.yaml | 1 + data/scenarios/Tutorials/backstory.yaml | 2 +- data/scenarios/Tutorials/bind2.yaml | 2 +- data/scenarios/Tutorials/build.yaml | 1 + data/scenarios/Tutorials/conditionals.yaml | 2 +- data/scenarios/Tutorials/craft.yaml | 1 + data/scenarios/Tutorials/crash.yaml | 2 +- data/scenarios/Tutorials/def.yaml | 1 + data/scenarios/Tutorials/equip.yaml | 1 + data/scenarios/Tutorials/farming.yaml | 1 + data/scenarios/Tutorials/give.yaml | 1 + data/scenarios/Tutorials/grab.yaml | 1 + data/scenarios/Tutorials/lambda.yaml | 1 + data/scenarios/Tutorials/move.yaml | 1 + data/scenarios/Tutorials/place.yaml | 2 +- data/scenarios/Tutorials/require.yaml | 2 +- data/scenarios/Tutorials/requireinv.yaml | 1 + data/scenarios/Tutorials/scan.yaml | 1 + data/scenarios/Tutorials/type-errors.yaml | 2 +- data/scenarios/Tutorials/types.yaml | 2 +- data/scenarios/Tutorials/world101.yaml | 1 + data/scenarios/blank.yaml | 1 + data/scenarios/classic.yaml | 1 + data/scenarios/creative.yaml | 1 + 164 files changed, 434 insertions(+), 320 deletions(-) diff --git a/data/entities.yaml b/data/entities.yaml index dc35cc464c..97f1b7f55d 100644 --- a/data/entities.yaml +++ b/data/entities.yaml @@ -7,7 +7,7 @@ A tall, living entity made of a tough cellular material called "wood". They regrow after being harvested and are an important raw ingredient used in making many different devices. - properties: [portable, growable, opaque, combustible] + properties: [pickable, growable, opaque, combustible] growth: [500, 600] combustion: ignition: 0.01 @@ -20,21 +20,21 @@ description: - | Burned-out remnants of combustion. - properties: [portable] + properties: [pickable] - name: branch display: attr: wood char: 'y' description: - A branch cut from a tree. It's as if the tree had to make a decision and was exploring two options. - properties: [portable] + properties: [pickable] - name: log display: attr: wood char: 'l' description: - A wooden log, obtained by harvesting a tree and cutting off its branches. - properties: [portable, combustible] + properties: [pickable, combustible] combustion: ignition: 0.05 duration: [40, 80] @@ -45,7 +45,7 @@ char: 'w' description: - A wooden board, made by cutting a log into pieces. - properties: [portable, combustible] + properties: [pickable, combustible] combustion: ignition: 0.2 duration: [20, 40] @@ -61,7 +61,7 @@ ``` make "log" ``` - properties: [portable] + properties: [pickable] capabilities: [make] - name: paper display: @@ -69,7 +69,7 @@ char: '■' description: - A flat material made of pressed and dried wood fibers, used as a surface on which to inscribe symbols. - properties: [portable, combustible] + properties: [pickable, combustible] combustion: ignition: 0.5 duration: [10, 20] @@ -80,21 +80,21 @@ char: 'P' description: - Perhaps writing one of these will help gain the trust and respect of the native inhabitants. - properties: [portable] + properties: [pickable] - name: rock display: attr: rock char: 'o' description: - A medium-sized rock, picked up from the ground or created by drilling. Can be ground into sand or used to build a simple furnace, among other things. - properties: [portable] + properties: [pickable] - name: handle display: attr: device char: 'h' description: - Ergonomic affordance for manipulating objects. Also grants the "setname" capability, allowing one to assign a "handle" to robots. - properties: [portable] + properties: [pickable] capabilities: [setname] - name: lodestone display: @@ -102,7 +102,7 @@ char: 'o' description: - A medium-sized rock... that looks a little different. It seems to react to iron and surprisingly also to naturally growing bits. - properties: [portable] + properties: [pickable] capabilities: [negation] - name: beaglepuss display: @@ -110,7 +110,7 @@ char: 'B' description: - Iconic novelty disguise. Renders one either completely inconspicuous, or the opposite. - properties: [portable] + properties: [pickable] capabilities: [appear] - name: boulder display: @@ -141,7 +141,7 @@ description: - Raw copper ore, useful for making wires, pipes, and other metal things. Patches of copper ore can be found on the surface, but are quickly exhausted. - Scanners seem to indicate larger quantities of copper could be found beneath some of the mountains, but those would require a drill to access and mine. - properties: [portable] + properties: [pickable] - name: copper mine display: attr: copper' @@ -156,14 +156,14 @@ char: '|' description: - Copper wire is very good at conducting electricity and useful for making various types of circuits and machines. - properties: [portable] + properties: [pickable] - name: strange loop display: attr: copper char: '8' description: - Two copper wires twisted together in a strange shape that loops back on itself. It must be useful for something... - properties: [portable] + properties: [pickable] capabilities: [recursion] - name: copper pipe display: @@ -171,7 +171,7 @@ char: 'I' description: - A pipe made out of a thin sheet of copper. Great for transmitting water or steam. - properties: [portable] + properties: [pickable] - name: iron plate display: attr: iron @@ -179,14 +179,14 @@ description: - Worked iron suitable for crafting resilient tools. - It also possess some electro-magnetic properties. - properties: [portable] + properties: [pickable] - name: iron gear display: attr: iron char: '*' description: - An iron gear, suitable for constructing larger, more powerful machinery than a wooden gear. - properties: [portable] + properties: [pickable] - name: iron ore display: attr: iron @@ -194,7 +194,7 @@ description: - Raw iron ore. Used to create more resilient tools than copper. - It can only be mined by drilling in the mountains. - properties: [portable] + properties: [pickable] - name: iron mine display: attr: iron' @@ -210,7 +210,7 @@ description: - Raw quartz crystals. Useful for creating devices like clocks, and can be processed to extract silicon. - It can only be mined by drilling in the mountains. - properties: [portable] + properties: [pickable] - name: quartz mine display: attr: quartz @@ -225,7 +225,7 @@ char: 'S' description: - Extracted by processing quartz at high temperatures, silicon can be used to construct integrated circuits. - properties: [portable] + properties: [pickable] - name: deep mine display: attr: rock @@ -241,7 +241,7 @@ char: '•' description: - A shiny, metallic substance, noted for its high reflectivity when polished. - properties: [portable] + properties: [pickable] - name: gold display: attr: gold @@ -249,28 +249,28 @@ description: - A shiny, metallic substance, with applications in specialized electronics. - It also seems to be highly valued by local aliens. - properties: [portable] + properties: [pickable] - name: mithril display: attr: silver char: 'M' description: - Mithril can be beaten like copper, and polished like glass. One can also make of it a metal, light and yet harder than tempered steel. Its beauty is like to that of common silver, but the beauty of mithril does not tarnish or grow dim. - properties: [portable] + properties: [pickable] - name: furnace display: attr: fire char: '#' description: - A furnace can be used to turn metal ore into various useful products. - properties: [portable] + properties: [pickable] - name: big furnace display: attr: fire char: '#' description: - A big furnace can get even hotter than a normal furnace, and can be used to process quartz into silicon. - properties: [portable] + properties: [pickable] - name: small motor display: attr: entity @@ -278,7 +278,7 @@ description: - A motor is useful for making devices that can turn when electric current is applied. - This one is rather small, but surprisingly efficient. - properties: [portable] + properties: [pickable] - name: big motor display: attr: entity @@ -286,14 +286,14 @@ description: - A motor is useful for making devices that can turn when electric current is applied. - This one is huge and could be used to construct powerful machinery. - properties: [portable] + properties: [pickable] - name: flower display: attr: flower char: '*' description: - A beautiful flower that grows wild in local meadows. It is not clear what it might be useful for, but it looks nice. - properties: [portable, growable] + properties: [pickable, growable] growth: [30, 50] - name: cotton display: @@ -301,7 +301,7 @@ char: 'i' description: - A plant with tufts of soft fibers that can be harvested and used to make things, including sheets of material that the local aliens like to drape over their bodies. - properties: [portable, growable, combustible] + properties: [pickable, growable, combustible] growth: [100, 800] combustion: ignition: 0.1 @@ -319,7 +319,7 @@ format : a -> text ``` which can turn any value into a suitable text representation. - properties: [portable] + properties: [pickable] capabilities: [format] - name: Elmer's glue display: @@ -334,7 +334,7 @@ can be used to concatenate two text values. For example, - | "Number of widgets: " ++ format numWidgets - properties: [portable] + properties: [pickable] capabilities: [concat] - name: caliper display: @@ -347,7 +347,7 @@ chars : text -> int ``` computes the number of characters in a `text`{=type} value. - properties: [portable] + properties: [pickable] capabilities: [charcount] - name: wedge display: @@ -361,7 +361,7 @@ split : int -> text -> text * text ``` splits a `text`{=type} value into two pieces, one before the given index and one after. - properties: [portable] + properties: [pickable] capabilities: [split] - name: string display: @@ -389,7 +389,7 @@ - | `split : int -> text -> text * text` splits a `text`{=type} value into two pieces, one before the given index and one after. - properties: [portable] + properties: [pickable] capabilities: [format, concat, charcount, split] - name: decoder ring display: @@ -406,7 +406,7 @@ - | `toChar : int -> text` creates a singleton (length-1) `text`{=type} value containing a character with the given numeric code. - properties: [portable] + properties: [pickable] capabilities: [code] - name: lambda display: @@ -420,7 +420,7 @@ def thrice : cmd unit -> cmd unit = \c. c;c;c end ``` - defines the function `thrice`{=snippet} which repeats a command three times. - properties: [portable, growable] + properties: [pickable, growable] growth: [100, 200] capabilities: [lambda] - name: curry @@ -429,21 +429,21 @@ char: 'C' description: - Delicious curry cooked from wild lambdas. - properties: [portable] + properties: [pickable] - name: water display: attr: water char: ' ' description: - Liquid dihydrogen monoxide, which seems to be plentiful on this planet. - properties: [portable, infinite, liquid] + properties: [pickable, infinite, liquid] - name: wavy water display: attr: water char: '~' description: - A wavy section of water. The same as normal water, but with more waves. - properties: [portable, infinite, liquid] + properties: [pickable, infinite, liquid] yields: water - name: boat display: @@ -456,7 +456,7 @@ will require them; but this doesn't work in the case of boats since floating is not associated with any particular command. To manually ensure a boat is equipped on a robot, just add the special command `require "boat"` to the robot's program. - properties: [portable] + properties: [pickable] capabilities: [float] - name: sand display: @@ -464,21 +464,21 @@ char: '█' description: - A substance composed mostly of tiny rocks and mineral particles that can be used in a furnace to make glass. You can often find it near water, or make it yourself by grinding up rocks. - properties: [portable] + properties: [pickable] - name: glass display: attr: entity char: '□' description: - A pane of a brittle, clear substance, made from melting sand in a furnace. - properties: [portable] + properties: [pickable] - name: LaTeX display: attr: flower char: '$' description: - A naturally occurring substance derived from trees, useful for producing rubber and for typesetting mathematical documents. - properties: [portable, growable] + properties: [pickable, growable] growth: [2000, 3000] - name: rubber display: @@ -486,14 +486,14 @@ char: '%' description: - A flexible, durable material made from LaTeX. - properties: [portable] + properties: [pickable] - name: bit (0) display: attr: entity char: '0' description: - A bit is used to represent the smallest possible amount of information. Useful for constructing various information-processing devices, as well as drills. - properties: [portable, growable] + properties: [pickable, growable] growth: [200, 400] - name: bit (1) display: @@ -501,7 +501,7 @@ char: '1' description: - A bit is used to represent the smallest possible amount of information. Useful for constructing various information-processing devices, as well as drills. - properties: [portable, growable] + properties: [pickable, growable] growth: [200, 400] - name: pixel (R) display: @@ -509,7 +509,7 @@ char: '.' description: - A tiny picture element, used either to emit or detect red light. - properties: [portable, growable] + properties: [pickable, growable] growth: [1000, 1500] - name: pixel (G) display: @@ -517,7 +517,7 @@ char: '.' description: - A tiny picture element, used either to emit or detect green light. - properties: [portable, growable] + properties: [pickable, growable] growth: [1000, 1500] - name: pixel (B) display: @@ -525,7 +525,7 @@ char: '.' description: - A tiny picture element, used either to emit or detect blue light. - properties: [portable, growable] + properties: [pickable, growable] growth: [1000, 1500] - name: camera display: @@ -533,7 +533,7 @@ char: '@' description: - A camera is a device for capturing images. - properties: [portable] + properties: [pickable] - name: circuit display: attr: plant @@ -541,7 +541,7 @@ description: - | A circuit is needed for constructing various "smart" devices. - properties: [portable] + properties: [pickable] - name: blueprint display: attr: blue @@ -554,7 +554,7 @@ - | `floorplan : text -> cmd (int * int)` - Gets the dimensions of a structure template. - properties: [portable] + properties: [pickable] capabilities: [structure] - name: drill bit display: @@ -562,35 +562,35 @@ char: '!' description: - A drill bit is the most important component of a drill, and must be made out of two bits of opposite parity, for strength. - properties: [portable] + properties: [pickable] - name: box display: attr: wood char: '□' description: - A wooden box. It can hold things or be used as housing for other devices. - properties: [portable] + properties: [pickable] - name: wooden gear display: attr: wood char: '*' description: - A wooden gear. Not quite as strong or versatile as an iron gear, but easy to produce. - properties: [portable] + properties: [pickable] - name: teeter-totter display: attr: wood char: '/' description: - A rotating board apparently popular with young aliens. Perhaps it could also be used as a primitive balance scale. - properties: [portable] + properties: [pickable] - name: Linux display: attr: entity char: 'L' description: - A copy of the Linux operating system. - properties: [portable] + properties: [pickable] - name: gold coin display: char: '©' @@ -598,7 +598,7 @@ description: - A small round shaped piece of gold metal that the aliens pass between each other occasionaly. - Besides staying shiny it does not appear to have practical use. - properties: [portable] + properties: [pickable] ############################################################ ### Utility ################################################ ############################################################ @@ -682,7 +682,7 @@ description: - A beautiful round shaped piece of metal that seems to be of great value to the aliens on this planet. - Just like the bit it has two sides and when you flip it, it lands perfectly randomly on one of the sides. - properties: [portable] + properties: [pickable] capabilities: [random] - name: treads plural: treads @@ -702,7 +702,7 @@ - | `move; turn left; move; turn right` capabilities: [move, turn] - properties: [portable] + properties: [pickable] - name: tank treads plural: tank treads display: @@ -711,7 +711,7 @@ description: - Tank treads work like treads, but are large enough to move even heavy robots around. capabilities: [move, turn, moveheavy] - properties: [portable] + properties: [pickable] - name: tape drive display: attr: device @@ -719,7 +719,7 @@ description: - A `tape drive`{=entity} allows you to `backup`; that is, to drive in reverse. capabilities: [backup] - properties: [portable] + properties: [pickable] - name: dozer blade display: attr: silver @@ -728,7 +728,7 @@ - A broad, sturdy surface that can be attached to a robot and used to `push` objects. - | `push : cmd unit` will advance the robot and the entity in front of it forward by one step. - properties: [portable] + properties: [pickable] capabilities: [push] - name: grabber display: @@ -740,7 +740,7 @@ - The `place` command takes one argument, the name of the item to place. The item is removed from the robot's inventory and placed in the robot's current cell (which must be empty). Raises an exception if the operation fails. - "The `give` command takes two arguments: the actor to give an item to (which can be at most 1 cell away), and the name of the item to give. Raises an exception if the operation fails." capabilities: [grab, give, place] - properties: [portable] + properties: [pickable] - name: fast grabber display: attr: device @@ -751,7 +751,7 @@ - You can use this to prevent failures where multiple robots are trying to grab, place or scan a given location. - In addition you retain the capability to use the `atomic` command, with which you can implement other commands that are safe when run in parallel. capabilities: [grab, swap, give, place, atomic] - properties: [portable] + properties: [pickable] - name: binoculars display: attr: device @@ -759,7 +759,7 @@ description: - Allows one to `scout` for other robots capabilities: [recondir] - properties: [portable] + properties: [pickable] - name: welder display: attr: device @@ -775,7 +775,7 @@ The `unequip` command takes one argument: the name of the device to unequip. Raises an exception if the device is not equipped. capabilities: [equip, unequip] - properties: [portable] + properties: [pickable] - name: harvester display: attr: device @@ -784,7 +784,7 @@ - A harvester can be used via the `harvest` command, which is almost identical to the `grab` command. The big difference is that some entities, when harvested instead of grabbed, leave behind a seed which will eventually grow into another copy of the original entity. - For entities which do not grow, `harvest` behaves exactly the same as `grab`. capabilities: [grab, harvest, place] - properties: [portable] + properties: [pickable] - name: toolkit display: attr: device @@ -793,7 +793,7 @@ - "A toolkit can be used, via the `salvage` command, to take apart old robots." - "`salvage` takes no arguments. It looks for an inactive robot (one which is not currently running a program) in the current cell. If an inactive robot is found, its log (if any) is downloaded and it is dismantled, transferring its knowledge, devices, and inventory to the robot running `salvage`. If no inactive robots are found in the current cell, `salvage` does nothing." capabilities: [salvage] - properties: [portable] + properties: [pickable] - name: solar panel display: attr: device @@ -801,7 +801,7 @@ description: - An extremely efficient solar panel, capable of generating sufficient power from ambient starlight alone. A robot powered by one of these can operate any time, including on cloudy days and at night. capabilities: [power] - properties: [portable] + properties: [pickable] - name: drill display: attr: device @@ -809,7 +809,7 @@ description: - A drill allows robots to `drill` through rocks and mountains (with e.g. `drill forward`), and extract resources from mines (with `drill down`). capabilities: [drill] - properties: [portable] + properties: [pickable] - name: metal drill display: attr: iron @@ -818,14 +818,14 @@ - A metal drill allows robots to drill through rocks and mountains, and extract resources from mines, faster than a regular drill. - A metal drill is also able to drill deeper than a regular drill. Thus, some resources are only reachable using a metal drill. capabilities: [drill] - properties: [portable] + properties: [pickable] - name: typewriter display: attr: device char: 'Д' description: - A typewriter is used to inscribe symbols on paper, thus reifying pure, platonic information into a physical form. - properties: [portable] + properties: [pickable] - name: 3D printer display: attr: device @@ -847,7 +847,7 @@ ``` - | builds a robot and then views it. - properties: [portable] + properties: [pickable] capabilities: [build] - name: dictionary display: @@ -869,7 +869,7 @@ let x : int = 3 in x^2 + 2*x + 1 ``` - The type annotations in `def`{=snippet} are optional. - properties: [portable] + properties: [pickable] capabilities: [env] - name: branch predictor display: @@ -887,7 +887,7 @@ let x = 2 in if (x > 3) {move} {turn right; move} ``` - properties: [portable] + properties: [pickable] capabilities: [cond] - name: detonator display: @@ -895,7 +895,7 @@ char: '*' description: - An explosive device which can be used to self-destruct, via the `selfdestruct` command. Immediately vaporizes the robot and any inventory it is carrying. Can be useful, say, if you are sending out some exploratory robots and don't want them cluttering up the world once they are done. - properties: [portable] + properties: [pickable] capabilities: [selfdestruct] - name: life support system display: @@ -903,7 +903,7 @@ char: 'Ж' description: - A state-of-the-art life support system which maintains the particular temperature and mixture of gases you need to survive. It uses a sophisticated recirculating system and can run pretty much indefinitely. Unfortunately, the atmosphere outside is severely toxic (why do the inhabitants of this planet need so much nitrogen!?), so you'll have to stay inside for now. - properties: [portable] + properties: [pickable] - name: scanner display: attr: device @@ -912,7 +912,7 @@ - "With a scanner device, robots can use the `scan` command to learn about their surroundings. Simply give `scan` a direction in which to scan, and information about the scanned item (if any) will be added to the robot's inventory." - "A scanner also enables `blocked : cmd bool`, which returns a boolean value indicating whether the robot's path is blocked (i.e. whether executing a `move` command would fail); `ishere : text -> cmd bool` for checking whether the current cell contains a particular entity; and `isempty : cmd bool` for checking whether the current cell is empty of entities. Note that `ishere` and `isempty` do not detect robots, only entities." - "Finally, robots can use the `upload` command to copy their accumulated knowledge to another nearby robot; for example, `upload base`." - properties: [portable] + properties: [pickable] capabilities: [scan, sensefront, sensehere] - name: olfactometer display: @@ -921,7 +921,7 @@ - An electronic "nose" that can tell how far away something is. - | `sniff : text -> cmd int` returns the distance to the nearest specified entity. - properties: [portable] + properties: [pickable] capabilities: [detectdistance] - name: flash memory display: @@ -931,7 +931,7 @@ - "A compact, non-volatile memory device, capable of storing up to 8 pZ of data." - "Flash memory can be used as a component of other devices. In addition, a flash memory device can be used to reprogram other robots using the `reprogram` command." - "The robot being reprogrammed must be idle, and must possess enough capabilities to run the new command; otherwise reprogramming will fail." - properties: [portable] + properties: [pickable] capabilities: [reprogram] - name: mirror display: @@ -941,7 +941,7 @@ - "With a mirror, robots can reflect on themselves and see their own name." - "A mirror enables the `whoami` command, which returns the robot's name as a string." - "It also enables the special `self` variable, which gives a robot a reference to itself." - properties: [portable] + properties: [pickable] capabilities: [whoami] - name: logger display: @@ -949,7 +949,7 @@ char: 'l' description: - "Allows a robot to generate and store messages for later viewing, using the `log` command, which takes a string. Log messages are also automatically generated by uncaught exceptions." - properties: [portable] + properties: [pickable] capabilities: [log] - name: hearing aid display: @@ -964,7 +964,7 @@ ``` l <- listen; log $ "I have waited for someone to say " ++ l ``` - properties: [portable] + properties: [pickable] capabilities: [listen] - name: counter display: @@ -977,7 +977,7 @@ in the inventory. This is an upgraded version of the `has` command, which returns a bool instead of an int and does not require any special device. - properties: [portable] + properties: [pickable] capabilities: [count] - name: calculator display: @@ -985,7 +985,7 @@ char: '+' description: - "A calculator allows a robot to do basic arithmetic calculations: addition, subtraction, multiplication, division, and exponentiation." - properties: [portable] + properties: [pickable] capabilities: [arith] - name: ADT calculator display: @@ -1018,7 +1018,7 @@ function `case : (a + b) -> (a -> c) -> (b -> c) -> c`. For example, `case (inl 3) (\x. 2*x) (\y. 3*y) == 6`, and `case (inr 3) (\x. 2*x) (\y. 3*y) == 9`. - properties: [portable] + properties: [pickable] capabilities: [arith, sum, prod] - name: compass display: @@ -1036,7 +1036,7 @@ east and then restores the same heading as before: - | `d <- heading; turn east; move; turn d` - properties: [portable] + properties: [pickable] capabilities: [orient] - name: clock display: @@ -1048,7 +1048,7 @@ `time : cmd int` returns the current time, measured in game ticks since the beginning of the game. - | `wait : int -> cmd unit` causes a robot to sleep for a specified amount of time (measured in game ticks). - properties: [portable] + properties: [pickable] capabilities: [timeabs, timerel] - name: hourglass display: @@ -1058,7 +1058,7 @@ - An hourglass can measure the relative passage of time. It enables the `wait` command. - | `wait : int -> cmd unit` causes a robot to sleep for a specified amount of time (measured in game ticks). - properties: [portable] + properties: [pickable] capabilities: [timerel] - name: rolex display: @@ -1069,7 +1069,7 @@ - | `watch : dir -> cmd unit` will mark an adjacent (in the specified direction) location of interest to monitor for placement or removal of items. A subsequent call to `wait` will be interrupted upon a change to the location. - properties: [portable] + properties: [pickable] capabilities: [timerel, wakeself] - name: comparator display: @@ -1078,7 +1078,7 @@ description: - "A comparator allows comparing two values to see whether the first is less, equal, or greater than the second." - "Valid comparison operators are <, <=, >, >=, ==, and !=." - properties: [portable] + properties: [pickable] capabilities: [compare] - name: I/O cable display: @@ -1086,7 +1086,7 @@ char: 'Ю' description: - An I/O cable can be used to communicate with adjacent actors. - properties: [portable] + properties: [pickable] - name: rubber band display: attr: device @@ -1104,7 +1104,7 @@ ``` atomic (b <- ishere "rock"; if b {grab; return ()} {}) ``` - properties: [portable] + properties: [pickable] capabilities: [atomic] - name: net display: @@ -1117,7 +1117,7 @@ try {move} {turn left} ``` - will attempt to move, but if that fails, turn left instead. - properties: [portable] + properties: [pickable] capabilities: [try] - name: antenna display: @@ -1141,7 +1141,7 @@ `x`{=snippet}, `y`{=snippet}, and `z`{=snippet} are nearby actors, then `meetAll f b0`{=snippet} is equivalent to `b1 <- f b0 x; b2 <- f b1 y; f b2 z`{=snippet}. - properties: [portable] + properties: [pickable] capabilities: [meet] - name: GPS receiver display: @@ -1152,7 +1152,7 @@ A GPS receiver triangulates your current (x,y) coordinates from some convenient satellite signals, enabling the command `whereami : cmd (int * int)`. - properties: [portable] + properties: [pickable] capabilities: [senseloc] - name: tweezers display: @@ -1164,7 +1164,7 @@ relays, preventing it from executing properly. Tweezers are useful for removing such pests, and for inspecting robots' detailed inner workings. - properties: [portable] + properties: [pickable] capabilities: [debug] - name: victrola display: @@ -1183,7 +1183,7 @@ can be projected using dot notation. For example, `let r = [y="hi", x=2] in r.x` has the value `2`. The order of the fields does not matter. - properties: [portable] + properties: [pickable] capabilities: [record] - name: quantum dot display: @@ -1193,14 +1193,14 @@ - | A nanoscale semiconductor particle with a wide range of applications. - properties: [portable] + properties: [pickable] - name: 'key' display: attr: gold char: 'k' description: - A versatile item, with uses such as opening locked doors, entering input, and retrieving stored values. - properties: [portable] + properties: [pickable] - name: keyboard display: attr: device @@ -1214,7 +1214,7 @@ - | `key : text -> key` constructs values of type `key`{=type}, for example `key "Down"` or `key "C-S-x"`. - properties: [portable] + properties: [pickable] capabilities: [handleinput] - name: halting oracle display: @@ -1227,5 +1227,5 @@ a robot as an argument and, if it is up to one cell away, cancels its currently running program (if any). In creative mode, there is no distance limitation. - properties: [portable] + properties: [pickable] capabilities: [halt] 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..1dc989c635 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,26 +218,27 @@ 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' description: - Required for handling hot material. + properties: [] - name: temple display: char: 'T' @@ -272,7 +273,7 @@ entities: attr: silver description: - Can break hard objects - properties: [known, portable] + properties: [known, pickable] - name: granite mountain display: char: 'A' @@ -298,35 +299,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 +341,7 @@ entities: attr: wood description: - Burnable plant material - properties: [known, portable] + properties: [known, pickable] - name: peat bog display: char: 'b' @@ -374,14 +375,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 +437,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 +455,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 +476,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/chess_horse.yaml b/data/scenarios/Challenges/chess_horse.yaml index 90dcd8c714..0869abc703 100644 --- a/data/scenarios/Challenges/chess_horse.yaml +++ b/data/scenarios/Challenges/chess_horse.yaml @@ -56,3 +56,4 @@ world: │.#.#.#.#│ │#.#.#.#.│ └────────┘ +entities: [] 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..b6c9e90523 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' @@ -143,6 +143,7 @@ entities: attr: gold description: - This entity signals that the column is sorted. + properties: [] known: - bottom tee - OK 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/teleport.yaml b/data/scenarios/Challenges/teleport.yaml index 736d8f074a..77e8a5e0a3 100644 --- a/data/scenarios/Challenges/teleport.yaml +++ b/data/scenarios/Challenges/teleport.yaml @@ -82,3 +82,4 @@ world: └┐.....┌───┐*...T┌┘ ~ ~└─────┘ ~~└─────┘~ , ~~~ ~ ~ ~ +entities: [] 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..c12aa48c5c 100644 --- a/data/scenarios/Challenges/word-search.yaml +++ b/data/scenarios/Challenges/word-search.yaml @@ -258,34 +258,40 @@ entities: char: 'C' description: - C is for California + properties: [] - name: capital O display: char: 'O' description: - O is for Oklahoma + properties: [] - name: capital W display: char: 'W' description: - W is for Washington + properties: [] - name: lowercase c display: char: 'c' attr: gold description: - c is for cantaloupe + properties: [] - name: lowercase o display: char: 'o' attr: gold description: - o is for orange + properties: [] - name: lowercase w display: char: 'w' attr: gold description: - w is for watermelon + properties: [] - name: highlighter display: char: 'P' @@ -293,14 +299,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/GoL.yaml b/data/scenarios/Fun/GoL.yaml index 788e18ed7e..2dcebee534 100644 --- a/data/scenarios/Fun/GoL.yaml +++ b/data/scenarios/Fun/GoL.yaml @@ -81,3 +81,4 @@ world: .............................. .............................. .............................. +entities: [] 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/logo-burst.yaml b/data/scenarios/Fun/logo-burst.yaml index 3ee8df430a..f398b5f588 100644 --- a/data/scenarios/Fun/logo-burst.yaml +++ b/data/scenarios/Fun/logo-burst.yaml @@ -80,3 +80,4 @@ world: . >>^v^^^ < ~ T~v v< <~ >>T . . ▒ . . ^ ^ v > > . +entities: [] 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/Mechanics/active-trapdoor.yaml b/data/scenarios/Mechanics/active-trapdoor.yaml index 84bd3c2dc1..b2aebe57f3 100644 --- a/data/scenarios/Mechanics/active-trapdoor.yaml +++ b/data/scenarios/Mechanics/active-trapdoor.yaml @@ -78,3 +78,4 @@ world: ..... ..Ω.. ..... +entities: [] diff --git a/data/scenarios/Speedruns/curry.yaml b/data/scenarios/Speedruns/curry.yaml index e5cba0790f..490041f8d1 100644 --- a/data/scenarios/Speedruns/curry.yaml +++ b/data/scenarios/Speedruns/curry.yaml @@ -36,3 +36,4 @@ world: scrollable: false dsl: | "classic" +entities: [] diff --git a/data/scenarios/Speedruns/forester.yaml b/data/scenarios/Speedruns/forester.yaml index 8962ed0d8f..4b11a87354 100644 --- a/data/scenarios/Speedruns/forester.yaml +++ b/data/scenarios/Speedruns/forester.yaml @@ -36,3 +36,4 @@ world: scrollable: false dsl: | "classic" +entities: [] diff --git a/data/scenarios/Speedruns/mithril.yaml b/data/scenarios/Speedruns/mithril.yaml index ba4e84de02..22ff761605 100644 --- a/data/scenarios/Speedruns/mithril.yaml +++ b/data/scenarios/Speedruns/mithril.yaml @@ -36,3 +36,4 @@ world: scrollable: false dsl: | "classic" +entities: [] 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/1024-sand.yaml b/data/scenarios/Testing/1024-sand.yaml index fa0e5dd9ca..7e37bbb904 100644 --- a/data/scenarios/Testing/1024-sand.yaml +++ b/data/scenarios/Testing/1024-sand.yaml @@ -43,3 +43,4 @@ world: upperleft: [0, 0] map: | >Å +entities: [] diff --git a/data/scenarios/Testing/1138-structures/flip-and-rotate.yaml b/data/scenarios/Testing/1138-structures/flip-and-rotate.yaml index 933e7088f4..4491ba61d2 100644 --- a/data/scenarios/Testing/1138-structures/flip-and-rotate.yaml +++ b/data/scenarios/Testing/1138-structures/flip-and-rotate.yaml @@ -85,3 +85,4 @@ world: │.*..*..*..*..*..*..*..*..*..*.│ │..*..*..*..*..*..*..*..*..*..*│ └──────────────────────────────┘ +entities: [] diff --git a/data/scenarios/Testing/1138-structures/nested-structure.yaml b/data/scenarios/Testing/1138-structures/nested-structure.yaml index 0311f4a56d..2d6bd1c31f 100644 --- a/data/scenarios/Testing/1138-structures/nested-structure.yaml +++ b/data/scenarios/Testing/1138-structures/nested-structure.yaml @@ -79,3 +79,4 @@ world: │*..*..*..*..│ │.*..*..*..*.│ └────────────┘ +entities: [] diff --git a/data/scenarios/Testing/1138-structures/sibling-precedence.yaml b/data/scenarios/Testing/1138-structures/sibling-precedence.yaml index 656025e402..a81e571e3f 100644 --- a/data/scenarios/Testing/1138-structures/sibling-precedence.yaml +++ b/data/scenarios/Testing/1138-structures/sibling-precedence.yaml @@ -86,3 +86,4 @@ world: ............ ............ ............ +entities: [] diff --git a/data/scenarios/Testing/1140-detect-command.yaml b/data/scenarios/Testing/1140-detect-command.yaml index 6dade590c3..9f8383f4bd 100644 --- a/data/scenarios/Testing/1140-detect-command.yaml +++ b/data/scenarios/Testing/1140-detect-command.yaml @@ -50,3 +50,4 @@ world: ......... .Ω....... ......... +entities: [] 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/1171-chirp-command.yaml b/data/scenarios/Testing/1171-chirp-command.yaml index c06ebe7cfa..c3e34eb27c 100644 --- a/data/scenarios/Testing/1171-chirp-command.yaml +++ b/data/scenarios/Testing/1171-chirp-command.yaml @@ -45,3 +45,4 @@ world: ......... .Ω....... ......... +entities: [] diff --git a/data/scenarios/Testing/1171-resonate-command.yaml b/data/scenarios/Testing/1171-resonate-command.yaml index 692613b8ca..32ad5a353f 100644 --- a/data/scenarios/Testing/1171-resonate-command.yaml +++ b/data/scenarios/Testing/1171-resonate-command.yaml @@ -48,3 +48,4 @@ world: J........ .Ω....... ......... +entities: [] diff --git a/data/scenarios/Testing/1171-sniff-command.yaml b/data/scenarios/Testing/1171-sniff-command.yaml index 3807ccf845..df87d6e041 100644 --- a/data/scenarios/Testing/1171-sniff-command.yaml +++ b/data/scenarios/Testing/1171-sniff-command.yaml @@ -54,3 +54,4 @@ world: ......... .Ω....... ......... +entities: [] diff --git a/data/scenarios/Testing/1207-scout-command.yaml b/data/scenarios/Testing/1207-scout-command.yaml index e0ed48cabc..34f8ad7fd6 100644 --- a/data/scenarios/Testing/1207-scout-command.yaml +++ b/data/scenarios/Testing/1207-scout-command.yaml @@ -87,3 +87,4 @@ world: ......... Ω.......@ ......... +entities: [] 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/1256-halt-command.yaml b/data/scenarios/Testing/1256-halt-command.yaml index d6b6c6a4e2..cb7bc853c6 100644 --- a/data/scenarios/Testing/1256-halt-command.yaml +++ b/data/scenarios/Testing/1256-halt-command.yaml @@ -53,3 +53,4 @@ world: ......... ......... ......... +entities: [] diff --git a/data/scenarios/Testing/1295-density-command.yaml b/data/scenarios/Testing/1295-density-command.yaml index aaba569e6d..226b7a968c 100644 --- a/data/scenarios/Testing/1295-density-command.yaml +++ b/data/scenarios/Testing/1295-density-command.yaml @@ -48,3 +48,4 @@ world: Ω*.* *.*. J*.* +entities: [] diff --git a/data/scenarios/Testing/1320-world-DSL/constant.yaml b/data/scenarios/Testing/1320-world-DSL/constant.yaml index bfb7d21794..f07488b2b1 100644 --- a/data/scenarios/Testing/1320-world-DSL/constant.yaml +++ b/data/scenarios/Testing/1320-world-DSL/constant.yaml @@ -21,3 +21,4 @@ robots: world: dsl: | {terrain: ice} <> {entity: tree} +entities: [] diff --git a/data/scenarios/Testing/1320-world-DSL/erase.yaml b/data/scenarios/Testing/1320-world-DSL/erase.yaml index 014b362464..5308d1da04 100644 --- a/data/scenarios/Testing/1320-world-DSL/erase.yaml +++ b/data/scenarios/Testing/1320-world-DSL/erase.yaml @@ -28,3 +28,4 @@ world: [ {terrain: ice} <> {entity: tree} , if (x + y) % 2 == 0 then {erase} else {blank} ] +entities: [] diff --git a/data/scenarios/Testing/1320-world-DSL/override.yaml b/data/scenarios/Testing/1320-world-DSL/override.yaml index 6f87e7f309..e1722845f3 100644 --- a/data/scenarios/Testing/1320-world-DSL/override.yaml +++ b/data/scenarios/Testing/1320-world-DSL/override.yaml @@ -23,3 +23,4 @@ world: [ {terrain: ice} <> {entity: rock} , {entity: tree} ] +entities: [] diff --git a/data/scenarios/Testing/1341-command-count.yaml b/data/scenarios/Testing/1341-command-count.yaml index 51a2b886a1..2529a80b76 100644 --- a/data/scenarios/Testing/1341-command-count.yaml +++ b/data/scenarios/Testing/1341-command-count.yaml @@ -105,3 +105,4 @@ world: .B.fff..2 ...T....3 ........4 +entities: [] 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/1356-portals/automatic-waypoint-patrol.yaml b/data/scenarios/Testing/1356-portals/automatic-waypoint-patrol.yaml index b73932d9a5..3db9ad3b01 100644 --- a/data/scenarios/Testing/1356-portals/automatic-waypoint-patrol.yaml +++ b/data/scenarios/Testing/1356-portals/automatic-waypoint-patrol.yaml @@ -70,3 +70,4 @@ world: │.*..*..*..*│ │..*..*..*..│ └───────────┘ +entities: [] diff --git a/data/scenarios/Testing/1399-backup-command.yaml b/data/scenarios/Testing/1399-backup-command.yaml index dd3d66defc..16f171e8cc 100644 --- a/data/scenarios/Testing/1399-backup-command.yaml +++ b/data/scenarios/Testing/1399-backup-command.yaml @@ -28,3 +28,4 @@ world: .B. ... .f. +entities: [] diff --git a/data/scenarios/Testing/1430-built-robot-ownership.yaml b/data/scenarios/Testing/1430-built-robot-ownership.yaml index 337bfb9524..05e77062e2 100644 --- a/data/scenarios/Testing/1430-built-robot-ownership.yaml +++ b/data/scenarios/Testing/1430-built-robot-ownership.yaml @@ -62,3 +62,4 @@ world: ...Ω..r.. ......... ......... +entities: [] 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/1536-custom-unwalkable-entities.yaml b/data/scenarios/Testing/1536-custom-unwalkable-entities.yaml index 9065f2ce8c..04898455ca 100644 --- a/data/scenarios/Testing/1536-custom-unwalkable-entities.yaml +++ b/data/scenarios/Testing/1536-custom-unwalkable-entities.yaml @@ -44,3 +44,4 @@ world: upperleft: [0, 0] map: | BfTb +entities: [] 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/1575-structure-recognizer/1575-bounding-box-overlap.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-bounding-box-overlap.yaml index a61008d798..a86d7033a4 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-bounding-box-overlap.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-bounding-box-overlap.yaml @@ -81,3 +81,4 @@ world: ..... ..... ..... +entities: [] diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-browse-structures.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-browse-structures.yaml index c2689fc627..a942eed399 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-browse-structures.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-browse-structures.yaml @@ -129,3 +129,4 @@ world: B............ .cqq......... ............. +entities: [] diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-construction-count.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-construction-count.yaml index a5b43be7b0..242f713d7c 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-construction-count.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-construction-count.yaml @@ -67,3 +67,4 @@ world: ......... ......... ......... +entities: [] diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-ensure-disjoint.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-ensure-disjoint.yaml index 39995f64e4..7a05887ae5 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-ensure-disjoint.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-ensure-disjoint.yaml @@ -83,3 +83,4 @@ world: sgsgsgsg gsgsgsgs sgsgsgsg +entities: [] 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 index 55787caeae..b84df01f93 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-ensure-single-recognition.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-ensure-single-recognition.yaml @@ -78,3 +78,4 @@ world: sgsgsgsg gsgsgsgs sgsgsgs. +entities: [] diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-floorplan-command.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-floorplan-command.yaml index 5cdf107e87..a2b3d71ff2 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-floorplan-command.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-floorplan-command.yaml @@ -73,3 +73,4 @@ world: .......... .......... .......... +entities: [] diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-handle-overlapping.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-handle-overlapping.yaml index 2201cf704b..46be305e3d 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-handle-overlapping.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-handle-overlapping.yaml @@ -74,3 +74,4 @@ world: .gsq. B.... .cqq. +entities: [] 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 index 9832ec7ccd..c63ee7d2bf 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-interior-entity-placement.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-interior-entity-placement.yaml @@ -107,3 +107,4 @@ world: B.r... ...... ...... +entities: [] 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 index af2ee74bfd..47e332dd4e 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-nested-structure-definition.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-nested-structure-definition.yaml @@ -98,3 +98,4 @@ world: ........ ........ ........ +entities: [] 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 index 51be897e1e..a17b336236 100644 --- 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 @@ -69,3 +69,4 @@ world: .sss .ggs B.gs +entities: [] diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-overlapping-tiebreaker-by-location.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-overlapping-tiebreaker-by-location.yaml index 3dc2b0394a..88e78e04c1 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-overlapping-tiebreaker-by-location.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-overlapping-tiebreaker-by-location.yaml @@ -74,3 +74,4 @@ world: B.g.g ...gg ...ss +entities: [] diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-placement-occlusion.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-placement-occlusion.yaml index 982f1a0d25..ada0e7d0ed 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-placement-occlusion.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-placement-occlusion.yaml @@ -87,3 +87,4 @@ world: ......... ......... ......... +entities: [] diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-remove-structure.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-remove-structure.yaml index d6e7e6a9f6..b2bee9a845 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-remove-structure.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-remove-structure.yaml @@ -63,3 +63,4 @@ world: sgsgs gsgsg sgsgs +entities: [] diff --git a/data/scenarios/Testing/1575-structure-recognizer/1575-swap-structure.yaml b/data/scenarios/Testing/1575-structure-recognizer/1575-swap-structure.yaml index b05aad809d..c07b15c382 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1575-swap-structure.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1575-swap-structure.yaml @@ -115,3 +115,4 @@ world: B..... ...... ...... +entities: [] 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 index 8dcfbb5186..58c8c5477c 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1644-rotated-preplacement-recognition.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1644-rotated-preplacement-recognition.yaml @@ -45,3 +45,4 @@ world: B.... ..... ..... +entities: [] diff --git a/data/scenarios/Testing/1575-structure-recognizer/1644-rotated-recognition.yaml b/data/scenarios/Testing/1575-structure-recognizer/1644-rotated-recognition.yaml index c1ae6ac2de..c5cdb5ab08 100644 --- a/data/scenarios/Testing/1575-structure-recognizer/1644-rotated-recognition.yaml +++ b/data/scenarios/Testing/1575-structure-recognizer/1644-rotated-recognition.yaml @@ -49,3 +49,4 @@ world: B.x.. ..xx. ..... +entities: [] diff --git a/data/scenarios/Testing/1631-tags.yaml b/data/scenarios/Testing/1631-tags.yaml index ac209fb0e5..8eb25869c6 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,33 +87,34 @@ 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' description: - Just ripe tags: [edible, fruit] + properties: [] - name: peach display: char: 'g' description: - Just ripe tags: [edible, fruit] - properties: [portable] + properties: [pickable] world: palette: '.': [grass] diff --git a/data/scenarios/Testing/1634-message-colors.yaml b/data/scenarios/Testing/1634-message-colors.yaml index d7cfb97151..3251acefbd 100644 --- a/data/scenarios/Testing/1634-message-colors.yaml +++ b/data/scenarios/Testing/1634-message-colors.yaml @@ -38,3 +38,4 @@ world: ..s ..s ..s +entities: [] diff --git a/data/scenarios/Testing/201-require/1664-require-system-robot-children.yaml b/data/scenarios/Testing/201-require/1664-require-system-robot-children.yaml index 095a1b1063..dd20d399e2 100644 --- a/data/scenarios/Testing/201-require/1664-require-system-robot-children.yaml +++ b/data/scenarios/Testing/201-require/1664-require-system-robot-children.yaml @@ -49,3 +49,4 @@ world: B..Q .... .... +entities: [] diff --git a/data/scenarios/Testing/201-require/201-require-device-creative.yaml b/data/scenarios/Testing/201-require/201-require-device-creative.yaml index 6f01061de5..7c07bdd594 100644 --- a/data/scenarios/Testing/201-require/201-require-device-creative.yaml +++ b/data/scenarios/Testing/201-require/201-require-device-creative.yaml @@ -39,3 +39,4 @@ world: ┌───┐ │.~.│ └───┘ +entities: [] 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/201-require/201-require-device.yaml b/data/scenarios/Testing/201-require/201-require-device.yaml index 4c259cf4ad..33562c13d0 100644 --- a/data/scenarios/Testing/201-require/201-require-device.yaml +++ b/data/scenarios/Testing/201-require/201-require-device.yaml @@ -42,3 +42,4 @@ world: ┌───┐ │.~.│ └───┘ +entities: [] diff --git a/data/scenarios/Testing/201-require/201-require-entities-def.yaml b/data/scenarios/Testing/201-require/201-require-entities-def.yaml index 3b38167cda..be2335f7c5 100644 --- a/data/scenarios/Testing/201-require/201-require-entities-def.yaml +++ b/data/scenarios/Testing/201-require/201-require-entities-def.yaml @@ -43,3 +43,4 @@ world: ┌─────┐ │.....│ └─────┘ +entities: [] diff --git a/data/scenarios/Testing/201-require/201-require-entities.yaml b/data/scenarios/Testing/201-require/201-require-entities.yaml index 70341fe818..1a8e3dadda 100644 --- a/data/scenarios/Testing/201-require/201-require-entities.yaml +++ b/data/scenarios/Testing/201-require/201-require-entities.yaml @@ -41,3 +41,4 @@ world: ┌───┐ │...│ └───┘ +entities: [] diff --git a/data/scenarios/Testing/201-require/533-reprogram-simple.yaml b/data/scenarios/Testing/201-require/533-reprogram-simple.yaml index 8092326e14..a6c12b5ef0 100644 --- a/data/scenarios/Testing/201-require/533-reprogram-simple.yaml +++ b/data/scenarios/Testing/201-require/533-reprogram-simple.yaml @@ -60,3 +60,4 @@ world: ┌───┐ │.~.│ └───┘ +entities: [] diff --git a/data/scenarios/Testing/201-require/533-reprogram.yaml b/data/scenarios/Testing/201-require/533-reprogram.yaml index 5553c8579f..cc5f983109 100644 --- a/data/scenarios/Testing/201-require/533-reprogram.yaml +++ b/data/scenarios/Testing/201-require/533-reprogram.yaml @@ -60,3 +60,4 @@ world: ┌───┐ │.~.│ └───┘ +entities: [] diff --git a/data/scenarios/Testing/378-objectives.yaml b/data/scenarios/Testing/378-objectives.yaml index 3f4ffd61cb..0df72358d4 100644 --- a/data/scenarios/Testing/378-objectives.yaml +++ b/data/scenarios/Testing/378-objectives.yaml @@ -61,3 +61,4 @@ world: ┌────────┐ │Ω.TTTTTT│ └────────┘ +entities: [] diff --git a/data/scenarios/Testing/394-build-drill.yaml b/data/scenarios/Testing/394-build-drill.yaml index 8d60dd0b36..b4a7de16a1 100644 --- a/data/scenarios/Testing/394-build-drill.yaml +++ b/data/scenarios/Testing/394-build-drill.yaml @@ -55,3 +55,4 @@ world: ┌───┐ │..M│ └───┘ +entities: [] diff --git a/data/scenarios/Testing/397-wrong-missing.yaml b/data/scenarios/Testing/397-wrong-missing.yaml index 3e10289ec5..6a31e8176a 100644 --- a/data/scenarios/Testing/397-wrong-missing.yaml +++ b/data/scenarios/Testing/397-wrong-missing.yaml @@ -35,3 +35,4 @@ world: map: | . Ω +entities: [] diff --git a/data/scenarios/Testing/428-drowning-destroy.yaml b/data/scenarios/Testing/428-drowning-destroy.yaml index ca01b71587..884f96f9e5 100644 --- a/data/scenarios/Testing/428-drowning-destroy.yaml +++ b/data/scenarios/Testing/428-drowning-destroy.yaml @@ -49,3 +49,4 @@ world: │. │ │. │ └──┘ +entities: [] diff --git a/data/scenarios/Testing/475-wait-one.yaml b/data/scenarios/Testing/475-wait-one.yaml index efe8b6b355..9dce3e5976 100644 --- a/data/scenarios/Testing/475-wait-one.yaml +++ b/data/scenarios/Testing/475-wait-one.yaml @@ -48,3 +48,4 @@ world: │....λ│ │...λ.│ └─────┘ +entities: [] 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/490-harvest.yaml b/data/scenarios/Testing/490-harvest.yaml index ad10963429..f332714e51 100644 --- a/data/scenarios/Testing/490-harvest.yaml +++ b/data/scenarios/Testing/490-harvest.yaml @@ -42,3 +42,4 @@ world: │.TT│ │~~~│ └───┘ +entities: [] diff --git a/data/scenarios/Testing/504-teleport-self.yaml b/data/scenarios/Testing/504-teleport-self.yaml index d375d32e53..a1e9f607ce 100644 --- a/data/scenarios/Testing/504-teleport-self.yaml +++ b/data/scenarios/Testing/504-teleport-self.yaml @@ -36,3 +36,4 @@ world: ┌──────┐ │......│ └──────┘ +entities: [] 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/555-teleport-location.yaml b/data/scenarios/Testing/555-teleport-location.yaml index d04c7d7861..9742878f76 100644 --- a/data/scenarios/Testing/555-teleport-location.yaml +++ b/data/scenarios/Testing/555-teleport-location.yaml @@ -26,3 +26,4 @@ robots: world: dsl: | {grass} +entities: [] diff --git a/data/scenarios/Testing/684-swap.yaml b/data/scenarios/Testing/684-swap.yaml index b1d387a898..4f5f3b7c4d 100644 --- a/data/scenarios/Testing/684-swap.yaml +++ b/data/scenarios/Testing/684-swap.yaml @@ -58,3 +58,4 @@ world: ┌─┐ │λ│ └─┘ +entities: [] diff --git a/data/scenarios/Testing/687-watch-command.yaml b/data/scenarios/Testing/687-watch-command.yaml index e3aff576d6..8d92e1cc3d 100644 --- a/data/scenarios/Testing/687-watch-command.yaml +++ b/data/scenarios/Testing/687-watch-command.yaml @@ -75,3 +75,4 @@ world: ......b... .p........ ......Ω... +entities: [] diff --git a/data/scenarios/Testing/699-movement-fail/699-move-blocked.yaml b/data/scenarios/Testing/699-movement-fail/699-move-blocked.yaml index c709c789bc..5cc98ec3c2 100644 --- a/data/scenarios/Testing/699-movement-fail/699-move-blocked.yaml +++ b/data/scenarios/Testing/699-movement-fail/699-move-blocked.yaml @@ -47,3 +47,4 @@ world: │1@│ │2@│ └──┘ +entities: [] diff --git a/data/scenarios/Testing/699-movement-fail/699-move-liquid.yaml b/data/scenarios/Testing/699-movement-fail/699-move-liquid.yaml index e410a74cf0..2957ec535d 100644 --- a/data/scenarios/Testing/699-movement-fail/699-move-liquid.yaml +++ b/data/scenarios/Testing/699-movement-fail/699-move-liquid.yaml @@ -55,3 +55,4 @@ world: │2~│ │3~│ └──┘ +entities: [] diff --git a/data/scenarios/Testing/699-movement-fail/699-teleport-blocked.yaml b/data/scenarios/Testing/699-movement-fail/699-teleport-blocked.yaml index b67f0a53e7..99a9a6a5ce 100644 --- a/data/scenarios/Testing/699-movement-fail/699-teleport-blocked.yaml +++ b/data/scenarios/Testing/699-movement-fail/699-teleport-blocked.yaml @@ -51,3 +51,4 @@ world: ┌──────┐ │B12@34│ └──────┘ +entities: [] diff --git a/data/scenarios/Testing/710-multi-robot.yaml b/data/scenarios/Testing/710-multi-robot.yaml index d4aa9fb9c1..683abfe735 100644 --- a/data/scenarios/Testing/710-multi-robot.yaml +++ b/data/scenarios/Testing/710-multi-robot.yaml @@ -234,15 +234,18 @@ entities: attr: gold description: - This entity signals that the objective has been met. + properties: [] - name: "1" display: char: W invisible: true description: - This entity is used to mean that the robot should check the 1st objective. + properties: [] - name: "2" display: char: W invisible: true description: - This entity is used to mean that the robot should check the 2nd objective. + properties: [] diff --git a/data/scenarios/Testing/795-prerequisite/795-prerequisite-and.yaml b/data/scenarios/Testing/795-prerequisite/795-prerequisite-and.yaml index 3a5c94c688..01d5d75f63 100644 --- a/data/scenarios/Testing/795-prerequisite/795-prerequisite-and.yaml +++ b/data/scenarios/Testing/795-prerequisite/795-prerequisite-and.yaml @@ -47,3 +47,4 @@ world: upperleft: [0, 0] map: | x +entities: [] diff --git a/data/scenarios/Testing/795-prerequisite/795-prerequisite-cycle-with-not.yaml b/data/scenarios/Testing/795-prerequisite/795-prerequisite-cycle-with-not.yaml index d4c8f74fd1..ddb969e33b 100644 --- a/data/scenarios/Testing/795-prerequisite/795-prerequisite-cycle-with-not.yaml +++ b/data/scenarios/Testing/795-prerequisite/795-prerequisite-cycle-with-not.yaml @@ -39,3 +39,4 @@ world: upperleft: [0, 0] map: | x +entities: [] diff --git a/data/scenarios/Testing/795-prerequisite/795-prerequisite-mutually-exclusive.yaml b/data/scenarios/Testing/795-prerequisite/795-prerequisite-mutually-exclusive.yaml index c7e97790c0..18102dfa7e 100644 --- a/data/scenarios/Testing/795-prerequisite/795-prerequisite-mutually-exclusive.yaml +++ b/data/scenarios/Testing/795-prerequisite/795-prerequisite-mutually-exclusive.yaml @@ -57,3 +57,4 @@ world: upperleft: [0, 0] map: | x +entities: [] diff --git a/data/scenarios/Testing/795-prerequisite/795-prerequisite-or.yaml b/data/scenarios/Testing/795-prerequisite/795-prerequisite-or.yaml index d198768623..f6b72ee023 100644 --- a/data/scenarios/Testing/795-prerequisite/795-prerequisite-or.yaml +++ b/data/scenarios/Testing/795-prerequisite/795-prerequisite-or.yaml @@ -46,3 +46,4 @@ world: upperleft: [0, 0] map: | x +entities: [] 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-distance-limit-reachable.yaml b/data/scenarios/Testing/836-pathfinding/836-path-exists-distance-limit-reachable.yaml index 4e7582c384..11f6009b34 100644 --- a/data/scenarios/Testing/836-pathfinding/836-path-exists-distance-limit-reachable.yaml +++ b/data/scenarios/Testing/836-pathfinding/836-path-exists-distance-limit-reachable.yaml @@ -31,3 +31,4 @@ world: ....... .B...f. ....... +entities: [] diff --git a/data/scenarios/Testing/836-pathfinding/836-path-exists-distance-limit-unreachable.yaml b/data/scenarios/Testing/836-pathfinding/836-path-exists-distance-limit-unreachable.yaml index 55c9056707..71825f2191 100644 --- a/data/scenarios/Testing/836-pathfinding/836-path-exists-distance-limit-unreachable.yaml +++ b/data/scenarios/Testing/836-pathfinding/836-path-exists-distance-limit-unreachable.yaml @@ -32,3 +32,4 @@ world: ....... ..B..f. ....... +entities: [] 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/858-inventory/858-counting-objective.yaml b/data/scenarios/Testing/858-inventory/858-counting-objective.yaml index d476abdb78..0b96a5b6c1 100644 --- a/data/scenarios/Testing/858-inventory/858-counting-objective.yaml +++ b/data/scenarios/Testing/858-inventory/858-counting-objective.yaml @@ -33,3 +33,4 @@ world: map: |- w B +entities: [] diff --git a/data/scenarios/Testing/858-inventory/858-nonpossession-objective.yaml b/data/scenarios/Testing/858-inventory/858-nonpossession-objective.yaml index f875063e38..c6e46bbe62 100644 --- a/data/scenarios/Testing/858-inventory/858-nonpossession-objective.yaml +++ b/data/scenarios/Testing/858-inventory/858-nonpossession-objective.yaml @@ -32,3 +32,4 @@ world: map: |- w B +entities: [] diff --git a/data/scenarios/Testing/858-inventory/858-possession-objective.yaml b/data/scenarios/Testing/858-inventory/858-possession-objective.yaml index 150afdd2f4..4011ee0737 100644 --- a/data/scenarios/Testing/858-inventory/858-possession-objective.yaml +++ b/data/scenarios/Testing/858-inventory/858-possession-objective.yaml @@ -30,3 +30,4 @@ world: map: |- w B +entities: [] diff --git a/data/scenarios/Testing/920-meet.yaml b/data/scenarios/Testing/920-meet.yaml index 09567cbd3b..da0b1e8d09 100644 --- a/data/scenarios/Testing/920-meet.yaml +++ b/data/scenarios/Testing/920-meet.yaml @@ -49,3 +49,4 @@ world: │oΩo│ │.o.│ └───┘ +entities: [] diff --git a/data/scenarios/Testing/955-heading.yaml b/data/scenarios/Testing/955-heading.yaml index 1470473ac4..8fac1f7eea 100644 --- a/data/scenarios/Testing/955-heading.yaml +++ b/data/scenarios/Testing/955-heading.yaml @@ -25,3 +25,4 @@ world: ^.. ... ... +entities: [] diff --git a/data/scenarios/Testing/956-GPS.yaml b/data/scenarios/Testing/956-GPS.yaml index 7829c76bc6..032598374b 100644 --- a/data/scenarios/Testing/956-GPS.yaml +++ b/data/scenarios/Testing/956-GPS.yaml @@ -62,3 +62,4 @@ world: ........... ........... ........... +entities: [] 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/Testing/Achievements/RobotIntoWater.yaml b/data/scenarios/Testing/Achievements/RobotIntoWater.yaml index 3a302f2608..29773f3252 100644 --- a/data/scenarios/Testing/Achievements/RobotIntoWater.yaml +++ b/data/scenarios/Testing/Achievements/RobotIntoWater.yaml @@ -46,3 +46,4 @@ world: offset: true dsl: | "classic" +entities: [] diff --git a/data/scenarios/Testing/_Validation/1138-nonexistent-nested-structure.yaml b/data/scenarios/Testing/_Validation/1138-nonexistent-nested-structure.yaml index 5ff238e031..064c7a9a28 100644 --- a/data/scenarios/Testing/_Validation/1138-nonexistent-nested-structure.yaml +++ b/data/scenarios/Testing/_Validation/1138-nonexistent-nested-structure.yaml @@ -53,3 +53,4 @@ world: ........ ........ ........ +entities: [] diff --git a/data/scenarios/Testing/_Validation/1221-duplicate-entities.yaml b/data/scenarios/Testing/_Validation/1221-duplicate-entities.yaml index 773cf0b0b1..4b56055646 100644 --- a/data/scenarios/Testing/_Validation/1221-duplicate-entities.yaml +++ b/data/scenarios/Testing/_Validation/1221-duplicate-entities.yaml @@ -9,11 +9,13 @@ entities: char: 'M' description: - My scooter + properties: [] - name: scooter display: char: 'Y' description: - Your scooter + properties: [] robots: [] world: palette: diff --git a/data/scenarios/Testing/_Validation/1575-recognized-placements-disallow-reorientation.yaml b/data/scenarios/Testing/_Validation/1575-recognized-placements-disallow-reorientation.yaml index f51d016fa3..0160c8b3e9 100644 --- a/data/scenarios/Testing/_Validation/1575-recognized-placements-disallow-reorientation.yaml +++ b/data/scenarios/Testing/_Validation/1575-recognized-placements-disallow-reorientation.yaml @@ -38,3 +38,4 @@ world: B...... ....... ....... +entities: [] diff --git a/data/scenarios/Testing/_Validation/1632-entity-attributes.yaml b/data/scenarios/Testing/_Validation/1632-entity-attributes.yaml index 4505932bc2..9983e2d08a 100644 --- a/data/scenarios/Testing/_Validation/1632-entity-attributes.yaml +++ b/data/scenarios/Testing/_Validation/1632-entity-attributes.yaml @@ -10,6 +10,7 @@ entities: attr: 'foobar' description: - My scooter + properties: [] robots: [] world: palette: diff --git a/data/scenarios/Testing/_Validation/1655-display-characters.yaml b/data/scenarios/Testing/_Validation/1655-display-characters.yaml index cefa211c6c..f8054e218f 100644 --- a/data/scenarios/Testing/_Validation/1655-display-characters.yaml +++ b/data/scenarios/Testing/_Validation/1655-display-characters.yaml @@ -9,6 +9,7 @@ entities: char: '且' description: - My ladder + properties: [] robots: [] world: palette: diff --git a/data/scenarios/Testing/_Validation/1678-redundant-structure-recognition-symmetries.yaml b/data/scenarios/Testing/_Validation/1678-redundant-structure-recognition-symmetries.yaml index 6942c13f1f..98db19481d 100644 --- a/data/scenarios/Testing/_Validation/1678-redundant-structure-recognition-symmetries.yaml +++ b/data/scenarios/Testing/_Validation/1678-redundant-structure-recognition-symmetries.yaml @@ -27,3 +27,4 @@ world: upperleft: [0, 0] map: | B +entities: [] diff --git a/data/scenarios/Testing/_Validation/795-prerequisite-cycle.yaml b/data/scenarios/Testing/_Validation/795-prerequisite-cycle.yaml index 0aa7a3c8ea..8e150d7b10 100644 --- a/data/scenarios/Testing/_Validation/795-prerequisite-cycle.yaml +++ b/data/scenarios/Testing/_Validation/795-prerequisite-cycle.yaml @@ -35,3 +35,4 @@ world: upperleft: [0, 0] map: | x +entities: [] diff --git a/data/scenarios/Testing/_Validation/795-prerequisite-nonexistent-reference.yaml b/data/scenarios/Testing/_Validation/795-prerequisite-nonexistent-reference.yaml index 10dfe28397..9da4c6f7cb 100644 --- a/data/scenarios/Testing/_Validation/795-prerequisite-nonexistent-reference.yaml +++ b/data/scenarios/Testing/_Validation/795-prerequisite-nonexistent-reference.yaml @@ -35,3 +35,4 @@ world: upperleft: [0, 0] map: | x +entities: [] diff --git a/data/scenarios/Testing/_Validation/795-prerequisite-self-reference.yaml b/data/scenarios/Testing/_Validation/795-prerequisite-self-reference.yaml index 78ea76d42a..eaa8d481d5 100644 --- a/data/scenarios/Testing/_Validation/795-prerequisite-self-reference.yaml +++ b/data/scenarios/Testing/_Validation/795-prerequisite-self-reference.yaml @@ -28,3 +28,4 @@ world: upperleft: [0, 0] map: | x +entities: [] 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/build.yaml b/data/scenarios/Tutorials/build.yaml index d471584316..808634cac5 100644 --- a/data/scenarios/Tutorials/build.yaml +++ b/data/scenarios/Tutorials/build.yaml @@ -65,3 +65,4 @@ world: │...│ │~~~│ └───┘ +entities: [] 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/craft.yaml b/data/scenarios/Tutorials/craft.yaml index 7808b6b156..501f12516d 100644 --- a/data/scenarios/Tutorials/craft.yaml +++ b/data/scenarios/Tutorials/craft.yaml @@ -47,3 +47,4 @@ world: ┌─┐ │Ω│ └─┘ +entities: [] 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/def.yaml b/data/scenarios/Tutorials/def.yaml index 8125dff2d3..77823d24ab 100644 --- a/data/scenarios/Tutorials/def.yaml +++ b/data/scenarios/Tutorials/def.yaml @@ -86,3 +86,4 @@ world: │@@@@@@@@@@@@@@@@.│ │Ω................│ └─────────────────┘ +entities: [] diff --git a/data/scenarios/Tutorials/equip.yaml b/data/scenarios/Tutorials/equip.yaml index ff41e6c525..a98c34e34b 100644 --- a/data/scenarios/Tutorials/equip.yaml +++ b/data/scenarios/Tutorials/equip.yaml @@ -54,3 +54,4 @@ world: │3..│ │~~~│ └───┘ +entities: [] diff --git a/data/scenarios/Tutorials/farming.yaml b/data/scenarios/Tutorials/farming.yaml index 1a14ba7592..41a01ac09b 100644 --- a/data/scenarios/Tutorials/farming.yaml +++ b/data/scenarios/Tutorials/farming.yaml @@ -87,3 +87,4 @@ world: scrollable: false dsl: | "classic" +entities: [] diff --git a/data/scenarios/Tutorials/give.yaml b/data/scenarios/Tutorials/give.yaml index c924008ae7..2a3e536003 100644 --- a/data/scenarios/Tutorials/give.yaml +++ b/data/scenarios/Tutorials/give.yaml @@ -71,3 +71,4 @@ world: │.$.......│ │........C│ └─────────┘ +entities: [] diff --git a/data/scenarios/Tutorials/grab.yaml b/data/scenarios/Tutorials/grab.yaml index 97f5cccc65..a2b007b266 100644 --- a/data/scenarios/Tutorials/grab.yaml +++ b/data/scenarios/Tutorials/grab.yaml @@ -46,3 +46,4 @@ world: ┌────────┐ │>.TTTTTT│ └────────┘ +entities: [] diff --git a/data/scenarios/Tutorials/lambda.yaml b/data/scenarios/Tutorials/lambda.yaml index d07a338fdc..014d6a039c 100644 --- a/data/scenarios/Tutorials/lambda.yaml +++ b/data/scenarios/Tutorials/lambda.yaml @@ -89,3 +89,4 @@ world: │@@@@.@.@@@@@.@.@@@@@.@.@@@@@.@.@@│ │Ω....@.......@.......@.......@..*│ └─────────────────────────────────┘ +entities: [] diff --git a/data/scenarios/Tutorials/move.yaml b/data/scenarios/Tutorials/move.yaml index f1c4269dca..1a9f900d69 100644 --- a/data/scenarios/Tutorials/move.yaml +++ b/data/scenarios/Tutorials/move.yaml @@ -336,3 +336,4 @@ entities: attr: gold description: - This entity signals that the objective has been met. + properties: [] 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/requireinv.yaml b/data/scenarios/Tutorials/requireinv.yaml index 28b96d70aa..933cd6dbd3 100644 --- a/data/scenarios/Tutorials/requireinv.yaml +++ b/data/scenarios/Tutorials/requireinv.yaml @@ -75,3 +75,4 @@ world: │.____│ │.____│ └─────┘ +entities: [] diff --git a/data/scenarios/Tutorials/scan.yaml b/data/scenarios/Tutorials/scan.yaml index 24f5814aa1..73792bcdca 100644 --- a/data/scenarios/Tutorials/scan.yaml +++ b/data/scenarios/Tutorials/scan.yaml @@ -59,3 +59,4 @@ world: │..A.~│ │Ω...A│ └─────┘ +entities: [] 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: diff --git a/data/scenarios/Tutorials/world101.yaml b/data/scenarios/Tutorials/world101.yaml index 4fb5fed658..f3116c8e7b 100644 --- a/data/scenarios/Tutorials/world101.yaml +++ b/data/scenarios/Tutorials/world101.yaml @@ -63,3 +63,4 @@ world: scrollable: false dsl: | "classic" +entities: [] diff --git a/data/scenarios/blank.yaml b/data/scenarios/blank.yaml index 6208510488..f204d331e2 100644 --- a/data/scenarios/blank.yaml +++ b/data/scenarios/blank.yaml @@ -13,3 +13,4 @@ robots: world: dsl: | {grass} +entities: [] diff --git a/data/scenarios/classic.yaml b/data/scenarios/classic.yaml index 2166ccd7af..5717e69183 100644 --- a/data/scenarios/classic.yaml +++ b/data/scenarios/classic.yaml @@ -33,3 +33,4 @@ world: scrollable: false dsl: | "classic" +entities: [] diff --git a/data/scenarios/creative.yaml b/data/scenarios/creative.yaml index 253b364766..12158c38dc 100644 --- a/data/scenarios/creative.yaml +++ b/data/scenarios/creative.yaml @@ -14,3 +14,4 @@ world: offset: true dsl: | "classic" +entities: []