From 144e98c51e8934c22941ca1af593df641be514be Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 18 Nov 2021 18:22:31 -0500 Subject: [PATCH] v1.1.0: adjusted recipe costs for food, catalysts, and brews --- .../shatteredpixeldungeon/items/food/Blandfruit.java | 2 +- .../shatteredpixeldungeon/items/food/StewedMeat.java | 6 +++--- .../items/potions/AlchemicalCatalyst.java | 6 +++--- .../items/potions/brews/BlizzardBrew.java | 2 +- .../items/potions/brews/CausticBrew.java | 2 +- .../items/potions/brews/InfernalBrew.java | 2 +- .../items/potions/brews/ShockingBrew.java | 2 +- .../shatteredpixeldungeon/items/spells/ArcaneCatalyst.java | 6 +++--- .../shatteredpixeldungeon/ui/QuickRecipe.java | 6 ++++-- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java index 856375c81..d089b668d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java @@ -273,7 +273,7 @@ public class Blandfruit extends Food { @Override public int cost(ArrayList ingredients) { - return 3; + return 2; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/StewedMeat.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/StewedMeat.java index d8aa1b8b4..f6f1962e5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/StewedMeat.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/StewedMeat.java @@ -42,7 +42,7 @@ public class StewedMeat extends Food { inputs = new Class[]{MysteryMeat.class}; inQuantity = new int[]{1}; - cost = 2; + cost = 1; output = StewedMeat.class; outQuantity = 1; @@ -54,7 +54,7 @@ public class StewedMeat extends Food { inputs = new Class[]{MysteryMeat.class}; inQuantity = new int[]{2}; - cost = 3; + cost = 2; output = StewedMeat.class; outQuantity = 2; @@ -69,7 +69,7 @@ public class StewedMeat extends Food { inputs = new Class[]{MysteryMeat.class}; inQuantity = new int[]{3}; - cost = 4; + cost = 2; output = StewedMeat.class; outQuantity = 3; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/AlchemicalCatalyst.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/AlchemicalCatalyst.java index f1aaf671a..87dea5565 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/AlchemicalCatalyst.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/AlchemicalCatalyst.java @@ -114,12 +114,12 @@ public class AlchemicalCatalyst extends Potion { public int cost(ArrayList ingredients) { for (Item i : ingredients){ if (i instanceof Plant.Seed){ - return 1; + return 0; } else if (i instanceof Runestone){ - return 2; + return 1; } } - return 1; + return 0; } @Override 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 d9c1de57f..50b42af76 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 @@ -60,7 +60,7 @@ public class BlizzardBrew extends Brew { inputs = new Class[]{PotionOfFrost.class, AlchemicalCatalyst.class}; inQuantity = new int[]{1, 1}; - cost = 6; + cost = 4; output = BlizzardBrew.class; outQuantity = 1; 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 e273c8119..cc7cfca58 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 @@ -74,7 +74,7 @@ public class CausticBrew extends Brew { inputs = new Class[]{PotionOfToxicGas.class, GooBlob.class}; inQuantity = new int[]{1, 1}; - cost = 4; + cost = 3; output = CausticBrew.class; outQuantity = 1; 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 35d648ba8..666dd1623 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 @@ -61,7 +61,7 @@ public class InfernalBrew extends Brew { inputs = new Class[]{PotionOfLiquidFlame.class, AlchemicalCatalyst.class}; inQuantity = new int[]{1, 1}; - cost = 6; + cost = 5; output = InfernalBrew.class; outQuantity = 1; 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 5762b8e0b..5f9ec43cd 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 @@ -66,7 +66,7 @@ public class ShockingBrew extends Brew { inputs = new Class[]{PotionOfParalyticGas.class, AlchemicalCatalyst.class}; inQuantity = new int[]{1, 1}; - cost = 8; + cost = 6; output = ShockingBrew.class; outQuantity = 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ArcaneCatalyst.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ArcaneCatalyst.java index b0c006dd7..618209997 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ArcaneCatalyst.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ArcaneCatalyst.java @@ -107,12 +107,12 @@ public class ArcaneCatalyst extends Spell { public int cost(ArrayList ingredients) { for (Item i : ingredients){ if (i instanceof Plant.Seed){ - return 2; - } else if (i instanceof Runestone){ return 1; + } else if (i instanceof Runestone){ + return 0; } } - return 1; + return 0; } @Override 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 d7d824663..aac644341 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java @@ -354,14 +354,16 @@ public class QuickRecipe extends Component { return result; case 8: result.add(new QuickRecipe(new CausticBrew.Recipe())); - result.add(new QuickRecipe(new InfernalBrew.Recipe())); result.add(new QuickRecipe(new BlizzardBrew.Recipe())); + result.add(new QuickRecipe(new InfernalBrew.Recipe())); result.add(new QuickRecipe(new ShockingBrew.Recipe())); result.add(null); result.add(null); result.add(new QuickRecipe(new ElixirOfHoneyedHealing.Recipe())); - result.add(new QuickRecipe(new ElixirOfMight.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())); result.add(new QuickRecipe(new ElixirOfToxicEssence.Recipe()));