From efa9c3bb73bb4b95ea5426f08255e7062038985c Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 10 Jul 2016 22:28:51 -0400 Subject: [PATCH] v0.4.1: a couple more price changes --- .../shatteredpixeldungeon/items/armor/Armor.java | 4 +++- .../items/artifacts/CloakOfShadows.java | 5 +++++ .../shatteredpixeldungeon/items/weapon/melee/MagesStaff.java | 5 +++++ .../items/weapon/melee/MeleeWeapon.java | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index dbba0d093..b90a60b29 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -366,7 +366,9 @@ public class Armor extends EquipableItem { @Override public int price() { - int price = 20 * (1 << (tier - 1)); + if (seal != null) return 0; + + int price = 20 * tier; if (hasGoodGlyph()) { price *= 1.5; } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index 78a914bac..4671c2fd1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -162,6 +162,11 @@ public class CloakOfShadows extends Artifact { } } + @Override + public int price() { + return 0; + } + public class cloakRecharge extends ArtifactBuff{ @Override public boolean act() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java index f49ecaa82..a7fc3bbaf 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java @@ -281,6 +281,11 @@ public class MagesStaff extends MeleeWeapon { } } + @Override + public int price() { + return 0; + } + private final WndBag.Listener itemSelector = new WndBag.Listener() { @Override public void onSelect( final Item item ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java index 697d54355..6132020c5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java @@ -104,7 +104,7 @@ public class MeleeWeapon extends Weapon { @Override public int price() { - int price = 20 * (1 << (tier - 1)); + int price = 20 * tier; if (hasGoodEnchant()) { price *= 1.5; }