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

v0.9.2: fixed seal with a cursed glyph not applying to cursed armor

Browse Source
This commit is contained in:
Evan Debenham 2021-01-22 20:27:05 -05:00
parent 8abfa7a8c7
commit f5124b2ccc
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/BrokenSeal.java
View File

@ -101,30 +101,35 @@ public class BrokenSeal extends Item {
protected static WndBag.Listener armorSelector = new WndBag.Listener() { protected static WndBag.Listener armorSelector = new WndBag.Listener() {
@Override @Override
public void onSelect( Item item ) { public void onSelect( Item item ) {
BrokenSeal seal = (BrokenSeal) curItem;
if (item != null && item instanceof Armor) { if (item != null && item instanceof Armor) {
Armor armor = (Armor)item; Armor armor = (Armor)item;
if (!armor.levelKnown){ if (!armor.levelKnown){
GLog.w(Messages.get(BrokenSeal.class, "unknown_armor")); GLog.w(Messages.get(BrokenSeal.class, "unknown_armor"));
} else if (armor.cursed || armor.level() < 0){
} else if ((armor.cursed || armor.level() < 0)
&& (seal.getGlyph() == null || !seal.getGlyph().curse())){
GLog.w(Messages.get(BrokenSeal.class, "degraded_armor")); GLog.w(Messages.get(BrokenSeal.class, "degraded_armor"));
} else if (armor.glyph != null && ((BrokenSeal)curItem).getGlyph() != null
&& armor.glyph.getClass() != ((BrokenSeal) curItem).getGlyph().getClass()) { } else if (armor.glyph != null && seal.getGlyph() != null
&& armor.glyph.getClass() != seal.getGlyph().getClass()) {
GameScene.show(new WndOptions(Messages.get(BrokenSeal.class, "choose_title"), GameScene.show(new WndOptions(Messages.get(BrokenSeal.class, "choose_title"),
Messages.get(BrokenSeal.class, "choose_desc"), Messages.get(BrokenSeal.class, "choose_desc"),
armor.glyph.name(), armor.glyph.name(),
((BrokenSeal)curItem).getGlyph().name()){ seal.getGlyph().name()){
@Override @Override
protected void onSelect(int index) { protected void onSelect(int index) {
if (index == 0) ((BrokenSeal)curItem).setGlyph(null); if (index == 0) seal.setGlyph(null);
//if index is 1, then the glyph transfer happens in affixSeal //if index is 1, then the glyph transfer happens in affixSeal
GLog.p(Messages.get(BrokenSeal.class, "affix")); GLog.p(Messages.get(BrokenSeal.class, "affix"));
Dungeon.hero.sprite.operate(Dungeon.hero.pos); Dungeon.hero.sprite.operate(Dungeon.hero.pos);
Sample.INSTANCE.play(Assets.Sounds.UNLOCK); Sample.INSTANCE.play(Assets.Sounds.UNLOCK);
armor.affixSeal((BrokenSeal)curItem); armor.affixSeal(seal);
curItem.detach(Dungeon.hero.belongings.backpack); seal.detach(Dungeon.hero.belongings.backpack);
} }
}); });
} else { } else {
GLog.p(Messages.get(BrokenSeal.class, "affix")); GLog.p(Messages.get(BrokenSeal.class, "affix"));
Dungeon.hero.sprite.operate(Dungeon.hero.pos); Dungeon.hero.sprite.operate(Dungeon.hero.pos);