fix #H4181 - strange death messages
"Petrified by <foo>, while getting stoned." -- multi_reason "while getting stoned" explains why no last-second recovery could be made, but doesn't explain how the petrification happened, so suppress it. "Died of starvation, while fainted from lack of food." -- nethack does not display this; presumeably the IRC death notices for NAO are generated from xlogfile entries. Change 'while fainted from lack of food' to 'while fainted' at time of death if reason for death is starvation. The longer version is accurate but sounds fairly silly. When starvation is set in motion, set it up before checking whether the initial faint triggers falling on a wielded cockatrice corpse, so that fainting isn't applied after recovery in case of life-saving.
This commit is contained in:
@@ -2838,14 +2838,14 @@ boolean incr;
|
||||
/* stop what you're doing, then faint */
|
||||
stop_occupation();
|
||||
You("faint from lack of food.");
|
||||
if (!Levitation)
|
||||
selftouch("Falling, you");
|
||||
incr_itimeout(&HDeaf, duration);
|
||||
nomul(-duration);
|
||||
multi_reason = "fainted from lack of food";
|
||||
nomovemsg = "You regain consciousness.";
|
||||
afternmv = unfaint;
|
||||
newhs = FAINTED;
|
||||
if (!Levitation)
|
||||
selftouch("Falling, you");
|
||||
}
|
||||
} else if (u.uhunger < -(int) (200 + 20 * ACURR(A_CON))) {
|
||||
u.uhs = STARVED;
|
||||
|
||||
Reference in New Issue
Block a user