mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-11-16 13:48:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #466 from josephcsible/orb-stone-ghost-barrier

Browse Source 
Fix getting rid of Great Walls by killing Ghosts with OotStone
This commit is contained in:
Zeno Rogue
2025-10-09 08:10:23 +02:00
committed by GitHub
parent e763e59a68 924cdc12c6
commit 63fe2f4fb5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
attack.cpp
View File

@@ -189,13 +189,13 @@ EX bool petrify(cell *c, eWall walltype, eMonster m) {
if(c->land == laWestWall) return false;
if(do_not_touch_this_wall(c)) return false;
if(isWateryOrBoat(c) && c->land == laWhirlpool) {
c->wall = waSea;
return false;
}
if(c->wall == waRoundTable) return false;
if(walltype == waGargoyle && cellUnstableOrChasm(c))
walltype = waGargoyleFloor;
else if(walltype == waGargoyle && isWatery(c))

6
complex.cpp
View File

@@ -2721,7 +2721,7 @@ EX namespace dragon {
c->monst = moNone;
if(checkOrb(who, itOrbUndeath))
c->monst = moFriendlyGhost;
if(checkOrb(who, itOrbStone))
if(!do_not_touch_this_wall(c) && checkOrb(who, itOrbStone))
c->wparam = m, c->wall = waPetrified;
else if(c->wall == waFire) {
if(delay) delay = false;
@@ -2993,13 +2993,13 @@ EX namespace kraken {
if(checkOrb(who, itOrbUndeath)) c->monst = moFriendlyGhost;
if(c->land == laKraken && !c->item) c->item = itKraken;
kills[moKrakenH]++;
if(checkOrb(who, itOrbStone)) c->wall = waNone;
if(!do_not_touch_this_wall(c) && checkOrb(who, itOrbStone)) c->wall = waNone;
forCellEx(c1, c)
if(c1->monst == moKrakenT) {
changes.ccell(c1);
drawParticles(c, minf[moKrakenT].color, 16);
c1->monst = moNone;
if(checkOrb(who, itOrbStone)) {
if(!do_not_touch_this_wall(c1) && checkOrb(who, itOrbStone)) {
if(isWatery(c1))
c1->wall = waNone;
else