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

V0.1.1: rebalanced sungrass again, fixed save bug with sungrass

Browse Source
This commit is contained in:
Evan Debenham 2014-08-08 18:58:02 -04:00
parent c5e8ffea91
commit 9a60bbb51e
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java
View File

@ -31,7 +31,7 @@ import com.watabou.utils.Bundle;
public class Sungrass extends Plant { public class Sungrass extends Plant {
private static final String TXT_DESC = "Sungrass is renowned for its sap's show but effective healing properties."; private static final String TXT_DESC = "Sungrass is renowned for its sap's slow but effective healing properties.";
{ {
image = 4; image = 4;
@ -43,7 +43,7 @@ public class Sungrass extends Plant {
super.activate( ch ); super.activate( ch );
if (ch != null) { if (ch != null) {
Buff.affect( ch, Health.class ); Buff.affect( ch, Health.class ).level = ch.HT;
} }
if (Dungeon.visible[pos]) { if (Dungeon.visible[pos]) {
@ -78,31 +78,31 @@ public class Sungrass extends Plant {
private static final float STEP = 1f; private static final float STEP = 1f;
private int pos; private int pos;
private int healCurr = 2; private int healCurr = 1;
private int count = 5; private int count = 0;
private int healTot; private int level;
@Override @Override
public boolean attachTo( Char target ) { public boolean attachTo( Char target ) {
pos = target.pos; pos = target.pos;
healTot = target.HT;
return super.attachTo( target ); return super.attachTo( target );
} }
@Override @Override
public boolean act() { public boolean act() {
if (target.pos != pos || healTot <= 0) { if (target.pos != pos || level <= 0) {
detach(); detach();
} }
if (count == 5) { if (count == 5) {
if (healTot <= healCurr) { if (level <= healCurr) {
target.HP = Math.min(target.HT, target.HP + healTot); target.HP = Math.min(target.HT, target.HP + level);
target.sprite.emitter().burst(Speck.factory(Speck.HEALING), 1); target.sprite.emitter().burst(Speck.factory(Speck.HEALING), 1);
detach(); detach();
} else { } else {
target.HP = Math.min(target.HT, target.HP + healCurr); target.HP = Math.min(target.HT, target.HP+(int)(healCurr*.025*target.HT));
healTot -= healCurr; level -= (healCurr*.025*target.HT);
healCurr = Math.min(healCurr+healCurr-1,(int)(target.HT*0.15)); if (healCurr < 6)
healCurr ++;
target.sprite.emitter().burst(Speck.factory(Speck.HEALING), 1); target.sprite.emitter().burst(Speck.factory(Speck.HEALING), 1);
} }
count = 1; count = 1;
@ -114,8 +114,8 @@ public class Sungrass extends Plant {
} }
public int absorb( int damage ) { public int absorb( int damage ) {
healTot -= damage; level -= damage;
if (healTot <= 0) if (level <= 0)
detach(); detach();
return damage; return damage;
} }
@ -127,21 +127,35 @@ public class Sungrass extends Plant {
@Override @Override
public String toString() { public String toString() {
return Utils.format( "Herbal Healing (%d)", healTot); return Utils.format( "Herbal Healing (%d)", level);
} }
private static final String POS = "pos"; private static final String POS = "pos";
private static final String HEALCURR = "healCurr";
private static final String COUNT = "count";
private static final String LEVEL = "level";
@Override @Override
public void storeInBundle( Bundle bundle ) { public void storeInBundle( Bundle bundle ) {
super.storeInBundle( bundle ); super.storeInBundle( bundle );
bundle.put( POS, pos ); bundle.put( POS, pos );
bundle.put( HEALCURR, healCurr);
bundle.put( COUNT, count);
bundle.put( LEVEL, level);
} }
@Override @Override
public void restoreFromBundle( Bundle bundle ) { public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle( bundle ); super.restoreFromBundle( bundle );
pos = bundle.getInt( POS ); pos = bundle.getInt( POS );
//to support legacy saves from 0.1.0, TODO: remove when saves from V0.1.0 are invalidated
if (!bundle.contains( LEVEL )){
return;
}
healCurr = bundle.getInt( HEALCURR );
count = bundle.getInt( COUNT );
level = bundle.getInt( LEVEL );
} }
} }
} }