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

m_digweapon_check()

Browse Source 
Some streamlining that I left out of the recent commit for maybe
avoiding exclamation mark when a monster wields a tool or weapon
to dig or chop.
This commit is contained in:
PatR
2022-08-04 14:26:12 -07:00
parent 672ef846fa
commit 908a8a132f
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/monmove.c
+11 -9
View File
@@ -867,10 +867,14 @@ should_displace(
return FALSE; return FALSE;
} }
/* have monster wield a pick-axe if it wants to dig and it has one;
return True if it spends this move wielding one, False otherwise */
boolean boolean
m_digweapon_check(struct monst* mtmp, coordxy nix, coordxy niy) m_digweapon_check(
struct monst *mtmp,
coordxy nix, coordxy niy)
{ {
boolean can_tunnel = 0; boolean can_tunnel = FALSE;
struct obj *mw_tmp = MON_WEP(mtmp); struct obj *mw_tmp = MON_WEP(mtmp);
if (!Is_rogue_level(&u.uz)) if (!Is_rogue_level(&u.uz))
@@ -880,15 +884,13 @@ m_digweapon_check(struct monst* mtmp, coordxy nix, coordxy niy)
&& (may_dig(nix, niy) || closed_door(nix, niy))) { && (may_dig(nix, niy) || closed_door(nix, niy))) {
/* may_dig() is either IS_STWALL or IS_TREE */ /* may_dig() is either IS_STWALL or IS_TREE */
if (closed_door(nix, niy)) { if (closed_door(nix, niy)) {
if (!mw_tmp if (!mw_tmp || !is_pick(mw_tmp) || !is_axe(mw_tmp))
|| !is_pick(mw_tmp)
|| !is_axe(mw_tmp))
mtmp->weapon_check = NEED_PICK_OR_AXE; mtmp->weapon_check = NEED_PICK_OR_AXE;
} else if (IS_TREE(levl[nix][niy].typ)) { } else if (IS_TREE(levl[nix][niy].typ)) {
if (!(mw_tmp = MON_WEP(mtmp)) || !is_axe(mw_tmp)) if (!mw_tmp || !is_axe(mw_tmp))
mtmp->weapon_check = NEED_AXE; mtmp->weapon_check = NEED_AXE;
} else if (IS_STWALL(levl[nix][niy].typ)) { } else if (IS_STWALL(levl[nix][niy].typ)) {
if (!(mw_tmp = MON_WEP(mtmp)) || !is_pick(mw_tmp)) if (!mw_tmp || !is_pick(mw_tmp))
mtmp->weapon_check = NEED_PICK_AXE; mtmp->weapon_check = NEED_PICK_AXE;
} }
if (mtmp->weapon_check >= NEED_PICK_AXE && mon_wield_item(mtmp)) if (mtmp->weapon_check >= NEED_PICK_AXE && mon_wield_item(mtmp))
@@ -1398,10 +1400,10 @@ m_move(register struct monst* mtmp, register int after)
} }
if (mmoved != MMOVE_NOTHING) { if (mmoved != MMOVE_NOTHING) {
if (mmoved == MMOVE_MOVED && (u.ux != nix || u.uy != niy) && itsstuck(mtmp)) if (mmoved == MMOVE_MOVED && !u_at(nix, niy) && itsstuck(mtmp))
return MMOVE_DONE; return MMOVE_DONE;
if (mmoved == MMOVE_MOVED && m_digweapon_check(mtmp, nix,niy)) if (mmoved == MMOVE_MOVED && m_digweapon_check(mtmp, nix, niy))
return MMOVE_DONE; return MMOVE_DONE;
/* If ALLOW_U is set, either it's trying to attack you, or it /* If ALLOW_U is set, either it's trying to attack you, or it