From 0213cfe31840c92d1f25f545f88644538db17600 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 18 Nov 2021 19:18:55 -0500 Subject: [PATCH] v1.1.0: adjusted recipe costs for elixirs and spells --- .../items/potions/elixirs/ElixirOfMight.java | 2 +- .../items/spells/AquaBlast.java | 2 +- .../items/spells/BeaconOfReturning.java | 2 +- .../items/spells/FeatherFall.java | 2 +- .../items/spells/MagicalInfusion.java | 2 +- .../items/spells/WildEnergy.java | 2 +- .../shatteredpixeldungeon/ui/QuickRecipe.java | 18 ++++++++++-------- 7 files changed, 16 insertions(+), 14 deletions(-) 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 57528214c..e1eaf5c1a 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 @@ -76,7 +76,7 @@ public class ElixirOfMight extends Elixir { inputs = new Class[]{PotionOfStrength.class, AlchemicalCatalyst.class}; inQuantity = new int[]{1, 1}; - cost = 5; + cost = 6; output = ElixirOfMight.class; outQuantity = 1; 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 81ef80b36..f9bdc0ace 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 @@ -72,7 +72,7 @@ public class AquaBlast extends TargetedSpell { inputs = new Class[]{PotionOfStormClouds.class, ArcaneCatalyst.class}; inQuantity = new int[]{1, 1}; - cost = 4; + cost = 2; output = AquaBlast.class; outQuantity = 12; 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 cbd56c8ef..07e100129 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 @@ -202,7 +202,7 @@ public class BeaconOfReturning extends Spell { inputs = new Class[]{ScrollOfPassage.class, ArcaneCatalyst.class}; inQuantity = new int[]{1, 1}; - cost = 10; + cost = 8; output = BeaconOfReturning.class; outQuantity = 5; 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 b9f4d64b8..4da7840ac 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 @@ -68,7 +68,7 @@ public class FeatherFall extends Spell { inputs = new Class[]{PotionOfLevitation.class, ArcaneCatalyst.class}; inQuantity = new int[]{1, 1}; - cost = 6; + cost = 8; output = FeatherFall.class; outQuantity = 2; 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 039264a44..91f072ec8 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 @@ -81,7 +81,7 @@ public class MagicalInfusion extends InventorySpell { inputs = new Class[]{ScrollOfUpgrade.class, ArcaneCatalyst.class}; inQuantity = new int[]{1, 1}; - cost = 4; + cost = 3; output = MagicalInfusion.class; outQuantity = 1; 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 b0d788f23..5726ac63a 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 @@ -84,7 +84,7 @@ public class WildEnergy extends TargetedSpell { inputs = new Class[]{ScrollOfMysticalEnergy.class, MetalShard.class}; inQuantity = new int[]{1, 1}; - cost = 8; + cost = 6; output = WildEnergy.class; outQuantity = 5; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java index aac644341..d77eca1bc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java @@ -169,10 +169,12 @@ public class QuickRecipe extends Component { height = 16; width = 0; - + + int padding = inputs.size() == 1 ? 8 : 0; + for (ItemSlot item : inputs){ - item.setRect(x + width, y, 16, 16); - width += 16; + item.setRect(x + width + padding, y, 16, 16); + width += 16 + padding; } arrow.setRect(x + width, y, 14, 16); @@ -180,6 +182,8 @@ public class QuickRecipe extends Component { output.setRect(x + width, y, 16, 16); width += 16; + + width += padding; } //used to ensure that un-IDed items are not spoiled @@ -361,8 +365,6 @@ public class QuickRecipe extends Component { result.add(null); result.add(new QuickRecipe(new ElixirOfHoneyedHealing.Recipe())); result.add(new QuickRecipe(new ElixirOfAquaticRejuvenation.Recipe())); - result.add(null); - result.add(null); result.add(new QuickRecipe(new ElixirOfMight.Recipe())); result.add(new QuickRecipe(new ElixirOfDragonsBlood.Recipe())); result.add(new QuickRecipe(new ElixirOfIcyTouch.Recipe())); @@ -376,13 +378,13 @@ public class QuickRecipe extends Component { result.add(null); result.add(null); result.add(new QuickRecipe(new AquaBlast.Recipe())); - result.add(new QuickRecipe(new FeatherFall.Recipe())); result.add(new QuickRecipe(new ReclaimTrap.Recipe())); + result.add(new QuickRecipe(new FeatherFall.Recipe())); result.add(null); result.add(null); - result.add(new QuickRecipe(new CurseInfusion.Recipe())); - result.add(new QuickRecipe(new MagicalInfusion.Recipe())); result.add(new QuickRecipe(new Alchemize.Recipe())); + result.add(new QuickRecipe(new MagicalInfusion.Recipe())); + result.add(new QuickRecipe(new CurseInfusion.Recipe())); result.add(new QuickRecipe(new Recycle.Recipe())); return result; }