konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Debenham
2017-08-23 14:59:47 -04:00
parent 71b74fd3de
commit 1bebbc348a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSadGhost.java
+4 -1
View File
@@ -21,6 +21,7 @@
package com.shatteredpixel.shatteredpixeldungeon.windows; package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.Challenges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Ghost;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; 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 ); btnWeapon.setRect( 0, message.top() + message.height() + GAP, WIDTH, BTN_HEIGHT );
add( btnWeapon ); add( btnWeapon );
if (Ghost.Quest.armor != null) { if (!Dungeon.isChallenged( Challenges.NO_ARMOR )) {
RedButton btnArmor = new RedButton( Messages.get(this, "armor") ) { RedButton btnArmor = new RedButton( Messages.get(this, "armor") ) {
@Override @Override
protected void onClick() { protected void onClick() {
@@ -101,6 +102,8 @@ public class WndSadGhost extends Window {
hide(); hide();
if (reward == null) return;
reward.identify(); reward.identify();
if (reward.doPickUp( Dungeon.hero )) { if (reward.doPickUp( Dungeon.hero )) {
GLog.i( Messages.get(Dungeon.hero, "you_now_have", reward.name()) ); GLog.i( Messages.get(Dungeon.hero, "you_now_have", reward.name()) );