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

fix #K3378 - quaffing lit potion of oil

Browse Source 
should cure sliming.  Implement the suggestion that quaffing a
burning potion of oil while turning into green slime will cure the
latter.

It's somewhat iffy since the slime is on the outside moving in and
the burning oil ends up on the inside, but the message sequence is
|You burn your face.
|The slime that covers you is burned away!
and it could be that igniting part of the slime quickly spreads to
the rest.

Implemented for monsters as well as for the hero.  They will light
and drink the oil in a single turn in the extremely rare situation
where they actually have a potion of oil and need to use it.
This commit is contained in:
PatR
2021-06-30 17:33:18 -07:00
parent 183e31ef14
commit 4c7734ebbd
3 changed files with 65 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/potion.c
View File

@@ -1102,22 +1102,37 @@ peffects(struct obj *otmp)
break;
}
case POT_OIL: { /* P. Winner */
boolean good_for_you = FALSE;
boolean good_for_you = FALSE, vulnerable;
if (otmp->lamplit) {
if (likes_fire(g.youmonst.data)) {
pline("Ahh, a refreshing drink.");
good_for_you = TRUE;
} else {
/*
* Note: if poly'd into green slime, hero ought to take
* extra damage, but drinking potions in that form isn't
* possible so there's no need to try to handle that.
*/
You("burn your %s.", body_part(FACE));
/* fire damage */
losehp(d(Fire_resistance ? 1 : 3, 4), "burning potion of oil",
KILLED_BY_AN);
vulnerable = !Fire_resistance || Cold_resistance;
losehp(d(vulnerable ? 4 : 2, 4),
"quaffing a burning potion of oil",
KILLED_BY);
}
} else if (otmp->cursed)
/*
* This is slightly iffy because the burning isn't being
* spread across the body. But the message is "the slime
* that covers you burns away" and having that follow
* "you burn your face" seems consistent enough.
*/
burn_away_slime();
} else if (otmp->cursed) {
pline("This tastes like castor oil.");
else
} else {
pline("That was smooth!");
}
exercise(A_WIS, good_for_you);
break;
}