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

v0.9.1b: fixed rare cases of levelgen freezes with Cached Rations

Browse Source
This commit is contained in:
Evan Debenham 2021-01-03 13:17:16 -05:00
parent 7c1ada875f
commit 4d59fa6682
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
View File

@ -420,9 +420,11 @@ public abstract class RegularLevel extends Level {
Talent.CachedRationsDropped dropped = Buff.affect(Dungeon.hero, Talent.CachedRationsDropped.class); Talent.CachedRationsDropped dropped = Buff.affect(Dungeon.hero, Talent.CachedRationsDropped.class);
if (dropped.count() < 2 + 2*Dungeon.hero.pointsInTalent(Talent.CACHED_RATIONS)){ if (dropped.count() < 2 + 2*Dungeon.hero.pointsInTalent(Talent.CACHED_RATIONS)){
int cell; int cell;
int tries = 100;
do { do {
cell = randomDropCell(SpecialRoom.class); cell = randomDropCell(SpecialRoom.class);
} while (room(cell) instanceof SecretRoom); } while (tries-- > 0 && room(cell) instanceof SecretRoom);
if (!(room(cell) instanceof SecretRoom) && cell != -1) {
if (map[cell] == Terrain.HIGH_GRASS || map[cell] == Terrain.FURROWED_GRASS) { if (map[cell] == Terrain.HIGH_GRASS || map[cell] == Terrain.FURROWED_GRASS) {
map[cell] = Terrain.GRASS; map[cell] = Terrain.GRASS;
losBlocking[cell] = false; losBlocking[cell] = false;
@ -431,6 +433,7 @@ public abstract class RegularLevel extends Level {
dropped.countUp(1); dropped.countUp(1);
} }
} }
}
//guide pages //guide pages
Collection<String> allPages = Document.ADVENTURERS_GUIDE.pages(); Collection<String> allPages = Document.ADVENTURERS_GUIDE.pages();
@ -503,7 +506,10 @@ public abstract class RegularLevel extends Level {
protected int randomDropCell( Class<?extends Room> roomType ) { protected int randomDropCell( Class<?extends Room> roomType ) {
while (true) { while (true) {
Room room = randomRoom( roomType ); Room room = randomRoom( roomType );
if (room != null && room != roomEntrance) { if (room == null){
return -1;
}
if (room != roomEntrance) {
int pos = pointToCell(room.random()); int pos = pointToCell(room.random());
if (passable[pos] && !solid[pos] if (passable[pos] && !solid[pos]
&& pos != exit && pos != exit