1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-08-06 20:55:25 +01:00

FIQ Bugfix: Fix Pale Night's interaction with lifesaving

This commit is contained in:
Chris-plus-alphanumericgibberish 2017-05-30 13:15:11 -04:00
parent 7e9c8c4f8d
commit 8babfbd8b1

View file

@ -6563,8 +6563,8 @@ register struct monst *mon;
noit_Monnam(mon), fem ? "her" : "his");
if(rn2( (int)(ACURR(A_WIS)/2))){
boolean loopingDeath = TRUE;
struct obj *wore_amulet = uamul;
while(loopingDeath) {
boolean has_lifesaving = Lifesaved;
if (lifesaved){
pline("There is something horrible lurking in your memory... the mere thought of it is consuming your mind from within!");
}
@ -6577,11 +6577,10 @@ register struct monst *mon;
done(DIED);
lifesaved++;
/* avoid looping on "die(y/n)?" */
if (lifesaved && (discover || wizard)) {
if (wore_amulet && !uamul) {
if (lifesaved && (discover || wizard || has_lifesaving)) {
if (has_lifesaving) {
/* used up AMULET_OF_LIFE_SAVING; still
subject to dying from memory */
wore_amulet = 0;
if(rn2( (int)(ACURR(A_WIS)/2)) < 4) loopingDeath = FALSE;
} else {
/* explicitly chose not to die */