diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Weightstone.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Weightstone.java index 7fa21f209..ab2c79a62 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Weightstone.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Weightstone.java @@ -102,7 +102,7 @@ public class Weightstone extends Item { @Override public int price() { - return 40 * quantity; + return 50 * quantity; } private final WndBag.Listener itemSelector = new WndBag.Listener() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index 710c2fbe2..dbba0d093 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -366,19 +366,15 @@ public class Armor extends EquipableItem { @Override public int price() { - int price = 10 * (1 << (tier - 1)); - if (hasCurseGlyph()) { + int price = 20 * (1 << (tier - 1)); + if (hasGoodGlyph()) { price *= 1.5; } if (cursedKnown && (cursed || hasCurseGlyph())) { price /= 2; } - if (levelKnown) { - if (level() > 0) { - price *= (level() + 1); - } else if (level() < 0) { - price /= (1 - level()); - } + if (levelKnown && level() > 0) { + price *= (level() + 1); } if (price < 1) { price = 1; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java index 5c53f924c..988dca617 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java @@ -181,7 +181,7 @@ public class Artifact extends KindofMisc { public int price() { int price = 100; if (level() > 0) - price += 50*((level()*10)/levelCap); + price += 20*visiblyUpgraded(); if (cursed && cursedKnown) { price /= 2; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index a5f5a288f..c37ef32d1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -376,7 +376,7 @@ public class TimekeepersHourglass extends Artifact { @Override public int price() { - return 20; + return 10; } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java index 7fb87ba94..872d9eb80 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/PotionBandolier.java @@ -39,7 +39,7 @@ public class PotionBandolier extends Bag { @Override public int price() { - return 50; + return 40; } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java index f3a0e1b16..090922466 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/ScrollHolder.java @@ -39,7 +39,7 @@ public class ScrollHolder extends Bag { @Override public int price() { - return 50; + return 40; } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/SeedPouch.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/SeedPouch.java index e928ff090..1331b74a8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/SeedPouch.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/bags/SeedPouch.java @@ -39,7 +39,7 @@ public class SeedPouch extends Bag { @Override public int price() { - return 50; + return 30; } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java index 6f00e3661..552a4f580 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/ChargrilledMeat.java @@ -33,7 +33,7 @@ public class ChargrilledMeat extends Food { @Override public int price() { - return 5 * quantity; + return 8 * quantity; } public static Food cook( MysteryMeat ingredient ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java index c8552235f..1969f707c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/food/OverpricedRation.java @@ -33,6 +33,6 @@ public class OverpricedRation extends Food { @Override public int price() { - return 20 * quantity; + return 10 * quantity; } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java index 1a92eedec..6f2d21441 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java @@ -313,6 +313,6 @@ public class Potion extends Item { @Override public int price() { - return 20 * quantity; + return 30 * quantity; } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java index 5e516c37d..970314a63 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfExperience.java @@ -38,6 +38,6 @@ public class PotionOfExperience extends Potion { @Override public int price() { - return isKnown() ? 80 * quantity : super.price(); + return isKnown() ? 50 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java index 6931c5f79..0fbe8144e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java @@ -61,6 +61,6 @@ public class PotionOfFrost extends Potion { @Override public int price() { - return isKnown() ? 50 * quantity : super.price(); + return isKnown() ? 30 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java index 828657c3b..2fd54b2f3 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLevitation.java @@ -60,6 +60,6 @@ public class PotionOfLevitation extends Potion { @Override public int price() { - return isKnown() ? 35 * quantity : super.price(); + return isKnown() ? 30 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java index a3924a9d8..7e05c994e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfLiquidFlame.java @@ -64,6 +64,6 @@ public class PotionOfLiquidFlame extends Potion { @Override public int price() { - return isKnown() ? 40 * quantity : super.price(); + return isKnown() ? 30 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java index ba283e7b9..86f3262b1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMight.java @@ -49,6 +49,6 @@ public class PotionOfMight extends Potion { @Override public int price() { - return isKnown() ? 200 * quantity : super.price(); + return isKnown() ? 100 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java index a54f356f4..93e79617f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfMindVision.java @@ -48,6 +48,6 @@ public class PotionOfMindVision extends Potion { @Override public int price() { - return isKnown() ? 35 * quantity : super.price(); + return isKnown() ? 40 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java index d8529f141..7db006bcc 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfPurity.java @@ -125,6 +125,6 @@ public class PotionOfPurity extends Potion { @Override public int price() { - return isKnown() ? 50 * quantity : super.price(); + return isKnown() ? 40 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java index 6b57c919e..773de1e4e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfStrength.java @@ -47,6 +47,6 @@ public class PotionOfStrength extends Potion { @Override public int price() { - return isKnown() ? 100 * quantity : super.price(); + return isKnown() ? 50 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java index 97872f5b1..3c2ef20f2 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfToxicGas.java @@ -48,6 +48,6 @@ public class PotionOfToxicGas extends Potion { @Override public int price() { - return isKnown() ? 40 * quantity : super.price(); + return isKnown() ? 30 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java index 12ac7daf7..d67317b42 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DarkGold.java @@ -41,9 +41,4 @@ public class DarkGold extends Item { public boolean isIdentified() { return true; } - - @Override - public int price() { - return quantity; - } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java index ae158d0e2..1a4144193 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/DwarfToken.java @@ -41,9 +41,4 @@ public class DwarfToken extends Item { public boolean isIdentified() { return true; } - - @Override - public int price() { - return quantity * 100; - } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java index 3e515a8d3..6196f8a9a 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/quest/RatSkull.java @@ -42,9 +42,4 @@ public class RatSkull extends Item { public boolean isIdentified() { return true; } - - @Override - public int price() { - return 100; - } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java index fe0ade877..1fc399138 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java @@ -212,6 +212,6 @@ public abstract class Scroll extends Item { @Override public int price() { - return 15 * quantity; + return 30 * quantity; } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java index f4926da15..629d060c8 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfLullaby.java @@ -63,6 +63,6 @@ public class ScrollOfLullaby extends Scroll { @Override public int price() { - return isKnown() ? 50 * quantity : super.price(); + return isKnown() ? 40 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java index a1fe96e52..f7d784393 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicMapping.java @@ -87,7 +87,7 @@ public class ScrollOfMagicMapping extends Scroll { @Override public int price() { - return isKnown() ? 25 * quantity : super.price(); + return isKnown() ? 40 * quantity : super.price(); } public static void discover( int cell ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java index 7f9775a23..56a06bf12 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMagicalInfusion.java @@ -21,7 +21,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.scrolls; import com.shatteredpixel.shatteredpixeldungeon.Badges; -import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.effects.Enchanting; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.items.Item; @@ -56,4 +55,8 @@ public class ScrollOfMagicalInfusion extends InventoryScroll { Enchanting.show(curUser, item); } + @Override + public int price() { + return isKnown() ? 100 * quantity : super.price(); + } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java index c347a38a5..6fa666655 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java @@ -74,4 +74,8 @@ public class ScrollOfMirrorImage extends Scroll { readAnimation(); } + @Override + public int price() { + return isKnown() ? 30 * quantity : super.price(); + } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java index 8603beba0..72af08db4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfPsionicBlast.java @@ -73,6 +73,6 @@ public class ScrollOfPsionicBlast extends Scroll { @Override public int price() { - return isKnown() ? 80 * quantity : super.price(); + return isKnown() ? 50 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java index d07b79b4b..6d301fef3 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfRage.java @@ -70,4 +70,8 @@ public class ScrollOfRage extends Scroll { readAnimation(); } + @Override + public int price() { + return isKnown() ? 30 * quantity : super.price(); + } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java index b10c691de..ff4f037de 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java @@ -93,6 +93,6 @@ public class ScrollOfTeleportation extends Scroll { @Override public int price() { - return isKnown() ? 40 * quantity : super.price(); + return isKnown() ? 30 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java index 2e08306b1..3a97468fd 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTerror.java @@ -75,6 +75,6 @@ public class ScrollOfTerror extends Scroll { @Override public int price() { - return isKnown() ? 50 * quantity : super.price(); + return isKnown() ? 30 * quantity : super.price(); } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java index bc71824e3..24fbd8f61 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfUpgrade.java @@ -127,4 +127,8 @@ public class ScrollOfUpgrade extends InventoryScroll { hero.sprite.emitter().start( ShadowParticle.UP, 0.05f, 10 ); } + @Override + public int price() { + return isKnown() ? 50 * quantity : super.price(); + } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java index 84a741650..697d54355 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java @@ -24,7 +24,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; -import com.watabou.utils.Random; public class MeleeWeapon extends Weapon { @@ -112,12 +111,8 @@ public class MeleeWeapon extends Weapon { if (cursedKnown && (cursed || hasCurseEnchant())) { price /= 2; } - if (levelKnown) { - if (level() > 0) { - price *= (level() + 1); - } else if (level() < 0) { - price /= (1 - level()); - } + if (levelKnown && level() > 0) { + price *= (level() + 1); } if (price < 1) { price = 1;