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

fix github pull request #418 - towel wetness

Browse Source 
Fire damage would dry out a wet towel but never all the way to 0.
Water damage would wet a towel but if it was already wet, its
wetness might decrease.

This uses the pull request's change for increasing the wetness
but changes dry_a_towel so that the original code for decreasing
that will work as is.  Using wet_a_towel() to set wetness to 0
doesn't make much sense, so still won't do so; dry_a_towel() does
and now will.

This also adds missing perm_invent update for towels in inventory
changing wetness.

Fixes #418
This commit is contained in:
PatR
2020-12-12 12:04:20 -08:00
parent bbc5cee97f
commit 25bcbe3846
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/trap.c
View File

@@ -89,7 +89,7 @@ struct monst *victim;
/* burning damage may dry wet towel */
item = hitting_u ? carrying(TOWEL) : m_carrying(victim, TOWEL);
while (item) {
if (is_wet_towel(item)) {
if (is_wet_towel(item)) { /* True => (item->spe > 0) */
oldspe = item->spe;
dry_a_towel(item, rn2(oldspe + 1), TRUE);
if (item->spe != oldspe)
@@ -3882,7 +3882,10 @@ boolean force;
if (obj->otyp == CAN_OF_GREASE && obj->spe > 0) {
return ER_NOTHING;
} else if (obj->otyp == TOWEL && obj->spe < 7) {
wet_a_towel(obj, rnd(7), TRUE);
/* a negative change induces a reverse increment, adding abs(change);
spe starts 0..6, arg passed to rnd() is 1..7, change is -7..-1,
final spe is 1..7 and always greater than its starting value */
wet_a_towel(obj, -rnd(7 - obj->spe), TRUE);
return ER_NOTHING;
} else if (obj->greased) {
if (!rn2(2))