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

Merge remote-tracking branch 'origin/NetHack-3.6.0'

Browse Source
This commit is contained in:
keni
2016-07-04 20:17:43 -04:00
parent 8ff16b07c1 9f89c0792c
commit af49f320a2
25 changed files with 358 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/flag.h
View File

@@ -382,6 +382,7 @@ extern NEARDATA struct instance_flags iflags;
#define PLNMSG_TOWER_OF_FLAME 2 /* scroll of fire */
#define PLNMSG_CAUGHT_IN_EXPLOSION 3 /* explode() feedback */
#define PLNMSG_OBJ_GLOWS 4 /* "the <obj> glows <color>" */
#define PLNMSG_OBJNAM_ONLY 5 /* xname/doname only, for #tip */
/* Usage:
* pline("some message");
* pline: vsprintf + putstr + iflags.last_msg = PLNMSG_UNKNOWN;

16
include/mondata.h
View File

@@ -193,10 +193,18 @@
(vegan(ptr) \
|| ((ptr)->mlet == S_PUDDING && (ptr) != &mons[PM_BLACK_PUDDING]))
/* monkeys are tameable via bananas but not pacifiable via food,
otherwise their theft attack could be nullified too easily;
dogs and cats can be tamed by anything they like to eat and are
pacified by any other food;
horses can be tamed by always-veggy food or lichen corpses but
not tamed or pacified by other corpses or tins of veggy critters */
#define befriend_with_obj(ptr, obj) \
(((obj)->oclass == FOOD_CLASS && is_domestic(ptr)) \
|| ((obj)->otyp == BANANA && \
((ptr) == &mons[PM_MONKEY] \
|| (ptr) == &mons[PM_APE])))
(((ptr) == &mons[PM_MONKEY] || (ptr) == &mons[PM_APE]) \
? (obj)->otyp == BANANA \
: (is_domestic(ptr) && (obj)->oclass == FOOD_CLASS \
&& ((ptr)->mlet != S_UNICORN \
|| objects[(obj)->otyp].oc_material == VEGGY \
|| ((obj)->otyp == CORPSE && (obj)->corpsenm == PM_LICHEN))))
#endif /* MONDATA_H */