mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Orb of Empathy works correctly with Orb of the Fish now

This commit is contained in:
Zeno Rogue 2019-01-02 16:21:17 +01:00
parent dabadb0cf4
commit 213cd2febf
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flags.cpp
View File

@ -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
}

2
game.cpp
View File

@ -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);