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

Monster movement and object pickup cleanup

Browse Source 
Clean up some of the code for monster deciding what objects
to pick up, removing duplicate code.  There should be no real
difference in behaviour, other than monsters now can pick up
one stack of items at a time; previously monster could pick up
gold, then a practical item, followed by a magical item all
in a single turn, although this very rarely mattered.

Not extensively tested.

Code originally from NetHack4.
This commit is contained in:
Pasi Kallinen
2023-02-01 10:23:20 +02:00
parent 56d4822f4e
commit 6c9700ab25
3 changed files with 72 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/extern.h
View File

@@ -1553,9 +1553,10 @@ extern int meatcorpse(struct monst *);
extern void mon_give_prop(struct monst *, int);
extern void mon_givit(struct monst *, struct permonst *);
extern void mpickgold(struct monst *);
extern boolean mpickstuff(struct monst *, const char *);
extern boolean mpickstuff(struct monst *);
extern int curr_mon_load(struct monst *);
extern int max_mon_load(struct monst *);
extern boolean can_touch_safely(struct monst *, struct obj *);
extern int can_carry(struct monst *, struct obj *);
extern long mon_allowflags(struct monst *);
extern int mfndpos(struct monst *, coord *, long *, long);
@@ -1682,6 +1683,7 @@ extern int mstrength(struct permonst *);
/* ### monmove.c ### */
extern boolean mon_would_take_item(struct monst *, struct obj *);
extern boolean itsstuck(struct monst *);
extern boolean mb_trapped(struct monst *, boolean);
extern void mon_track_add(struct monst *, coordxy, coordxy);