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

V0.2.0: ...further corrected Chalice Logic & artifact logic

Browse Source
This commit is contained in:
Evan Debenham 2014-09-08 01:12:36 -04:00
parent b91ed818ce
commit 20b59a372d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,6 +167,7 @@ public class Artifact extends KindofMisc {
@Override @Override
public void storeInBundle( Bundle bundle ) { public void storeInBundle( Bundle bundle ) {
super.storeInBundle(bundle);
bundle.put( "exp", exp ); bundle.put( "exp", exp );
bundle.put( "charge", charge ); bundle.put( "charge", charge );
bundle.put( "partialcharge", partialCharge); bundle.put( "partialcharge", partialCharge);
@ -174,6 +175,7 @@ public class Artifact extends KindofMisc {
@Override @Override
public void restoreFromBundle( Bundle bundle ) { public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle(bundle);
exp = bundle.getInt("exp"); exp = bundle.getInt("exp");
charge = bundle.getInt("charge"); charge = bundle.getInt("charge");
partialCharge = bundle.getFloat("partialcharge"); partialCharge = bundle.getFloat("partialcharge");

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

@ -89,7 +89,6 @@ public class ChaliceOfBlood extends Artifact {
//TODO: make sure this look good //TODO: make sure this look good
if (damage <= 0){ if (damage <= 0){
GLog.i("You prick yourself, that hardly hurt at all!"); GLog.i("You prick yourself, that hardly hurt at all!");
return;
} else if (damage < 25){ } else if (damage < 25){
GLog.w("You prick yourself and the chalice feeds on you."); GLog.w("You prick yourself and the chalice feeds on you.");
Sample.INSTANCE.play(Assets.SND_CURSED); Sample.INSTANCE.play(Assets.SND_CURSED);
@ -104,6 +103,7 @@ public class ChaliceOfBlood extends Artifact {
hero.sprite.emitter().burst( ShadowParticle.CURSE, 6 ); hero.sprite.emitter().burst( ShadowParticle.CURSE, 6 );
} }
if (damage > 0)
hero.damage(damage, this); hero.damage(damage, this);