Monsters were bashing with Snickersnee
Side effect of allowing Snickersnee to attack like a polearm, monsters were bashing with it in melee.
This commit is contained in:
@@ -1273,7 +1273,7 @@ mswingsm(
|
|||||||
struct obj *otemp) /* attacker's weapon */
|
struct obj *otemp) /* attacker's weapon */
|
||||||
{
|
{
|
||||||
if (flags.verbose && !Blind && mon_visible(magr)) {
|
if (flags.verbose && !Blind && mon_visible(magr)) {
|
||||||
boolean bash = (is_pole(otemp)
|
boolean bash = (is_pole(otemp) && !is_art(otemp, ART_SNICKERSNEE)
|
||||||
&& (dist2(magr->mx, magr->my, mdef->mx, mdef->my)
|
&& (dist2(magr->mx, magr->my, mdef->mx, mdef->my)
|
||||||
<= 2));
|
<= 2));
|
||||||
|
|
||||||
|
|||||||
@@ -872,6 +872,7 @@ mattacku(struct monst *mtmp)
|
|||||||
mon_currwep = MON_WEP(mtmp);
|
mon_currwep = MON_WEP(mtmp);
|
||||||
if (mon_currwep) {
|
if (mon_currwep) {
|
||||||
boolean bash = (is_pole(mon_currwep)
|
boolean bash = (is_pole(mon_currwep)
|
||||||
|
&& !is_art(mon_currwep, ART_SNICKERSNEE)
|
||||||
&& m_next2u(mtmp));
|
&& m_next2u(mtmp));
|
||||||
|
|
||||||
hittmp = hitval(mon_currwep, &gy.youmonst);
|
hittmp = hitval(mon_currwep, &gy.youmonst);
|
||||||
|
|||||||
Reference in New Issue
Block a user