From 213cd2febfcb89dac2bf63b74bf59d8a9aa49582 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Wed, 2 Jan 2019 16:21:17 +0100
Subject: [PATCH] Orb of Empathy works correctly with Orb of the Fish now

---
 flags.cpp | 3 ++-
 game.cpp  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/flags.cpp b/flags.cpp
index 129b0e3a..980fc9f2 100644
--- a/flags.cpp
+++ b/flags.cpp
@@ -589,7 +589,7 @@ bool isEmpathyOrb(eItem i) {
     i == itOrbAether || i == itOrbInvis || i == itOrbThorns ||
     i == itOrbWater || i == itOrbStone ||
     i == itOrbSide1 || i == itOrbSide2 || i == itOrbSide3 ||
-    i == itOrbSlaying;
+    i == itOrbSlaying || i == itOrbFish;
   }
 
 bool isUtilityOrb(eItem i) {
@@ -624,6 +624,7 @@ bool survivesWater(eMonster m) {
     isBird(m) || m == moWaterElemental || m == moAirElemental ||
     isWorm(m) || isIvy(m) || isDragon(m) || isKraken(m) ||
     m == moMutant || m == moFriendlyIvy || 
+    (isFriendly(m) && markOrb(itOrbFish)) ||
     m == moTortoise; // Tortoises and Ivies survive, but don't go through water
   }
 
diff --git a/game.cpp b/game.cpp
index 2b2372b0..e2047971 100644
--- a/game.cpp
+++ b/game.cpp
@@ -3048,7 +3048,7 @@ void bfs() {
             targets.push_back(c2);
             }
           else if(isFriendly(c2)) {
-            if(c2->monst != moMouse && !markEmpathy(itOrbInvis) &&
+            if(c2->monst != moMouse && !markEmpathy(itOrbInvis) && !(isWatery(c2) && markEmpathy(itOrbFish)) &&
               !c2->stuntime) targets.push_back(c2);
             if(c2->monst == moGolem) golems.push_back(c2);
             if(c2->monst == moFriendlyGhost) golems.push_back(c2);