From 4a2b421fd05efa74e68831cd4c979c9ca3f6e419 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 9 Jun 2016 15:23:56 -0400 Subject: [PATCH] v0.4.0: bug and typo fixes --- .../shatteredpixeldungeon/items/armor/Armor.java | 4 ++-- .../shatteredpixeldungeon/messages/items/items.properties | 2 +- .../shatteredpixel/shatteredpixeldungeon/windows/WndBag.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java index 9ce8fcc02..46f499f70 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java @@ -170,8 +170,8 @@ public class Armor extends EquipableItem { public void affixSeal(BrokenSeal seal){ this.seal = seal; if (seal.level() > 0){ - //doesn't override existing glyphs, but doesn't create one either - upgrade(glyph != null); + //doesn't trigger upgrading logic such as affecting curses/glyphs + level(level()+1); } if (isEquipped(Dungeon.hero)){ Buff.affect(Dungeon.hero, BrokenSeal.WarriorShield.class).setArmor(this); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index 435e5c2e7..3b8c97b89 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -713,7 +713,7 @@ items.weapon.curses.fragile.name=fragile %s items.weapon.curses.fragile.desc=Fragile weapons start out just as strong as their uncursed counterparts, but rapidly decrease in effectiveness as they are used. items.weapon.curses.wayward.name=wayward %s -items.weapon.curses.wayward.desc=A wayward weapon has a very hard time finding its mark, making it extremely inaccurate unless the attack is garunteed to suceed. +items.weapon.curses.wayward.desc=A wayward weapon has a very hard time finding its mark, making it extremely inaccurate unless the attack is guaranteed to succeed. ###enchantments diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java index 9a336fb60..5ee19994d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndBag.java @@ -369,7 +369,7 @@ public class WndBag extends WndTabbed { mode == Mode.FOR_SALE && (item.price() > 0) && (!item.isEquipped( Dungeon.hero ) || !item.cursed) || mode == Mode.UPGRADEABLE && item.isUpgradable() || mode == Mode.UNIDENTIFED && !item.isIdentified() || - mode == Mode.UNIDED_OR_CURSED && (item instanceof EquipableItem && (!item.isIdentified() || item.cursed)) || + mode == Mode.UNIDED_OR_CURSED && ((item instanceof EquipableItem || item instanceof Wand) && (!item.isIdentified() || item.cursed)) || mode == Mode.QUICKSLOT && (item.defaultAction != null) || mode == Mode.WEAPON && (item instanceof MeleeWeapon || item instanceof Boomerang) || mode == Mode.ARMOR && (item instanceof Armor) ||