From e2372805bf76c89d6a9731c8dac8742d29aeca33 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 20 Feb 2024 13:59:14 -0500 Subject: [PATCH] v2.4.0: standardized values (gold and energy) for brews/elixirs/spells --- .../items/potions/brews/BlizzardBrew.java | 8 +------- .../items/potions/brews/Brew.java | 10 ++++++++++ .../items/potions/brews/CausticBrew.java | 6 ------ .../items/potions/brews/InfernalBrew.java | 6 ------ .../items/potions/brews/ShockingBrew.java | 6 ------ .../items/potions/elixirs/Elixir.java | 10 ++++++++++ .../potions/elixirs/ElixirOfAquaticRejuvenation.java | 6 ------ .../items/potions/elixirs/ElixirOfArcaneArmor.java | 6 ------ .../items/potions/elixirs/ElixirOfDragonsBlood.java | 6 ------ .../items/potions/elixirs/ElixirOfHoneyedHealing.java | 6 ------ .../items/potions/elixirs/ElixirOfIcyTouch.java | 6 ------ .../items/potions/elixirs/ElixirOfMight.java | 6 ------ .../items/potions/elixirs/ElixirOfToxicEssence.java | 6 ------ .../shatteredpixeldungeon/items/spells/Alchemize.java | 11 ++++++++--- .../shatteredpixeldungeon/items/spells/AquaBlast.java | 8 ++++++-- .../items/spells/BeaconOfReturning.java | 8 ++++++-- .../items/spells/CurseInfusion.java | 8 ++++++-- .../items/spells/FeatherFall.java | 8 ++++++-- .../items/spells/MagicalInfusion.java | 8 ++++++-- .../items/spells/PhaseShift.java | 8 ++++++-- .../items/spells/ReclaimTrap.java | 8 ++++++-- .../shatteredpixeldungeon/items/spells/Recycle.java | 8 ++++++-- .../items/spells/TelekineticGrab.java | 8 ++++++-- .../items/spells/WildEnergy.java | 10 +++++++--- 24 files changed, 90 insertions(+), 91 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java index 30d3d150c..546556417 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java @@ -57,13 +57,7 @@ public class BlizzardBrew extends Brew { GameScene.add( Blob.seed( cell, centerVolume, Blizzard.class ) ); } - - @Override - public int value() { - //prices of ingredients - return quantity * (30 + 40); - } - + public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/Brew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/Brew.java index 1a1655e54..f49cd7d29 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/Brew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/Brew.java @@ -54,4 +54,14 @@ public abstract class Brew extends Potion { return true; } + @Override + public int value() { + return quantity * 60; + } + + @Override + public int energyVal() { + return quantity * 12; + } + } 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 8fc45e05d..cc352444b 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 @@ -62,12 +62,6 @@ public class CausticBrew extends Brew { } } - @Override - public int value() { - //prices of ingredients - 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/brews/InfernalBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java index 98ed00473..d2e554f79 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java @@ -59,12 +59,6 @@ public class InfernalBrew extends Brew { GameScene.add( Blob.seed( cell, centerVolume, Inferno.class ) ); } - @Override - public int value() { - //prices of ingredients - return quantity * (30 + 40); - } - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java index 3cb9d3a33..db32ae81a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java @@ -54,12 +54,6 @@ public class ShockingBrew extends Brew { } } - @Override - public int value() { - //prices of ingredients - return quantity * (40 + 40); - } - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/Elixir.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/Elixir.java index 32f4c2ef1..ac78e6d64 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/Elixir.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/Elixir.java @@ -32,4 +32,14 @@ public abstract class Elixir extends Potion { public boolean isKnown() { return true; } + + @Override + public int value() { + return quantity * 60; + } + + @Override + public int energyVal() { + return quantity * 12; + } } 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 b39cc684f..07af7fdb1 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 @@ -52,12 +52,6 @@ public class ElixirOfAquaticRejuvenation extends Elixir { } } - @Override - public int value() { - //prices of ingredients - 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 f06036dba..a55178419 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 @@ -39,12 +39,6 @@ public class ElixirOfArcaneArmor extends Elixir { Buff.affect(hero, ArcaneArmor.class).set(5 + hero.lvl/2, 80); } - @Override - public int value() { - //prices of ingredients - 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/potions/elixirs/ElixirOfDragonsBlood.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfDragonsBlood.java index d1e9955f7..0660a6c3d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfDragonsBlood.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfDragonsBlood.java @@ -49,12 +49,6 @@ public class ElixirOfDragonsBlood extends Elixir { return 0xFFFF002A; } - @Override - public int value() { - //prices of ingredients - return quantity * (50 + 40); - } - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java index 314643723..d58470ea2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java @@ -67,12 +67,6 @@ public class ElixirOfHoneyedHealing extends Elixir { } } - @Override - public int value() { - //prices of ingredients - return quantity * (30 + 5); - } - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfIcyTouch.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfIcyTouch.java index c6340a334..bd6c52f1f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfIcyTouch.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfIcyTouch.java @@ -46,12 +46,6 @@ public class ElixirOfIcyTouch extends Elixir { return 0xFF18C3E6; } - @Override - public int value() { - //prices of ingredients - return quantity * (50 + 40); - } - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java index e7cf7e4eb..5b42b2385 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java @@ -66,12 +66,6 @@ public class ElixirOfMight extends Elixir { return Messages.get(this, "desc", HTBoost.boost(Dungeon.hero.HT)); } - @Override - public int value() { - //prices of ingredients - return quantity * (50 + 40); - } - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfToxicEssence.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfToxicEssence.java index 5d1c5ea6f..351347803 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfToxicEssence.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfToxicEssence.java @@ -46,12 +46,6 @@ public class ElixirOfToxicEssence extends Elixir { return 0xFF00B34A; } - @Override - public int value() { - //prices of ingredients - return quantity * (30 + 40); - } - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Alchemize.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Alchemize.java index 176777eba..d48331da8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Alchemize.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Alchemize.java @@ -56,11 +56,16 @@ public class Alchemize extends Spell { @Override public int value() { - //prices of ingredients, divided by output quantity, rounds down - return (int)(40 * (quantity/8f)); + //cheap, as ingredients are cheap + return (int)(20 * (quantity/8f)); + } + + @Override + public int energyVal() { + //also cheap, same reason + return (int)(4 * (quantity/8f)); } - //TODO this can't be simple anymore =S public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe { @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/AquaBlast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/AquaBlast.java index 7469fc1a9..a37d7b5ab 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/AquaBlast.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/AquaBlast.java @@ -49,8 +49,12 @@ public class AquaBlast extends TargetedSpell { @Override public int value() { - //prices of ingredients, divided by output quantity, rounds down - return (int)((60 + 40) * (quantity/8f)); + return (int)(60 * (quantity/8f)); + } + + @Override + public int energyVal() { + return (int)(12 * (quantity/8f)); } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java index b8ec233d9..54da26c45 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java @@ -212,8 +212,12 @@ public class BeaconOfReturning extends Spell { @Override public int value() { - //prices of ingredients, divided by output quantity, rounds down - return (int)((50 + 40) * (quantity/5f)); + return (int)(60 * (quantity/5f)); + } + + @Override + public int energyVal() { + return (int)(12 * (quantity/5f)); } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { 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 5bdfe20a4..8e52db41b 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 @@ -95,8 +95,12 @@ public class CurseInfusion extends InventorySpell { @Override public int value() { - //prices of ingredients, divided by output quantity, rounds down - return (int)((30 + 50) * (quantity/3f)); + return (int)(60 * (quantity/4f)); + } + + @Override + public int energyVal() { + return (int)(12 * (quantity/4f)); } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java index 5252bfdd9..2cef88c73 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java @@ -82,8 +82,12 @@ public class FeatherFall extends Spell { @Override public int value() { - //prices of ingredients, divided by output quantity, rounds down - return (int)((30 + 40) * (quantity/2f)); + return (int)(60 * (quantity/2f)); + } + + @Override + public int energyVal() { + return (int)(12 * (quantity/2f)); } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalInfusion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalInfusion.java index bbd7955bc..f1fd861d2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalInfusion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalInfusion.java @@ -73,8 +73,12 @@ public class MagicalInfusion extends InventorySpell { @Override public int value() { - //prices of ingredients - return (50 + 40) * quantity; + return 60 * quantity; + } + + @Override + public int energyVal() { + return 12 * quantity; } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java index d7f28663d..9f0d020fc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java @@ -65,8 +65,12 @@ public class PhaseShift extends TargetedSpell { @Override public int value() { - //prices of ingredients, divided by output quantity, rounds down - return (int)((30 + 40) * (quantity/8f)); + return (int)(60 * (quantity/8f)); + } + + @Override + public int energyVal() { + return (int)(12 * (quantity/8f)); } 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 a259ca248..5d1679aa4 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 @@ -115,8 +115,12 @@ public class ReclaimTrap extends TargetedSpell { @Override public int value() { - //prices of ingredients, divided by output quantity, rounds down - return (int)((40 + 50) * (quantity/4f)); + return (int)(60 * (quantity/4f)); + } + + @Override + public int energyVal() { + return (int)(12 * (quantity/4f)); } private static final String STORED_TRAP = "stored_trap"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Recycle.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Recycle.java index 47fc6147b..8fad7b2cb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Recycle.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Recycle.java @@ -92,8 +92,12 @@ public class Recycle extends InventorySpell { @Override public int value() { - //prices of ingredients, divided by output quantity, rounds down - return (int)((50 + 40) * (quantity/12f)); + return (int)(60 * (quantity/12f)); + } + + @Override + public int energyVal() { + return (int)(12 * (quantity/12f)); } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/TelekineticGrab.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/TelekineticGrab.java index 2f5e73b4c..bbe2ce967 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/TelekineticGrab.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/TelekineticGrab.java @@ -116,8 +116,12 @@ public class TelekineticGrab extends TargetedSpell { @Override public int value() { - //prices of ingredients, divided by output quantity, rounds down - return (int)((10 + 40) * (quantity/6f)); + return (int)(60 * (quantity/6f)); + } + + @Override + public int energyVal() { + return (int)(12 * (quantity/6f)); } public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { 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 12fa4936f..46b80676e 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 @@ -65,10 +65,14 @@ public class WildEnergy extends TargetedSpell { @Override public int value() { - //prices of ingredients, divided by output quantity, rounds down - return (int)((50 + 50) * (quantity/5f)); + return (int)(60 * (quantity/5f)); } - + + @Override + public int energyVal() { + return (int)(12 * (quantity/5f)); + } + public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { {