From 63e7b7a21c65d85cb413fb6678e0e7baac24bb1c Mon Sep 17 00:00:00 2001 From: Jan Philipp Timme Date: Tue, 25 Nov 2014 14:26:34 +0100 Subject: [PATCH] All Entities have to implement explode() from now on. --- res/levels/test.level | 10 ++++++---- .../teamteamteam/spacescooter/entity/LivingEntity.java | 2 +- src/de/teamteamteam/spacescooter/entity/Player.java | 1 - .../spacescooter/entity/enemy/EnemyFour.java | 7 +++++++ .../spacescooter/entity/enemy/EnemyOne.java | 7 +++++++ .../spacescooter/entity/enemy/EnemyTwo.java | 6 ++++++ .../teamteamteam/spacescooter/utility/GameConfig.java | 2 +- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/res/levels/test.level b/res/levels/test.level index 1d572bf..e6bdf6e 100644 --- a/res/levels/test.level +++ b/res/levels/test.level @@ -1,10 +1,12 @@ name:Lustiger Levelname backgroundMusic:music/bla.wav -background:FooBackground +background:StarBackground - -[0-20] -spawn:EnemyTwo,2,2 -[21-25] +[0-4] +spawn:EnemyBoss,1,1 +[5-10] +spawn:EnemyTwo,2,10 +[11-25] spawn:EnemyThree,2,4 spawn:EnemyTwo,5,6 [26-30] diff --git a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java index 1e321ea..41a6705 100644 --- a/src/de/teamteamteam/spacescooter/entity/LivingEntity.java +++ b/src/de/teamteamteam/spacescooter/entity/LivingEntity.java @@ -109,7 +109,7 @@ public abstract class LivingEntity extends CollidableEntity implements Hittable * The default way the LivingEntity explodes. Override this method for a * different explosion behaviour. */ - public void explode() {} + public abstract void explode(); /** * The default way the LivingEntity dies. Override this method for a diff --git a/src/de/teamteamteam/spacescooter/entity/Player.java b/src/de/teamteamteam/spacescooter/entity/Player.java index 54277da..b6dab6a 100644 --- a/src/de/teamteamteam/spacescooter/entity/Player.java +++ b/src/de/teamteamteam/spacescooter/entity/Player.java @@ -126,7 +126,6 @@ public class Player extends ShootingEntity implements KeyboardListener { */ @Override public void explode() { - super.explode(); SoundSystem.playSound("sounds/abgang.wav"); } diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java index ed93c2a..d5fc47c 100644 --- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java +++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyFour.java @@ -3,6 +3,8 @@ package de.teamteamteam.spacescooter.entity.enemy; import java.awt.Point; import java.util.ArrayList; +import de.teamteamteam.spacescooter.entity.explosion.ExplosionOne; + public class EnemyFour extends Enemy{ private ArrayList points; @@ -61,5 +63,10 @@ public class EnemyFour extends Enemy{ this.remove(); } } + + @Override + public void explode() { + new ExplosionOne(this.getX(), this.getY()); + } } diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyOne.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyOne.java index 516c802..2a75ecb 100644 --- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyOne.java +++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyOne.java @@ -1,5 +1,7 @@ package de.teamteamteam.spacescooter.entity.enemy; +import de.teamteamteam.spacescooter.entity.explosion.ExplosionOne; + public class EnemyOne extends Enemy { public EnemyOne(int x, int y) { @@ -20,5 +22,10 @@ public class EnemyOne extends Enemy { public void update() { super.update(); } + + @Override + public void explode() { + new ExplosionOne(this.getX(), this.getY()); + } } diff --git a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java index cdf2189..cd170a4 100644 --- a/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java +++ b/src/de/teamteamteam/spacescooter/entity/enemy/EnemyTwo.java @@ -1,5 +1,6 @@ package de.teamteamteam.spacescooter.entity.enemy; +import de.teamteamteam.spacescooter.entity.explosion.ExplosionTwo; import de.teamteamteam.spacescooter.utility.GameConfig; import de.teamteamteam.spacescooter.utility.Random; @@ -28,5 +29,10 @@ public class EnemyTwo extends Enemy{ this.remove(); } } + + @Override + public void explode() { + new ExplosionTwo(this.getX(), this.getY()); + } } diff --git a/src/de/teamteamteam/spacescooter/utility/GameConfig.java b/src/de/teamteamteam/spacescooter/utility/GameConfig.java index 23ab204..741271c 100644 --- a/src/de/teamteamteam/spacescooter/utility/GameConfig.java +++ b/src/de/teamteamteam/spacescooter/utility/GameConfig.java @@ -8,7 +8,7 @@ public class GameConfig { /** * Whether debug output (and more) is enabled or disabled. */ - public static boolean DEBUG = false; + public static boolean DEBUG = true; /** * Width of GameWindow.