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

decaying globs of {ooze,pudding,slime}

Browse Source 
Globs never rotted away but did become tainted after a relatively
short while, which seemed like a contradiction.  Change them to never
be tainted but shrink by 1 unit of weight approximately every 25
turns.  An ordinary glob (one that hasn't combined with any others)
starts out weighing 20 units, so it takes about 500 turns to vanish.
That's roughly twice as long as a corpse takes to rot away.

Shrinking globs give feedback when in hero's invent or in a container
in hero's inventory, but rarely (when going from an exact multiple
of 20 weight units; that is, from integral number of N globs to
N-1 + 19/20, or if weight reduction triggers an encumbrance change).
When a glob goes away completely, there is feedback for those two
circumstances and also for seeing the glob vanish from the floor.

I haven't touched how much nutrition eating a glob confers.  I have
changed formatting of glob names to use "small", "medium", "large",
"very large" instead of "small", [no adjective], "large", &c.  You
still need to have at least five globs coalesced together for the
adjective to become "medium", same amount as before.

I don't think EDITLEVEL needs to be modified but have incremented it
anyway to play things safe.
This commit is contained in:
PatR
2021-11-06 18:24:36 -07:00
parent aa8fd3ab3c
commit e2ca016484
11 changed files with 293 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pickup.c
View File

@@ -2351,12 +2351,7 @@ in_container(struct obj *obj)
/* boxes, boulders, and big statues can't fit into any container */
if (obj->otyp == ICE_BOX || Is_box(obj) || obj->otyp == BOULDER
|| (obj->otyp == STATUE && bigmonst(&mons[obj->corpsenm]))) {
/*
* xname() uses a static result array. Save obj's name
* before g.current_container's name is computed. Don't
* use the result of strcpy() within You() --- the order
* of evaluation of the parameters is undefined.
*/
/* consumes multiple obufs but not enough to overwrite the result */
Strcpy(buf, the(xname(obj)));
You("cannot fit %s into %s.", buf, the(xname(g.current_container)));
return 0;
@@ -2391,6 +2386,8 @@ in_container(struct obj *obj)
/* if this is the corpse of a cancelled ice troll, uncancel it */
if (obj->corpsenm == PM_ICE_TROLL && has_omonst(obj))
OMONST(obj)->mcan = 0;
} else if (obj->globby && obj->timed) {
(void) stop_timer(SHRINK_GLOB, obj_to_any(obj));
}
} else if (Is_mbag(g.current_container) && mbag_explodes(obj, 0)) {
/* explicitly mention what item is triggering the explosion */
@@ -2531,6 +2528,9 @@ removed_from_icebox(struct obj *obj)
otherwise start a rot-away timer (even for other trolls) */
obj->norevive = iceT ? 0 : 1;
start_corpse_timeout(obj);
} else if (obj->globby) {
/* non-frozen globs gradually shrink away to nothing */
start_glob_timeout(obj, 0L);
}
}
}