From dd34e08e5dffa4209a3d3e3c9f293500e10d6ec6 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 7 Mar 2022 12:07:45 -0500 Subject: [PATCH] v1.2.0: reduced energy from boss consumables, fixed recipes prices, reduced alchemize in stores --- .../shatteredpixeldungeon/items/bombs/ArcaneBomb.java | 2 +- .../shatteredpixeldungeon/items/bombs/ShrapnelBomb.java | 2 +- .../shatteredpixeldungeon/items/potions/brews/CausticBrew.java | 2 +- .../items/potions/elixirs/ElixirOfAquaticRejuvenation.java | 2 +- .../items/potions/elixirs/ElixirOfArcaneArmor.java | 2 +- .../shatteredpixeldungeon/items/quest/GooBlob.java | 2 +- .../shatteredpixeldungeon/items/quest/MetalShard.java | 2 +- .../shatteredpixeldungeon/items/spells/CurseInfusion.java | 2 +- .../shatteredpixeldungeon/items/spells/ReclaimTrap.java | 2 +- .../shatteredpixeldungeon/items/spells/WildEnergy.java | 2 +- .../shatteredpixeldungeon/levels/rooms/special/ShopRoom.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ArcaneBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ArcaneBomb.java index 17b33f420..9ecd9c53c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ArcaneBomb.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ArcaneBomb.java @@ -92,6 +92,6 @@ public class ArcaneBomb extends Bomb { @Override public int value() { //prices of ingredients - return quantity * (20 + 50); + return quantity * (20 + 30); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShrapnelBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShrapnelBomb.java index ca01a44ba..688c9e93f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShrapnelBomb.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShrapnelBomb.java @@ -81,6 +81,6 @@ public class ShrapnelBomb extends Bomb { @Override public int value() { //prices of ingredients - return quantity * (20 + 100); + return quantity * (20 + 50); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java index 2c1ac4c31..e51cf831d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java @@ -65,7 +65,7 @@ public class CausticBrew extends Brew { @Override public int value() { //prices of ingredients - return quantity * (30 + 50); + return quantity * (30 + 30); } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfAquaticRejuvenation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfAquaticRejuvenation.java index fb28ae5c2..c39fbeb58 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfAquaticRejuvenation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfAquaticRejuvenation.java @@ -56,7 +56,7 @@ public class ElixirOfAquaticRejuvenation extends Elixir { @Override public int value() { //prices of ingredients - return quantity * (30 + 50); + return quantity * (30 + 30); } public static class AquaHealing extends Buff { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfArcaneArmor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfArcaneArmor.java index 01f1aab38..896476cb0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfArcaneArmor.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfArcaneArmor.java @@ -42,7 +42,7 @@ public class ElixirOfArcaneArmor extends Elixir { @Override public int value() { //prices of ingredients - return quantity * (50 + 40); + return quantity * (60 + 30); } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/GooBlob.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/GooBlob.java index ca8d7b90e..5fed32dcd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/GooBlob.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/GooBlob.java @@ -48,6 +48,6 @@ public class GooBlob extends Item { @Override public int energyVal() { - return quantity * 4; + return quantity * 3; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/MetalShard.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/MetalShard.java index e360e44d5..898521ba8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/MetalShard.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/MetalShard.java @@ -48,6 +48,6 @@ public class MetalShard extends Item { @Override public int energyVal() { - return quantity * 6; + return quantity * 3; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java index 674b99685..cc623cc6c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java @@ -90,7 +90,7 @@ public class CurseInfusion extends InventorySpell { @Override public int value() { //prices of ingredients, divided by output quantity - return Math.round(quantity * ((30 + 100) / 3f)); + return Math.round(quantity * ((30 + 50) / 3f)); } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java index 0733ac7ce..1e0994c34 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java @@ -117,7 +117,7 @@ public class ReclaimTrap extends TargetedSpell { @Override public int value() { //prices of ingredients, divided by output quantity - return Math.round(quantity * ((40 + 100) / 3f)); + return Math.round(quantity * ((40 + 50) / 3f)); } private static final String STORED_TRAP = "stored_trap"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java index 98ebb6eba..61c01f84c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java @@ -66,7 +66,7 @@ public class WildEnergy extends TargetedSpell { @Override public int value() { //prices of ingredients, divided by output quantity - return Math.round(quantity * ((50 + 100) / 5f)); + return Math.round(quantity * ((50 + 50) / 5f)); } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java index 0c39dc5b4..cd54ddc4b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java @@ -189,7 +189,7 @@ public class ShopRoom extends SpecialRoom { itemsToSpawn.add( TippedDart.randomTipped(2) ); - itemsToSpawn.add( new Alchemize().quantity(Random.IntRange(3, 4))); + itemsToSpawn.add( new Alchemize().quantity(Random.IntRange(2, 3))); itemsToSpawn.add(ChooseBag(Dungeon.hero.belongings));