From 1f8299c46f02ff170eb0bc06f8288222d63681bb Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 22 Nov 2021 16:54:44 -0500 Subject: [PATCH] v1.1.0: fixed seed/stone energy values not account for quantity --- .../shatteredpixeldungeon/items/stones/Runestone.java | 2 +- .../shatteredpixeldungeon/items/stones/StoneOfAugmentation.java | 2 +- .../shatteredpixeldungeon/items/stones/StoneOfEnchantment.java | 2 +- .../com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/plants/Rotberry.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/plants/Starflower.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/Runestone.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/Runestone.java index bb79b00e6..53535aa4a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/Runestone.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/Runestone.java @@ -66,7 +66,7 @@ public abstract class Runestone extends Item { @Override public int energyVal() { - return 3; + return 3 * quantity; } public static class PlaceHolder extends Runestone { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAugmentation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAugmentation.java index 74e8565f3..73d1f576e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAugmentation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAugmentation.java @@ -77,7 +77,7 @@ public class StoneOfAugmentation extends InventoryStone { @Override public int energyVal() { - return 4; + return 4 * quantity; } public class WndAugment extends Window { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfEnchantment.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfEnchantment.java index aa8f9b7a5..01ec75c2d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfEnchantment.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfEnchantment.java @@ -79,7 +79,7 @@ public class StoneOfEnchantment extends InventoryStone { @Override public int energyVal() { - return 4; + return 4 * quantity; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java index 063591981..d25ea381b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java @@ -207,7 +207,7 @@ public abstract class Plant implements Bundlable { @Override public int energyVal() { - return 2; + return 2 * quantity; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Rotberry.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Rotberry.java index 22815fc95..1543b520b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Rotberry.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Rotberry.java @@ -74,7 +74,7 @@ public class Rotberry extends Plant { @Override public int energyVal() { - return 3; + return 3 * quantity; } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Starflower.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Starflower.java index 4979445fd..16600e7a1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Starflower.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Starflower.java @@ -63,7 +63,7 @@ public class Starflower extends Plant { @Override public int energyVal() { - return 3; + return 3 * quantity; } } }