From 21804614eb8508be6aa55c1ef9925e12cae30ed3 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 10 Mar 2024 14:21:54 -0400 Subject: [PATCH] v2.4.0: slightly reduced free energy spawns --- .../shatteredpixeldungeon/items/EnergyCrystal.java | 7 ------- .../levels/rooms/secret/SecretLaboratoryRoom.java | 4 ++-- .../levels/rooms/special/LaboratoryRoom.java | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EnergyCrystal.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EnergyCrystal.java index bee6accb7..abc428c51 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EnergyCrystal.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/EnergyCrystal.java @@ -28,7 +28,6 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.FloatingText; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.audio.Sample; -import com.watabou.utils.Random; import java.util.ArrayList; @@ -79,10 +78,4 @@ public class EnergyCrystal extends Item { return true; } - @Override - public Item random() { - quantity = Random.IntRange( 4, 6 ); - return this; - } - } 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 01e1ab96e..6495681de 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 @@ -78,12 +78,12 @@ public class SecretLaboratoryRoom extends SecretRoom { do { pos = level.pointToCell(random()); } while (level.map[pos] != Terrain.EMPTY_SP || level.heaps.get( pos ) != null); - level.drop( new EnergyCrystal().random(), pos ); + level.drop( new EnergyCrystal().quantity(Random.IntRange(3, 5)), pos ); do { pos = level.pointToCell(random()); } while (level.map[pos] != Terrain.EMPTY_SP || level.heaps.get( pos ) != null); - level.drop( new EnergyCrystal().random(), pos ); + level.drop( new EnergyCrystal().quantity(Random.IntRange(3, 5)), pos ); int n = Random.IntRange( 2, 3 ); HashMap, Float> chances = new HashMap<>(potionChances); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/LaboratoryRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/LaboratoryRoom.java index 928d301d9..0182cff12 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/LaboratoryRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/LaboratoryRoom.java @@ -70,7 +70,7 @@ public class LaboratoryRoom extends SpecialRoom { } while ( level.map[pos] != Terrain.EMPTY_SP || level.heaps.get( pos ) != null); - level.drop( new EnergyCrystal().random(), pos ); + level.drop( new EnergyCrystal().quantity(5), pos ); int n = Random.NormalIntRange( 1, 2 ); for (int i=0; i < n; i++) {