diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java index 26646ba08..d1d235c9c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java @@ -72,12 +72,14 @@ public class CavesLevel extends RegularLevel { @Override protected int standardRooms() { - return 5+Random.chances(new float[]{2, 2, 3, 2, 1, 1}); + //6 to 9, average 7.333 + return 6+Random.chances(new float[]{2, 3, 3, 1}); } @Override protected int specialRooms() { - return 1+Random.chances(new float[]{3, 3, 2, 1}); + //1 to 3, average 2.2 + return 1+Random.chances(new float[]{2, 4, 4}); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java index 8651285dc..3c33fcd4b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java @@ -61,12 +61,14 @@ public class CityLevel extends RegularLevel { @Override protected int standardRooms() { - return 6+Random.chances(new float[]{2, 3, 3, 2, 1}); + //7 to 10, average 7.9 + return 7+Random.chances(new float[]{4, 3, 2, 1}); } @Override protected int specialRooms() { - return 1 + Random.chances(new float[]{2, 3, 3, 1}); + //2 to 3, average 2.33 + return 2 + Random.chances(new float[]{2, 1}); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java index 40ff83118..c945a3e9c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java @@ -69,12 +69,14 @@ public class HallsLevel extends RegularLevel { @Override protected int standardRooms() { - return 8+Random.chances(new float[]{3, 3, 2, 2, 1}); + //8 to 10, average 8.67 + return 8+Random.chances(new float[]{3, 2, 1}); } @Override protected int specialRooms() { - return 1 + Random.chances(new float[]{1, 3, 3, 2}); + //2 to 3, average 2.5 + return 2 + Random.chances(new float[]{1, 1}); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java index cf986144d..447e98b50 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonLevel.java @@ -67,12 +67,14 @@ public class PrisonLevel extends RegularLevel { @Override protected int standardRooms() { - return 4+Random.chances(new float[]{2, 3, 3, 2, 1}); + //6 to 8, average 6.66 + return 6+Random.chances(new float[]{4, 2, 2}); } @Override protected int specialRooms() { - return 1+Random.chances(new float[]{4, 3, 3}); + //1 to 3, average 1.83 + return 1+Random.chances(new float[]{3, 4, 3}); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java index 3ec1f8359..ca9852c71 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerBossLevel.java @@ -66,7 +66,8 @@ public class SewerBossLevel extends SewerLevel { @Override protected int standardRooms() { - return 2+Random.chances(new float[]{3, 3, 1}); + //2 to 4, average 3 + return 2+Random.chances(new float[]{1, 1, 1}); } protected Builder builder(){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java index b68a216fb..615449069 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/SewerLevel.java @@ -56,20 +56,14 @@ public class SewerLevel extends RegularLevel { @Override protected int standardRooms() { - if (Dungeon.depth == 1){ - return 5+Random.chances(new float[]{4, 3, 3}); - } else { - return 4+Random.chances(new float[]{2, 4, 2, 1}); - } + //5 to 7, average 5.57 + return 5+Random.chances(new float[]{4, 2, 1}); } @Override protected int specialRooms() { - if (Dungeon.depth == 1){ - return 1; - } else { - return 1+Random.chances(new float[]{4, 4, 2}); - } + //1 to 3, average 1.67 + return 1+Random.chances(new float[]{4, 4, 2}); } @Override