v0.8.2: refactored the names/locations of methods relating to item price

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Bones.java

@@ -154,7 +154,7 @@ public class Bones {
 						Artifact artifact = Reflection.newInstance(((Artifact)item).getClass());
 						
 						if (artifact == null){
-							return new Gold(item.price());
+							return new Gold(item.value());
 						}
 
 						artifact.cursed = true;
@@ -163,7 +163,7 @@ public class Bones {
 						return artifact;
 						
 					} else {
-						return new Gold(item.price());
+						return new Gold(item.value());
 					}
 				}
 				

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java

@@ -41,7 +41,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Combo;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Drowsy;
-import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FlavourBuff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Foresight;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Fury;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger;
@@ -82,7 +81,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfExperience;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing;
-import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfMight;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfAccuracy;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEvasion;
@@ -93,7 +91,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfMight;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfTenacity;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping;
-import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLivingEarth;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfWarding;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow;
@@ -1302,7 +1299,7 @@ public class Hero extends Char {
 				curAction = new HeroAction.PickUp( cell );
 				break;
 			case FOR_SALE:
-				curAction = heap.size() == 1 && heap.peek().price() > 0 ?
+				curAction = heap.size() == 1 && heap.peek().value() > 0 ?
 					new HeroAction.Buy( cell ) :
 					new HeroAction.PickUp( cell );
 				break;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java

@@ -93,6 +93,11 @@ public class Shopkeeper extends NPC {
 	public boolean reset() {
 		return true;
 	}
+
+	//shopkeepers are greedy!
+	public static int sellPrice(Item item){
+		return item.value() * 5 * (Dungeon.depth / 5 + 1);
+	}
 	
 	public static WndBag sell() {
 		return GameScene.selectItem( itemSelector, WndBag.Mode.FOR_SALE, Messages.get(Shopkeeper.class, "sell"));

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

@@ -128,7 +128,7 @@ public class Ankh extends Item {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 50 * quantity;
 	}
 }

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

@@ -23,17 +23,12 @@ package com.shatteredpixel.shatteredpixeldungeon.items;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
-import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
-import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning;
-import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
-import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mimic;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Wraith;
+import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Shopkeeper;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
-import com.shatteredpixel.shatteredpixeldungeon.effects.Flare;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle;
-import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle;
 import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
 import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.Artifact;
@@ -43,10 +38,8 @@ import com.shatteredpixel.shatteredpixeldungeon.items.food.FrozenCarpaccio;
 import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat;
 import com.shatteredpixel.shatteredpixeldungeon.items.journal.DocumentPage;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
-import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfWealth;
 import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
-import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
@@ -54,7 +47,6 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundlable;
 import com.watabou.utils.Bundle;
-import com.watabou.utils.Random;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -352,7 +344,7 @@ public class Heap implements Bundlable {
 		switch(type){
 			case FOR_SALE:
 				Item i = peek();
-				return Messages.get(this, "for_sale", i.sellPrice(), i.toString());
+				return Messages.get(this, "for_sale", Shopkeeper.sellPrice(i), i.toString());
 			case CHEST:
 			case MIMIC:
 				return Messages.get(this, "chest");

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

@@ -144,7 +144,7 @@ public class Honeypot extends Item {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 30 * quantity;
 	}
 
@@ -242,7 +242,7 @@ public class Honeypot extends Item {
 		}
 		
 		@Override
-		public int price() {
+		public int value() {
 			return 5 * quantity;
 		}
 	}

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

@@ -438,13 +438,9 @@ public class Item implements Bundlable {
 		return this;
 	}
 	
-	public int price() {
+	public int value() {
 		return 0;
 	}
-
-	public final int sellPrice(){
-		return price() * 5 * (Dungeon.depth / 5 + 1);
-	}
 	
 	public Item virtual(){
 		Item item = Reflection.newInstance(getClass());

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

@@ -74,7 +74,7 @@ public class MerchantsBeacon extends Item {
 	}
 
 	@Override
-	public int price() {
+	public int value() {
 		return 5 * quantity;
 	}
 

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

@@ -105,7 +105,7 @@ public class Stylus extends Item {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 30 * quantity;
 	}
 

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

@@ -84,7 +84,7 @@ public class Torch extends Item {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 8 * quantity;
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java

@@ -513,7 +513,7 @@ public class Armor extends EquipableItem {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		if (seal != null) return 0;
 
 		int price = 20 * tier;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java

@@ -174,7 +174,7 @@ abstract public class ClassArmor extends Armor {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 0;
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java

@@ -188,7 +188,7 @@ public class Artifact extends KindofMisc {
 	}
 
 	@Override
-	public int price() {
+	public int value() {
 		int price = 100;
 		if (level() > 0)
 			price += 20*visiblyUpgraded();

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java

@@ -168,7 +168,7 @@ public class CloakOfShadows extends Artifact {
 	}
 
 	@Override
-	public int price() {
+	public int value() {
 		return 0;
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java

@@ -408,7 +408,7 @@ public class TimekeepersHourglass extends Artifact {
 		}
 
 		@Override
-		public int price() {
+		public int value() {
 			return 20;
 		}
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/MagicalHolster.java

@@ -80,7 +80,7 @@ public class MagicalHolster extends Bag {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 60;
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java

@@ -48,7 +48,7 @@ public class PotionBandolier extends Bag {
 	}
 
 	@Override
-	public int price() {
+	public int value() {
 		return 40;
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java

@@ -60,7 +60,7 @@ public class ScrollHolder extends Bag {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 40;
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/VelvetPouch.java

@@ -51,7 +51,7 @@ public class VelvetPouch extends Bag {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 30;
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ArcaneBomb.java

@@ -90,7 +90,7 @@ public class ArcaneBomb extends Bomb {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (20 + 50);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java

@@ -228,7 +228,7 @@ public class Bomb extends Item {
 	}
 
 	@Override
-	public int price() {
+	public int value() {
 		return 20 * quantity;
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Firebomb.java

@@ -57,7 +57,7 @@ public class Firebomb extends Bomb {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (20 + 30);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Flashbang.java

@@ -58,7 +58,7 @@ public class Flashbang extends Bomb {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (20 + 40);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/FrostBomb.java

@@ -55,7 +55,7 @@ public class FrostBomb extends Bomb {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (20 + 30);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/HolyBomb.java

@@ -77,7 +77,7 @@ public class HolyBomb extends Bomb {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (20 + 30);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java

@@ -141,7 +141,7 @@ public class Noisemaker extends Bomb {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (20 + 40);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/RegrowthBomb.java

@@ -117,7 +117,7 @@ public class RegrowthBomb extends Bomb {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (20 + 30);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShockBomb.java

@@ -84,7 +84,7 @@ public class ShockBomb extends Bomb {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (20 + 30);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShrapnelBomb.java

@@ -80,7 +80,7 @@ public class ShrapnelBomb extends Bomb {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (20 + 100);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java

@@ -66,7 +66,7 @@ public class WoollyBomb extends Bomb {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (20 + 30);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Blandfruit.java

@@ -119,7 +119,7 @@ public class Blandfruit extends Food {
 	}
 
 	@Override
-	public int price() {
+	public int value() {
 		return 20 * quantity;
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java

@@ -32,7 +32,7 @@ public class ChargrilledMeat extends Food {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 8 * quantity;
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java

@@ -123,7 +123,7 @@ public class Food extends Item {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 10 * quantity;
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java

@@ -46,7 +46,7 @@ public class FrozenCarpaccio extends Food {
 		effect(hero);
 	}
 	
-	public int price() {
+	public int value() {
 		return 10 * quantity;
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java

@@ -44,7 +44,7 @@ public class MeatPie extends Food {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 40 * quantity;
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java

@@ -48,7 +48,7 @@ public class MysteryMeat extends Food {
 		effect(hero);
 	}
 
-	public int price() {
+	public int value() {
 		return 5 * quantity;
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java

@@ -129,7 +129,7 @@ public class Pasty extends Food {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 20 * quantity;
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/SmallRation.java

@@ -32,7 +32,7 @@ public class SmallRation extends Food {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 10 * quantity;
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/StewedMeat.java

@@ -33,7 +33,7 @@ public class StewedMeat extends Food {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 8 * quantity;
 	}
 	

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

@@ -76,7 +76,7 @@ public class AlchemicalCatalyst extends Potion {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 40 * quantity;
 	}
 	

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

@@ -426,7 +426,7 @@ public class Potion extends Item {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 30 * quantity;
 	}
 	

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

@@ -39,7 +39,7 @@ public class PotionOfExperience extends Potion {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 50 * quantity : super.price();
+		return isKnown() ? 50 * quantity : super.value();
 	}
 }

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

@@ -57,7 +57,7 @@ public class PotionOfFrost extends Potion {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 30 * quantity : super.price();
+		return isKnown() ? 30 * quantity : super.value();
 	}
 }

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

@@ -43,7 +43,7 @@ public class PotionOfHaste extends Potion {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 40 * quantity : super.price();
+		return isKnown() ? 40 * quantity : super.value();
 	}
 }

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

@@ -68,7 +68,7 @@ public class PotionOfHealing extends Potion {
 	}
 
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 30 * quantity : super.price();
+		return isKnown() ? 30 * quantity : super.value();
 	}
 }

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

@@ -45,8 +45,8 @@ public class PotionOfInvisibility extends Potion {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 40 * quantity : super.price();
+		return isKnown() ? 40 * quantity : super.value();
 	}
 
 }

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

@@ -62,7 +62,7 @@ public class PotionOfLevitation extends Potion {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 40 * quantity : super.price();
+		return isKnown() ? 40 * quantity : super.value();
 	}
 }

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

@@ -57,7 +57,7 @@ public class PotionOfLiquidFlame extends Potion {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 30 * quantity : super.price();
+		return isKnown() ? 30 * quantity : super.value();
 	}
 }

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

@@ -49,7 +49,7 @@ public class PotionOfMindVision extends Potion {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 30 * quantity : super.price();
+		return isKnown() ? 30 * quantity : super.value();
 	}
 }

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

@@ -50,7 +50,7 @@ public class PotionOfParalyticGas extends Potion {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 40 * quantity : super.price();
+		return isKnown() ? 40 * quantity : super.value();
 	}
 }

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

@@ -105,7 +105,7 @@ public class PotionOfPurity extends Potion {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 40 * quantity : super.price();
+		return isKnown() ? 40 * quantity : super.value();
 	}
 }

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

@@ -48,7 +48,7 @@ public class PotionOfStrength extends Potion {
 	}
 
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 50 * quantity : super.price();
+		return isKnown() ? 50 * quantity : super.value();
 	}
 }

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

@@ -50,7 +50,7 @@ public class PotionOfToxicGas extends Potion {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 30 * quantity : super.price();
+		return isKnown() ? 30 * quantity : super.value();
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/BlizzardBrew.java

@@ -49,7 +49,7 @@ public class BlizzardBrew extends Brew {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (30 + 40);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/CausticBrew.java

@@ -64,7 +64,7 @@ public class CausticBrew extends Brew {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (30 + 50);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/InfernalBrew.java

@@ -52,7 +52,7 @@ public class InfernalBrew extends Brew {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (30 + 40);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/ShockingBrew.java

@@ -55,7 +55,7 @@ public class ShockingBrew extends Brew {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (40 + 40);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfAquaticRejuvenation.java

@@ -49,7 +49,7 @@ public class ElixirOfAquaticRejuvenation extends Elixir {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (30 + 50);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfArcaneArmor.java

@@ -40,7 +40,7 @@ public class ElixirOfArcaneArmor extends Elixir {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (50 + 40);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfDragonsBlood.java

@@ -51,7 +51,7 @@ public class ElixirOfDragonsBlood extends Elixir {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (50 + 40);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java

@@ -68,7 +68,7 @@ public class ElixirOfHoneyedHealing extends Elixir {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (30 + 5);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfIcyTouch.java

@@ -48,7 +48,7 @@ public class ElixirOfIcyTouch extends Elixir {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (50 + 40);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java

@@ -65,7 +65,7 @@ public class ElixirOfMight extends Elixir {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (50 + 40);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfToxicEssence.java

@@ -48,7 +48,7 @@ public class ElixirOfToxicEssence extends Elixir {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients
 		return quantity * (30 + 40);
 	}

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

@@ -117,8 +117,8 @@ public class ExoticPotion extends Potion {
 	
 	@Override
 	//20 gold more than its none-exotic equivalent
-	public int price() {
+	public int value() {
-		return (Reflection.newInstance(exoToReg.get(getClass())).price() + 20) * quantity;
+		return (Reflection.newInstance(exoToReg.get(getClass())).value() + 20) * quantity;
 	}
 	
 	public static class PotionToExotic extends Recipe{

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/GooBlob.java

@@ -42,7 +42,7 @@ public class GooBlob extends Item {
 	}
 
 	@Override
-	public int price() {
+	public int value() {
 		return quantity * 50;
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/quest/MetalShard.java

@@ -42,7 +42,7 @@ public class MetalShard extends Item {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return quantity * 100;
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java

@@ -250,7 +250,7 @@ public class Ring extends KindofMisc {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		int price = 75;
 		if (cursed && cursedKnown) {
 			price /= 2;

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

@@ -257,7 +257,7 @@ public abstract class Scroll extends Item {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 30 * quantity;
 	}
 	

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

@@ -73,7 +73,7 @@ public class ScrollOfIdentify extends InventoryScroll {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 30 * quantity : super.price();
+		return isKnown() ? 30 * quantity : super.value();
 	}
 }

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

@@ -74,7 +74,7 @@ public class ScrollOfLullaby extends Scroll {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 40 * quantity : super.price();
+		return isKnown() ? 40 * quantity : super.value();
 	}
 }

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

@@ -98,8 +98,8 @@ public class ScrollOfMagicMapping extends Scroll {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 40 * quantity : super.price();
+		return isKnown() ? 40 * quantity : super.value();
 	}
 	
 	public static void discover( int cell ) {

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

@@ -167,7 +167,7 @@ public class ScrollOfMirrorImage extends Scroll {
 	}
 
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 30 * quantity : super.price();
+		return isKnown() ? 30 * quantity : super.value();
 	}
 }

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

@@ -27,10 +27,8 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Amok;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
-import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mimic;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
-import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
@@ -80,7 +78,7 @@ public class ScrollOfRage extends Scroll {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 40 * quantity : super.price();
+		return isKnown() ? 40 * quantity : super.value();
 	}
 }

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

@@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Invisibility;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Recharging;
-import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.effects.SpellSprite;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EnergyParticle;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
@@ -68,7 +67,7 @@ public class ScrollOfRecharging extends Scroll {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 30 * quantity : super.price();
+		return isKnown() ? 30 * quantity : super.value();
 	}
 }

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

@@ -129,7 +129,7 @@ public class ScrollOfRemoveCurse extends InventoryScroll {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 30 * quantity : super.price();
+		return isKnown() ? 30 * quantity : super.value();
 	}
 }

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

@@ -93,7 +93,7 @@ public class ScrollOfRetribution extends Scroll {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 40 * quantity : super.price();
+		return isKnown() ? 40 * quantity : super.value();
 	}
 }

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

@@ -241,7 +241,7 @@ public class ScrollOfTeleportation extends Scroll {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 30 * quantity : super.price();
+		return isKnown() ? 30 * quantity : super.value();
 	}
 }

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

@@ -91,7 +91,7 @@ public class ScrollOfTerror extends Scroll {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 40 * quantity : super.price();
+		return isKnown() ? 40 * quantity : super.value();
 	}
 }

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

@@ -273,7 +273,7 @@ public class ScrollOfTransmutation extends InventoryScroll {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 50 * quantity : super.price();
+		return isKnown() ? 50 * quantity : super.value();
 	}
 }

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

@@ -128,7 +128,7 @@ public class ScrollOfUpgrade extends InventoryScroll {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
-		return isKnown() ? 50 * quantity : super.price();
+		return isKnown() ? 50 * quantity : super.value();
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ExoticScroll.java

@@ -117,8 +117,8 @@ public abstract class ExoticScroll extends Scroll {
 	
 	@Override
 	//20 gold more than its none-exotic equivalent
-	public int price() {
+	public int value() {
-		return (Reflection.newInstance(exoToReg.get(getClass())).price() + 20) * quantity;
+		return (Reflection.newInstance(exoToReg.get(getClass())).value() + 20) * quantity;
 	}
 	
 	public static class ScrollToExotic extends Recipe {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Alchemize.java

@@ -58,7 +58,7 @@ public class Alchemize extends Spell implements AlchemyScene.AlchemyProvider {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients, divided by output quantity
 		return Math.round(quantity * ((40 + 40) / 4f));
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/AquaBlast.java

@@ -64,7 +64,7 @@ public class AquaBlast extends TargetedSpell {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients, divided by output quantity
 		return Math.round(quantity * ((60 + 40) / 12f));
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ArcaneCatalyst.java

@@ -79,7 +79,7 @@ public class ArcaneCatalyst extends Spell {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 40 * quantity;
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java

@@ -187,7 +187,7 @@ public class BeaconOfReturning extends Spell {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients, divided by output quantity
 		return Math.round(quantity * ((50 + 40) / 5f));
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java

@@ -78,7 +78,7 @@ public class CurseInfusion extends InventorySpell {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients, divided by output quantity
 		return Math.round(quantity * ((30 + 100) / 3f));
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java

@@ -57,7 +57,7 @@ public class FeatherFall extends Spell {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients, divided by output quantity
 		return Math.round(quantity * ((30 + 40) / 2f));
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalInfusion.java

@@ -62,7 +62,7 @@ public class MagicalInfusion extends InventorySpell {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients, divided by output quantity
 		return Math.round(quantity * ((50 + 40) / 1f));
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalPorter.java

@@ -62,7 +62,7 @@ public class MagicalPorter extends InventorySpell {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients, divided by output quantity
 		return Math.round(quantity * ((5 + 40) / 8f));
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java

@@ -76,7 +76,7 @@ public class PhaseShift extends TargetedSpell {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients, divided by output quantity
 		return Math.round(quantity * ((30 + 40) / 8f));
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java

@@ -113,7 +113,7 @@ public class ReclaimTrap extends TargetedSpell {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients, divided by output quantity
 		return Math.round(quantity * ((40 + 100) / 3f));
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Recycle.java

@@ -84,7 +84,7 @@ public class Recycle extends InventorySpell {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients, divided by output quantity
 		return Math.round(quantity * ((50 + 40) / 8f));
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java

@@ -74,7 +74,7 @@ public class WildEnergy extends TargetedSpell {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		//prices of ingredients, divided by output quantity
 		return Math.round(quantity * ((50 + 100) / 5f));
 	}

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

@@ -54,7 +54,7 @@ public abstract class Runestone extends Item {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 10 * quantity;
 	}
 	

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

@@ -65,7 +65,7 @@ public class StoneOfAugmentation extends InventoryStone {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 30 * quantity;
 	}
 	

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

@@ -67,7 +67,7 @@ public class StoneOfEnchantment extends InventoryStone {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		return 30 * quantity;
 	}
 }

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java

@@ -366,7 +366,7 @@ public abstract class Wand extends Item {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		int price = 75;
 		if (cursed && cursedKnown) {
 			price /= 2;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java

@@ -309,7 +309,7 @@ public class MagesStaff extends MeleeWeapon {
 	}
 
 	@Override
-	public int price() {
+	public int value() {
 		return 0;
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java

@@ -117,7 +117,7 @@ public class MeleeWeapon extends Weapon {
 	}
 	
 	@Override
-	public int price() {
+	public int value() {
 		int price = 20 * tier;
 		if (hasGoodEnchant()) {
 			price *= 1.5;