Merge branch 'v0.2.1' of https://github.com/00-Evan/shattered-pixel-dungeon

Changes in v0.2.1c Conflicts: src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java Additionally: Improved challenge characteristics (now armor challenge removes the reward menu button, rather than giving cloth armor)
2014-10-21 09:53:56 -04:00
parent 1592ceb6d8
commit 29a323ebcf
2 changed files with 21 additions and 20 deletions
@@ -359,10 +359,6 @@ public class Ghost extends NPC {
                    }
                }

-                //TODO this is silly, why trap the player with bad armour? Just remove the button from the window.
-                if (Dungeon.isChallenged( Challenges.NO_ARMOR ))
-                    armor = (Armor)new ClothArmor().degrade();
-
 				weapon.identify();
 				armor.identify();
 			}