From efa1f575e97bdab4ed196f2734d024ad0d2d4f8a Mon Sep 17 00:00:00 2001
From: Jesse Ruderman <jruderman@gmail.com>
Date: Fri, 2 Jul 2021 15:24:51 -0700
Subject: [PATCH] Flash Witches no longer avoid killing the player's allies

---
 attack.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/attack.cpp b/attack.cpp
index e853eb0f..b64876ca 100644
--- a/attack.cpp
+++ b/attack.cpp
@@ -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);