fix #Q117 - vomiting by rodents & more

     From a bug report:  you could vomit when polymorphed into a rat but real life
rats can't/don't vomit.  The latter was confirmed by <Someone> and <Someone>.
While testing a fix for this, I discovered a couple of other problems.
Healing magic which cured sickness failed to heal Vomiting (potion or
spell; unicorn horn deals with them separately).  Enlightenment failed to
report Vomiting (it's not shown on the status line).  Most significant was
that vomiting_dialogue() called vomit() twice (also make_confused() and
make_stunned() three times for every once intended).  It was dividing the
remaining turns by 3 and then using that value to decide what to do, but
only message display took into account that the same divided value would
occur on 3 consecutive turns (or just 2 for the final countdown to 0,
because dialog routine gets called before timed-property decrement).

diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 56813781e3876c97839e18215435896b9588bcd6..b35687bccc60f4a4fcdbf2edc50aebe65238a77c 100644 (file)
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -303,6 +303,10 @@ a magic portal could be rendered inactive for the hero if a successful
        hangup save took place during level change; leaving the level by any
        means other than triggering the portal would reactivate it
 hero wasn't allowed to affix candles to the candelabrum while underwater
+non-unicorn horn healing magic which cures sickness now also cures vomiting
+vomiting/nauseated state is included in enlightenment feedback
+vomiting countdown actually triggered the final vomit code twice
+rats aren't capable of vomiting
 
 
 Platform- and/or Interface-Specific Fixes

diff --git a/include/extern.h b/include/extern.h
index 9a5703eba3ed93209f68954c0d7a5b37e75d211a..b4cd4761021f53a0109c74d261c3e87103ea4352 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -1316,6 +1316,7 @@ E boolean FDECL(can_track, (struct permonst *));
 E boolean FDECL(breakarm, (struct permonst *));
 E boolean FDECL(sliparm, (struct permonst *));
 E boolean FDECL(sticks, (struct permonst *));
+E boolean FDECL(cantvomit, (struct permonst *));
 E int FDECL(num_horns, (struct permonst *));
 /* E boolean FDECL(canseemon, (struct monst *)); */
 E struct attack *FDECL(dmgtype_fromattack, (struct permonst *,int,int));

diff --git a/src/cmd.c b/src/cmd.c
index e5fcd0a3eb3bf3dc5e96a3b4cdebb95cf0bb2bca..2e76f1c4dd61e5608d8d302ec14af278670a2960 100644 (file)
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)cmd.c      3.5     2007/01/12      */
+/*     SCCS Id: @(#)cmd.c      3.5     2007/02/05      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -1105,6 +1105,7 @@ int final;        /* 0 => still in progress; 1 => over, survived; 2 => dead */
        if (Stoned) you_are("turning to stone","");
        if (Slimed) you_are("turning into slime","");
        if (Strangled) you_are((u.uburied) ? "buried" : "being strangled","");
+       if (Vomiting) you_are("nauseated","");
        if (Glib) {
                Sprintf(buf, "slippery %s", makeplural(body_part(FINGER)));
                you_have(buf,"");

diff --git a/src/eat.c b/src/eat.c
index 1e5299106aa89be3933686bbf92d1f8e4d7b54c0..3cef6fc7aaf0e595b44c6995a55b46ac141b19fd 100644 (file)
--- a/src/eat.c
+++ b/src/eat.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)eat.c      3.5     2007/01/24      */
+/*     SCCS Id: @(#)eat.c      3.5     2007/02/05      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -2853,7 +2853,12 @@ floorfood(verb,corpsecheck)      /* get food from floor or pack */
 void
 vomit()                /* A good idea from David Neves */
 {
-       make_sick(0L, (char *) 0, TRUE, SICK_VOMITABLE);
+       if (cantvomit(youmonst.data))
+           /* doesn't cure food poisoning; message assumes that we aren't
+              dealing with some esoteric body_part() */
+           Your("jaw gapes convulsively.");
+       else
+           make_sick(0L, (char *)0, TRUE, SICK_VOMITABLE);
        nomul(-2);
        nomovemsg = You_can_move_again;
 }

