diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java
index ba5b5c9a6631d923a0ed0fcfce2e10b2c30b2fbd..64bbcbddc75575c07392fa86218239c34b9512f5 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/GameSceneController.java
@@ -156,8 +156,6 @@ public class GameSceneController implements Initializable {
player.attack(enemy, graphicsContext2D);
enemy.attack(player, graphicsContext2D);
updateGameplayObjects();
- //updateExplosionspawns();
- player.checkGameplayExplosionInteraction(player,graphicsContext2D);
enemy.checkGameplayObjectInteraction(enemy, graphicsContext2D);
enemy.checkGameplayObjectInteraction(enemy, graphicsContext2D);
player.placeBomb(player, graphicsContext2D);
@@ -169,7 +167,6 @@ public class GameSceneController implements Initializable {
player.renderEntity(graphicsContext);
enemy.renderEntity(graphicsContext);
renderGameplayObjects(graphicsContext);
- //renderExplosionObjects(graphicsContext);
}
private void renderGameplayObjects(GraphicsContext graphicsContext) {
@@ -178,12 +175,6 @@ public class GameSceneController implements Initializable {
gameplayObject.renderEntity(graphicsContext);
}
}
- /*private void renderExplosionObjects(GraphicsContext graphicsContext) {
- List<IEntity> explosionSpawns = runtimeInfo.getExplosionspawns();
- for (IEntity explosionSpawn : explosionSpawns) {
- explosionSpawn.renderEntity(graphicsContext);
- }
- }*/
private void updateGameplayObjects() {
List<IEntity> gameplayObjects = runtimeInfo.getGameplayObjects();
@@ -192,13 +183,6 @@ public class GameSceneController implements Initializable {
runtimeInfo.setGameplayObjects(updateList);
log.debug("Gameplay objects updated");
}
- /*private void updateExplosionspawns() {
- List<IEntity> explosionspawns = runtimeInfo.getExplosionspawns();
- /*List<IEntity> updateList = explosionspawns.stream().filter(obj -> obj.getOBJECT_STATUS() != ObjectStatus.USED)
- .collect(Collectors.toList());*/
- /*runtimeInfo.setExplosionspawns(explosionspawns);
- log.debug("explosions objects updated");
- }*/
public IEntity getEnemy() {
return enemy;
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
index 3f66342114ed6025687eb4f6fa1677641f1d295b..fbb09802613440b454709bfbfd4f0f994281b742 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/DataStorage/Classes/RuntimeInfo.java
@@ -121,14 +121,6 @@ public class RuntimeInfo {
this.gameplayObjects = gameplayObjects;
}
- public List<IEntity> getExplosionspawns() {
- return explosionspawns;
- }
-
- public void setExplosionspawns(List<IEntity> explosionspawns) {
- this.explosionspawns = explosionspawns;
- }
-
public String getMapDataGame() {
return mapDataGame;
}
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BigBomb.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BigBomb.java
index 7076ad163728eb445ad8314fec70a8b7433edd1b..c2124e748da0dd91a64920115ac0d93b4a0d1165 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BigBomb.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BigBomb.java
@@ -68,11 +68,6 @@ public class BigBomb implements IEntity {
}
- @Override
- public void checkGameplayExplosionInteraction(IEntity entity, GraphicsContext graphicsContext) {
-
- }
-
@Override
public void placeBomb(IEntity entity, GraphicsContext graphicsContext) {
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BigBombItemFrame.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BigBombItemFrame.java
index cdc81bada710627e2a41fdf9ffbb2ba234c79431..2bd118071679204c6e038e22c3e98047b03fc5b7 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BigBombItemFrame.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BigBombItemFrame.java
@@ -62,11 +62,6 @@ public class BigBombItemFrame implements IEntity {
}
- @Override
- public void checkGameplayExplosionInteraction(IEntity entity, GraphicsContext graphicsContext) {
-
- }
-
@Override
public void placeBomb(IEntity entity, GraphicsContext graphicsContext) {
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BlastUpItemFrame.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BlastUpItemFrame.java
index 064218ea3c1ad08d3d35d59692098a76be78c4ea..28cec8756b12fbfcfbaddd897e7925b47246776a 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BlastUpItemFrame.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/BlastUpItemFrame.java
@@ -62,11 +62,6 @@ public class BlastUpItemFrame implements IEntity {
}
- @Override
- public void checkGameplayExplosionInteraction(IEntity entity, GraphicsContext graphicsContext) {
-
- }
-
@Override
public void placeBomb(IEntity entity, GraphicsContext graphicsContext) {
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java
index b6e94cd571fafd779c824f22c72d60d41a42edc1..2049cc725e4e79c6443304d1433be0c767529141 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Bomb.java
@@ -69,18 +69,11 @@ public class Bomb implements IEntity {
if (gameplayObject.getOBJECT_TYPE() == ObjectType.BLASTUP_ITEMFRAME) {
if (gameplayObject.getBoxCollider().intersects(boxCollider)) {
isBlastUpItemFrame = true;
- log.info("Collision with blastUpItemFrame");
- gameplayObject.setObjectStatus(ObjectStatus.USED);
}
}
}
}
- @Override
- public void checkGameplayExplosionInteraction(IEntity entity, GraphicsContext graphicsContext) {
-
- }
-
@Override
public void placeBomb(IEntity entity, GraphicsContext graphicsContext) {
@@ -117,7 +110,7 @@ public class Bomb implements IEntity {
frameCounter = 0;
}
}
- public int updateblastradius(int blastradius){ //TODO: It is not updating, return always 0?
+ public int updateblastradius(int blastradius){ //TODO: It is not updating, always returning 1?
if(isBlastUpItemFrame){
blastradius ++;
log.info("Upded blastradius:" + blastradius);
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Explosion.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Explosion.java
index 819102f4156f3b2e962753040e34c40c62f30f23..f43b573b2076576e09f98cdeba53a455ed505ad2 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Explosion.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Explosion.java
@@ -54,11 +54,6 @@ public class Explosion implements IEntity {
}
- @Override
- public void checkGameplayExplosionInteraction(IEntity entity, GraphicsContext graphicsContext) {
-
- }
-
@Override
public void placeBomb(IEntity entity, GraphicsContext graphicsContext) {
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Heart.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Heart.java
index ea4b26fe790f9dcc03629c590bcc0b81e028dd56..46b21ae58d3531284c5b8b734298d930bee266ca 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Heart.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/GameplayObjects/Heart.java
@@ -54,11 +54,6 @@ public class Heart implements IEntity {
}
- @Override
- public void checkGameplayExplosionInteraction(IEntity entity, GraphicsContext graphicsContext) {
-
- }
-
@Override
public void placeBomb(IEntity entity, GraphicsContext graphicsContext) {
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java
index fd8287c000ae249aa22c8ae1fd67c08480f35648..275a1e4d3c970e5a63bf7ffa55f21b2af7d409e2 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/IEntity.java
@@ -16,7 +16,6 @@ public interface IEntity {
//checks collision with GameplayObjects by iterating through GameplayObjects list
void checkGameplayObjectInteraction(IEntity entity, GraphicsContext graphicsContext);
- void checkGameplayExplosionInteraction(IEntity entity, GraphicsContext graphicsContext);
void placeBomb(IEntity entity, GraphicsContext graphicsContext);
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/NetworkPlayerTwo.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/NetworkPlayerTwo.java
index 518b8bbbab63a0c69c256dd066abbcb7201013be..a756382e85a05c45bed71d40c6cee052a63c11d8 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/NetworkPlayerTwo.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/NetworkPlayerTwo.java
@@ -43,11 +43,6 @@ class NetworkPlayerTwo implements IEntity{
}
- @Override
- public void checkGameplayExplosionInteraction(IEntity entity, GraphicsContext graphicsContext) {
-
- }
-
@Override
public void placeBomb(IEntity entity, GraphicsContext graphicsContext) {
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
index 02b173ba9a67b8cefd1bad96d26abb5fd2246cc7..c736dc1cd488876d18d1da5a79b05d0190683f96 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Entity/Player.java
@@ -362,35 +362,17 @@ class Player implements IEntity {
log.info("Collision with blastUpItemFrame");
gameplayObject.setObjectStatus(ObjectStatus.USED);
}
- }
- if (gameplayObject.getOBJECT_TYPE() == ObjectType.EXPLOSION) {
+ } else if (gameplayObject.getOBJECT_TYPE() == ObjectType.EXPLOSION) {
if (gameplayObject.getBoxCollider().intersects(boxCollider)) {
- log.info("Collision with explosion");
+ log.debug("Collision with explosion");
gotHit(10);
}
}
- }
}
-
- @Override
- public void checkGameplayExplosionInteraction(IEntity entity, GraphicsContext graphicsContext) {
-
- }
-
- public int updateblastradius(int blastradius){
- if(isBlastUpItemFrame){
- blastradius ++;
- log.info("Upded blastradius:" + blastradius);
- isBlastUpItemFrame = false;
- return blastradius;
- }else {
- return blastradius;
- }
}
@Override
public void placeBomb(IEntity entity, GraphicsContext graphicsContext) {
- //blastradius = updateblastradius(blastradius);
List<IEntity> gameplayObjects = runtimeInfo.getGameplayObjects();
if (inputHandler.isBomb() && PLAYER_MODE == PlayerMode.PLAYER_ONE && bombPlacementRate == 0 ||