diff --git a/attack.cpp b/attack.cpp index 688f1b05..939a92c8 100644 --- a/attack.cpp +++ b/attack.cpp @@ -173,9 +173,6 @@ EX bool canAttack(cell *c1, eMonster m1, cell *c2, eMonster m2, flagtype flags) if(m2 == moFlailer && !c2->stuntime) if(!(flags & (AF_MAGIC | AF_TOUGH | AF_EAT | AF_HORNS | AF_LANCE | AF_BACK | AF_SWORD_INTO | AF_BULL | AF_CRUSH))) return false; - if(m2 == moVizier && c2->hitpoints > 1 && !c2->stuntime) - if(!(flags & (AF_MAGIC | AF_TOUGH | AF_EAT | AF_HORNS | AF_LANCE | AF_BACK | AF_FAST | AF_BULL | AF_CRUSH))) return false; - return true; } diff --git a/pcmove.cpp b/pcmove.cpp index 4ad53de0..b3fa044c 100644 --- a/pcmove.cpp +++ b/pcmove.cpp @@ -779,10 +779,6 @@ void pcmove::tell_why_cannot_attack() { addMessage(XLAT("You cannot attack %the1 directly!", c2->monst)); addMessage(XLAT("Make him hit himself by walking away from him.")); } - else if(c2->monst == moVizier && c2->hitpoints > 1 && !(attackflags & AF_FAST)) { - addMessage(XLAT("You cannot attack %the1 directly!", c2->monst)); - addMessage(XLAT("Hit him by walking away from him.")); - } else if(c2->monst == moShadow) addMessage(XLAT("You cannot defeat the Shadow!")); else if(c2->monst == moGreater || c2->monst == moGreaterM)