diff --git a/res/images/explosion2_1.png b/res/images/explosion2_1.png index 9af1943..fb81572 100644 Binary files a/res/images/explosion2_1.png and b/res/images/explosion2_1.png differ diff --git a/res/images/explosion2_10.png b/res/images/explosion2_10.png index b35cdc2..076c6f5 100644 Binary files a/res/images/explosion2_10.png and b/res/images/explosion2_10.png differ diff --git a/res/images/explosion2_11.png b/res/images/explosion2_11.png index e04e5ca..67776fa 100644 Binary files a/res/images/explosion2_11.png and b/res/images/explosion2_11.png differ diff --git a/res/images/explosion2_12.png b/res/images/explosion2_12.png index 9f58c3b..c15b1da 100644 Binary files a/res/images/explosion2_12.png and b/res/images/explosion2_12.png differ diff --git a/res/images/explosion2_13.png b/res/images/explosion2_13.png index b5aa4e8..fbb970a 100644 Binary files a/res/images/explosion2_13.png and b/res/images/explosion2_13.png differ diff --git a/res/images/explosion2_14.png b/res/images/explosion2_14.png index f3e4592..d6441bd 100644 Binary files a/res/images/explosion2_14.png and b/res/images/explosion2_14.png differ diff --git a/res/images/explosion2_15.png b/res/images/explosion2_15.png index 88a6584..b0ce6b8 100644 Binary files a/res/images/explosion2_15.png and b/res/images/explosion2_15.png differ diff --git a/res/images/explosion2_16.png b/res/images/explosion2_16.png new file mode 100644 index 0000000..58352d2 Binary files /dev/null and b/res/images/explosion2_16.png differ diff --git a/res/images/explosion2_2.png b/res/images/explosion2_2.png index 332ca65..89d10cb 100644 Binary files a/res/images/explosion2_2.png and b/res/images/explosion2_2.png differ diff --git a/res/images/explosion2_3.png b/res/images/explosion2_3.png index 6252c66..4a45d9e 100644 Binary files a/res/images/explosion2_3.png and b/res/images/explosion2_3.png differ diff --git a/res/images/explosion2_4.png b/res/images/explosion2_4.png index a7835a4..e625b05 100644 Binary files a/res/images/explosion2_4.png and b/res/images/explosion2_4.png differ diff --git a/res/images/explosion2_5.png b/res/images/explosion2_5.png index 4c3cf65..fb873ef 100644 Binary files a/res/images/explosion2_5.png and b/res/images/explosion2_5.png differ diff --git a/res/images/explosion2_6.png b/res/images/explosion2_6.png index 8e48f9c..c19adbf 100644 Binary files a/res/images/explosion2_6.png and b/res/images/explosion2_6.png differ diff --git a/res/images/explosion2_7.png b/res/images/explosion2_7.png index a9f5dfe..e8119c1 100644 Binary files a/res/images/explosion2_7.png and b/res/images/explosion2_7.png differ diff --git a/res/images/explosion2_8.png b/res/images/explosion2_8.png index b76f7aa..27acd39 100644 Binary files a/res/images/explosion2_8.png and b/res/images/explosion2_8.png differ diff --git a/res/images/explosion2_9.png b/res/images/explosion2_9.png index abdc33a..33ca5cf 100644 Binary files a/res/images/explosion2_9.png and b/res/images/explosion2_9.png differ diff --git a/res/images/shot02.png b/res/images/shot02.png new file mode 100644 index 0000000..5a9cf1a Binary files /dev/null and b/res/images/shot02.png differ diff --git a/res/images/shot03.png b/res/images/shot03.png new file mode 100644 index 0000000..ed53a3c Binary files /dev/null and b/res/images/shot03.png differ diff --git a/res/images/shot04.png b/res/images/shot04.png new file mode 100644 index 0000000..f06ba7e Binary files /dev/null and b/res/images/shot04.png differ diff --git a/res/images/shot05.png b/res/images/shot05.png new file mode 100644 index 0000000..48f6df2 Binary files /dev/null and b/res/images/shot05.png differ diff --git a/src/de/teamteamteam/spacescooter/entity/ExplosionBig.java b/src/de/teamteamteam/spacescooter/entity/ExplosionBig.java index 5409d6b..eb6f8cf 100644 --- a/src/de/teamteamteam/spacescooter/entity/ExplosionBig.java +++ b/src/de/teamteamteam/spacescooter/entity/ExplosionBig.java @@ -60,6 +60,9 @@ public class ExplosionBig extends Explosion { case 10: this.setImage("images/explosion2_15.png"); break; + case 1: + this.setImage("images/explosion2_16.png"); + break; } } diff --git a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java index 6e6c625..b000198 100644 --- a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java +++ b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java @@ -86,14 +86,13 @@ public abstract class LivingEntity extends Entity implements Collidable { if (this.isAlive() == false) { if(GameConfig.DEBUG) System.out.println(this + " ist gestorben. RIP"); this.explode(); - //Screen.currentScreen.addEntity(new Explosion(this.x, this.y)); this.remove(); } } private void explode() { Random rnd = new Random(); - if (rnd.nextInt(10) < 7) { + if (rnd.nextInt(99) < 70) { Screen.currentScreen.addEntity(new Explosion(this.x, this.y)); } else { Screen.currentScreen.addEntity(new ExplosionBig(this.x, this.y));