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

wet towel enhancements

Browse Source 
Flesh out wet towels a bit:
1) wielding a wet towel--or a dry one which becomes wet--won't give a
   "you begin bashing with your wet towel" message when attacking;
2) if a formerly wet towel dries out completely while wielded, *do* give
   "you begin bashing with your towel" on the next attack;
3) successfully hitting with a wet towel no longer always loses wetness;
4) water damage to dry towel always confers at least 1 point of wetness;
5) taking fire damage (via burnarmor() which is used for most types of
   fire damage) has a chance to partially or fully dry a wet towel
   (regardless of whether it's wielded at the time; applies to monsters
   as well as hero; each towel being carried is checked until one is
   affected, then any others escape drying.

Not done:
-) attacking with a wielded wet towel perhaps ought to be treated as a
   weapon attack using whip skill rather than an augmented arbitrary-
   junk-by-weight attack;
-) throwing a wet towel should probably ignore wetness--it's just a wet
   piece of cloth when not finishing with a whip snap; right now, it
   loses a point of wetness when thrown and usually--#3 above--another
   point if it hits...;
-) hitting burning creatures is no different than hitting anything else;
-) likewise for hitting wet creatures.
This commit is contained in:
PatR
2015-10-17 17:00:53 -07:00
parent af1c77808b
commit 4b8db661dd
8 changed files with 163 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/apply.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 apply.c $NHDT-Date: 1440120650 2015/08/21 01:30:50 $ $NHDT-Branch: master $:$NHDT-Revision: 1.201 $ */
/* NetHack 3.6 apply.c $NHDT-Date: 1445126424 2015/10/18 00:00:24 $ $NHDT-Branch: master $:$NHDT-Revision: 1.206 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -88,6 +88,8 @@ STATIC_OVL int
use_towel(obj)
struct obj *obj;
{
boolean drying_feedback = (obj == uwep);
if (!freehand()) {
You("have no free %s!", body_part(HAND));
return 0;
@@ -102,7 +104,8 @@ struct obj *obj;
incr_itimeout(&Glib, rn1(10, 3));
Your("%s %s!", makeplural(body_part(HAND)),
(old ? "are filthier than ever" : "get slimy"));
if (obj->spe > 0) obj->spe--;
if (is_wet_towel(obj))
dry_a_towel(obj, -1, drying_feedback);
return 1;
case 1:
if (!ublindf) {
@@ -128,7 +131,8 @@ struct obj *obj;
dropx(saved_ublindf);
}
}
if (obj->spe > 0) obj->spe--;
if (is_wet_towel(obj))
dry_a_towel(obj, -1, drying_feedback);
return 1;
case 0:
break;
@@ -138,13 +142,12 @@ struct obj *obj;
if (Glib) {
Glib = 0;
You("wipe off your %s.", makeplural(body_part(HAND)));
if (obj->spe > 0) obj->spe--;
if (is_wet_towel(obj))
dry_a_towel(obj, -1, drying_feedback);
return 1;
} else if (u.ucreamed) {
Blinded -= u.ucreamed;
u.ucreamed = 0;
if (obj->spe > 0) obj->spe--;
if (!Blinded) {
pline("You've got the glop off.");
if (!gulp_blnd_check()) {
@@ -154,6 +157,8 @@ struct obj *obj;
} else {
Your("%s feels clean now.", body_part(FACE));
}
if (is_wet_towel(obj))
dry_a_towel(obj, -1, drying_feedback);
return 1;
}