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

v1.2.0: fixed alchemize prompt still appearing after spell is consumed

Browse Source
This commit is contained in:
Evan Debenham 2022-03-20 15:55:02 -04:00
parent f9c95d0402
commit 4ce6c1df45
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Alchemize.java
View File

@ -48,9 +48,11 @@ public class Alchemize extends Spell {
image = ItemSpriteSheet.ALCHEMIZE; image = ItemSpriteSheet.ALCHEMIZE;
} }
private static WndBag parentWnd;
@Override @Override
protected void onCast(Hero hero) { protected void onCast(Hero hero) {
GameScene.selectItem( itemSelector ); parentWnd = GameScene.selectItem( itemSelector );
} }
@Override @Override
@ -89,7 +91,9 @@ public class Alchemize extends Spell {
@Override @Override
public void onSelect( Item item ) { public void onSelect( Item item ) {
if (item != null) { if (item != null) {
WndBag parentWnd = GameScene.selectItem( itemSelector ); if (parentWnd != null) {
parentWnd = GameScene.selectItem(itemSelector);
}
GameScene.show( new WndAlchemizeItem( item, parentWnd ) ); GameScene.show( new WndAlchemizeItem( item, parentWnd ) );
} }
} }
@ -216,25 +220,15 @@ public class Alchemize extends Spell {
curItem.detachAll(Dungeon.hero.belongings.backpack); curItem.detachAll(Dungeon.hero.belongings.backpack);
if (owner != null) { if (owner != null) {
owner.hide(); owner.hide();
owner = null;
} }
} else { } else {
curItem.detach(Dungeon.hero.belongings.backpack); curItem.detach(Dungeon.hero.belongings.backpack);
if (owner == null){ if (owner != null){
GameScene.selectItem(itemSelector);
}
}
}
@Override
public void hide() {
super.hide();
if (owner != null) {
owner.hide(); owner.hide();
}
GameScene.selectItem(itemSelector); GameScene.selectItem(itemSelector);
} }
} }
} }
} }