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

more slippery gloves

Browse Source 
Move makeplural(body_part(FINGER)) into its own routine, with option
to substitute gloves when wearing such.

Wearing slippery gloves (ie, wearing gloves while having slippery
fingers) wouldn't let you put on a ring because you can't take the
gloves off, but removing a worn ring lacked the same restriction.

After changing that, teach prayer that slippery gloves is another
reason why a ring of levitation can't be removed.
This commit is contained in:
PatR
2019-11-09 16:36:41 -08:00
parent 67bea58539
commit 15dbf661d9
9 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/apply.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 apply.c $NHDT-Date: 1573290415 2019/11/09 09:06:55 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.282 $ */
/* NetHack 3.6 apply.c $NHDT-Date: 1573346182 2019/11/10 00:36:22 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.283 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2012. */
/* NetHack may be freely redistributed. See license for details. */
@@ -2293,20 +2293,19 @@ struct obj *obj;
if (Glib) {
pline("%s from your %s.", Tobjnam(obj, "slip"),
makeplural(body_part(FINGER)));
fingers_or_gloves(FALSE));
dropx(obj);
return;
}
if (obj->spe > 0) {
const char *fingers_or_gloves;
int oldglib;
if ((obj->cursed || Fumbling) && !rn2(2)) {
consume_obj_charge(obj, TRUE);
pline("%s from your %s.", Tobjnam(obj, "slip"),
makeplural(body_part(FINGER)));
fingers_or_gloves(FALSE));
dropx(obj);
return;
}
@@ -2317,8 +2316,6 @@ struct obj *obj;
return;
consume_obj_charge(obj, TRUE);
fingers_or_gloves = !uarmg ? makeplural(body_part(FINGER))
: gloves_simple_name(uarmg);
oldglib = (int) (Glib & TIMEOUT);
if (otmp != &zeroobj) {
You("cover %s with a thick layer of grease.", yname(otmp));
@@ -2326,11 +2323,11 @@ struct obj *obj;
if (obj->cursed && !nohands(youmonst.data)) {
make_glib(oldglib + rn1(6, 10)); /* + 10..15 */
pline("Some of the grease gets all over your %s.",
fingers_or_gloves);
fingers_or_gloves(TRUE));
}
} else {
make_glib(oldglib + rn1(11, 5)); /* + 5..15 */
You("coat your %s with grease.", fingers_or_gloves);
You("coat your %s with grease.", fingers_or_gloves(TRUE));
}
} else {
if (obj->known)