diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java index a76f027fd..739ad2fba 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java @@ -262,7 +262,7 @@ public class WandOfRegrowth extends Wand { @Override public void activate() { - int nDrops = Random.NormalIntRange(2, 8); + int nDrops = Random.NormalIntRange(3, 6); ArrayList candidates = new ArrayList(); for (int i : PathFinder.NEIGHBOURS8){ @@ -296,7 +296,7 @@ public class WandOfRegrowth extends Wand { @Override public void activate() { - int nSeeds = Random.NormalIntRange(1, 5); + int nSeeds = Random.NormalIntRange(2, 4); ArrayList candidates = new ArrayList(); for (int i : PathFinder.NEIGHBOURS8){ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLaboratoryRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLaboratoryRoom.java index 60d645627..8d3886086 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLaboratoryRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLaboratoryRoom.java @@ -70,10 +70,10 @@ public class SecretLaboratoryRoom extends SecretRoom { Painter.set( level, pot, Terrain.ALCHEMY ); Alchemy alchemy = new Alchemy(); - alchemy.seed( level, pot.x + level.width() * pot.y, Random.IntRange(40, 75) ); + alchemy.seed( level, pot.x + level.width() * pot.y, Random.IntRange(30, 60) ); level.blobs.put( Alchemy.class, alchemy ); - int n = Random.IntRange( 2, 4 ); + int n = Random.IntRange( 2, 3 ); HashMap, Float> chances = new HashMap<>(potionChances); for (int i=0; i < n; i++) { int pos; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLibraryRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLibraryRoom.java index 748ff1b01..ec16949de 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLibraryRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLibraryRoom.java @@ -82,7 +82,7 @@ public class SecretLibraryRoom extends SecretRoom { } entrance.set( Door.Type.HIDDEN ); - int n = Random.IntRange( 2, 4 ); + int n = Random.IntRange( 2, 3 ); HashMap, Float> chances = new HashMap<>(scrollChances); for (int i=0; i < n; i++) { int pos; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRoom.java index fd9c5762d..27bb3fb6d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRoom.java @@ -37,7 +37,7 @@ public abstract class SecretRoom extends SpecialRoom { private static final ArrayList> ALL_SECRETS = new ArrayList<>( Arrays.asList( SecretGardenRoom.class, SecretLaboratoryRoom.class, SecretLibraryRoom.class, - SecretLarderRoom.class, SecretTransmutationRoom.class, SecretRunestoneRoom.class, + SecretLarderRoom.class, SecretWellRoom.class, SecretRunestoneRoom.class, SecretHoneypotRoom.class)); public static ArrayList> runSecrets = new ArrayList<>(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretTransmutationRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretWellRoom.java similarity index 75% rename from core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretTransmutationRoom.java rename to core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretWellRoom.java index 903bcd573..1833417a6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretTransmutationRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretWellRoom.java @@ -21,13 +21,20 @@ package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.secret; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WaterOfAwareness; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WaterOfHealth; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WaterOfTransmutation; +import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WellWater; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; import com.watabou.utils.Point; +import com.watabou.utils.Random; -public class SecretTransmutationRoom extends SecretRoom { +public class SecretWellRoom extends SecretRoom { + + private static final Class[] WATERS = + {WaterOfAwareness.class, WaterOfHealth.class, WaterOfTransmutation.class}; @Override public boolean canConnect(Point p) { @@ -55,7 +62,10 @@ public class SecretTransmutationRoom extends SecretRoom { Painter.set( level, well, Terrain.WELL ); - WaterOfTransmutation.seed(well.x + level.width() * well.y, 1, WaterOfTransmutation.class, level); + @SuppressWarnings("unchecked") + Class waterClass = (Class) Random.element( WATERS ); + + WellWater.seed(well.x + level.width() * well.y, 1, waterClass, level); entrance().set( Door.Type.HIDDEN ); }