X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=b866007c00cc59ebcf447e6f81e729529c5c8a95;hp=f746dee1edfe8003c719d45b22aafb16dfba121f;hb=f815299a2a97656b0f4ea0793c2207c2437888f6;hpb=83fb64b5a817de3f1023c79ab2319d01d9dce9ae

diff --git a/actions.c b/actions.c
index f746dee..b866007 100644
--- a/actions.c
+++ b/actions.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include "advent.h"
-#include "newdb.h"
+#include "dungeon.h"
 
 static int fill(token_t, token_t);
 
@@ -23,20 +23,28 @@ static int attack(struct command_t *command)
     if (obj == 0 || obj == INTRANSITIVE) {
         if (atdwrf(game.loc) > 0)
             obj = DWARF;
-        if (HERE(SNAKE))obj = obj * NOBJECTS + SNAKE;
-        if (AT(DRAGON) && game.prop[DRAGON] == 0)obj = obj * NOBJECTS + DRAGON;
-        if (AT(TROLL))obj = obj * NOBJECTS + TROLL;
-        if (AT(OGRE))obj = obj * NOBJECTS + OGRE;
+        if (HERE(SNAKE))
+            obj = obj * NOBJECTS + SNAKE;
+        if (AT(DRAGON) && game.prop[DRAGON] == DRAGON_BARS)
+            obj = obj * NOBJECTS + DRAGON;
+        if (AT(TROLL))
+            obj = obj * NOBJECTS + TROLL;
+        if (AT(OGRE))
+            obj = obj * NOBJECTS + OGRE;
         if (HERE(BEAR) && game.prop[BEAR] == UNTAMED_BEAR)
-	    obj = obj * NOBJECTS + BEAR;
-        if (obj > NOBJECTS) return GO_UNKNOWN;
+            obj = obj * NOBJECTS + BEAR;
+        if (obj > NOBJECTS)
+            return GO_UNKNOWN;
         if (obj == 0) {
             /* Can't attack bird or machine by throwing axe. */
-            if (HERE(BIRD) && verb != THROW)obj = BIRD;
-            if (HERE(VEND) && verb != THROW)obj = obj * NOBJECTS + VEND;
+            if (HERE(BIRD) && verb != THROW)
+                obj = BIRD;
+            if (HERE(VEND) && verb != THROW)
+                obj = obj * NOBJECTS + VEND;
             /* Clam and oyster both treated as clam for intransitive case;
              * no harm done. */
-            if (HERE(CLAM) || HERE(OYSTER))obj = NOBJECTS * obj + CLAM;
+            if (HERE(CLAM) || HERE(OYSTER))
+                obj = NOBJECTS * obj + CLAM;
             if (obj > NOBJECTS)
                 return GO_UNKNOWN;
         }
@@ -50,19 +58,27 @@ static int attack(struct command_t *command)
         DESTROY(BIRD);
         spk = BIRD_DEAD;
     } else if (obj == VEND) {
-	state_change(VEND,
-		     game.prop[VEND]==VEND_BLOCKS ? VEND_UNBLOCKS : VEND_BLOCKS);
+        state_change(VEND,
+                     game.prop[VEND] == VEND_BLOCKS ? VEND_UNBLOCKS : VEND_BLOCKS);
         return GO_CLEAROBJ;
     }
 
-    if (obj == 0)spk = NO_TARGET;
-    if (obj == CLAM || obj == OYSTER)spk = SHELL_IMPERVIOUS;
-    if (obj == SNAKE)spk = SNAKE_WARNING;
-    if (obj == DWARF)spk = BARE_HANDS_QUERY;
-    if (obj == DWARF && game.closed) return GO_DWARFWAKE;
-    if (obj == DRAGON)spk = ALREADY_DEAD;
-    if (obj == TROLL)spk = ROCKY_TROLL;
-    if (obj == OGRE)spk = OGRE_DODGE;
+    if (obj == 0)
+        spk = NO_TARGET;
+    if (obj == CLAM || obj == OYSTER)
+        spk = SHELL_IMPERVIOUS;
+    if (obj == SNAKE)
+        spk = SNAKE_WARNING;
+    if (obj == DWARF)
+        spk = BARE_HANDS_QUERY;
+    if (obj == DWARF && game.closed)
+        return GO_DWARFWAKE;
+    if (obj == DRAGON)
+        spk = ALREADY_DEAD;
+    if (obj == TROLL)
+        spk = ROCKY_TROLL;
+    if (obj == OGRE)
+        spk = OGRE_DODGE;
     if (obj == OGRE && atdwrf(game.loc) > 0) {
         rspeak(spk);
         rspeak(KNIFE_THROWN);
@@ -76,29 +92,38 @@ static int attack(struct command_t *command)
             }
         }
         spk = (dwarves > 1) ? OGRE_PANIC1 : OGRE_PANIC2;
-    } else if (obj == BEAR)
-        /* FIXME: Arithmetic on message numbers */
-        spk = BEAR_HANDS + (game.prop[BEAR] + 1) / 2;
-    else if (obj == DRAGON && game.prop[DRAGON] == 0) {
+    } else if (obj == BEAR) {
+        switch (game.prop[BEAR]) {
+        case UNTAMED_BEAR:
+            spk = BEAR_HANDS;
+            break;
+        case SITTING_BEAR:
+            spk = BEAR_CONFUSED;
+            break;
+        case CONTENTED_BEAR:
+            spk = BEAR_CONFUSED;
+            break;
+        case BEAR_DEAD:
+            spk = ALREADY_DEAD;
+            break;
+        }
+    } else if (obj == DRAGON && game.prop[DRAGON] == DRAGON_BARS) {
         /*  Fun stuff for dragon.  If he insists on attacking it, win!
          *  Set game.prop to dead, move dragon to central loc (still
          *  fixed), move rug there (not fixed), and move him there,
          *  too.  Then do a null motion to get new description. */
         rspeak(BARE_HANDS_QUERY);
-	if(silent_yes())
-	  {
-	    // FIXME: setting wd1 is a workaround for broken logic
-	    command->wd1 = token_to_packed("Y");
-	  }
-	else
-	  {
-	    // FIXME: setting wd1 is a workaround for broken logic
-	    command->wd1 = token_to_packed("N");
-	    return GO_CHECKFOO;
-	  }
-        pspeak(DRAGON, look, 3);
-        game.prop[DRAGON] = 1;
-        game.prop[RUG] = 0;
+        if (silent_yes()) {
+            // FIXME: setting wd1 is a workaround for broken logic
+            command->wd1 = token_to_packed("Y");
+        } else {
+            // FIXME: setting wd1 is a workaround for broken logic
+            command->wd1 = token_to_packed("N");
+            return GO_CHECKFOO;
+        }
+        state_change(DRAGON, DRAGON_DEAD);
+        game.prop[RUG] = RUG_FLOOR;
+        /* FIXME: Arithmetic on location values */
         int k = (objects[DRAGON].plac + objects[DRAGON].fixd) / 2;
         move(DRAGON + NOBJECTS, -1);
         move(RUG + NOBJECTS, 0);
@@ -128,7 +153,8 @@ static int bigwords(token_t foo)
     int k = (int) get_special_vocab_id(word);
     int spk = NOTHING_HAPPENS;
     if (game.foobar != 1 - k) {
-        if (game.foobar != 0 && game.loc == LOC_GIANTROOM)spk = START_OVER;
+        if (game.foobar != 0 && game.loc == LOC_GIANTROOM)
+            spk = START_OVER;
         rspeak(spk);
         return GO_CLEAROBJ;
     } else {
@@ -144,11 +170,13 @@ static int bigwords(token_t foo)
         } else {
             /*  Bring back troll if we steal the eggs back from him before
              *  crossing. */
-            if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == 0)
-                game.prop[TROLL] = 1;
-            k = 2;
-            if (HERE(EGGS))k = 1;
-            if (game.loc == objects[EGGS].plac)k = 0;
+            if (game.place[EGGS] == LOC_NOWHERE && game.place[TROLL] == LOC_NOWHERE && game.prop[TROLL] == TROLL_UNPAID)
+                game.prop[TROLL] = TROLL_PAIDONCE;
+            k = EGGS_DONE;
+            if (HERE(EGGS))
+                k = EGGS_VANISHED;
+            if (game.loc == objects[EGGS].plac)
+                k = EGGS_HERE;
             move(EGGS, objects[EGGS].plac);
             pspeak(EGGS, look, k);
             return GO_CLEAROBJ;
@@ -162,9 +190,12 @@ static int bivalve(token_t verb, token_t obj)
     int spk;
     bool is_oyster = (obj == OYSTER);
     spk = is_oyster ? OYSTER_OPENS : PEARL_FALLS;
-    if (TOTING(obj))spk = is_oyster ? DROP_OYSTER : DROP_CLAM;
-    if (!TOTING(TRIDENT))spk = is_oyster ? OYSTER_OPENER : CLAM_OPENER;
-    if (verb == LOCK)spk = HUH_MAN;
+    if (TOTING(obj))
+        spk = is_oyster ? DROP_OYSTER : DROP_CLAM;
+    if (!TOTING(TRIDENT))
+        spk = is_oyster ? OYSTER_OPENER : CLAM_OPENER;
+    if (verb == LOCK)
+        spk = HUH_MAN;
     if (spk == PEARL_FALLS) {
         DESTROY(CLAM);
         drop(OYSTER, game.loc);
@@ -193,21 +224,24 @@ static void blast(void)
 static int vbreak(token_t verb, token_t obj)
 /*  Break.  Only works for mirror in repository and, of course, the vase. */
 {
-    int spk = actions[verb].message;
-    if (obj == MIRROR)spk = TOO_FAR;
-    if (obj == VASE && game.prop[VASE] == 0) {
-        if (TOTING(VASE))drop(VASE, game.loc);
-        game.prop[VASE] = 2;
-        game.fixed[VASE] = -1;
-        spk = BREAK_VASE;
-    } else {
-        if (obj == MIRROR && game.closed) {
+    if (obj == MIRROR) {
+        if (game.closed) {
             rspeak(BREAK_MIRROR);
             return GO_DWARFWAKE;
+        } else {
+            rspeak(TOO_FAR);
+            return GO_CLEAROBJ;
         }
     }
-    rspeak(spk);
-    return GO_CLEAROBJ;
+    if (obj == VASE && game.prop[VASE] == VASE_WHOLE) {
+        if (TOTING(VASE))
+            drop(VASE, game.loc);
+        state_change(VASE, VASE_BROKEN);
+        game.fixed[VASE] = -1;
+        return GO_CLEAROBJ;
+    }
+    rspeak(actions[verb].message);
+    return (GO_CLEAROBJ);
 }
 
 static int brief(void)
@@ -239,16 +273,22 @@ static int vcarry(token_t verb, token_t obj)
         return GO_CLEAROBJ;
     }
     spk = YOU_JOKING;
-    if (obj == PLANT && game.prop[PLANT] <= 0)spk = DEEP_ROOTS;
+    if (obj == PLANT && game.prop[PLANT] <= 0)
+        spk = DEEP_ROOTS;
     if (obj == BEAR && game.prop[BEAR] == SITTING_BEAR)
-	spk = BEAR_CHAINED;
+        spk = BEAR_CHAINED;
     if (obj == CHAIN && game.prop[BEAR] != UNTAMED_BEAR)
-	spk = STILL_LOCKED;
-    if (obj == URN)spk = URN_NOBUDGE;
-    if (obj == CAVITY)spk = DOUGHNUT_HOLES;
-    if (obj == BLOOD)spk = FEW_DROPS;
-    if (obj == RUG && game.prop[RUG] == 2)spk = RUG_HOVERS;
-    if (obj == SIGN)spk = HAND_PASSTHROUGH;
+        spk = STILL_LOCKED;
+    if (obj == URN)
+        spk = URN_NOBUDGE;
+    if (obj == CAVITY)
+        spk = DOUGHNUT_HOLES;
+    if (obj == BLOOD)
+        spk = FEW_DROPS;
+    if (obj == RUG && game.prop[RUG] == RUG_HOVER)
+        spk = RUG_HOVERS;
+    if (obj == SIGN)
+        spk = HAND_PASSTHROUGH;
     if (obj == MESSAG) {
         rspeak(REMOVE_MESSAGE);
         DESTROY(MESSAG);
@@ -264,8 +304,9 @@ static int vcarry(token_t verb, token_t obj)
                 return (fill(verb, BOTTLE));
             else {
                 if (game.prop[BOTTLE] != EMPTY_BOTTLE)
-		    spk = BOTTLE_FULL;
-                if (!TOTING(BOTTLE))spk = NO_CONTAINER;
+                    spk = BOTTLE_FULL;
+                if (!TOTING(BOTTLE))
+                    spk = NO_CONTAINER;
                 rspeak(spk);
                 return GO_CLEAROBJ;
             }
@@ -283,8 +324,10 @@ static int vcarry(token_t verb, token_t obj)
             rspeak(BIRD_CRAP);
             return GO_CLEAROBJ;
         }
-        if (!TOTING(CAGE))spk = CANNOT_CARRY;
-        if (TOTING(ROD))spk = BIRD_EVADES;
+        if (!TOTING(CAGE))
+            spk = CANNOT_CARRY;
+        if (TOTING(ROD))
+            spk = BIRD_EVADES;
         if (spk == CANNOT_CARRY || spk == BIRD_EVADES) {
             rspeak(spk);
             return GO_CLEAROBJ;
@@ -311,32 +354,32 @@ static int chain(token_t verb)
     if (verb != LOCK) {
         spk = CHAIN_UNLOCKED;
         if (game.prop[BEAR] == UNTAMED_BEAR)
-	    spk = BEAR_BLOCKS;
-        if (game.prop[CHAIN] == 0)
-	    spk = ALREADY_UNLOCKED;
+            spk = BEAR_BLOCKS;
+        if (game.prop[CHAIN] == CHAIN_HEAP)
+            spk = ALREADY_UNLOCKED;
         if (spk != CHAIN_UNLOCKED) {
             rspeak(spk);
             return GO_CLEAROBJ;
         }
-        game.prop[CHAIN] = 0;
-        game.fixed[CHAIN] = 0;
+        game.prop[CHAIN] = CHAIN_HEAP;
+        game.fixed[CHAIN] = CHAIN_HEAP;
         if (game.prop[BEAR] != BEAR_DEAD)
-	    game.prop[BEAR] = CONTENTED_BEAR;
-	/* FIXME: Arithmetic on state numbers */
+            game.prop[BEAR] = CONTENTED_BEAR;
+        /* FIXME: Arithmetic on state numbers */
         game.fixed[BEAR] = 2 - game.prop[BEAR];
     } else {
         spk = CHAIN_LOCKED;
-        if (game.prop[CHAIN] != 0)
-	    spk = ALREADY_LOCKED;
+        if (game.prop[CHAIN] != CHAIN_HEAP)
+            spk = ALREADY_LOCKED;
         if (game.loc != objects[CHAIN].plac)
-	    spk = NO_LOCKSITE;
+            spk = NO_LOCKSITE;
         if (spk != CHAIN_LOCKED) {
             rspeak(spk);
             return GO_CLEAROBJ;
         }
-        game.prop[CHAIN] = 2;
+        game.prop[CHAIN] = CHAIN_FIXED;
         if (TOTING(CHAIN))
-	    drop(CHAIN, game.loc);
+            drop(CHAIN, game.loc);
         game.fixed[CHAIN] = -1;
     }
     rspeak(spk);
@@ -350,14 +393,16 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
 {
     int spk = actions[verb].message;
     if (!just_do_it) {
-        if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))obj = ROD2;
+        if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))
+            obj = ROD2;
         if (!TOTING(obj)) {
             rspeak(spk);
             return GO_CLEAROBJ;
         }
         if (obj == BIRD && HERE(SNAKE)) {
             rspeak(BIRD_ATTACKS);
-            if (game.closed) return GO_DWARFWAKE;
+            if (game.closed)
+                return GO_DWARFWAKE;
             DESTROY(SNAKE);
             /* Set game.prop for use by travel options */
             game.prop[SNAKE] = SNAKE_CHASED;
@@ -366,16 +411,20 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
             rspeak(GEM_FITS);
             game.prop[obj] = 1;
             game.prop[CAVITY] = CAVITY_FULL;
-            if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != 2) || (obj == RUBY &&
-                              game.prop[RUG] == 2))) {
+            if (HERE(RUG) && ((obj == EMERALD && game.prop[RUG] != RUG_HOVER) || (obj == RUBY &&
+                              game.prop[RUG] == RUG_HOVER))) {
                 spk = RUG_RISES;
-                if (TOTING(RUG))spk = RUG_WIGGLES;
-                if (obj == RUBY)spk = RUG_SETTLES;
+                if (TOTING(RUG))
+                    spk = RUG_WIGGLES;
+                if (obj == RUBY)
+                    spk = RUG_SETTLES;
                 rspeak(spk);
                 if (spk != RUG_WIGGLES) {
+                    /* FIXME: Arithmetic on state numbers */
                     int k = 2 - game.prop[RUG];
                     game.prop[RUG] = k;
-                    if (k == 2) k = objects[SAPPH].plac;
+                    if (k == 2)
+                        k = objects[SAPPH].plac;
                     move(RUG + NOBJECTS, k);
                 }
             }
@@ -384,7 +433,7 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
             drop(BATTERY, game.loc);
             pspeak(BATTERY, look, FRESH_BATTERIES);
             return GO_CLEAROBJ;
-        } else if (obj == BIRD && AT(DRAGON) && game.prop[DRAGON] == 0) {
+        } else if (obj == BIRD && AT(DRAGON) && game.prop[DRAGON] == DRAGON_BARS) {
             rspeak(BIRD_BURNT);
             DESTROY(BIRD);
             return GO_CLEAROBJ;
@@ -395,27 +444,31 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
             move(TROLL2, objects[TROLL].plac);
             move(TROLL2 + NOBJECTS, objects[TROLL].fixd);
             juggle(CHASM);
-            game.prop[TROLL] = 2;
+            game.prop[TROLL] = TROLL_GONE;
         } else if (obj != VASE || game.loc == objects[PILLOW].plac) {
             rspeak(OK_MAN);
         } else {
-            game.prop[VASE] = 2;
-            if (AT(PILLOW))game.prop[VASE] = 0;
+            game.prop[VASE] = VASE_BROKEN;
+            if (AT(PILLOW))
+                game.prop[VASE] = VASE_WHOLE;
             pspeak(VASE, look, game.prop[VASE] + 1);
-            if (game.prop[VASE] != 0)game.fixed[VASE] = -1;
+            if (game.prop[VASE] != VASE_WHOLE)
+                game.fixed[VASE] = -1;
         }
     }
     int k = LIQUID();
