mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-09-03 19:27:54 +00:00
Code Issues Releases Wiki Activity

push Statue/Fire with Orb of Winter

Browse Source
This commit is contained in:
Zeno Rogue
2020-09-15 20:01:30 +02:00
parent 313204f732
commit b782452a4a
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
passable.cpp
View File

@@ -216,7 +216,7 @@ EX bool passable(cell *w, cell *from, flagtype flags) {
if(from && isWatery(from) && isWatery(w) && F(P_CHAIN) && !againstCurrent(w, from))
return true;
if(w->wall == waBigStatue && from && canPushStatueOn(from)) return true;
if(w->wall == waBigStatue && from && canPushStatueOn(from, flags)) return true;
}
if(F(P_EARTHELEM)) {
@@ -402,8 +402,8 @@ bool sharkpassable(cell *w, cell *c) {
return true;
}
EX bool canPushStatueOn(cell *c) {
return passable(c, NULL, P_MONSTER) && !snakelevel(c) &&
EX bool canPushStatueOn(cell *c, flagtype flags) {
return passable(c, NULL, P_MONSTER | flags) && !snakelevel(c) &&
!isWorm(c->monst) && !isReptile(c->wall) && !peace::on &&
!among(c->wall, waBoat, waFireTrap, waArrowTrap);
}