Magic-number and state-arithmetic removal.

[open-adventure.git] / adventure.yaml

diff --git a/adventure.yaml b/adventure.yaml
index 66ebb667b1e13ef049d055e300834938b38d480d..ed482e2208793c23fc5fcf88975e63b77b1416ec 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -3057,7 +3057,6 @@ arbitrary_messages:  !!omap
 - TROLL_SCAMPERS: 'The bear lumbers toward the troll, who lets out a startled shriek and\nscurries away.  The bear soon gives up the pursuit and wanders back.'
 - AXE_LOST: 'The axe misses and lands near the bear where you can''t get at it.'
 - BEAR_HANDS: 'With what?  Your bare hands?  Against *HIS* bear hands??'
-# The following three messages must be contiguous
 - BEAR_CONFUSED: 'The bear is confused; he only wants to be your friend.'
 - ALREADY_DEAD: 'For crying out loud, the poor thing is already dead!'
 - BEAR_TAMED: 'The bear eagerly wolfs down your food, after which he seems to calm\ndown considerably and even becomes rather friendly.'
@@ -3466,9 +3465,9 @@ objects: !!omap
     locations: [LOC_SWCHASM, LOC_NECHASM]
     immovable: true
     descriptions:
-    - 'A burly troll stands by the bridge and insists you throw him a\ntreasure before you may cross.'
-    - 'The troll steps out from beneath the bridge and blocks your way.'
-    - '' # chased away
+    - [TROLL_UNPAID, 'A burly troll stands by the bridge and insists you throw him a\ntreasure before you may cross.']
+    - [TROLL_PAIDONCE, 'The troll steps out from beneath the bridge and blocks your way.']
+    - [TROLL_GONE, ''] # chased away
     sounds:
     - 'The troll sounds quite adamant in his demand for a treasure.'
 - TROLL2: