fix sleeping shopkeeper's gold handling

     Make a sleeping or paralyzed shopkeeper wake up if you drop something
he's interested in buying (covers the recently reported case where dropping
gold failed to add credit, but picking it back up increased shop dept) or
if you use the 'p'ay command while owing money.  Sleeping shopkeeper is not
affected if you drop something he doesn't care about, or use 'p'ay when
there is no debt, or pick up shop goods (latter case is handled normally--
you'll owe money for the item even though the shk remains asleep).

     This makes shopping become a little easier--you aren't stuck waiting
for the shopkeeper to wake up if you actually want to pay for something--
in the rare case where the shopkeeper has been put to sleep, but it's an
awful lot simpler than any other reasonable way I could think of to deal
with the [lack of] credit problem.

     This makes the snoring message handling moot--it no longer exists.
(It wasn't very reasonable to begin with, because the program can't tell
whether mon->mfrozen is for timed sleep or timed paralysis so avoided
giving that message for temporary sleep.  There ought to be two separate
counters; probing is another case where vague messages are given because
the program can't tell the reason why a monster can't move.)

diff --git a/doc/fixes34.2 b/doc/fixes34.2
index 41c40f33fc1d69d0d39bb6f3f8f2c29098f8cc05..017c60fa5ef5df69f4e7871b0242fefff201d80e 100644 (file)
--- a/doc/fixes34.2
+++ b/doc/fixes34.2
@@ -135,6 +135,7 @@ stone-to-flesh no longer silently ignored by a statue of a unique monster
 wishing for quest guardian corpse now gives a generic corpse of the species
 prevent quest guardians from other classes from talking to you as if they 
        were your quest guardian
+wake up shopkeeper if a shop transaction is attempted while he's immobilized 
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/src/shk.c b/src/shk.c
index a3cdbb6f2590b91aac93762e0a72afec58e6bc16..f77a4ce24c420eca4dbce862655d252fdc9ae749 100644 (file)
--- a/src/shk.c
+++ b/src/shk.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)shk.c      3.4     2003/05/07      */
+/*     SCCS Id: @(#)shk.c      3.4     2003/08/18      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -56,6 +56,7 @@ STATIC_DCL boolean FDECL(inherits, (struct monst *,int,int));
 STATIC_DCL void FDECL(set_repo_loc, (struct eshk *));
 STATIC_DCL boolean NDECL(angry_shk_exists);
 STATIC_DCL void FDECL(rile_shk, (struct monst *));
+STATIC_DCL void FDECL(rouse_shk, (struct monst *,BOOLEAN_P));
 STATIC_DCL void FDECL(remove_damage, (struct monst *, BOOLEAN_P));
 STATIC_DCL void FDECL(sub_one_frombill, (struct obj *, struct monst *));
 STATIC_DCL void FDECL(add_one_tobill, (struct obj *, BOOLEAN_P));
@@ -950,6 +951,23 @@ register struct monst *shkp;
        }
 }
 
+/* wakeup and/or unparalyze shopkeeper */
+STATIC_OVL void
+rouse_shk(shkp, verbosely)
+struct monst *shkp;
+boolean verbosely;
+{
+       if (!shkp->mcanmove) {
+           /* greed induced recovery... */
+           if (verbosely && canspotmon(shkp))
+               pline("%s %s.", Monnam(shkp),
+                     shkp->msleeping ? "wakes up" : "can move again");
+           shkp->msleeping = 0;
+           shkp->mfrozen = 0;
+           shkp->mcanmove = 1;
+       }
+}
+
 void
 make_happy_shk(shkp, silentkops)
 register struct monst *shkp;
@@ -1170,15 +1188,18 @@ dopay()
                return(0);
        }
 proceed:
+       eshkp = ESHK(shkp);
+       ltmp = eshkp->robbed;
+
+       /* wake sleeping shk when someone who owes money offers payment */
+       if (ltmp || eshkp->billct || eshkp->debit) 
+           rouse_shk(shkp, TRUE);
 
-       if (shkp->msleeping || !shkp->mcanmove) {
+       if (!shkp->mcanmove) {      /* still asleep or paralyzed */
                pline("%s %s.", Monnam(shkp),
                      rn2(2) ? "seems to be napping" : "doesn't respond");
                return 0;
        }
-       eshkp = ESHK(shkp);
-
-       ltmp = eshkp->robbed;
 
        if(shkp != resident && NOTANGRY(shkp)) {
 #ifdef GOLDOBJ
@@ -1623,14 +1644,15 @@ int croaked;
 
        /* the simplifying principle is that first-come */
        /* already took everything you had.             */
-       if(numsk > 1) {
-           if(cansee(shkp->mx, shkp->my) && croaked)
-               pline("%s %slooks at your corpse%s%s", Monnam(shkp),
-                    (shkp->msleeping || !shkp->mcanmove) ?
-                                  "wakes up, " : "",
-                    !rn2(2) ? (shkp->female ? ", shakes her head," :
-                                ", shakes his head,") : "",
-                    !inhishop(shkp) ? " and disappears. " : " and sighs.");
+       if (numsk > 1) {
+           if (cansee(shkp->mx, shkp->my && croaked))
+               pline("%s %slooks at your corpse%s and %s.",
+                     Monnam(shkp),
+                     !shkp->mcanmove ? "wakes up, " : "",
+                     !rn2(2) ? (shkp->female ? ", shakes her head," :
+                          ", shakes his head,") : "",
+                     !inhishop(shkp) ? "disappears" : "sighs");
+           rouse_shk(shkp, FALSE);     /* wake shk for bones */    
            taken = (roomno == eshkp->shoproom);
            goto skip;
        }
@@ -1662,7 +1684,7 @@ int croaked;
                 umoney = money_cnt(invent);
 #endif
                takes[0] = '\0';
-               if (shkp->msleeping || !shkp->mcanmove)
+               if (!shkp->mcanmove)
                        Strcat(takes, "wakes up and ");
                if (distu(shkp->mx, shkp->my) > 2)
                        Strcat(takes, "comes and ");
@@ -1707,7 +1729,7 @@ int croaked;
                }
 skip:
                /* in case we create bones */
-               shkp->msleeping = 0;
+               rouse_shk(shkp, FALSE); /* wake up */
                if (!inhishop(shkp))
                        home_shk(shkp, FALSE);
        }
@@ -2565,23 +2587,7 @@ xchar x, y;
        }
 
        /* you dropped something of your own - probably want to sell it */
-       if (shkp->msleeping || !shkp->mcanmove) {
-               if (container)
-                   dropped_container(obj, shkp, TRUE);
-               if (!obj->unpaid)
-                   obj->no_charge = 1;
-               if (shkp->msleeping) {
-                   if(!rn2(3))
-                       pline("%s snores indifferently.", Monnam(shkp));
-               } else {
-                   if(ANGRY(shkp) && !rn2(4))
-                       pline("%s utters a curse.", Monnam(shkp));
-                   else pline("%s is indisposed.", Monnam(shkp));
-               }
-               subfrombill(obj, shkp);
-               return;
-       }
-
+       rouse_shk(shkp, TRUE);  /* wake up sleeping or paralyzed shk */
        eshkp = ESHK(shkp);
 
        if (ANGRY(shkp)) { /* they become shop-objects, no pay */