mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-06-29 00:12:52 +00:00
Viziers were immune to some attacks in illogical circumstances -- this is no longer the case
This commit is contained in:
parent
91faa3faf3
commit
6d1ded7fd4
@ -173,9 +173,6 @@ EX bool canAttack(cell *c1, eMonster m1, cell *c2, eMonster m2, flagtype flags)
|
|||||||
if(m2 == moFlailer && !c2->stuntime)
|
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(!(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;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -779,10 +779,6 @@ void pcmove::tell_why_cannot_attack() {
|
|||||||
addMessage(XLAT("You cannot attack %the1 directly!", c2->monst));
|
addMessage(XLAT("You cannot attack %the1 directly!", c2->monst));
|
||||||
addMessage(XLAT("Make him hit himself by walking away from him."));
|
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)
|
else if(c2->monst == moShadow)
|
||||||
addMessage(XLAT("You cannot defeat the Shadow!"));
|
addMessage(XLAT("You cannot defeat the Shadow!"));
|
||||||
else if(c2->monst == moGreater || c2->monst == moGreaterM)
|
else if(c2->monst == moGreater || c2->monst == moGreaterM)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user