1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-07-29 17:02:25 +01:00

More weapon-based AT_ types have been added, update pet AI

This commit is contained in:
ChrisANG 2018-03-16 12:54:21 -04:00
parent 77ca5cb48c
commit 898f43755a
2 changed files with 2 additions and 2 deletions

View file

@ -182,7 +182,7 @@
#define can_teleport(ptr) (((ptr)->mflagsm & MM_TPORT) != 0L)
#define control_teleport(ptr) (((ptr)->mflagsm & MM_TPORT_CNTRL) != 0L)
#define telepathic(ptr) (((ptr)->mflagsv & MV_TELEPATHIC) != 0L)
#define is_armed(ptr) attacktype(ptr, AT_WEAP)
#define is_armed(ptr) (attacktype(ptr, AT_WEAP) || attacktype(ptr, AT_XWEP) || attacktype(ptr, AT_MARI) || attacktype(ptr, AT_DEVA))
#define crpsdanger(ptr) (acidic(ptr) || poisonous(ptr) ||\
freezing(ptr) || burning(ptr))
#define acidic(ptr) (((ptr)->mflagsb & MB_ACID) != 0L)

View file

@ -119,7 +119,7 @@ boolean check_if_better;
/* chains for some */
((mtmp->data == &mons[PM_CATHEZAR]) && otmp->otyp == IRON_CHAIN) ||
/* better weapons */
(attacktype(mtmp->data, AT_WEAP) &&
(is_armed(mtmp->data) &&
(otmp->oclass == WEAPON_CLASS || is_weptool(otmp)) &&
(!check_if_better ||
mtmp->data == &mons[PM_MARILITH] ||