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

v0.6.1: bugfixes to new dried rose

Browse Source
This commit is contained in:
Evan Debenham 2017-06-28 22:28:00 -04:00
parent bc4dda1bf3
commit 7ebf612917
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java
View File

@ -46,6 +46,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs.Swiftness;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.messages.Languages; import com.shatteredpixel.shatteredpixeldungeon.messages.Languages;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
@ -811,12 +812,11 @@ public class DriedRose extends Artifact {
GameScene.selectItem(new WndBag.Listener() { GameScene.selectItem(new WndBag.Listener() {
@Override @Override
public void onSelect(Item item) { public void onSelect(Item item) {
if (item.unique) { //catches boomerang if (!(item instanceof MeleeWeapon || item instanceof Boomerang)) {
//do nothing, should only happen when window is cancelled
} else if (item.unique || item instanceof Boomerang) {
GLog.w( Messages.get(WndGhostHero.class, "cant_unique")); GLog.w( Messages.get(WndGhostHero.class, "cant_unique"));
hide(); hide();
} else if (!(item instanceof MeleeWeapon)) {
//no message because this should never happen
hide();
} else if (!item.isIdentified()) { } else if (!item.isIdentified()) {
GLog.w( Messages.get(WndGhostHero.class, "cant_unidentified")); GLog.w( Messages.get(WndGhostHero.class, "cant_unidentified"));
hide(); hide();
@ -864,8 +864,7 @@ public class DriedRose extends Artifact {
@Override @Override
public void onSelect(Item item) { public void onSelect(Item item) {
if (!(item instanceof Armor)) { if (!(item instanceof Armor)) {
//no message because this should never happen //do nothing, should only happen when window is cancelled
hide();
} else if (item.unique || ((Armor) item).checkSeal() != null) { } else if (item.unique || ((Armor) item).checkSeal() != null) {
GLog.w( Messages.get(WndGhostHero.class, "cant_unique")); GLog.w( Messages.get(WndGhostHero.class, "cant_unique"));
hide(); hide();