konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.3.1: magical fire is now cleared if frost is merely next to it

Browse Source
This commit is contained in:
Evan Debenham
2024-01-24 14:21:57 -05:00
parent 910eb58be7
commit 63ea27a80a
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java
+6 -2
View File
@@ -186,16 +186,20 @@ public class MagicalFireRoom extends SpecialRoom {
if (fire != null && fire.volume > 0 && fire.cur[cell] > 0){ if (fire != null && fire.volume > 0 && fire.cur[cell] > 0){
fire.clear(cell); fire.clear(cell);
} }
if (freeze != null && freeze.volume > 0 && freeze.cur[cell] > 0){
//clears itself if there is frost/blizzard on or next to it
for (int k : PathFinder.NEIGHBOURS9) {
if (freeze != null && freeze.volume > 0 && freeze.cur[cell+k] > 0) {
freeze.clear(cell); freeze.clear(cell);
cur[cell] = 0; cur[cell] = 0;
clearAll = true; clearAll = true;
} }
if (bliz != null && bliz.volume > 0 && bliz.cur[cell] > 0){ if (bliz != null && bliz.volume > 0 && bliz.cur[cell+k] > 0) {
bliz.clear(cell); bliz.clear(cell);
cur[cell] = 0; cur[cell] = 0;
clearAll = true; clearAll = true;
} }
}
l.passable[cell] = cur[cell] == 0 && (Terrain.flags[l.map[cell]] & Terrain.PASSABLE) != 0; l.passable[cell] = cur[cell] == 0 && (Terrain.flags[l.map[cell]] & Terrain.PASSABLE) != 0;
} }