-    if (k == obj)obj = BOTTLE;
+    if (k == obj)
+        obj = BOTTLE;
     if (obj == BOTTLE && k != 0)
         game.place[k] = LOC_NOWHERE;
     if (obj == CAGE && game.prop[BIRD] == BIRD_CAGED)
-	drop(BIRD, game.loc);
+        drop(BIRD, game.loc);
     drop(obj, game.loc);
-    if (obj != BIRD) return GO_CLEAROBJ;
+    if (obj != BIRD)
+        return GO_CLEAROBJ;
     game.prop[BIRD] = BIRD_UNCAGED;
     if (FOREST(game.loc))
-	game.prop[BIRD] = BIRD_FOREST_UNCAGED;
+        game.prop[BIRD] = BIRD_FOREST_UNCAGED;
     return GO_CLEAROBJ;
 }
 
@@ -427,19 +480,19 @@ static int drink(token_t verb, token_t obj)
     if (obj == 0 && LIQLOC(game.loc) != WATER && (LIQUID() != WATER || !HERE(BOTTLE)))
         return GO_UNKNOWN;
     if (obj != BLOOD) {
-        if (obj != 0 && obj != WATER)spk = RIDICULOUS_ATTEMPT;
+        if (obj != 0 && obj != WATER)
+            spk = RIDICULOUS_ATTEMPT;
         if (spk != RIDICULOUS_ATTEMPT && LIQUID() == WATER && HERE(BOTTLE)) {
             game.prop[BOTTLE] = EMPTY_BOTTLE;
             game.place[WATER] = LOC_NOWHERE;
             spk = BOTTLE_EMPTY;
         }
+        rspeak(spk);
     } else {
         DESTROY(BLOOD);
-        game.prop[DRAGON] = 2;
+        state_change(DRAGON, DRAGON_BLOODLESS);
         game.blooded = true;
-        spk = HEAD_BUZZES;
     }
