Magic number elimination

[open-adventure.git] / adventure.yaml

diff --git a/adventure.yaml b/adventure.yaml
index e8e9c210d345b5c07f37fd86c7bfd154cf35135d..e61a2d3f9f3c4dc9d443dbabe0922ca240a74021 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -2971,9 +2971,6 @@ arbitrary_messages:  !!omap
     weight of the bear, which was still following you around.  You
     scrabble desperately for support, but as the bridge collapses you
     stumble back and fall into the chasm.
     weight of the bear, which was still following you around.  You
     scrabble desperately for support, but as the bridge collapses you
     stumble back and fall into the chasm.

-- TROLL_SCAMPERS: |-
-    The bear lumbers toward the troll, who lets out a startled shriek and
-    scurries away.  The bear soon gives up the pursuit and wanders back.

 - BEAR_HANDS: 'With what?  Your bare hands?  Against *HIS* bear hands??'
 - 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_HANDS: 'With what?  Your bare hands?  Against *HIS* bear hands??'
 - 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!'


@@ -3254,6 +3251,7 @@ objects: !!omap
     inventory: '*steps'
     locations: [LOC_PITTOP, LOC_MISTHALL]
     immovable: true
     inventory: '*steps'
     locations: [LOC_PITTOP, LOC_MISTHALL]
     immovable: true

+    states: [STEPS_DOWN, STEPS_UP]

     descriptions:
     - 'Rough stone steps lead down the pit.'
     - 'Rough stone steps lead up the dome.'
     descriptions:
     - 'Rough stone steps lead down the pit.'
     - 'Rough stone steps lead up the dome.'


@@ -3317,11 +3315,13 @@ objects: !!omap
     inventory: '*fissure'
     locations: [LOC_EASTBANK, LOC_WESTBANK]
     immovable: true
     inventory: '*fissure'
     locations: [LOC_EASTBANK, LOC_WESTBANK]
     immovable: true

-    states: [UNBRIDGED, BRIDGED, VANISHED]
+    states: [UNBRIDGED, BRIDGED]

     descriptions:
     - ''
     descriptions:
     - ''

-    - 'A crystal bridge now spans the fissure.'
+    - 'A crystal bridge spans the fissure.'
+    changes:

     - 'The crystal bridge has vanished!'
     - 'The crystal bridge has vanished!'

+    - 'A crystal bridge now spans the fissure.'

 - OBJ_13:
     words: ['table']
     inventory: '*stone tablet'
 - OBJ_13:
     words: ['table']
     inventory: '*stone tablet'


@@ -3506,9 +3506,16 @@ objects: !!omap
     - '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
     - '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

+    changes:
+    - ''
+    - ''
+    - |-
+        The bear lumbers toward the troll, who lets out a startled shriek and
+        scurries away.  The bear soon gives up the pursuit and wanders back.

     sounds:
     - 'The troll sounds quite adamant in his demand for a treasure.'
     - 'The troll sounds quite adamant in his demand for a treasure.'
     sounds:
     - 'The troll sounds quite adamant in his demand for a treasure.'
     - 'The troll sounds quite adamant in his demand for a treasure.'

+    - ''

 - TROLL2:
     words: ['troll']
     inventory: '*phony troll'
 - TROLL2:
     words: ['troll']
     inventory: '*phony troll'


@@ -3621,11 +3628,13 @@ objects: !!omap
     inventory: '*reservoir'
     locations: [LOC_RESERVOIR, LOC_RESNORTH]
     immovable: true
     inventory: '*reservoir'
     locations: [LOC_RESERVOIR, LOC_RESNORTH]
     immovable: true

-    states: [WATERS_UNPARTED, WATERS_PARTED, WATERS_CRASH]
+    states: [WATERS_UNPARTED, WATERS_PARTED]

     descriptions:
     - ''
     - 'The waters have parted to form a narrow path across the reservoir.'
     descriptions:
     - ''
     - 'The waters have parted to form a narrow path across the reservoir.'

+    changes:

     - 'The waters crash together again.'
     - 'The waters crash together again.'

+    - 'The waters have parted to form a narrow path across the reservoir.'

 - OBJ_46:
     words: ['appen', 'lepor']
     inventory: 'Leporine appendage'
 - OBJ_46:
     words: ['appen', 'lepor']
     inventory: 'Leporine appendage'


@@ -3729,15 +3738,14 @@ objects: !!omap
     inventory: 'Ming vase'
     locations: LOC_ORIENTAL
     treasure: true
     inventory: 'Ming vase'
     locations: LOC_ORIENTAL
     treasure: true

-    states: [VASE_WHOLE, VASE_RESTING, VASE_BROKEN, VASE_DROPS]
+    states: [VASE_WHOLE, VASE_DROPPED, VASE_BROKEN]

     descriptions:
     - 'There is a delicate, precious, ming vase here!'
     descriptions:
     - 'There is a delicate, precious, ming vase here!'

-    - 'The vase is now resting, delicately, on a velvet pillow.'

     - 'The floor is littered with worthless shards of pottery.'
     - 'The floor is littered with worthless shards of pottery.'

-    - 'The ming vase drops with a delicate crash.'
+    - 'The floor is littered with worthless shards of pottery.'

     changes:
     changes:

-    - ''
-    - ''
+    - 'The vase is now resting, delicately, on a velvet pillow.'
+    - 'The ming vase drops with a delicate crash.'

     - 'You have taken the vase and hurled it delicately to the ground.'
 - EMERALD:
     words: ['emera']
     - 'You have taken the vase and hurled it delicately to the ground.'
 - EMERALD:
     words: ['emera']