diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties index ffd170223..f4d4a0c1a 100644 --- a/core/src/main/assets/messages/items/items.properties +++ b/core/src/main/assets/messages/items/items.properties @@ -1172,6 +1172,7 @@ items.scrolls.exotic.scrollofforesight.desc=After reading this scroll, the detai items.scrolls.exotic.scrollofmetamorphosis.name=scroll of metamorphosis items.scrolls.exotic.scrollofmetamorphosis.choose_desc=Choose a talent to metamorphose. items.scrolls.exotic.scrollofmetamorphosis.replace_desc=Choose a new talent to replace your metamorphosed talent with. +items.scrolls.exotic.scrollofmetamorphosis.cancel_warn=Cancelling will still consume your scroll of metamorphosis, are you sure? items.scrolls.exotic.scrollofmetamorphosis.metamorphose_talent=metamorphose talent items.scrolls.exotic.scrollofmetamorphosis.desc=This scroll contains powerful transmutation magic, which will apply to the caster instead of to an item. The magic of this scroll will let you select one talent, and replace it with one of four talents of the same tier from different hero classes!\n\nThis effect can only apply to class talents, not talents gained from subclasses or armor abilities. Talents that you cannot use will not be given as options. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMetamorphosis.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMetamorphosis.java index 9efc97446..efbbe999d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMetamorphosis.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfMetamorphosis.java @@ -81,10 +81,10 @@ public class ScrollOfMetamorphosis extends ExoticScroll { } } - private void confirmCancelation( Window chooseWindow ) { + private void confirmCancelation( Window chooseWindow, boolean byID ) { GameScene.show( new WndOptions(new ItemSprite(this), Messages.titleCase(name()), - Messages.get(InventoryScroll.class, "warning"), + byID ? Messages.get(InventoryScroll.class, "warning") : Messages.get(ScrollOfMetamorphosis.class, "cancel_warn"), Messages.get(InventoryScroll.class, "yes"), Messages.get(InventoryScroll.class, "no") ) { @Override @@ -158,7 +158,7 @@ public class ScrollOfMetamorphosis extends ExoticScroll { public void onBackPressed() { if (identifiedByUse){ - ((ScrollOfMetamorphosis)curItem).confirmCancelation(this); + ((ScrollOfMetamorphosis)curItem).confirmCancelation(this, true); } else { super.onBackPressed(); } @@ -277,7 +277,7 @@ public class ScrollOfMetamorphosis extends ExoticScroll { @Override public void onBackPressed() { if (curItem instanceof ScrollOfMetamorphosis) { - ((ScrollOfMetamorphosis) curItem).confirmCancelation(this); + ((ScrollOfMetamorphosis) curItem).confirmCancelation(this, false); } else { super.onBackPressed(); }