diff --git a/src/mondata.c b/src/mondata.c
index e4d34d9bab4f10890a6522ec2c31dac4ca6a62ba..479c86817484fcd85ff14468434d6cada85738ce 100644 (file)
--- a/src/mondata.c
+++ b/src/mondata.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)mondata.c  3.5     2006/11/24      */
+/*     SCCS Id: @(#)mondata.c  3.5     2007/02/05      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -335,6 +335,19 @@ sticks(ptr)        /* creature sticks other creatures it hits */
                attacktype(ptr,AT_HUGS)));
 }
 
+boolean
+cantvomit(ptr)
+struct permonst *ptr;
+{
+    /* rats and mice are incapable of vomitting;
+       which other creatures have the same limitation? */
+    if (ptr->mlet == S_RODENT &&
+           ptr != &mons[PM_ROCK_MOLE] &&
+           ptr != &mons[PM_WOODCHUCK])
+       return TRUE;
+    return FALSE;
+}
+
 /* number of horns this type of monster has on its head */
 int
 num_horns(ptr)

diff --git a/src/potion.c b/src/potion.c
index 06b18494069b327934d6edb0ce4ec0c9f4424324..f00b36270e3dcf3e6cb2c5756d11812334e386a5 100644 (file)
--- a/src/potion.c
+++ b/src/potion.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)potion.c   3.5     2006/11/29      */
+/*     SCCS Id: @(#)potion.c   3.5     2007/02/05      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -988,8 +988,11 @@ healup(nhp, nxtra, curesick, cureblind)
                        if(u.uhp > u.uhpmax) u.uhp = (u.uhpmax += nxtra);
                }
        }
-       if(cureblind)   make_blinded(0L,TRUE);
-       if(curesick)    make_sick(0L, (char *) 0, TRUE, SICK_ALL);
+       if (cureblind) make_blinded(0L, TRUE);
+       if (curesick) {
+           make_vomiting(0L, TRUE);
+           make_sick(0L, (char *)0, TRUE, SICK_ALL);
+       }
        context.botl = 1;
        return;
 }

diff --git a/src/timeout.c b/src/timeout.c
index 0a73ad20422844f6dfb553ac621735f8473bb8bb..56f03e5a6dfe50cdb8e7dac5481e519ebdea6127 100644 (file)
--- a/src/timeout.c
+++ b/src/timeout.c
@@ -1,4 +1,4 @@
-/*     SCCS Id: @(#)timeout.c  3.5     2006/07/08      */
+/*     SCCS Id: @(#)timeout.c  3.5     2007/02/05      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -64,27 +64,35 @@ static NEARDATA const char * const vomiting_texts[] = {
 STATIC_OVL void
 vomiting_dialogue()
 {
-       register long i = (Vomiting & TIMEOUT) / 3L;
-
-       if ((((Vomiting & TIMEOUT) % 3L) == 2) && (i >= 0)
-           && (i < SIZE(vomiting_texts)))
-               You(vomiting_texts[SIZE(vomiting_texts) - i - 1]);
-
-       switch ((int) i) {
-       case 0:
-               stop_occupation();
-               morehungry(20);
-               vomit();
-               break;
-       case 2:
+       const char *txt = 0;
+       long v = (Vomiting & TIMEOUT);
+
+       /* note: nhtimeout() hasn't decremented timed properties for the
+          current turn yet, so we use Vomiting-1 here */
+       switch ((int)(v - 1L)) {
+       case 14: txt = vomiting_texts[0]; break;
+       case 11: txt = vomiting_texts[1]; break;
+       case 6:
                make_stunned(HStun + d(2,4), FALSE);
                if (!Popeye(VOMITING)) stop_occupation();
-               /* fall through */
-       case 3:
+               /*FALLTHRU*/
+       case 9:
                make_confused(HConfusion + d(2,4), FALSE);
                if (multi > 0) nomul(0);
                break;
+       case 8: txt = vomiting_texts[2]; break;
+       case 5: txt = vomiting_texts[3]; break;
+       case 2: txt = vomiting_texts[4];
+               if (cantvomit(youmonst.data)) txt = "gag uncontrolably.";
+               break;
+       case 0:
+               stop_occupation();
+               if (!cantvomit(youmonst.data)) morehungry(20);
+               vomit();
+               break;
+       default: break; 
        }
+       if (txt) You("%s", txt);
        exercise(A_CON, FALSE);
 }