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

pet fodder

Browse Source 
Allow starving pets to consume items they wouldn't ordinarily
eat.  Carnivores will eat fruits and vegetables--such as they are--
and herbivores will eat assorted rations.  Even though eating such
rations doesn't violate vegetarian conduct for the character, horses
would never eat them.

     This change should allow players to keep mundane steeds alive
much longer.  The new behavior doesn't kick in until the pet has
been classified as starving though; it doesn't affect ones who are
merely hungry.

     This also gives the reason why a starving pet has died instead
of just saying "<pet> dies" whenever it starved with hit points left.
This commit is contained in:
nethack.rankin
2002-09-13 05:31:54 +00:00
parent d916769a77
commit 6f63f81b86
3 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/dog.c
View File

@@ -596,6 +596,7 @@ register struct obj *obj;
boolean carni = carnivorous(mon->data);
boolean herbi = herbivorous(mon->data);
struct permonst *fptr = &mons[obj->corpsenm];
boolean starving;
if (is_quest_artifact(obj) || obj_resists(obj, 0, 95))
return (obj->cursed ? TABU : APPORT);
@@ -609,12 +610,17 @@ register struct obj *obj;
/* Ghouls only eat old corpses... yum! */
if (mon->data == &mons[PM_GHOUL])
return (obj->otyp == CORPSE && obj->age+50 <= monstermoves) ?
DOGFOOD : TABU;
return (obj->otyp == CORPSE &&
peek_at_iced_corpse_age(obj) + 50L <= monstermoves) ?
DOGFOOD : TABU;
if (!carni && !herbi)
return (obj->cursed ? UNDEF : APPORT);
/* a starving pet will eat almost anything */
starving = (mon->mtame && !mon->isminion &&
EDOG(mon)->mhpmax_penalty);
switch (obj->otyp) {
case TRIPE_RATION:
case MEATBALL:
@@ -627,7 +633,7 @@ register struct obj *obj;
return POISON;
return (carni ? CADAVER : MANFOOD);
case CORPSE:
if ((peek_at_iced_corpse_age(obj)+50 <= monstermoves
if ((peek_at_iced_corpse_age(obj) + 50L <= monstermoves
&& obj->corpsenm != PM_LIZARD
&& obj->corpsenm != PM_LICHEN
&& mon->data->mlet != S_FUNGUS) ||
@@ -640,24 +646,25 @@ register struct obj *obj;
else return (carni ? CADAVER : MANFOOD);
case CLOVE_OF_GARLIC:
return (is_undead(mon->data) ? TABU :
(herbi ? ACCFOOD : MANFOOD));
((herbi || starving) ? ACCFOOD : MANFOOD));
case TIN:
return (metallivorous(mon->data) ? ACCFOOD : MANFOOD);
case APPLE:
case CARROT:
return (herbi ? DOGFOOD : MANFOOD);
return (herbi ? DOGFOOD : starving ? ACCFOOD : MANFOOD);
case BANANA:
return ((mon->data->mlet == S_YETI) ? DOGFOOD :
(herbi ? ACCFOOD : MANFOOD));
((herbi || starving) ? ACCFOOD : MANFOOD));
default:
if (starving) return ACCFOOD;
return (obj->otyp > SLIME_MOLD ?
(carni ? ACCFOOD : MANFOOD) :
(herbi ? ACCFOOD : MANFOOD));
}
default:
if (obj->otyp == AMULET_OF_STRANGULATION ||
obj->otyp == RIN_SLOW_DIGESTION)
return (TABU);
obj->otyp == RIN_SLOW_DIGESTION)
return TABU;
if (hates_silver(mon->data) &&
objects[obj->otyp].oc_material == SILVER)
return(TABU);