github issue #935 - disarming swallowed hero
Issue reported by AndrioCelos: bullwhip using monster was able to snatch hero's weapon when hero was engulfed. Fix is trivial: when a monster is choosing an item to use, don't pick bullwhip if hero is engulfed. Regular attack attempts already skip engulfed hero. Fixes #935
This commit is contained in:
@@ -1057,6 +1057,7 @@ some instances of using up or stealing shop-owned boulder didn't charge for it
|
||||
when hero hears an unseen monster reading a scroll, only describe the monster
|
||||
acccurately if hero is not hallucinating and monster is same species
|
||||
as hero's current form
|
||||
don't allow monsters to disarm hero with bullwhip if hero is engulfed
|
||||
|
||||
|
||||
Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
|
||||
|
||||
@@ -1963,6 +1963,7 @@ find_misc(struct monst* mtmp)
|
||||
&& next2u(mtmp->mx, mtmp->my)
|
||||
/* don't bother if it can't work (this doesn't
|
||||
prevent cursed weapons from being targeted) */
|
||||
&& !u.uswallow
|
||||
&& (canletgo(uwep, "")
|
||||
|| (u.twoweap && canletgo(uswapwep, "")))) {
|
||||
g.m.misc = obj;
|
||||
|
||||
Reference in New Issue
Block a user