From 5bafa5395b5fe86f9b1442171e9f3dafd44d3328 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 16 May 2025 13:17:25 -0400 Subject: [PATCH] v3.1.0: change to region deco rooms, mainly to reduce sewers barrels: - barrel patch room spawn rate in sewers down by 50%, pipe rooms up by 33% to compensate - barrel patch entr/exit rooms down by 25%, bridge entr/exit up 33% to comepsnate - region deco patch room fill rate down to 20-30%, from 20-40% --- .../levels/rooms/standard/RegionDecoPatchRoom.java | 4 ++-- .../levels/rooms/standard/StandardRoom.java | 8 ++++---- .../levels/rooms/standard/entrance/EntranceRoom.java | 2 +- .../levels/rooms/standard/exit/ExitRoom.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/RegionDecoPatchRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/RegionDecoPatchRoom.java index 07781f48d..d3fea3fee 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/RegionDecoPatchRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/RegionDecoPatchRoom.java @@ -40,9 +40,9 @@ public class RegionDecoPatchRoom extends PatchRoom { @Override protected float fill() { - //fill scales from ~20% at 4x4, to ~40% at 10x10 + //fill scales from ~20% at 4x4, to ~30% at 10x10 int scale = Math.min(width()*height(), 10*10); - return 0.20f + scale/512f; + return 0.20f + scale/1024f; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java index a5ddbfada..55db55b27 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java @@ -121,9 +121,9 @@ public abstract class StandardRoom extends Room { private static ArrayList> rooms = new ArrayList<>(); static { rooms.add(SewerPipeRoom.class); - rooms.add(RegionDecoPatchRoom.class); rooms.add(RingRoom.class); rooms.add(WaterBridgeRoom.class); + rooms.add(RegionDecoPatchRoom.class); rooms.add(CircleBasinRoom.class); rooms.add(RegionDecoLineRoom.class); @@ -165,10 +165,10 @@ public abstract class StandardRoom extends Room { private static float[][] chances = new float[27][]; static { - chances[1] = new float[]{12,8,8,8,4, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 1,0,1,0,1,0,1,1,0,0}; - chances[2] = new float[]{12,8,8,8,4, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 1,1,1,1,1,1,1,1,1,1}; + chances[1] = new float[]{16,8,8,4,4, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 1,0,1,0,1,0,1,1,0,0}; + chances[2] = new float[]{16,8,8,4,4, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 1,1,1,1,1,1,1,1,1,1}; chances[4] = chances[3] = chances[2]; - chances[5] = new float[]{12,8,8,8,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0}; + chances[5] = new float[]{16,8,8,4,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0}; chances[6] = new float[]{0,0,0,0,0, 10,10,10,5,5, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 1,1,1,1,1,1,1,1,1,1}; chances[10] = chances[9] = chances[8] = chances[7] = chances[6]; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/EntranceRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/EntranceRoom.java index e8ac71927..9f1a5bfa3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/EntranceRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/entrance/EntranceRoom.java @@ -134,8 +134,8 @@ public class EntranceRoom extends StandardRoom { private static ArrayList> rooms = new ArrayList<>(); static { - rooms.add(RegionDecoPatchEntranceRoom.class); rooms.add(WaterBridgeEntranceRoom.class); + rooms.add(RegionDecoPatchEntranceRoom.class); rooms.add(RingEntranceRoom.class); rooms.add(CircleBasinEntranceRoom.class); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/ExitRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/ExitRoom.java index 68c5e6824..39272a89a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/ExitRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/exit/ExitRoom.java @@ -72,8 +72,8 @@ public class ExitRoom extends StandardRoom { private static ArrayList> rooms = new ArrayList<>(); static { - rooms.add(RegionDecoPatchExitRoom.class); rooms.add(WaterBridgeExitRoom.class); + rooms.add(RegionDecoPatchExitRoom.class); rooms.add(RingExitRoom.class); rooms.add(CircleBasinExitRoom.class);