v1.1.0: added energy conversion values to most consumables

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

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java

@@ -458,10 +458,16 @@ public class Item implements Bundlable {
 		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());
 		if (item == null) return null;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/AlchemicalCatalyst.java

@@ -83,6 +83,11 @@ 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 {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java

@@ -420,6 +420,11 @@ public class Potion extends Item {
 		return 30 * quantity;
 	}
 
+	@Override
+	public int energyVal() {
+		return 6 * quantity;
+	}
+
 	public static class PlaceHolder extends Potion {
 		
 		{

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();
+	}
 }

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();
+	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/ExoticPotion.java

@@ -121,6 +121,12 @@ public class ExoticPotion extends Potion {
 		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

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;
 	}
 }

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;
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java

@@ -259,6 +259,11 @@ public abstract class Scroll extends Item {
 		return 30 * quantity;
 	}
 
+	@Override
+	public int energyVal() {
+		return 6 * quantity;
+	}
+	
 	public static class PlaceHolder extends Scroll {
 		
 		{

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();
+	}
 }

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();
+	}
 }

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 {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/Runestone.java

@@ -61,7 +61,12 @@ 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 {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAugmentation.java

@@ -75,6 +75,11 @@ public class StoneOfAugmentation extends InventoryStone {
 		return 30 * quantity;
 	}
 
+	@Override
+	public int energyVal() {
+		return 4;
+	}
+	
 	public class WndAugment extends Window {
 		
 		private static final int WIDTH			= 120;

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;
+	}
+
 }

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");

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;
+		}
 	}
 }

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;
+		}
 	}
 }