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

v1.1.0: fixed bundling errors with summon elemental and reclaim trap

Browse Source
This commit is contained in:
Evan Debenham 2021-12-04 19:50:58 -05:00
parent 4d643fda6b
commit 203f61a520
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/ReclaimTrap.java
View File

@ -125,13 +125,13 @@ public class ReclaimTrap extends TargetedSpell {
@Override @Override
public void storeInBundle(Bundle bundle) { public void storeInBundle(Bundle bundle) {
super.storeInBundle(bundle); super.storeInBundle(bundle);
bundle.put(STORED_TRAP, storedTrap); if (storedTrap != null) bundle.put(STORED_TRAP, storedTrap);
} }
@Override @Override
public void restoreFromBundle(Bundle bundle) { public void restoreFromBundle(Bundle bundle) {
super.restoreFromBundle(bundle); super.restoreFromBundle(bundle);
storedTrap = bundle.getClass(STORED_TRAP); if (bundle.contains(STORED_TRAP)) storedTrap = bundle.getClass(STORED_TRAP);
} }
public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe {

15
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/SummonElemental.java
View File

@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.watabou.utils.Bundle;
import com.watabou.utils.PathFinder; import com.watabou.utils.PathFinder;
import com.watabou.utils.Random; import com.watabou.utils.Random;
import com.watabou.utils.Reflection; import com.watabou.utils.Reflection;
@ -122,6 +123,20 @@ public class SummonElemental extends Spell {
return desc; return desc;
} }
private static final String SUMMON_CLASS = "summon_class";
@Override
public void storeInBundle(Bundle bundle) {
super.storeInBundle(bundle);
bundle.put(SUMMON_CLASS, summonClass);
}
@Override
public void restoreFromBundle(Bundle bundle) {
super.restoreFromBundle(bundle);
summonClass = bundle.getClass(SUMMON_CLASS);
}
public WndBag.ItemSelector selector = new WndBag.ItemSelector() { public WndBag.ItemSelector selector = new WndBag.ItemSelector() {
@Override @Override
public String textPrompt() { public String textPrompt() {