v3.3.0: fixed some inconsistencies on regular vs. unlocked doors

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

@@ -258,16 +258,17 @@ public abstract class RegularPainter extends Painter {
 						d.type = Room.Door.Type.UNLOCKED;
 					}
 
-					//entrance doors on floor 1 are hidden during tutorial
+				}
-					//entrance doors on floor 2 are hidden if the player hasn't picked up 2nd guidebook page
+
-					if (r.isEntrance() || n.isEntrance()){
+				//unlocked entrance doors on floor 1 are hidden during tutorial
-						if ((Dungeon.depth == 1 && SPDSettings.intro())
+				//unlocked entrance doors on floor 2 are hidden if the player hasn't picked up 2nd guidebook page
+				if (d.type == Room.Door.Type.UNLOCKED && (r.isEntrance() || n.isEntrance())){
+					if ((Dungeon.depth == 1 && SPDSettings.intro())
 							|| (Dungeon.depth == 2 && !Document.ADVENTURERS_GUIDE.isPageFound(Document.GUIDE_SEARCHING))) {
-							d.type = Room.Door.Type.HIDDEN;
+						d.type = Room.Door.Type.HIDDEN;
-						}
 					}
 				}
-				
+
 				switch (d.type) {
 					case EMPTY:
 						l.map[door] = Terrain.EMPTY;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/CrystalPathRoom.java

@@ -247,7 +247,7 @@ public class CrystalPathRoom extends SpecialRoom {
 		level.addItemToSpawn( new CrystalKey( Dungeon.depth ) );
 		level.addItemToSpawn( new CrystalKey( Dungeon.depth ) );
 
-		entrance().set( Door.Type.UNLOCKED );
+		entrance().set( Door.Type.REGULAR );
 
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/DemonSpawnerRoom.java

@@ -45,7 +45,7 @@ public class DemonSpawnerRoom extends SpecialRoom {
 		int cy = c.y;
 
 		Door door = entrance();
-		door.set(Door.Type.UNLOCKED);
+		door.set(Door.Type.UNLOCKED); //cannot be hidden randomly under any circumstance
 
 		DemonSpawner spawner = new DemonSpawner();
 		spawner.pos = cx + cy * level.width();

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ToxicGasRoom.java

@@ -105,7 +105,7 @@ public class ToxicGasRoom extends SpecialRoom {
 
 		level.addItemToSpawn(new PotionOfPurity());
 
-		entrance().set( Door.Type.UNLOCKED );
+		entrance().set( Door.Type.REGULAR );
 
 	}