mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-05-15 13:44:08 +00:00
Code Issues Releases Wiki Activity

Curse of Water now protects from fire

Browse Source
This commit is contained in:
Zeno Rogue 2021-05-22 02:42:49 +02:00
parent 0562fc4b63
commit 745d524433
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
passable.cpp
View File

@ -69,7 +69,7 @@ EX int incline(cell *cfrom, cell *cto) {
EX bool checkflags(flagtype flags, flagtype x) { EX bool checkflags(flagtype flags, flagtype x) {
if(flags & x) return true; if(flags & x) return true;
if(flags & P_ISPLAYER) { if(flags & P_ISPLAYER) {
if((x & P_WINTER) && markOrb(itOrbWinter)) return true; if((x & P_WINTER) && (markOrb(itOrbWinter) || markOrb(itCurseWater))) return true;
if((x & P_IGNORE37) && markOrb(itOrb37)) return true; if((x & P_IGNORE37) && markOrb(itOrb37)) return true;
if((x & P_FISH) && markOrb(itOrbFish)) return true; if((x & P_FISH) && markOrb(itOrbFish)) return true;
if((x & P_MARKWATER) && markOrb(itOrbWater)) return true; if((x & P_MARKWATER) && markOrb(itOrbWater)) return true;

4
pcmove.cpp
View File

@ -150,11 +150,11 @@ bool pcmove::checkNeedMove(bool checkonly, bool attacking) {
if(markOrb2(itOrbAether)) return false; if(markOrb2(itOrbAether)) return false;
if(vmsg()) addMessage(XLAT("The gate is closing right on you! RUN!")); if(vmsg()) addMessage(XLAT("The gate is closing right on you! RUN!"));
} }
else if(isFire(cwt.at) && !markOrb(itOrbWinter) && !markOrb2(itOrbShield)) { else if(isFire(cwt.at) && !markOrb(itOrbWinter) && !markOrb(itCurseWater) && !markOrb2(itOrbShield)) {
if(markOrb2(itOrbAether)) return false; if(markOrb2(itOrbAether)) return false;
if(vmsg()) addMessage(XLAT("This spot will be burning soon! RUN!")); if(vmsg()) addMessage(XLAT("This spot will be burning soon! RUN!"));
} }
else if(cwt.at->wall == waMagma && !markOrb(itOrbWinter) && !markOrb2(itOrbShield)) { else if(cwt.at->wall == waMagma && !markOrb(itOrbWinter) && !markOrb(itCurseWater) && !markOrb2(itOrbShield)) {
if(markOrb2(itOrbAether)) return false; if(markOrb2(itOrbAether)) return false;
if(in_gravity_zone(cwt.at) && passable(cwt.at, cwt.at, P_ISPLAYER)) return false; if(in_gravity_zone(cwt.at) && passable(cwt.at, cwt.at, P_ISPLAYER)) return false;
if(vmsg()) addMessage(XLAT("Run away from the magma!")); if(vmsg()) addMessage(XLAT("Run away from the magma!"));