LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.1: fixed errors with room merge limits

Browse Source
This commit is contained in:
Evan Debenham 2020-10-27 14:03:16 -04:00
parent f0b815471e
commit 1369ac221c
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RegularPainter.java
View File

@ -248,14 +248,8 @@ public abstract class RegularPainter extends Painter {
if (roomMerges.get(r) == n) return true;
if (roomMerges.get(n) == r) return true;
//normal sized rooms can be merged at most once. Large and Giant rooms can be merged many times
if (roomMerges.containsKey(r) || roomMerges.containsValue(r)){
if (((StandardRoom) r).sizeCat == StandardRoom.SizeCategory.NORMAL) return false;
}
if (roomMerges.containsKey(n) || roomMerges.containsValue(n)){
if (((StandardRoom) n).sizeCat == StandardRoom.SizeCategory.NORMAL) return false;
}
if (roomMerges.containsKey(r)) return false;
if (roomMerges.containsKey(n)) return false;
//TODO maybe more limitations here, such as limiting maximum width/height for normal sized rooms?
@ -283,7 +277,9 @@ public abstract class RegularPainter extends Painter {
Painter.fill( l, w.left, w.top, w.width(), 1, Terrain.EMPTY );
}
roomMerges.put(r, n);
//normal sized rooms can be merged at most once. Large and Giant rooms can be merged many times
if (((StandardRoom) r).sizeCat == StandardRoom.SizeCategory.NORMAL) roomMerges.put(r, n);
if (((StandardRoom) n).sizeCat == StandardRoom.SizeCategory.NORMAL) roomMerges.put(n, r);
return true;
}