LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.4: fixed minor errors in WndResurrect

Browse Source
This commit is contained in:
Evan Debenham 2021-08-01 19:48:24 -04:00
parent 6b37305ddb
commit 5109e17f14
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/assets/messages/windows/windows.properties
View File

@ -145,6 +145,7 @@ windows.wndranking$statstab.ankhs=Ankhs Used
windows.wndresurrect.title=Resurrection
windows.wndresurrect.message=As you perish you can feel your ankh guiding your spirit back toward this world. It's giving you another chance to conquer the dungeon!\n\nYou can bring two of your items with you, but the rest will be left where you perished. Which items will you choose?
windows.wndresurrect.prompt=Select an item
windows.wndresurrect.confirm=Preserve these items
windows.wndsadghost.rat_title=DEFEATED FETID RAT

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndResurrect.java
View File

@ -21,11 +21,13 @@
package com.shatteredpixel.shatteredpixeldungeon.windows;
import com.shatteredpixel.shatteredpixeldungeon.Badges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.items.Ankh;
import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.Bag;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
@ -123,13 +125,13 @@ public class WndResurrect extends Window {
@Override
public String textPrompt() {
return "TODO";
return Messages.get(WndResurrect.class, "prompt");
}
@Override
public boolean itemSelectable(Item item) {
//cannot select ankhs or equippable items that aren't equipped
return !(item instanceof Ankh) &&
//cannot select ankhs, bags or equippable items that aren't equipped
return !(item instanceof Ankh) && !(item instanceof Bag) &&
(!(item instanceof EquipableItem) || item.isEquipped(Dungeon.hero) || item instanceof MissileWeapon);
}