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

clean up handling, roll everything into merged()

Browse Source 
it should be possible to wish for globs now; also hero's
inventory, containers, ground, monster inventories will all
honor the globbiness.

basically, any way you bring two globs together (adjacent on floor,
same inventory, same bag) should cause them to merge, combining
weight and nutrition as appropriate.

20 seems low-ish on nutrition for a pudding (kelp fronds are 30!)
at first glance but this is easy enough to fix later; don't really
want players to be able to stock up on food _this_ way and accidentally
obsolete all the other food-generation methods.
This commit is contained in:
Derek S. Ray
2015-04-03 13:03:55 -04:00
parent e2f839efbd
commit 0b4383e32e
5 changed files with 90 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/objects.c
View File

@@ -676,10 +676,10 @@ OBJECT(OBJ("meat ring", (char *)0),
0, FOOD_CLASS, 0, 1, 5, 1, 0, 0, 0, 0, 5, CLR_BROWN),
/* pudding 'corpses' will turn into these and combine */
FOOD("glob of gray ooze", 0, 2, 10, 0, FLESH, 0, CLR_GRAY),
FOOD("glob of brown pudding", 0, 2, 10, 0, FLESH, 0, CLR_BROWN),
FOOD("glob of green slime", 0, 2, 10, 0, FLESH, 0, CLR_GREEN),
FOOD("glob of black pudding", 0, 2, 10, 0, FLESH, 0, CLR_BLACK),
FOOD("glob of gray ooze", 0, 2, 20, 0, FLESH, 20, CLR_GRAY),
FOOD("glob of brown pudding", 0, 2, 20, 0, FLESH, 20, CLR_BROWN),
FOOD("glob of green slime", 0, 2, 20, 0, FLESH, 20, CLR_GREEN),
FOOD("glob of black pudding", 0, 2, 20, 0, FLESH, 20, CLR_BLACK),
/* fruits & veggies */
FOOD("kelp frond", 0, 1, 1, 0, VEGGY, 30, CLR_GREEN),