diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index 3dde16d46..8febee47f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -142,15 +142,12 @@ public class CloakOfShadows extends Artifact { return desc; } - //Note: cloak needs to bundle chargecap as it is dynamic. - private static final String CHARGECAP = "chargecap"; private static final String STEALTHED = "stealthed"; private static final String COOLDOWN = "cooldown"; @Override public void storeInBundle( Bundle bundle ) { super.storeInBundle(bundle); - bundle.put( CHARGECAP, chargeCap ); bundle.put( STEALTHED, stealthed ); bundle.put( COOLDOWN, cooldown ); } @@ -158,7 +155,6 @@ public class CloakOfShadows extends Artifact { @Override public void restoreFromBundle( Bundle bundle ) { super.restoreFromBundle(bundle); - chargeCap = bundle.getInt( CHARGECAP ); stealthed = bundle.getBoolean( STEALTHED ); cooldown = bundle.getInt( COOLDOWN ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index ea742a8ad..192ac4640 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -150,15 +150,12 @@ public class TimekeepersHourglass extends Artifact { } - //needs to bundle chargecap as it is dynamic. - private static final String CHARGECAP = "chargecap"; private static final String SANDBAGS = "sandbags"; private static final String BUFF = "buff"; @Override public void storeInBundle( Bundle bundle ) { super.storeInBundle(bundle); - bundle.put( CHARGECAP, chargeCap ); bundle.put( SANDBAGS, sandBags ); if (activeBuff != null) @@ -168,7 +165,6 @@ public class TimekeepersHourglass extends Artifact { @Override public void restoreFromBundle( Bundle bundle ) { super.restoreFromBundle(bundle); - chargeCap = bundle.getInt( CHARGECAP ); sandBags = bundle.getInt( SANDBAGS ); //these buffs belong to hourglass, need to handle unbundling within the hourglass class. diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java index 9a89ceb47..8527defca 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java @@ -111,7 +111,7 @@ public class UnstableSpellbook extends Artifact { @Override public Item upgrade() { - chargeCap = (((level+1)/2)+1); + chargeCap = (((level+1)/2)+3); //for artifact transmutation. while (scrolls.size() > (levelCap-1-level)) @@ -161,21 +161,17 @@ public class UnstableSpellbook extends Artifact { return desc; } - //needs to bundle chargecap as it is dynamic. - private static final String CHARGECAP = "chargecap"; private static final String SCROLLS = "scrolls"; @Override public void storeInBundle( Bundle bundle ) { super.storeInBundle(bundle); - bundle.put( CHARGECAP, chargeCap ); bundle.put( SCROLLS, scrolls.toArray(new String[scrolls.size()]) ); } @Override public void restoreFromBundle( Bundle bundle ) { super.restoreFromBundle(bundle); - chargeCap = bundle.getInt( CHARGECAP ); scrolls.clear(); Collections.addAll(scrolls, bundle.getStringArray(SCROLLS)); }