v0.7.0: fixed various issues caused by assuming bombs destroy terrain

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java

@@ -247,9 +247,10 @@ public class Heap implements Bundlable {
 			} else if (item instanceof Bomb) {
 				items.remove( item );
 				((Bomb) item).explode( pos );
-				burnt = true;
+				if (((Bomb) item).explodesDestructively()) {
-				//stop processing the burning, it will be replaced by the explosion.
+					//stop processing the burning, it will be replaced by the explosion.
-				break;
+					return;
+				}
 			}
 		}
 		
@@ -298,8 +299,10 @@ public class Heap implements Bundlable {
 				} else if (item instanceof Bomb) {
 					items.remove( item );
 					((Bomb) item).explode(pos);
-					//stop processing current explosion, it will be replaced by the new one.
+					if (((Bomb) item).explodesDestructively()) {
-					return;
+						//stop processing current explosion, it will be replaced by the new one.
+						return;
+					}
 
 				//unique and upgraded items can endure the blast
 				} else if (!(item.level() > 0 || item.unique))

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ArcaneBomb.java

@@ -21,7 +21,6 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.bombs;
 
-import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
@@ -32,14 +31,12 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
-import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.PathFinder;
 import com.watabou.utils.Random;
 
 public class ArcaneBomb extends Bomb {
 	
 	{
-		//TODO visuals
 		image = ItemSpriteSheet.ARCANE_BOMB;
 	}
 	
@@ -55,14 +52,14 @@ public class ArcaneBomb extends Bomb {
 		}
 	}
 	
