v0.3.3: fixed bugs with rot heard and lashers

This commit is contained in:
Evan Debenham
2015-12-16 22:31:43 -05:00
parent 108fd0085d
commit 64df321aa1
2 changed files with 16 additions and 13 deletions
@@ -24,7 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning;
import com.shatteredpixel.shatteredpixeldungeon.plants.Rotberry;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.RotHeartSprite;
@@ -49,13 +49,13 @@ public class RotHeart extends Mob {
}
@Override
protected boolean act() {
if (Dungeon.level.map[pos] != Terrain.GRASS && Dungeon.level.map[pos] != Terrain.HIGH_GRASS){
public void damage(int dmg, Object src) {
//TODO: when effect properties are done, change this to FIRE
if (src instanceof Burning) {
destroy();
sprite.die();
return true;
} else {
return super.act();
super.damage(dmg, src);
}
}