diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index ab25e8cd1..5b39dc7bd 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -778,10 +778,10 @@ items.quest.embers.name=elemental embers items.quest.embers.desc=Special embers which can only be harvested from young fire elementals. They radiate thermal energy. items.quest.gooblob.name=blob of goo -items.quest.gooblob.desc=A jiggly blob of goop, split off from Goo as it died. It's almost like a big ball of jelly, though you wouldn't dare eat it.\n\nIt does nothing on its own, but it might be useful when combined with certain potions, or a bomb. At the very least it should sell for a decent price. +items.quest.gooblob.desc=A jiggly blob of goop, split off from Goo as it died. It's almost like a big ball of jelly, though you wouldn't dare eat it.\n\nIt does nothing on its own, but it might be useful when combined with certain potions, or a bomb. At the very least it should convert into a decent amount of energy. items.quest.metalshard.name=cursed metal shard -items.quest.metalshard.desc=A shard of rusted cursed metal, which broke off DM-300 as it was destroyed. You can feel an inactive malevolent magic within it.\n\nIt does nothing on its own, but it might be useful when combined with certain scrolls, or a bomb. At the very least it should sell for a decent price. +items.quest.metalshard.desc=A shard of rusted cursed metal, which broke off DM-300 as it was destroyed. You can feel an inactive malevolent magic within it.\n\nIt does nothing on its own, but it might be useful when combined with certain scrolls, or a bomb. At the very least it should convert into a decent amount of energy. items.quest.pickaxe.name=pickaxe items.quest.pickaxe.ac_mine=MINE diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index c5a97fd4c..a32937471 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -457,10 +457,16 @@ public class Item implements Bundlable { quantity = value; return this; } - + + //item's value in gold coins public int value() { return 0; } + + //item's value in energy crystals + public int energyVal() { + return 0; + } public Item virtual(){ Item item = Reflection.newInstance(getClass()); 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 fa36b52ac..f1aaf671a 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 @@ -83,8 +83,13 @@ public class AlchemicalCatalyst extends Potion { @Override public int value() { return 40 * quantity; +} + + @Override + public int energyVal() { + return 8 * quantity; } - + public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe { @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java index 5054f8610..eedc8f239 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java @@ -419,7 +419,12 @@ public class Potion extends Item { public int value() { return 30 * quantity; } - + + @Override + public int energyVal() { + return 6 * quantity; + } + public static class PlaceHolder extends Potion { { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java index 67f1b5d16..4f35500dd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java @@ -42,4 +42,9 @@ public class PotionOfExperience extends Potion { public int value() { return isKnown() ? 50 * quantity : super.value(); } + + @Override + public int energyVal() { + return isKnown() ? 8 * quantity : super.energyVal(); + } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java index b14fd6106..7de3ad2a6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java @@ -51,4 +51,9 @@ public class PotionOfStrength extends Potion { public int value() { return isKnown() ? 50 * quantity : super.value(); } + + @Override + public int energyVal() { + return isKnown() ? 8 * quantity : super.energyVal(); + } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/ExoticPotion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/ExoticPotion.java index 584b5f62c..8fbfabfa4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/ExoticPotion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/ExoticPotion.java @@ -120,7 +120,13 @@ public class ExoticPotion extends Potion { public int value() { return (Reflection.newInstance(exoToReg.get(getClass())).value() + 20) * quantity; } - + + @Override + //4 more energy than its none-exotic equivalent + public int energyVal() { + return (Reflection.newInstance(exoToReg.get(getClass())).energyVal() + 4) * quantity; + } + public static class PotionToExotic extends Recipe{ @Override 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 a720ed66d..9599e4002 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 @@ -43,6 +43,11 @@ public class GooBlob extends Item { @Override public int value() { - return quantity * 50; + return quantity * 30; + } + + @Override + public int energyVal() { + return quantity * 4; } } 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 8410c11db..aa0175ee9 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 @@ -43,6 +43,11 @@ public class MetalShard extends Item { @Override public int value() { - return quantity * 100; + return quantity * 50; + } + + @Override + public int energyVal() { + return quantity * 6; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java index 15221b021..c158ec994 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java @@ -258,6 +258,11 @@ public abstract class Scroll extends Item { public int value() { return 30 * quantity; } + + @Override + public int energyVal() { + return 6 * quantity; + } public static class PlaceHolder extends Scroll { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java index 3cb70788e..99ef154b9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java @@ -293,4 +293,9 @@ public class ScrollOfTransmutation extends InventoryScroll { public int value() { return isKnown() ? 50 * quantity : super.value(); } + + @Override + public int energyVal() { + return isKnown() ? 8 * quantity : super.energyVal(); + } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java index 6d0b0b080..84ec33586 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java @@ -134,4 +134,9 @@ public class ScrollOfUpgrade extends InventoryScroll { public int value() { return isKnown() ? 50 * quantity : super.value(); } + + @Override + public int energyVal() { + return isKnown() ? 8 * quantity : super.energyVal(); + } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ExoticScroll.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ExoticScroll.java index d97f11c33..85d9f942a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ExoticScroll.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ExoticScroll.java @@ -110,7 +110,13 @@ public abstract class ExoticScroll extends Scroll { @Override //20 gold more than its none-exotic equivalent public int value() { - return (Reflection.newInstance(exoToReg.get(getClass())).value() + 20) * quantity; + return (Reflection.newInstance(exoToReg.get(getClass())).value() + 30) * quantity; + } + + @Override + //6 more energy than its none-exotic equivalent + public int energyVal() { + return (Reflection.newInstance(exoToReg.get(getClass())).energyVal() + 6) * quantity; } public static class ScrollToExotic extends Recipe { 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 7a37200c2..bb79b00e6 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 @@ -61,9 +61,14 @@ public abstract class Runestone extends Item { @Override public int value() { - return 10 * quantity; + return 15 * quantity; } - + + @Override + public int energyVal() { + return 3; + } + 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 6006b6f1b..74e8565f3 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 @@ -74,6 +74,11 @@ public class StoneOfAugmentation extends InventoryStone { public int value() { return 30 * quantity; } + + @Override + public int energyVal() { + return 4; + } 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 60591367b..aa8f9b7a5 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 @@ -76,4 +76,10 @@ public class StoneOfEnchantment extends InventoryStone { public int value() { return 30 * quantity; } + + @Override + public int energyVal() { + return 4; + } + } 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 c82751088..063591981 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java @@ -205,6 +205,11 @@ public abstract class Plant implements Bundlable { return 10 * quantity; } + @Override + public int energyVal() { + return 2; + } + @Override public String desc() { String desc = Messages.get(plantClass, "desc"); 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 e2efae983..22815fc95 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Rotberry.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Rotberry.java @@ -71,5 +71,10 @@ public class Rotberry extends Plant { public int value() { return 30 * quantity; } + + @Override + public int energyVal() { + return 3; + } } } 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 740067f96..4979445fd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Starflower.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Starflower.java @@ -60,5 +60,10 @@ public class Starflower extends Plant { public int value() { return 30 * quantity; } + + @Override + public int energyVal() { + return 3; + } } }