-    rspeak(spk);
     return GO_CLEAROBJ;
 }
 
@@ -460,7 +513,8 @@ static int eat(token_t verb, token_t obj)
         }
         if (obj == BIRD || obj == SNAKE || obj == CLAM || obj == OYSTER || obj ==
             DWARF || obj == DRAGON || obj == TROLL || obj == BEAR || obj ==
-            OGRE)spk = LOST_APPETITE;
+            OGRE)
+            spk = LOST_APPETITE;
     }
     rspeak(spk);
     return GO_CLEAROBJ;
@@ -472,16 +526,18 @@ static int extinguish(token_t verb, int obj)
     int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         if (HERE(LAMP) && game.prop[LAMP] == LAMP_BRIGHT)
-	    obj = LAMP;
-        if (HERE(URN) && game.prop[URN] == 2)obj = obj * NOBJECTS + URN;
-        if (obj == INTRANSITIVE || obj == 0 || obj > NOBJECTS) return GO_UNKNOWN;
+            obj = LAMP;
+        if (HERE(URN) && game.prop[URN] == 2)
+            obj = obj * NOBJECTS + URN;
+        if (obj == INTRANSITIVE || obj == 0 || obj > NOBJECTS)
+            return GO_UNKNOWN;
     }
 
     if (obj == URN) {
         game.prop[URN] = game.prop[URN] / 2;
         spk = URN_DARK;
     } else if (obj == LAMP) {
-	state_change(LAMP, LAMP_DARK);
+        state_change(LAMP, LAMP_DARK);
         spk = DARK(game.loc) ? PITCH_DARK : NO_MESSAGE;
     } else if (obj == DRAGON || obj == VOLCANO)
         spk = BEYOND_POWER;
