Skip to content

Commit

Permalink
add more markup to scenario descriptions (#1500)
Browse files Browse the repository at this point in the history
  • Loading branch information
kostmo authored Sep 9, 2023
1 parent 8ffd056 commit 25f6fde
Show file tree
Hide file tree
Showing 26 changed files with 69 additions and 68 deletions.
6 changes: 3 additions & 3 deletions data/scenarios/Challenges/2048.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ description: Make 2048!
objectives:
- goal:
- OK, OK, it's not really the same as the classic "2048" game.
However, your goal is still to make 2048! You start with a `1`
However, your goal is still to make 2048! You start with a `1`{=entity}
which regrows immediately when
it is harvested, so if you plant it, you can get as many as you want. Your
job is to combine `1`s in order to make a `2048`
it is `harvest`ed, so if you plant it, you can get as many as you want. Your
job is to combine `1`{=entity}s in order to make a `2048`{=entity}
entity.
- "Hint: the `format` command can turn numbers into strings!"
condition: |
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Mazes/easy_cave_maze.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ objectives:
- You are at the top of a cave that gradually descends until reaching a dead end.
- At its bottom is a great treasure.
- Luckily, the cave does not branch out, so it is easy to find the path to the treasure.
- Send a robot to the the item marked as '!'. You win once the robot grabs it.
- Send a robot to the the item marked as '**!**'. You win once the robot `grab`s it.
condition: |
j <- robotNamed "judge";
as j {has "goal"}
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Ranching/capture.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ objectives:
goal:
- |
This porcine pest has been running amok.
Block the pig by a "monolith" on all four sides to capture it.
Block the pig by a `monolith`{=entity} on all four sides to capture it.
- Blocking on fewer than four sides will spook the pig, and he will escape!
condition: |
def isSurrounded = \n.
Expand Down
15 changes: 8 additions & 7 deletions data/scenarios/Challenges/Ranching/gated-paddock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ objectives:
You've homesteaded on a small island in the ocean.
It's time to gather resources to trade.
- |
You encounter some feral sheep (@). They slowly wander the island and eat grass.
You encounter some feral sheep (**@**). They slowly wander the island and eat grass.
Your mind wanders to textiles...
- |
First, paddock at least one sheep so they don't drown.
Make sure there are no gaps in the fence!
- |
Note that you can use the "drill" command (by way of the "post puller" tool)
to demolish a fence that has been "placed".
Note that you can use the `drill` command (by way of the `post puller`{=entity} tool)
to demolish a `fence`{=entity} that has been `place`d.
condition: |-
// Algorithm:
// ----------
Expand Down Expand Up @@ -287,7 +287,7 @@ objectives:
The sheep will move toward something edible on
an adjacent tile and will eat it if they walk over it.
- |
You may want to add a gate to the fence
You may want to add a `gate`{=entity} to the fence
to give yourself easier access.
condition: |-
def getTruthForSheepIndex = \predicateCmd. \i.
Expand Down Expand Up @@ -317,11 +317,12 @@ objectives:
anySheep (has "clover") 3;
prerequisite: enclose_sheep
- goal:
- teaser: Knit sweater
goal:
- |
Yum! Contented, well-fed sheep may drop wool.
Yum! Contented, well-fed sheep may drop `wool`{=entity}.
- |
Winter is coming! Collect three wool bundles to make a sweater.
Winter is coming! Collect three wool bundles to make a `sweater`{=entity}.
- |
Each sheep drops a finite amount over
their lifetime.
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Ranching/powerset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ objectives:
However, his experiment is incomplete! He has forgotten one combination.
- |
Place the missing hybrid combination in the empty eastern-most column.
After you have done this, `place` the "bell" anywhere, and then Bill will inspect
After you have done this, `place` the `bell`{=entity} anywhere, and then Bill will inspect
your work.
prerequisite:
not: wrong_anwser
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Sliding Puzzles/3x3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ objectives:
- |
Or, if you prefer, `drill` a tile to cause it to slide
into the adjacent empty space. However, you must not drill a tile that
has nowhere to slide. Also, drilling consumes "ink", which will be replenished
has nowhere to slide. Also, drilling consumes `ink`{=entity}, which will be replenished
after the sliding operation is complete, so avoid drilling too fast in
succession.
condition: |
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Sokoban/Gadgets/no-reverse.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ creative: false
seed: 0
objectives:
- goal:
- Grab the flower.
- Grab the `flower`{=entity}.
condition: |
as base {
has "flower";
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Sokoban/Gadgets/one-way.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ creative: false
seed: 0
objectives:
- goal:
- Grab the flower.
- Grab the `flower`{=entity}.
condition: |
as base {
has "flower";
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/Sokoban/Simple/trapdoor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ creative: false
seed: 0
objectives:
- goal:
- Place the flower on the target.
- Place the `flower`{=entity} on the target.
- You may have to start over if you get stuck.
condition: |
as base {
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Challenges/Sokoban/foresight.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ attrs:
fg: "#bbbbff"
objectives:
- goal:
- Push a monolith onto the base's initial location.
- Push a `monolith`{=entity} onto the base's initial location.
condition: |
as base {
teleport self (0,0);
Expand All @@ -23,7 +23,7 @@ objectives:
hidden: true
optional: true
goal:
- Grab the flower
- Grab the `flower`{=entity}
condition: |
as base {
has "flower";
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/arbitrage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ objectives:
As an itinerant merchant, you may exploit market asymmetry
for profit.
- |
Amass a fortune of 100 paperclips.
Amass a fortune of 100 `paperclip`{=entity}s.
condition: |
as base {
pcount <- count "paperclip";
Expand Down
6 changes: 3 additions & 3 deletions data/scenarios/Challenges/blender.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ objectives:
- teaser: Get amulet
goal:
- |
`grab` the Amulet of Yoneda from the northwest sanctum while
timing your passage carefully to avoid Side Effects (X) on patrol.
`grab` the `Amulet of Yoneda`{=entity} from the northwest sanctum while
timing your passage carefully to avoid Side Effects (**X**) on patrol.
- |
To unlock a red door, `drill` it with the "door key" equipped.
To unlock a red door, `drill` it with the `door key`{=entity} equipped.
condition: |
as base {has "Amulet of Yoneda"}
prerequisite:
Expand Down
28 changes: 14 additions & 14 deletions data/scenarios/Challenges/bridge-building.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ objectives:
- id: hammer_time
teaser: Hammer time
goal:
- Produce an obsidian shard.
- Produce an `obsidian shard`{=entity}.
optional: true
hidden: true
condition: |
Expand Down Expand Up @@ -87,14 +87,14 @@ objectives:
- id: get_map
teaser: Get the map
goal:
- As a humble peat farmer, you subsist in a simple cabin by the bog.
- As a humble `peat`{=entity} farmer, you subsist in a simple cabin by the `bog`{=entity}.
Though long content with this ascetic lifestyle, recently the barren walls have
left you restless. Something is missing...
- "The majestic landscape that is your back yard is insufficient to distract you---not
even the ferocious, lava-spewing volcano little more than a stone's throw from
even the ferocious, `lava`{=entity}-spewing volcano little more than a stone's throw from
your porch.
You are preoccupied by one task: to find the perfect household decoration."
- First, grab a map to orient yourself.
- First, grab a `map`{=entity} to orient yourself.
condition: |
as base {
has "map";
Expand All @@ -103,18 +103,18 @@ objectives:
teaser: Find the temple
prerequisite: get_map
goal:
- You study the map.
- Glacier-bound mountains tower in the east,
a volcano oozes a river of lava to the north, and beyond that lies a mountain lake, punctuated with islands
- You study the `map`{=entity}.
- Glacier-bound mountains tower in the `east`,
a volcano oozes a river of `lava`{=entity} to the `north`, and beyond that lies a mountain lake, punctuated with islands
in the northwest.
Iron mines penetrate the base of the volcano. They could be useful, but how will you get there?
- A jungle abuts the volcano, ensconcing an ancient ruin.
- A `jungle`{=entity} abuts the volcano, ensconcing an ancient ruin.
The map notes that bygone travelers have stashed tools among the northeasterly mountains to
blaze a path through the jungle.
- Your only neighbor, a hemp farmer to the northwest, has evacuated since the sudden volcanic eruption.
- A disused quarry and clay pit flanks your cabin to the west, as does the familiar, swampy bog to the east.
A highly-prized flower is said to grow in the caves beyond the bog.
- Your mind is made up. You will pillage the ruins for treasure! Head to the ruins and "scan" them.
- Your only neighbor, a `hemp`{=entity} farmer to the northwest, has evacuated since the sudden volcanic eruption.
- A disused quarry and clay pit flanks your cabin to the `west`, as does the familiar, swampy `bog`{=entity} to the `east`.
A highly-prized `flower`{=entity} is said to grow in the caves beyond the bog.
- Your mind is made up. You will pillage the ruins for treasure! Head to the ruins and `scan` them.
Ingenuity and endurance are your allies as you forge paths through varied obstacles.
Study your "recipes" for clues!
condition: |
Expand All @@ -126,8 +126,8 @@ objectives:
prerequisite: find_temple
goal:
- "A note on the door says:"
- '"Greetings, intrepid traveler. Encircle this temple with the rare "flower" of the southeastern
caves, and the treasure of this temple shall be revealed."'
- '"Greetings, intrepid traveler. Encircle this temple with the rare `flower`{=entity} of the southeastern
caves, and the treasure of this `temple`{=entity} shall be revealed."'
- Plant a ring of flowers around the jungle temple.
condition: |
as base {
Expand Down
10 changes: 5 additions & 5 deletions data/scenarios/Challenges/bucket-brigade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ objectives:
- id: deliver_coal_lump
teaser: Get coal to base
goal:
- Deliver a "coal lump" to the base.
- Deliver a `coal lump`{=entity} to the base.
- |
To excavate coal from the "lignite mine" (M), a robot needs to
`drill` while in posession of a "bucketwheel excavator".
To excavate coal from the `lignite mine`{=entity} (**M**), a robot needs to
`drill` while in possession of a `bucketwheel excavator`{=entity}.
- |
To assemble the excavator, you'll need to repurpose
some "treads".
Unfortunately, you have only one set of "treads".
some `treads`{=entity}.
Unfortunately, you have only one set of `treads`{=entity}.
You'll have to make do...
condition: |
as base {has "coal lump"}
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Challenges/chess_horse.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ author: Ondřej Šebek
description: In this quirky challenge, you move as the chess knight piece. Can you capture the enemy king?
objectives:
- goal:
- Robots can use the 'move' command to move.
But they only 'turn' in cardinal directions.
- Robots can use the `move` command to move.
But they only `turn` in cardinal directions.
- You are special. You are a knight.
- Go forth and capture the King!
condition: |
Expand Down
8 changes: 4 additions & 4 deletions data/scenarios/Challenges/gopher.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ objectives:
teaser: Defeat gopher
goal:
- |
A gopher (G) is defiling your immaculate garden!
A gopher (**G**) is defiling your immaculate garden!
- |
He will burrow (o) underground awhile, then pop up
He will burrow (**o**) underground awhile, then pop up
anywhere within the rectangular grassy region
to gloat atop his "mound" of dirt for a short time.
`drill` the "mound" while he sits to drive him
to gloat atop his `mound`{=entity} of dirt for a short time.
`drill` the `mound`{=entity} while he sits to drive him
away. Eventually you should wear down his resolve!
condition: |
try {
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Challenges/hackman.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ objectives:
- teaser: Get pellets
goal:
- |
Pick up all of the caffeine "pellets" so that Hackman can write more code.
Pick up all of the caffeine `pellet`{=entity}s so that Hackman can write more code.
- |
Pay no mind to the colorful ghosts meandering about. That is, unless
you are feeling generous with your "donuts"...
you are feeling generous with your `donut`{=entity}s...
- |
Can you find all of the secret objectives?
condition: |
Expand Down
6 changes: 3 additions & 3 deletions data/scenarios/Challenges/ice-cream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ objectives:
goal:
- |
Congratulations on the grand opening of your new ice cream shop.
You have advertised: "All you can eat, for 1 bitcoin!"
You have advertised: "All you can eat, for 1 `bitcoin`{=entity}!"
- |
A customer is approaching the "Counter". They look hungry!
A customer is approaching the `Counter`{=entity}. They look hungry!
- "..."
- |
Customer: "`give` me a cone, and then I'll tell you how many scoops I want."
- "..."
- |
Oh dear, you've forgotten to stock your shop with a "calculator".
Oh dear, you've forgotten to provision your shop with a `calculator`{=entity}.
Let's hope this order is simple.
condition: |
customer <- robotnamed "customer";
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/maypole.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ objectives:
teaser: Around you go!
goal:
- |
Go around the maypole several times counter-clockwise.
Go around the `maypole`{=entity} several times counter-clockwise.
condition: |
monitor <- robotnamed "monitor";
as monitor {has "dizzy"};
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Challenges/teleport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: Ondřej Šebek
description: An impossible challenge - can you magically jump across the water?
objectives:
- goal:
- Get to the other room and grab the lambda.
- Get to the other room and grab the `lambda`{=entity}.
- Oh wait.
- The tunnel is flooded.
- Just give up then. It is impossible to get there.
Expand Down
6 changes: 3 additions & 3 deletions data/scenarios/Challenges/wolf-goat-cabbage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ robots:
objectives:
- goal:
- |
Ferry all three of the wolf, goat, and cabbage across the lake.
Ferry all three of the `wolf`{=entity}, `goat`{=entity}, and `cabbage`{=entity} across the lake.
However, only one of these can be carried at a time.
- |
Furthermore, if left unattended together, the wolf will eat the goat,
or the goat will eat the cabbage.
Furthermore, if left unattended together, the `wolf`{=entity} will eat the `goat`{=entity},
or the `goat`{=entity} will eat the `cabbage`{=entity}.
condition: |
run "data/scenarios/Challenges/_wolf-goat-cabbage/together-on-east-bank.sw";
prerequisite:
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Challenges/word-search.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ seed: 2
creative: false
objectives:
- goal:
- Use the `drill` command (e.g. "drill down" when on top of the
- Use the `drill` command (e.g. `drill down` when on top of the
intended letter) to mark the sequence of letters that
spells COW within the designated playfield.
spells `C`{=entity}`O`{=entity}`W`{=entity} within the designated playfield.
- |
The sequence may appear horizontally in either the
leftward or rightward direction,
Expand Down
2 changes: 1 addition & 1 deletion data/scenarios/Speedruns/curry.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 1
name: Curry
author: Brent Yorgey
description: Race to make a bowl of curry as quickly as possible.
description: Race to make a bowl of `curry`{=entity} as quickly as possible.
See the Swarm wiki for more information on Swarm speedrunning.
objectives:
- goal:
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Speedruns/forester.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
version: 1
name: Forester
author: Brent Yorgey
description: Race to harvest 1024 trees as quickly as possible.
description: Race to harvest 1024 `tree`{=entity}s as quickly as possible.
See the Swarm wiki for more information on Swarm speedrunning.
objectives:
- goal:
- Harvest 1024 trees as quickly as possible!
- Harvest 1024 `tree`{=entity}s as quickly as possible!
condition: as base {n <- count "tree"; return (n >= 1024)}
robots:
- name: base
Expand Down
4 changes: 2 additions & 2 deletions data/scenarios/Speedruns/mithril.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
version: 1
name: Mithril
author: Brent Yorgey
description: Race to mine some mithril.
description: Race to mine some `mithril`{=entity}.
See the Swarm wiki for more information on Swarm speedrunning.
objectives:
- goal:
- Mine some mithril as quickly as possible!
- Mine some `mithril`{=entity} as quickly as possible!
condition: as base {has "mithril"}
robots:
- name: base
Expand Down
Loading

0 comments on commit 25f6fde

Please sign in to comment.