v0.6.1b: further adjustments to sad ghost error checking

This commit is contained in:
Evan Debenham 2017-08-23 14:59:47 -04:00
parent 71b74fd3de
commit 1bebbc348a

View File

@ -21,6 +21,7 @@
package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.Challenges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
@ -81,7 +82,7 @@ public class WndSadGhost extends Window {
btnWeapon.setRect( 0, message.top() + message.height() + GAP, WIDTH, BTN_HEIGHT );
add( btnWeapon );
if (Ghost.Quest.armor != null) {
if (!Dungeon.isChallenged( Challenges.NO_ARMOR )) {
RedButton btnArmor = new RedButton( Messages.get(this, "armor") ) {
@Override
protected void onClick() {
@ -101,6 +102,8 @@ public class WndSadGhost extends Window {
hide();
if (reward == null) return;
reward.identify();
if (reward.doPickUp( Dungeon.hero )) {
GLog.i( Messages.get(Dungeon.hero, "you_now_have", reward.name()) );