v0.2.3: tweaks/corrections to blandfruit and associated buffs

src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/EarthImbue.java

@@ -1,7 +1,10 @@
 package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
+import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EarthParticle;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.utils.Bundle;
 
 import java.util.HashSet;
 
@@ -10,10 +13,11 @@ import java.util.HashSet;
  */
 public class EarthImbue extends FlavourBuff {
 
-    public static final float DURATION	= 20f;
+    public static final float DURATION	= 30f;
 
     public void proc(Char enemy){
-        Buff.affect(enemy, Roots.class);
+        Buff.affect(enemy, Roots.class, 2);
+        CellEmitter.bottom(enemy.pos).start(EarthParticle.FACTORY, 0.05f, 8);
     }
 
     @Override

src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FireImbue.java

@@ -4,7 +4,9 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
+import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.utils.Bundle;
 import com.watabou.utils.Random;
 
 import java.util.HashSet;
@@ -14,19 +16,46 @@ import java.util.HashSet;
  */
 public class FireImbue extends Buff {
 
-    public static final float DURATION	= 20f;
+    public static final float DURATION	= 30f;
+
+    protected float left;
+
+    private static final String LEFT	= "left";
+
+    @Override
+    public void storeInBundle( Bundle bundle ) {
+        super.storeInBundle( bundle );
+        bundle.put( LEFT, left );
+
+    }
+
+    @Override
+    public void restoreFromBundle( Bundle bundle ) {
+        super.restoreFromBundle( bundle );
+        left = bundle.getFloat( LEFT );
+    }
+
+    public void set( float duration ) {
+        this.left = duration;
+    };
 
     @Override
     public boolean act() {
-        if (Dungeon.level.map[target.pos] == Terrain.GRASS)
+        if (Dungeon.level.map[target.pos] == Terrain.GRASS) {
             Dungeon.level.set(target.pos, Terrain.EMBERS);
+            GameScene.updateMap(target.pos);
+        }
 
         spend(TICK);
+        left -= TICK;
+        if (left <= 0)
+            detach();
+
         return true;
     }
 
     public void proc(Char enemy){
-        if (Random.Int(3) == 0)
+        if (Random.Int(2) == 0)
             Buff.affect( enemy, Burning.class ).reignite( enemy );
 
         enemy.sprite.emitter().burst( FlameParticle.FACTORY, 2 );

src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ToxicImbue.java

@@ -4,6 +4,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
 import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.utils.Bundle;
 
 import java.util.HashSet;
 
@@ -12,13 +13,39 @@ import java.util.HashSet;
  */
 public class ToxicImbue extends Buff {
 
-    public static final float DURATION	= 20f;
+    public static final float DURATION	= 30f;
+
+    protected float left;
+
+    private static final String LEFT	= "left";
+
+    @Override
+    public void storeInBundle( Bundle bundle ) {
+        super.storeInBundle( bundle );
+        bundle.put( LEFT, left );
+
+    }
+
+    @Override
+    public void restoreFromBundle( Bundle bundle ) {
+        super.restoreFromBundle( bundle );
+        left = bundle.getFloat( LEFT );
+    }
+
+    public void set( float duration ) {
+        this.left = duration;
+    };
+
 
     @Override
     public boolean act() {
         GameScene.add(Blob.seed(target.pos, 50, ToxicGas.class));
 
         spend(TICK);
+        left -= TICK;
+        if (left <= 0)
+            detach();
+
         return true;
     }