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

v2.1.0: fixed errors when transmuting an equipped artifact into a ring

Browse Source
This commit is contained in:
Evan Debenham
2023-05-23 12:03:31 -04:00
parent c57a9dd8ee
commit c5892430a3
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java
View File

@@ -91,7 +91,13 @@ public class ScrollOfTransmutation extends InventoryScroll {
int slot = Dungeon.quickslot.getSlot(item);
if (item.isEquipped(Dungeon.hero)) {
item.cursed = false; //to allow it to be unequipped
if (item instanceof KindOfWeapon && Dungeon.hero.belongings.secondWep() == item){
if (item instanceof Artifact && result instanceof Ring){
//if we turned an equipped artifact into a ring, ring goes into inventory
((EquipableItem) item).doUnequip(Dungeon.hero, false);
if (!result.collect()){
Dungeon.level.drop(result, curUser.pos).sprite.drop();
}
} else if (item instanceof KindOfWeapon && Dungeon.hero.belongings.secondWep() == item){
((EquipableItem) item).doUnequip(Dungeon.hero, false);
((KindOfWeapon) result).equipSecondary(Dungeon.hero);
} else {