1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-28 22:59:54 +00:00

Merge pull request #175 from jruderman/flash_witch_a

Flash Witches no longer avoid killing the player's allies
This commit is contained in:
Zeno Rogue 2021-07-04 09:38:56 +02:00 committed by GitHub
commit 0799a5ea06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1099,6 +1099,7 @@ EX bool flashWouldKill(cell *c, flagtype extra) {
for(int u=0; u<c2->type; u++) {
cell *c3 = c2->move(u);
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 != c && (c3->monst || isPlayerOn(c3))) {
bool b = canAttack(NULL, moWitchFlash, c3, c3->monst, AF_MAGIC | extra);