From dd5b7592f946ea0ec570409ecbe697a90cdfa8d7 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 14 Nov 2022 15:00:06 -0500 Subject: [PATCH] v2.0.0: transmuting the dried rose now preserves the ghost's items --- .../items/scrolls/ScrollOfTransmutation.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java index 51025d607..9d434c181 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java @@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem; import com.shatteredpixel.shatteredpixeldungeon.items.Generator; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.Artifact; +import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.DriedRose; import com.shatteredpixel.shatteredpixeldungeon.items.potions.AlchemicalCatalyst; import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion; import com.shatteredpixel.shatteredpixeldungeon.items.potions.brews.Brew; @@ -231,6 +232,16 @@ public class ScrollOfTransmutation extends InventoryScroll { } while ( n != null && (Challenges.isItemBlocked(n) || n.getClass() == a.getClass())); if (n != null){ + + if (a instanceof DriedRose){ + if (((DriedRose) a).ghostWeapon() != null){ + Dungeon.level.drop(((DriedRose) a).ghostWeapon(), Dungeon.hero.pos); + } + if (((DriedRose) a).ghostArmor() != null){ + Dungeon.level.drop(((DriedRose) a).ghostArmor(), Dungeon.hero.pos); + } + } + n.cursedKnown = a.cursedKnown; n.cursed = a.cursed; n.levelKnown = a.levelKnown;