+	@Override
+	public boolean explodesDestructively() {
+		return false;
+	}
+	
 	@Override
 	public void explode(int cell) {
-		//We're blowing up, so no need for a fuse anymore.
+		super.explode(cell);
-		this.fuse = null;
-		
-		Sample.INSTANCE.play( Assets.SND_BURNING );
-		
-		//no regular explosion damage
 		
 		PathFinder.buildDistanceMap( cell, BArray.not( Dungeon.level.solid, null ), 2 );
 		for (int i = 0; i < PathFinder.distance.length; i++) {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Bomb.java

@@ -82,6 +82,10 @@ public class Bomb extends Item {
 		return super.isSimilar(item) && this.fuse == ((Bomb) item).fuse;
 	}
 	
+	public boolean explodesDestructively(){
+		return true;
+	}
+
 	@Override
 	public ArrayList<String> actions(Hero hero) {
 		ArrayList<String> actions = super.actions( hero );
@@ -132,48 +136,50 @@ public class Bomb extends Item {
 
 		Sample.INSTANCE.play( Assets.SND_BLAST );
 
-		if (Dungeon.level.heroFOV[cell]) {
+		if (explodesDestructively()) {
-			CellEmitter.center( cell ).burst( BlastParticle.FACTORY, 30 );
+			if (Dungeon.level.heroFOV[cell]) {
-		}
+				CellEmitter.center(cell).burst(BlastParticle.FACTORY, 30);
+			}
 			
-		boolean terrainAffected = false;
+			boolean terrainAffected = false;
-		for (int n : PathFinder.NEIGHBOURS9) {
+			for (int n : PathFinder.NEIGHBOURS9) {
-			int c = cell + n;
+				int c = cell + n;
-			if (c >= 0 && c < Dungeon.level.length()) {
+				if (c >= 0 && c < Dungeon.level.length()) {
-				if (Dungeon.level.heroFOV[c]) {
+					if (Dungeon.level.heroFOV[c]) {
-					CellEmitter.get( c ).burst( SmokeParticle.FACTORY, 4 );
+						CellEmitter.get(c).burst(SmokeParticle.FACTORY, 4);
-				}
-
-				if (Dungeon.level.flamable[c]) {
-					Dungeon.level.destroy( c );
-					GameScene.updateMap( c );
-					terrainAffected = true;
-				}
-
-				//destroys items / triggers bombs caught in the blast.
-				Heap heap = Dungeon.level.heaps.get( c );
-				if(heap != null)
-					heap.explode();
-
-				Char ch = Actor.findChar( c );
-				if (ch != null) {
-					//those not at the center of the blast take damage less consistently.
-					int minDamage = c == cell ? Dungeon.depth+5 : 1;
-					int maxDamage = 10 + Dungeon.depth * 2;
-
-					int dmg = Random.NormalIntRange( minDamage, maxDamage ) - ch.drRoll();
-					if (dmg > 0) {
-						ch.damage( dmg, this );
 					}
 					
-					if (ch == Dungeon.hero && !ch.isAlive())
+					if (Dungeon.level.flamable[c]) {
-						Dungeon.fail( Bomb.class );
+						Dungeon.level.destroy(c);
+						GameScene.updateMap(c);
+						terrainAffected = true;
+					}
+					
+					//destroys items / triggers bombs caught in the blast.
+					Heap heap = Dungeon.level.heaps.get(c);
+					if (heap != null)
+						heap.explode();
+					
+					Char ch = Actor.findChar(c);
+					if (ch != null) {
+						//those not at the center of the blast take damage less consistently.
+						int minDamage = c == cell ? Dungeon.depth + 5 : 1;
+						int maxDamage = 10 + Dungeon.depth * 2;
+						
+						int dmg = Random.NormalIntRange(minDamage, maxDamage) - ch.drRoll();
+						if (dmg > 0) {
+							ch.damage(dmg, this);
+						}
+						
+						if (ch == Dungeon.hero && !ch.isAlive())
+							Dungeon.fail(Bomb.class);
+					}
 				}
 			}
-		}
 			
-		if (terrainAffected) {
+			if (terrainAffected) {
-			Dungeon.observe();
+				Dungeon.observe();
+			}
 		}
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Firebomb.java

@@ -36,7 +36,6 @@ import com.watabou.utils.PathFinder;
 public class Firebomb extends Bomb {
 	
 	{
-		//TODO visuals
 		image = ItemSpriteSheet.FIRE_BOMB;
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Flashbang.java

@@ -21,39 +21,30 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.bombs;
 
-import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple;
-import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
-import com.shatteredpixel.shatteredpixeldungeon.effects.particles.BlastParticle;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.watabou.noosa.audio.Sample;
 
 public class Flashbang extends Bomb {
 	
 	{
-		//TODO visuals
 		image = ItemSpriteSheet.FLASHBANG;
 	}
 	
+	@Override
+	public boolean explodesDestructively() {
+		return false;
+	}
+	
 	@Override
 	public void explode(int cell) {
-		//We're blowing up, so no need for a fuse anymore.
+		super.explode(cell);
-		this.fuse = null;
-		
-		Sample.INSTANCE.play( Assets.SND_BLAST );
-		
-		if (Dungeon.level.heroFOV[cell]) {
-			CellEmitter.center( cell ).burst( BlastParticle.FACTORY, 30 );
-		}
-		
-		//no regular explosion damage
 		
 		//FIXME currently has somewhat odd behaviour, as FOV is updated at the start of a turn.
 		Level l = Dungeon.level;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/FrostBomb.java

@@ -32,7 +32,6 @@ import com.watabou.utils.PathFinder;
 public class FrostBomb extends Bomb {
 	
 	{
-		//TODO visuals
 		image = ItemSpriteSheet.FROST_BOMB;
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/HolyBomb.java

@@ -39,7 +39,6 @@ import com.watabou.utils.Random;
 public class HolyBomb extends Bomb {
 	
 	{
-		//TODO visuals
 		image = ItemSpriteSheet.HOLY_BOMB;
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/Noisemaker.java

@@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
-import com.shatteredpixel.shatteredpixeldungeon.effects.particles.BlastParticle;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundle;
@@ -35,22 +34,18 @@ import com.watabou.utils.Bundle;
 public class Noisemaker extends Bomb {
 	
 	{
-		//TODO visuals
 		image = ItemSpriteSheet.NOISEMAKER;
 	}
 	
+	
+	@Override
+	public boolean explodesDestructively() {
+		return false;
+	}
+	
 	@Override
 	public void explode(int cell) {
-		//We're blowing up, so no need for a fuse anymore.
+		super.explode(cell);
-		this.fuse = null;
-		
-		Sample.INSTANCE.play( Assets.SND_BLAST );
-		
-		if (Dungeon.level.heroFOV[cell]) {
-			CellEmitter.center( cell ).burst( BlastParticle.FACTORY, 30 );
-		}
-		
-		//no regular explosion damage
 		
 		Buff.affect(Dungeon.hero, Noise.class).set(cell);
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/RegrowthBomb.java

@@ -21,7 +21,6 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.bombs;
 
-import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
@@ -38,7 +37,6 @@ import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
-import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.PathFinder;
 import com.watabou.utils.Random;
 
@@ -52,18 +50,18 @@ public class RegrowthBomb extends Bomb {
 	}
 	
 	@Override
-	public void explode(int cell) {
+	public boolean explodesDestructively() {
-		//We're blowing up, so no need for a fuse anymore.
+		return false;
-		this.fuse = null;
+	}
 	
-		Sample.INSTANCE.play( Assets.SND_BLAST );
+	@Override
+	public void explode(int cell) {
+		super.explode(cell);
 		
 		if (Dungeon.level.heroFOV[cell]) {
 			Splash.at(cell, 0x00FF00, 30);
 		}
 		
-		//no regular explosion damage
-		
 		ArrayList<Integer> plantCandidates = new ArrayList<>();
 		
 		PathFinder.buildDistanceMap( cell, BArray.not( Dungeon.level.solid, null ), 2 );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShockBomb.java

@@ -34,7 +34,6 @@ import com.watabou.utils.PathFinder;
 public class ShockBomb extends Bomb {
 	
 	{
-		//TODO visuals
 		image = ItemSpriteSheet.SHOCK_BOMB;
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/ShrapnelBomb.java

@@ -21,7 +21,6 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.bombs;
 
-import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
@@ -29,25 +28,23 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.BlastParticle;
 import com.shatteredpixel.shatteredpixeldungeon.mechanics.ShadowCaster;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Point;
 import com.watabou.utils.Random;
 
 public class ShrapnelBomb extends Bomb {
 	
 	{
-		//TODO visuals
 		image = ItemSpriteSheet.SHRAPNEL_BOMB;
 	}
 	
+	@Override
+	public boolean explodesDestructively() {
+		return false;
+	}
+	
 	@Override
 	public void explode(int cell) {
-		//We're blowing up, so no need for a fuse anymore.
+		super.explode(cell);
-		this.fuse = null;
-		
-		Sample.INSTANCE.play( Assets.SND_BURNING );
-		
-		//no regular explosion damage
 		
 		boolean[] FOV = new boolean[Dungeon.level.length()];
 		Point c = Dungeon.level.cellToPoint(cell);

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bombs/WoollyBomb.java

@@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Sheep;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
-import com.shatteredpixel.shatteredpixeldungeon.effects.particles.BlastParticle;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
@@ -38,22 +37,17 @@ import com.watabou.utils.Random;
 public class WoollyBomb extends Bomb {
 	
 	{
-		//TODO visuals
 		image = ItemSpriteSheet.WOOLY_BOMB;
 	}
 	
+	@Override
+	public boolean explodesDestructively() {
+		return false;
+	}
+	
 	@Override
 	public void explode(int cell) {
-		//We're blowing up, so no need for a fuse anymore.
+		super.explode(cell);
-		this.fuse = null;
-		
-		Sample.INSTANCE.play( Assets.SND_BLAST );
-		
-		if (Dungeon.level.heroFOV[cell]) {
-			CellEmitter.center( cell ).burst( BlastParticle.FACTORY, 30 );
-		}
-		
-		//no regular explosion damage
 		
 		PathFinder.buildDistanceMap( cell, BArray.not( Dungeon.level.solid, null ), 2 );
 		for (int i = 0; i < PathFinder.distance.length; i++) {