1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-25 01:20:37 +00:00

Flash Witches no longer avoid killing the player's allies

This commit is contained in:
Jesse Ruderman 2021-07-02 15:24:51 -07:00
parent 7f8d978beb
commit efa1f575e9

View File

@ -1099,6 +1099,7 @@ EX bool flashWouldKill(cell *c, flagtype extra) {
for(int u=0; u<c2->type; u++) { for(int u=0; u<c2->type; u++) {
cell *c3 = c2->move(u); cell *c3 = c2->move(u);
if(isWorm(c3)) continue; // immune to Flash if(isWorm(c3)) continue; // immune to Flash
if(isFriendly(c3)) continue; // player's allies and mounts don't count
if(c3->monst == moEvilGolem) continue; // evil golems don't count if(c3->monst == moEvilGolem) continue; // evil golems don't count
if(c3 != c && (c3->monst || isPlayerOn(c3))) { if(c3 != c && (c3->monst || isPlayerOn(c3))) {
bool b = canAttack(NULL, moWitchFlash, c3, c3->monst, AF_MAGIC | extra); bool b = canAttack(NULL, moWitchFlash, c3, c3->monst, AF_MAGIC | extra);