@@ -499,8 +555,10 @@ static int feed(token_t verb, token_t obj)
         return GO_CLEAROBJ;
     } else if (obj == SNAKE || obj == DRAGON || obj == TROLL) {
         spk = NOTHING_EDIBLE;
-        if (obj == DRAGON && game.prop[DRAGON] != 0)spk = RIDICULOUS_ATTEMPT;
-        if (obj == TROLL)spk = TROLL_VICES;
+        if (obj == DRAGON && game.prop[DRAGON] != DRAGON_BARS)
+            spk = RIDICULOUS_ATTEMPT;
+        if (obj == TROLL)
+            spk = TROLL_VICES;
         if (obj == SNAKE && !game.closed && HERE(BIRD)) {
             DESTROY(BIRD);
             spk = BIRD_DEVOURED;
@@ -512,9 +570,9 @@ static int feed(token_t verb, token_t obj)
         }
     } else if (obj == BEAR) {
         if (game.prop[BEAR] == UNTAMED_BEAR)
-	    spk = NOTHING_EDIBLE;
+            spk = NOTHING_EDIBLE;
         if (game.prop[BEAR] == BEAR_DEAD)
-	    spk = RIDICULOUS_ATTEMPT;
+            spk = RIDICULOUS_ATTEMPT;
         if (HERE(FOOD)) {
             DESTROY(FOOD);
             game.prop[BEAR] = SITTING_BEAR;
@@ -540,13 +598,14 @@ int fill(token_t verb, token_t obj)
     int spk = actions[verb].message;
     if (obj == VASE) {
         spk = ARENT_CARRYING;
-        if (LIQLOC(game.loc) == 0)spk = FILL_INVALID;
+        if (LIQLOC(game.loc) == 0)
+            spk = FILL_INVALID;
         if (LIQLOC(game.loc) == 0 || !TOTING(VASE)) {
             rspeak(spk);
             return GO_CLEAROBJ;
         }
         rspeak(SHATTER_VASE);
-        game.prop[VASE] = 2;
+        game.prop[VASE] = VASE_BROKEN;
         game.fixed[VASE] = -1;
         return (discard(verb, obj, true));
     } else if (obj == URN) {
@@ -563,7 +622,8 @@ int fill(token_t verb, token_t obj)
         }
         game.place[k] = LOC_NOWHERE;
         game.prop[BOTTLE] = EMPTY_BOTTLE;
-        if (k == OIL)game.prop[URN] = 1;
+        if (k == OIL)
+            game.prop[URN] = 1;
         spk = WATER_URN + game.prop[URN];
         rspeak(spk);
         return GO_CLEAROBJ;
@@ -580,7 +640,7 @@ int fill(token_t verb, token_t obj)
     if (LIQUID() != 0)
         spk = BOTTLE_FULL;
     if (spk == BOTTLED_WATER) {
-	/* FIXME: Arithmetic on property values */
+        /* FIXME: Arithmetic on property values */
         game.prop[BOTTLE] = MOD(conditions[game.loc], 4) / 2 * 2;
         k = LIQUID();
         if (TOTING(BOTTLE))
@@ -601,8 +661,10 @@ static int find(token_t verb, token_t obj)
         obj == LIQLOC(game.loc) ||
         (obj == DWARF && atdwrf(game.loc) > 0))
         spk = YOU_HAVEIT;
-    if (game.closed)spk = NEEDED_NEARBY;
-    if (TOTING(obj))spk = ALREADY_CARRYING;
+    if (game.closed)
+        spk = NEEDED_NEARBY;
+    if (TOTING(obj))
+        spk = ALREADY_CARRYING;
     rspeak(spk);
     return GO_CLEAROBJ;
 }
@@ -612,8 +674,10 @@ static int fly(token_t verb, token_t obj)
 {
     int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
-        if (game.prop[RUG] != 2)spk = RUG_NOTHING2;
-        if (!HERE(RUG))spk = FLAP_ARMS;
+        if (game.prop[RUG] != RUG_HOVER)
+            spk = RUG_NOTHING2;
+        if (!HERE(RUG))
+            spk = FLAP_ARMS;
         if (spk == RUG_NOTHING2 || spk == FLAP_ARMS) {
             rspeak(spk);
             return GO_CLEAROBJ;
@@ -626,12 +690,13 @@ static int fly(token_t verb, token_t obj)
         return GO_CLEAROBJ;
     }
     spk = RUG_NOTHING1;
-    if (game.prop[RUG] != 2) {
+    if (game.prop[RUG] != RUG_HOVER) {
         rspeak(spk);
         return GO_CLEAROBJ;
     }
     game.oldlc2 = game.oldloc;
     game.oldloc = game.loc;
+    /* FIXME: Arithmetic on location values */
     game.newloc = game.place[RUG] + game.fixed[RUG] - game.loc;
     spk = RUG_GOES;
     if (game.prop[SAPPH] >= 0)
@@ -666,9 +731,11 @@ static int light(token_t verb, token_t obj)
     int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         if (HERE(LAMP) && game.prop[LAMP] == LAMP_DARK && game.limit >= 0)
-	    obj = LAMP;
-        if (HERE(URN) && game.prop[URN] == 1)obj = obj * NOBJECTS + URN;
-        if (obj == INTRANSITIVE || obj == 0 || obj > NOBJECTS) return GO_UNKNOWN;
+            obj = LAMP;
+        if (HERE(URN) && game.prop[URN] == 1)
+            obj = obj * NOBJECTS + URN;
+        if (obj == INTRANSITIVE || obj == 0 || obj > NOBJECTS)
+            return GO_UNKNOWN;
     }
 
     if (obj == URN) {
@@ -689,7 +756,7 @@ static int light(token_t verb, token_t obj)
             rspeak(spk);
             return GO_CLEAROBJ;
         }
-	state_change(LAMP, LAMP_BRIGHT);
+        state_change(LAMP, LAMP_BRIGHT);
         if (game.wzdark)
             return GO_TOP;
         else
@@ -706,21 +773,21 @@ static int listen(void)
     if (k != SILENT) {
         rspeak(k);
         if (locations[game.loc].loud)
-	    return GO_CLEAROBJ;
-	else
-	    spk = NO_MESSAGE;
+            return GO_CLEAROBJ;
+        else
+            spk = NO_MESSAGE;
     }
     for (int i = 1; i <= NOBJECTS; i++) {
         if (!HERE(i) || objects[i].sounds[0] == NULL || game.prop[i] < 0)
             continue;
-	int mi =  game.prop[i];
-	if (i == BIRD)
-	    mi += 3 * game.blooded;
-	long packed_zzword = token_to_packed(game.zzword);
+        int mi =  game.prop[i];
+        if (i == BIRD)
+            mi += 3 * game.blooded;
+        long packed_zzword = token_to_packed(game.zzword);
         pspeak(i, hear, mi, packed_zzword);
         spk = NO_MESSAGE;
-	/* FIXME: Magic number, sensitive to bird state logic */
-	if (i == BIRD && game.prop[i] == 5)
+        /* FIXME: Magic number, sensitive to bird state logic */
+        if (i == BIRD && game.prop[i] == 5)
             DESTROY(BIRD);
     }
     rspeak(spk);
@@ -733,12 +800,18 @@ static int lock(token_t verb, token_t obj)
     int spk = actions[verb].message;
     if (obj == INTRANSITIVE) {
         spk = NOTHING_LOCKED;
-        if (HERE(CLAM))obj = CLAM;
-        if (HERE(OYSTER))obj = OYSTER;
-        if (AT(DOOR))obj = DOOR;
-        if (AT(GRATE))obj = GRATE;
-        if (obj != 0 && HERE(CHAIN)) return GO_UNKNOWN;
-        if (HERE(CHAIN))obj = CHAIN;
+        if (HERE(CLAM))
+            obj = CLAM;
+        if (HERE(OYSTER))
+            obj = OYSTER;
+        if (AT(DOOR))
+            obj = DOOR;
+        if (AT(GRATE))
+            obj = GRATE;
+        if (obj != 0 && HERE(CHAIN))
+            return GO_UNKNOWN;
+        if (HERE(CHAIN))
+            obj = CHAIN;
         if (obj == 0 || obj == INTRANSITIVE) {
             rspeak(spk);
             return GO_CLEAROBJ;
@@ -749,10 +822,14 @@ static int lock(token_t verb, token_t obj)
      *  and for chain. */
     if (obj == CLAM || obj == OYSTER)
         return bivalve(verb, obj);
-    if (obj == DOOR)spk = RUSTY_DOOR;
-    if (obj == DOOR && game.prop[DOOR] == 1)spk = OK_MAN;
-    if (obj == CAGE)spk = NO_LOCK;
-    if (obj == KEYS)spk = CANNOT_UNLOCK;
+    if (obj == DOOR)
+        spk = RUSTY_DOOR;
+    if (obj == DOOR && game.prop[DOOR] == 1)
+        spk = OK_MAN;
+    if (obj == CAGE)
+        spk = NO_LOCK;
+    if (obj == KEYS)
+        spk = CANNOT_UNLOCK;
     if (obj == GRATE || obj == CHAIN) {
         spk = NO_KEYS;
         if (HERE(KEYS)) {
@@ -760,11 +837,12 @@ static int lock(token_t verb, token_t obj)
                 return chain(verb);
             if (game.closng) {
                 spk = EXIT_CLOSED;
-                if (!game.panic)game.clock2 = PANICTIME;
+                if (!game.panic)
+                    game.clock2 = PANICTIME;
                 game.panic = true;
             } else {
-		state_change(GRATE, (verb == LOCK) ? GRATE_CLOSED : GRATE_OPEN);
-		return GO_CLEAROBJ;
+                state_change(GRATE, (verb == LOCK) ? GRATE_CLOSED : GRATE_OPEN);
+                return GO_CLEAROBJ;
             }
         }
     }
@@ -777,8 +855,10 @@ static int pour(token_t verb, token_t obj)
  *  special tests for pouring water or oil on plant or rusty door. */
 {
     int spk = actions[verb].message;
-    if (obj == BOTTLE || obj == 0)obj = LIQUID();
-    if (obj == 0) return GO_UNKNOWN;
+    if (obj == BOTTLE || obj == 0)
+        obj = LIQUID();
+    if (obj == 0)
+        return GO_UNKNOWN;
     if (!TOTING(obj)) {
         rspeak(spk);
         return GO_CLEAROBJ;
@@ -808,10 +888,7 @@ static int pour(token_t verb, token_t obj)
         game.prop[PLANT2] = game.prop[PLANT];
         return GO_MOVE;
     } else {
-        game.prop[DOOR] = 0;
-        if (obj == OIL)game.prop[DOOR] = 1;
-        spk = RUSTED_HINGES + game.prop[DOOR];
-        rspeak(spk);
+	state_change(DOOR, (obj == OIL) ? DOOR_UNRUSTED: DOOR_RUSTED);
         return GO_CLEAROBJ;
     }
 }
@@ -899,8 +976,8 @@ static int say(struct command_t *command)
     char word1[6];
     packed_to_token(command->wd1, word1);
     int wd = (int) get_vocab_id(word1);
-    /* FIXME: Magic numbers */
-    if (wd == 62 || wd == 65 || wd == 71 || wd == 2025 || wd == 2034) {
+    /* FIXME: magic numbers */
+    if (wd == XYZZY || wd == PLUGH || wd == PLOVER || wd == ACTION_WORD(GIANTWORDS) || wd == ACTION_WORD(PART)) {
         /* FIXME: scribbles on the interpreter's command block */
         wordclear(&command->wd2);
         return GO_LOOKUP;
@@ -923,7 +1000,8 @@ static int throw (struct command_t *command)
  *  troll.  Treasures special for troll. */
 {
     int spk = actions[command->verb].message;
-    if (TOTING(ROD2) && command->obj == ROD && !TOTING(ROD))command->obj = ROD2;
+    if (TOTING(ROD2) && command->obj == ROD && !TOTING(ROD))
+        command->obj = ROD2;
     if (!TOTING(command->obj)) {
         rspeak(spk);
         return GO_CLEAROBJ;
@@ -950,7 +1028,7 @@ static int throw (struct command_t *command)
     else {
         int i = atdwrf(game.loc);
         if (i <= 0) {
-            if (AT(DRAGON) && game.prop[DRAGON] == 0)
+            if (AT(DRAGON) && game.prop[DRAGON] == DRAGON_BARS)
                 return throw_support(DRAGON_SCALES);
             if (AT(TROLL))
                 return throw_support(TROLL_RETURNS);
@@ -996,16 +1074,17 @@ static int wave(token_t verb, token_t obj)
 /* Wave.  No effect unless waving rod at fissure or at bird. */
 {
     int spk = actions[verb].message;
-    if ((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2)))spk = ARENT_CARRYING;
+    if ((!TOTING(obj)) && (obj != ROD || !TOTING(ROD2)))
+        spk = ARENT_CARRYING;
     if (obj != ROD ||
         !TOTING(obj) ||
         (!HERE(BIRD) && (game.closng || !AT(FISSURE)))) {
         rspeak(spk);
         return GO_CLEAROBJ;
     }
-    /* FIXME: Arithemetic on proprty values */
+    /* FIXME: Arithemetic on property values */
     if (HERE(BIRD))
-	spk = FREE_FLY + MOD(game.prop[BIRD], 2);
+        spk = FREE_FLY + MOD(game.prop[BIRD], 2);
     if (spk == FREE_FLY && game.loc == game.place[STEPS] && game.prop[JADE] < 0) {
         drop(JADE, game.loc);
         game.prop[JADE] = 0;
@@ -1022,7 +1101,8 @@ static int wave(token_t verb, token_t obj)
             rspeak(spk);
             return GO_CLEAROBJ;
         }
-        if (HERE(BIRD))rspeak(spk);
+        if (HERE(BIRD))
+            rspeak(spk);
         game.prop[FISSURE] = 1 - game.prop[FISSURE];
         pspeak(FISSURE, look, 2 - game.prop[FISSURE]);
         return GO_CLEAROBJ;
@@ -1086,8 +1166,9 @@ int action(struct command_t *command)
     switch (command->part) {
     case intransitive:
         if (command->wd2 > 0 && command->verb != SAY)
-	    return GO_WORD2;
-        if (command->verb == SAY)command->obj = command->wd2;
+            return GO_WORD2;
+        if (command->verb == SAY)
+            command->obj = command->wd2;
         if (command->obj == 0 || command->obj == INTRANSITIVE) {
             /*  Analyse an intransitive verb (ie, no object given yet). */
             switch (command->verb) {
@@ -1150,7 +1231,7 @@ int action(struct command_t *command)
             case BRIEF:
                 return brief();
             case READ:
-		command->obj = INTRANSITIVE;
+                command->obj = INTRANSITIVE;
                 return read(*command);
             case BREAK:
                 return GO_UNKNOWN;
@@ -1166,8 +1247,8 @@ int action(struct command_t *command)
                 return listen();
             case PART:
                 return reservoir();
-	    default:
-		BUG(INTRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
+            default:
+                BUG(INTRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
             }
         }
     /* FALLTHRU */
@@ -1198,7 +1279,7 @@ int action(struct command_t *command)
             rspeak(spk);
             return GO_CLEAROBJ;
         }
-	case GO: {
+        case GO: {
             rspeak(spk);
             return GO_CLEAROBJ;
         }
@@ -1213,7 +1294,7 @@ int action(struct command_t *command)
         case RUB:
             return rub(command->verb, command->obj);
         case THROW:
-            return throw(command);
+            return throw (command);
         case QUIT: {
             rspeak(spk);
             return GO_CLEAROBJ;
@@ -1261,11 +1342,11 @@ int action(struct command_t *command)
             rspeak(spk);
             return GO_CLEAROBJ;
         }
-	case PART:
+        case PART:
             return reservoir();
-    default:
-        BUG(TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
-    }
+        default:
+            BUG(TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
+        }
     case unknown:
         /* Unknown verb, couldn't deduce object - might need hint */
         rspeak(WHAT_DO, command->wd1, command->wd1x);