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

Use defines for pet hunger limits

Browse Source
This commit is contained in:
Pasi Kallinen
2022-02-17 20:03:39 +02:00
parent 390429545e
commit a9712442dd
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dogmove.c
+8 -4
View File
@@ -7,6 +7,10 @@
#include "mfndpos.h" #include "mfndpos.h"
#define DOG_HUNGRY 300
#define DOG_WEAK 500
#define DOG_STARVE 750
static boolean dog_hunger(struct monst *, struct edog *); static boolean dog_hunger(struct monst *, struct edog *);
static int dog_invent(struct monst *, struct edog *, int); static int dog_invent(struct monst *, struct edog *, int);
static int dog_goal(struct monst *, struct edog *, int, int, int); static int dog_goal(struct monst *, struct edog *, int, int, int);
@@ -369,9 +373,9 @@ dog_eat(struct monst *mtmp,
static boolean static boolean
dog_hunger(struct monst *mtmp, struct edog *edog) dog_hunger(struct monst *mtmp, struct edog *edog)
{ {
if (g.moves > edog->hungrytime + 500) { if (g.moves > edog->hungrytime + DOG_WEAK) {
if (!carnivorous(mtmp->data) && !herbivorous(mtmp->data)) { if (!carnivorous(mtmp->data) && !herbivorous(mtmp->data)) {
edog->hungrytime = g.moves + 500; edog->hungrytime = g.moves + DOG_WEAK;
/* but not too high; it might polymorph */ /* but not too high; it might polymorph */
} else if (!edog->mhpmax_penalty) { } else if (!edog->mhpmax_penalty) {
/* starving pets are limited in healing */ /* starving pets are limited in healing */
@@ -390,7 +394,7 @@ dog_hunger(struct monst *mtmp, struct edog *edog)
else else
You_feel("worried about %s.", y_monnam(mtmp)); You_feel("worried about %s.", y_monnam(mtmp));
stop_occupation(); stop_occupation();
} else if (g.moves > edog->hungrytime + 750 } else if (g.moves > edog->hungrytime + DOG_STARVE
|| DEADMONSTER(mtmp)) { || DEADMONSTER(mtmp)) {
dog_died: dog_died:
if (mtmp->mleashed && mtmp != u.usteed) if (mtmp->mleashed && mtmp != u.usteed)
@@ -1132,7 +1136,7 @@ dog_move(register struct monst *mtmp,
if (!mtmp->isminion) { if (!mtmp->isminion) {
struct edog *dog = EDOG(mtmp); struct edog *dog = EDOG(mtmp);
hungry = (g.moves > (dog->hungrytime + 300)); hungry = (g.moves > (dog->hungrytime + DOG_HUNGRY));
} }
/* Identify the best target in a straight line from the pet; /* Identify the best target in a straight line from the pet;