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

U716 - trapped monster switching weapons

Browse Source 
A trapped monster with one step between you and the monster (@.@) would
repeatedly switch between a ranged and hand-to-hand weapon if carrying both.
Since the monster switches each turn, it will not make ranged attacks.
Modified the test in dochug to prefer a ranged weapon in this case.
This commit is contained in:
cohrs
2003-11-05 15:47:50 +00:00
parent 1922636393
commit cf07cbf556
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/monmove.c
View File

@@ -441,11 +441,15 @@ toofar:
/* The scared check is necessary. Otherwise a monster that is /* The scared check is necessary. Otherwise a monster that is
* one square near the player but fleeing into a wall would keep * one square near the player but fleeing into a wall would keep
* switching between pick-axe and weapon. * switching between pick-axe and weapon. If monster is stuck
* in a trap, prefer ranged weapon (wielding is done in thrwmu).
* This may cost the monster an attack, but keeps the monster
* from switching back and forth if carrying both.
*/ */
mw_tmp = MON_WEP(mtmp); mw_tmp = MON_WEP(mtmp);
if (!(scared && mw_tmp && is_pick(mw_tmp)) && if (!(scared && mw_tmp && is_pick(mw_tmp)) &&
mtmp->weapon_check == NEED_WEAPON) { mtmp->weapon_check == NEED_WEAPON &&
!(mtmp->mtrapped && !nearby && select_rwep(mtmp))) {
mtmp->weapon_check = NEED_HTH_WEAPON; mtmp->weapon_check = NEED_HTH_WEAPON;
if (mon_wield_item(mtmp) != 0) return(0); if (mon_wield_item(mtmp) != 0) return(0);
} }