nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

message when going from fainting back to weak

Browse Source 
Implement the suggested revised wording when eating something
ends fainting back leaves the hero still weak.
This commit is contained in:
PatR
2020-05-31 17:39:52 -07:00
parent 157d54ca27
commit ac364b3e20
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eat.c
+10 -9
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 eat.c $NHDT-Date: 1590346071 2020/05/24 18:47:51 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.229 $ */ /* NetHack 3.6 eat.c $NHDT-Date: 1590971980 2020/06/01 00:39:40 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.230 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */ /*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1673,7 +1673,8 @@ struct obj *otmp;
} }
/* delay is weight dependent */ /* delay is weight dependent */
g.context.victual.reqtime = 3 + ((!glob ? mons[mnum].cwt : otmp->owt) >> 6); g.context.victual.reqtime
= 3 + ((!glob ? mons[mnum].cwt : otmp->owt) >> 6);
if (!tp && !nonrotting_corpse(mnum) && (otmp->orotten || !rn2(7))) { if (!tp && !nonrotting_corpse(mnum) && (otmp->orotten || !rn2(7))) {
if (rottenfood(otmp)) { if (rottenfood(otmp)) {
@@ -3090,9 +3091,9 @@ boolean incr;
You(!incr ? "now have a lesser case of the munchies." You(!incr ? "now have a lesser case of the munchies."
: "are getting the munchies."); : "are getting the munchies.");
} else } else
You(!incr ? "only feel hungry now." You("%s.", !incr ? "only feel hungry now"
: (u.uhunger < 145) ? "feel hungry." : (u.uhunger < 145) ? "feel hungry"
: "are beginning to feel hungry."); : "are beginning to feel hungry");
if (incr && g.occupation if (incr && g.occupation
&& (g.occupation != eatfood && g.occupation != opentin)) && (g.occupation != eatfood && g.occupation != opentin))
stop_occupation(); stop_occupation();
@@ -3100,7 +3101,7 @@ boolean incr;
break; break;
case WEAK: case WEAK:
if (Hallucination) if (Hallucination)
pline((!incr) ? "You still have the munchies." pline(!incr ? "You still have the munchies."
: "The munchies are interfering with your motor capabilities."); : "The munchies are interfering with your motor capabilities.");
else if (incr && (Role_if(PM_WIZARD) || Race_if(PM_ELF) else if (incr && (Role_if(PM_WIZARD) || Race_if(PM_ELF)
|| Role_if(PM_VALKYRIE))) || Role_if(PM_VALKYRIE)))
@@ -3109,9 +3110,9 @@ boolean incr;
? g.urole.name.m ? g.urole.name.m
: "Elf"); : "Elf");
else else
You(!incr ? "feel weak now." You("%s weak.", !incr ? "are still"
: (u.uhunger < 45) ? "feel weak." : (u.uhunger < 45) ? "feel"
: "are beginning to feel weak."); : "are beginning to feel");
if (incr && g.occupation if (incr && g.occupation
&& (g.occupation != eatfood && g.occupation != opentin)) && (g.occupation != eatfood && g.occupation != opentin))
stop_occupation(); stop_occupation();