From 7793ec0c04196525c679b4230c0390fdd94136a7 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 14 Sep 2018 20:15:26 -0400 Subject: [PATCH] v0.7.0: fixed: - spells being upgradeable - errors when certain bombs explode early - incorrect magical porter recipe --- .../com/shatteredpixel/shatteredpixeldungeon/items/Heap.java | 3 ++- .../shatteredpixeldungeon/items/spells/MagicalPorter.java | 4 ++-- .../shatteredpixeldungeon/items/spells/Spell.java | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java index 3f9bdc034..e3f121add 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java @@ -247,8 +247,9 @@ public class Heap implements Bundlable { } else if (item instanceof Bomb) { items.remove( item ); ((Bomb) item).explode( pos ); + burnt = true; //stop processing the burning, it will be replaced by the explosion. - return; + break; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalPorter.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalPorter.java index 3e0ba90d8..a6a4bd264 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalPorter.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalPorter.java @@ -23,9 +23,9 @@ package com.shatteredpixel.shatteredpixeldungeon.items.spells; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; -import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.MirrorImage; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.MerchantsBeacon; +import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMirrorImage; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; @@ -65,7 +65,7 @@ public class MagicalPorter extends InventorySpell { public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { { - inputs = new Class[]{MirrorImage.class, MerchantsBeacon.class}; + inputs = new Class[]{ScrollOfMirrorImage.class, MerchantsBeacon.class}; inQuantity = new int[]{1, 1}; cost = 2; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Spell.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Spell.java index 62b9d4ac6..e6b43c951 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Spell.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/Spell.java @@ -68,6 +68,11 @@ public abstract class Spell extends Item { return true; } + @Override + public boolean isUpgradable() { + return false; + } + protected abstract void onCast(Hero hero ); }