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

V0.2.0: improved bundling on several artifacts.

Browse Source
This commit is contained in:
Evan Debenham 2014-09-08 17:35:44 -04:00
parent 80467934f7
commit ba636007c2
4 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java
View File

@ -165,20 +165,27 @@ public class Artifact extends KindofMisc {
} }
private static final String IMAGE = "image";
private static final String EXP = "exp";
private static final String CHARGE = "charge";
private static final String PARTIALCHARGE = "partialcharge";
@Override @Override
public void storeInBundle( Bundle bundle ) { public void storeInBundle( Bundle bundle ) {
super.storeInBundle(bundle); super.storeInBundle(bundle);
bundle.put( "exp", exp ); bundle.put( IMAGE, image );
bundle.put( "charge", charge ); bundle.put( EXP , exp );
bundle.put( "partialcharge", partialCharge); bundle.put( CHARGE , charge );
bundle.put( PARTIALCHARGE , partialCharge );
} }
@Override @Override
public void restoreFromBundle( Bundle bundle ) { public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle(bundle); super.restoreFromBundle(bundle);
exp = bundle.getInt("exp"); image = bundle.getInt( IMAGE );
charge = bundle.getInt("charge"); exp = bundle.getInt( EXP );
partialCharge = bundle.getFloat("partialcharge"); charge = bundle.getInt( CHARGE );
partialCharge = bundle.getFloat( PARTIALCHARGE );
} }

2
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CapeOfThorns.java
View File

@ -31,8 +31,6 @@ public class CapeOfThorns extends Artifact {
private int timer = 0; private int timer = 0;
private int exp = 0;
@Override @Override
public String status() { public String status() {
if (timer == 0) if (timer == 0)

36
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java
View File

@ -128,6 +128,26 @@ public class CloakOfShadows extends Artifact {
return Utils.format(TXT_CD, cooldown); return Utils.format(TXT_CD, cooldown);
} }
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 );
}
@Override
public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle(bundle);
chargeCap = bundle.getInt( CHARGECAP );
stealthed = bundle.getBoolean( STEALTHED );
cooldown = bundle.getInt( COOLDOWN );
}
public class cloakRecharge extends ArtifactBuff{ public class cloakRecharge extends ArtifactBuff{
@Override @Override
public boolean act() { public boolean act() {
@ -217,20 +237,4 @@ public class CloakOfShadows extends Artifact {
super.detach(); super.detach();
} }
} }
@Override
public void storeInBundle( Bundle bundle ) {
super.storeInBundle(bundle);
bundle.put("chargecap", chargeCap);
bundle.put("stealthed", stealthed);
bundle.put("cooldown", cooldown);
}
@Override
public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle(bundle);
chargeCap = bundle.getInt("chargecap");
stealthed = bundle.getBoolean("stealthed");
cooldown = bundle.getInt("cooldown");
}
} }

20
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java
View File

@ -17,8 +17,10 @@ import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.shatteredpixel.shatteredpixeldungeon.utils.Utils; import com.shatteredpixel.shatteredpixeldungeon.utils.Utils;
import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
import com.watabou.noosa.Camera; import com.watabou.noosa.Camera;
import com.watabou.utils.Bundle;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
/** /**
* Created by debenhame on 08/09/2014. * Created by debenhame on 08/09/2014.
@ -61,7 +63,7 @@ public class SandalsOfNature extends Artifact {
if (charge > 0){ if (charge > 0){
Buff.prolong( hero, Roots.class, 5); Buff.prolong( hero, Roots.class, 5);
Buff.affect( hero, Earthroot.Armor.class ).level( charge ); Buff.affect( hero, Earthroot.Armor.class ).level( charge );
CellEmitter.bottom(hero.pos).start( EarthParticle.FACTORY, 0.05f, 8 ); CellEmitter.bottom(hero.pos).start(EarthParticle.FACTORY, 0.05f, 8);
Camera.main.shake( 1, 0.4f ); Camera.main.shake( 1, 0.4f );
charge = 0; charge = 0;
} }
@ -87,7 +89,21 @@ public class SandalsOfNature extends Artifact {
return ""; return "";
} }
//TODO: add bundle logic
private static final String SEEDS = "seeds";
@Override
public void storeInBundle( Bundle bundle ) {
super.storeInBundle(bundle);
bundle.put(SEEDS, seeds.toArray(new String[seeds.size()]));
}
@Override
public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle(bundle);
if (bundle.contains(SEEDS))
Collections.addAll(seeds , bundle.getStringArray(SEEDS));
}
public class Naturalism extends ArtifactBuff{ public class Naturalism extends ArtifactBuff{
public int level() { return level; } public int level() { return level; }