diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Bones.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Bones.java index 8dc9a7922..b9ff6ffa4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Bones.java +++ b/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()); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 5321ebfee..29bee39b6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/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; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java index 47d9dac2c..f2997d83b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Shopkeeper.java +++ b/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")); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java index 159bf75a0..56979e782 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Ankh.java +++ b/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; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java index 67e9e7def..aa9b235d7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java +++ b/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"); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java index dc08af733..cdb761ce3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java +++ b/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; } } 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 5875e60da..79ae652ab 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/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()); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java index ef6744038..119ef60a7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/MerchantsBeacon.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java index 411716435..1df2bc877 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Stylus.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java index 4da174cef..d30f2996b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Torch.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index 1e9bf3e7e..960634a5c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/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; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java index 5dbf1641d..56ab95059 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/ClassArmor.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java index dc43a8c29..cc3b4517d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java +++ b/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(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index 645e0399d..6423b2a0c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index 529f547fb..5361638ab 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/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; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/MagicalHolster.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/MagicalHolster.java index 749ac6d8e..440bfb434 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/MagicalHolster.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java index 663dd5259..9458f7ad1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java index 4076ca10e..cc5394b0a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/VelvetPouch.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/VelvetPouch.java index 70171a6eb..a41e386b7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/VelvetPouch.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ArcaneBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ArcaneBomb.java index bfeae6eba..0d0cc8305 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ArcaneBomb.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java index 09c01fe0e..6db1bc56c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Firebomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Firebomb.java index 03b901f17..9b313239c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Firebomb.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Flashbang.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Flashbang.java index 1136c3fc0..55d60723f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Flashbang.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/FrostBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/FrostBomb.java index 83110c290..c15703ba7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/FrostBomb.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/HolyBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/HolyBomb.java index 549a4bfda..0acdbd6e8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/HolyBomb.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java index 073dfb799..3ebbd82fd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/RegrowthBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/RegrowthBomb.java index a3808b40a..9f466a7a8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/RegrowthBomb.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShockBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShockBomb.java index 81345a292..e6bb92d4b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShockBomb.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShrapnelBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShrapnelBomb.java index f4c3d6d24..1f5e27469 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShrapnelBomb.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java index a500e651c..5a4bf1525 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java +++ b/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); } 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 96612a848..e3cf1839f 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 @@ -119,7 +119,7 @@ public class Blandfruit extends Food { } @Override - public int price() { + public int value() { return 20 * quantity; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java index 7b6516055..a7ee460ba 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java index 3f53ab8a8..d1e7a4164 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Food.java +++ b/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; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java index ea54cf98d..0401405e8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/FrozenCarpaccio.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java index d4d59b1fb..ee7f33199 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MeatPie.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java index 7c9da3604..4d9e79aa8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/MysteryMeat.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java index 63dc9d950..5d963ed9e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java +++ b/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; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/SmallRation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/SmallRation.java index 638b6dda5..ba95070f6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/SmallRation.java +++ b/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; } } 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 d356cbb5b..151195c99 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 @@ -33,7 +33,7 @@ public class StewedMeat extends Food { } @Override - public int price() { + public int value() { return 8 * quantity; } 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 6e37f034d..b11733e9d 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 @@ -76,7 +76,7 @@ public class AlchemicalCatalyst extends Potion { } @Override - public int price() { + public int value() { return 40 * quantity; } 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 503a6f94f..588856602 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 @@ -426,7 +426,7 @@ public class Potion extends Item { } @Override - public int price() { + public int value() { return 30 * quantity; } 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 7477c4f1a..882de316f 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 @@ -39,7 +39,7 @@ public class PotionOfExperience extends Potion { } @Override - public int price() { - return isKnown() ? 50 * quantity : super.price(); + public int value() { + return isKnown() ? 50 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java index 51f4e9d89..2a5d98f51 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java @@ -57,7 +57,7 @@ public class PotionOfFrost extends Potion { } @Override - public int price() { - return isKnown() ? 30 * quantity : super.price(); + public int value() { + return isKnown() ? 30 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHaste.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHaste.java index 5cc84feff..65bf4e327 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHaste.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHaste.java @@ -43,7 +43,7 @@ public class PotionOfHaste extends Potion { } @Override - public int price() { - return isKnown() ? 40 * quantity : super.price(); + public int value() { + return isKnown() ? 40 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java index 3e3aaf340..3d384c036 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java @@ -68,7 +68,7 @@ public class PotionOfHealing extends Potion { } @Override - public int price() { - return isKnown() ? 30 * quantity : super.price(); + public int value() { + return isKnown() ? 30 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java index 6069e67a9..198abf407 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java @@ -45,8 +45,8 @@ public class PotionOfInvisibility extends Potion { } @Override - public int price() { - return isKnown() ? 40 * quantity : super.price(); + public int value() { + return isKnown() ? 40 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java index 282b61137..1d99330ec 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java @@ -62,7 +62,7 @@ public class PotionOfLevitation extends Potion { } @Override - public int price() { - return isKnown() ? 40 * quantity : super.price(); + public int value() { + return isKnown() ? 40 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java index 12aa8fce5..09c672d7f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java @@ -57,7 +57,7 @@ public class PotionOfLiquidFlame extends Potion { } @Override - public int price() { - return isKnown() ? 30 * quantity : super.price(); + public int value() { + return isKnown() ? 30 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java index e910ef60d..38e1d6a5f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java @@ -49,7 +49,7 @@ public class PotionOfMindVision extends Potion { } @Override - public int price() { - return isKnown() ? 30 * quantity : super.price(); + public int value() { + return isKnown() ? 30 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java index 6bbe0aedf..151118030 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfParalyticGas.java @@ -50,7 +50,7 @@ public class PotionOfParalyticGas extends Potion { } @Override - public int price() { - return isKnown() ? 40 * quantity : super.price(); + public int value() { + return isKnown() ? 40 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java index 9dcd4df09..8df4fbb78 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java @@ -105,7 +105,7 @@ public class PotionOfPurity extends Potion { } @Override - public int price() { - return isKnown() ? 40 * quantity : super.price(); + public int value() { + return isKnown() ? 40 * quantity : super.value(); } } 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 a193a00d8..fa4310be7 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 @@ -48,7 +48,7 @@ public class PotionOfStrength extends Potion { } @Override - public int price() { - return isKnown() ? 50 * quantity : super.price(); + public int value() { + return isKnown() ? 50 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java index e08084bf5..21c3ca4c6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java @@ -50,7 +50,7 @@ public class PotionOfToxicGas extends Potion { } @Override - public int price() { - return isKnown() ? 30 * quantity : super.price(); + public int value() { + return isKnown() ? 30 * quantity : super.value(); } } 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 2c79e4de9..8552958e6 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 @@ -49,7 +49,7 @@ public class BlizzardBrew extends Brew { } @Override - public int price() { + public int value() { //prices of ingredients return quantity * (30 + 40); } 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 997e36532..ffc044010 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 @@ -64,7 +64,7 @@ public class CausticBrew extends Brew { } @Override - public int price() { + public int value() { //prices of ingredients return quantity * (30 + 50); } 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 9e24de0b5..10291fe04 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 @@ -52,7 +52,7 @@ public class InfernalBrew extends Brew { } @Override - public int price() { + public int value() { //prices of ingredients return quantity * (30 + 40); } 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 e0e0015cd..39ad8341f 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 @@ -55,7 +55,7 @@ public class ShockingBrew extends Brew { } @Override - public int price() { + public int value() { //prices of ingredients return quantity * (40 + 40); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfAquaticRejuvenation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfAquaticRejuvenation.java index 2363b719e..1630b8244 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfAquaticRejuvenation.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfArcaneArmor.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfArcaneArmor.java index 7ce62701d..de6248387 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfArcaneArmor.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfDragonsBlood.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfDragonsBlood.java index b9fd50daa..eedaf7d78 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfDragonsBlood.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java index 656d1aadf..2b5e329af 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfHoneyedHealing.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfIcyTouch.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfIcyTouch.java index 8fd7aa7b5..40e8a77cd 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfIcyTouch.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java index c9dc8e5d4..3b1daa01b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfMight.java +++ b/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); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfToxicEssence.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfToxicEssence.java index 159bf4f12..28cfe116a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfToxicEssence.java +++ b/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); } 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 033604889..b39248881 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 @@ -117,8 +117,8 @@ public class ExoticPotion extends Potion { @Override //20 gold more than its none-exotic equivalent - public int price() { - return (Reflection.newInstance(exoToReg.get(getClass())).price() + 20) * quantity; + public int value() { + return (Reflection.newInstance(exoToReg.get(getClass())).value() + 20) * quantity; } public static class PotionToExotic extends Recipe{ 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 b502af35a..638a011e8 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 @@ -42,7 +42,7 @@ public class GooBlob extends Item { } @Override - public int price() { + public int value() { return quantity * 50; } } 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 abcabd1c5..3663b3ce4 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 @@ -42,7 +42,7 @@ public class MetalShard extends Item { } @Override - public int price() { + public int value() { return quantity * 100; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java index 15a253551..5b0cf4865 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java +++ b/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; 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 ad4d6ca04..834a3f724 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 @@ -257,7 +257,7 @@ public abstract class Scroll extends Item { } @Override - public int price() { + public int value() { return 30 * quantity; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java index 8ea29b8ad..e8efc849a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfIdentify.java @@ -73,7 +73,7 @@ public class ScrollOfIdentify extends InventoryScroll { } @Override - public int price() { - return isKnown() ? 30 * quantity : super.price(); + public int value() { + return isKnown() ? 30 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java index cc91defa4..fe786d5f0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java @@ -74,7 +74,7 @@ public class ScrollOfLullaby extends Scroll { } @Override - public int price() { - return isKnown() ? 40 * quantity : super.price(); + public int value() { + return isKnown() ? 40 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java index e70d30abb..c167348d0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java @@ -98,8 +98,8 @@ public class ScrollOfMagicMapping extends Scroll { } @Override - public int price() { - return isKnown() ? 40 * quantity : super.price(); + public int value() { + return isKnown() ? 40 * quantity : super.value(); } public static void discover( int cell ) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java index 352638b8d..9f7e1402f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java @@ -167,7 +167,7 @@ public class ScrollOfMirrorImage extends Scroll { } @Override - public int price() { - return isKnown() ? 30 * quantity : super.price(); + public int value() { + return isKnown() ? 30 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java index 8c1c71c5c..758406be7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java +++ b/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() { - return isKnown() ? 40 * quantity : super.price(); + public int value() { + return isKnown() ? 40 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java index 6ce050da8..bc0871af2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRecharging.java +++ b/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() { - return isKnown() ? 30 * quantity : super.price(); + public int value() { + return isKnown() ? 30 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java index 5a6faf222..0053f5ffa 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRemoveCurse.java @@ -129,7 +129,7 @@ public class ScrollOfRemoveCurse extends InventoryScroll { } @Override - public int price() { - return isKnown() ? 30 * quantity : super.price(); + public int value() { + return isKnown() ? 30 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java index d8717a884..a02f95b8b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRetribution.java @@ -93,7 +93,7 @@ public class ScrollOfRetribution extends Scroll { } @Override - public int price() { - return isKnown() ? 40 * quantity : super.price(); + public int value() { + return isKnown() ? 40 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java index c00b8eef5..2c58c20eb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java @@ -241,7 +241,7 @@ public class ScrollOfTeleportation extends Scroll { } @Override - public int price() { - return isKnown() ? 30 * quantity : super.price(); + public int value() { + return isKnown() ? 30 * quantity : super.value(); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java index f0343483e..7f7a3e6b5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java @@ -91,7 +91,7 @@ public class ScrollOfTerror extends Scroll { } @Override - public int price() { - return isKnown() ? 40 * quantity : super.price(); + public int value() { + return isKnown() ? 40 * quantity : super.value(); } } 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 de6733cf4..f6ba0ddd4 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 @@ -273,7 +273,7 @@ public class ScrollOfTransmutation extends InventoryScroll { } @Override - public int price() { - return isKnown() ? 50 * quantity : super.price(); + public int value() { + return isKnown() ? 50 * quantity : super.value(); } } 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 98bd604f3..02aa5d075 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 @@ -128,7 +128,7 @@ public class ScrollOfUpgrade extends InventoryScroll { } @Override - public int price() { - return isKnown() ? 50 * quantity : super.price(); + public int value() { + return isKnown() ? 50 * quantity : super.value(); } } 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 911365f78..a3c7759ad 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 @@ -117,8 +117,8 @@ public abstract class ExoticScroll extends Scroll { @Override //20 gold more than its none-exotic equivalent - public int price() { - return (Reflection.newInstance(exoToReg.get(getClass())).price() + 20) * quantity; + public int value() { + return (Reflection.newInstance(exoToReg.get(getClass())).value() + 20) * quantity; } public static class ScrollToExotic extends Recipe { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Alchemize.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Alchemize.java index 8140bcf73..adf66edf6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Alchemize.java +++ b/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)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/AquaBlast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/AquaBlast.java index 435932350..3179bfd0c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/AquaBlast.java +++ b/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)); } 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 5f04dc943..1479e6912 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 @@ -79,7 +79,7 @@ public class ArcaneCatalyst extends Spell { } @Override - public int price() { + public int value() { return 40 * quantity; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java index 58bfb2e9f..d5e2b124f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/BeaconOfReturning.java +++ b/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)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java index 58adf7ab9..0cd9a4bdf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/CurseInfusion.java +++ b/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)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java index 9787b75a4..b5a76b5d4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java +++ b/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)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalInfusion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalInfusion.java index 56139ee02..bb926bdb2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalInfusion.java +++ b/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)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalPorter.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalPorter.java index 767cbe76a..3e1ce5936 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalPorter.java +++ b/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)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java index 2b3adfc84..92583a492 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/PhaseShift.java +++ b/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)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java index 1fa7064c9..10ab43067 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java +++ b/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)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Recycle.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Recycle.java index f2dd66338..de6cd0c7a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Recycle.java +++ b/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)); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java index 9a68b9b55..8bb9b72ef 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/WildEnergy.java +++ b/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)); } 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 e7736a7d2..a27ba17ad 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 @@ -54,7 +54,7 @@ public abstract class Runestone extends Item { } @Override - public int price() { + public int value() { return 10 * quantity; } 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 309f46db9..11c7d2fa9 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 @@ -65,7 +65,7 @@ public class StoneOfAugmentation extends InventoryStone { } @Override - public int price() { + public int value() { return 30 * quantity; } 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 cd1027f09..658205526 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 @@ -67,7 +67,7 @@ public class StoneOfEnchantment extends InventoryStone { } @Override - public int price() { + public int value() { return 30 * quantity; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java index cb9f8a965..9ab4971a7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java +++ b/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; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java index 079a5aec5..7975c91f7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java +++ b/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; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java index b2bb9189e..e43943f43 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java +++ b/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; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java index 1f9c6c176..124908457 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java @@ -365,7 +365,7 @@ abstract public class MissileWeapon extends Weapon { } @Override - public int price() { + public int value() { return 6 * tier * quantity * (level() + 1); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingStone.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingStone.java index fb3d5bdfd..cfc04d3d9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingStone.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingStone.java @@ -39,7 +39,7 @@ public class ThrowingStone extends MissileWeapon { } @Override - public int price() { - return super.price()/2; //half normal value + public int value() { + return super.value()/2; //half normal value } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/Dart.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/Dart.java index 3021149bb..dc166d49d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/Dart.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/Dart.java @@ -149,8 +149,8 @@ public class Dart extends MissileWeapon { } @Override - public int price() { - return super.price()/2; //half normal value + public int value() { + return super.value()/2; //half normal value } private final WndBag.Listener itemSelector = new WndBag.Listener() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java index a5fcf228a..c0d4fabe6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java @@ -163,7 +163,7 @@ public abstract class TippedDart extends Dart { } @Override - public int price() { + public int value() { //value of regular dart plus half of the seed return 8 * 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 a4605d67a..0c745614d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java @@ -189,7 +189,7 @@ public abstract class Plant implements Bundlable { } @Override - public int price() { + public int value() { return 10 * quantity; } 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 a9dc20bea..c54cab1d5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Rotberry.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Rotberry.java @@ -68,7 +68,7 @@ public class Rotberry extends Plant { } @Override - public int price() { + public int value() { return 30 * 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 1d05ccb4c..156a15d6f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Starflower.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Starflower.java @@ -59,7 +59,7 @@ public class Starflower extends Plant { } @Override - public int price() { + public int value() { return 30 * quantity; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java index f41852261..b7c48d3a3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java @@ -24,7 +24,6 @@ package com.shatteredpixel.shatteredpixeldungeon.windows; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.SPDAction; -import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; @@ -413,7 +412,7 @@ public class WndBag extends WndTabbed { enable( false ); } else { enable( - mode == Mode.FOR_SALE && !item.unique && (item.price() > 0) && (!item.isEquipped( Dungeon.hero ) || !item.cursed) || + mode == Mode.FOR_SALE && !item.unique && (item.value() > 0) && (!item.isEquipped( Dungeon.hero ) || !item.cursed) || mode == Mode.UPGRADEABLE && item.isUpgradable() || mode == Mode.UNIDENTIFED && !item.isIdentified() || mode == Mode.UNCURSABLE && ScrollOfRemoveCurse.uncursable(item) || diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java index 356d419f4..934eebf1b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTradeItem.java @@ -31,9 +31,6 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Heap; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.MasterThievesArmband; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; -import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; -import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; -import com.shatteredpixel.shatteredpixeldungeon.ui.ItemSlot; import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; public class WndTradeItem extends WndInfoItem { @@ -54,7 +51,7 @@ public class WndTradeItem extends WndInfoItem { if (item.quantity() == 1) { - RedButton btnSell = new RedButton( Messages.get(this, "sell", item.price()) ) { + RedButton btnSell = new RedButton( Messages.get(this, "sell", item.value()) ) { @Override protected void onClick() { sell( item ); @@ -68,7 +65,7 @@ public class WndTradeItem extends WndInfoItem { } else { - int priceAll= item.price(); + int priceAll= item.value(); RedButton btnSell1 = new RedButton( Messages.get(this, "sell_1", priceAll / item.quantity()) ) { @Override protected void onClick() { @@ -104,7 +101,7 @@ public class WndTradeItem extends WndInfoItem { float pos = height; - final int price = price( item ); + final int price = Shopkeeper.sellPrice( item ); RedButton btnBuy = new RedButton( Messages.get(this, "buy", price) ) { @Override @@ -175,7 +172,7 @@ public class WndTradeItem extends WndInfoItem { } item.detachAll( hero.belongings.backpack ); - new Gold( item.price() ).doPickUp( hero ); + new Gold( item.value() ).doPickUp( hero ); //selling items in the sell interface doesn't spend time hero.spend(-hero.cooldown()); @@ -191,24 +188,19 @@ public class WndTradeItem extends WndInfoItem { item = item.detach( hero.belongings.backpack ); - new Gold( item.price() ).doPickUp( hero ); + new Gold( item.value() ).doPickUp( hero ); //selling items in the sell interface doesn't spend time hero.spend(-hero.cooldown()); } } - private int price( Item item ) { - int price = item.price() * 5 * (Dungeon.depth / 5 + 1); - return price; - } - private void buy( Heap heap ) { Item item = heap.pickUp(); if (item == null) return; - int price = price( item ); + int price = Shopkeeper.sellPrice( item ); Dungeon.gold -= price; if (!item.doPickUp( Dungeon.hero )) {