From e8b4b3df24ec28e43bbbcf6a5758df6c9cf03c0a Mon Sep 17 00:00:00 2001
From: ys037 <ys037@hdm-stuttgart.de>
Date: Mon, 29 Jan 2024 01:56:57 +0100
Subject: [PATCH] Update: Classes for Clean Codecand TODOS as problems #90
---
.../battlearena/Model/Entity/GameplayObjects/BigBomb.java | 6 +-----
.../battlearena/Model/Entity/GameplayObjects/Bomb.java | 4 ++--
.../de/hdm_stuttgart/battlearena/Model/Entity/Player.java | 8 ++++----
3 files changed, 7 insertions(+), 11 deletions(-)
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 c2124e74..5b21bb83 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
@@ -53,9 +53,6 @@ public class BigBomb implements IEntity {
frames[0] = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/objects/big_bomb/Bigbomb.png")));
frames[1] = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/objects/big_bomb/Bigbomb.png")));
frames[2] = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/objects/bomb/redbomb.png")));
- //frames[3] = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/objects/vfx/bigexplosion.png")));
- //frames[4] = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/objects/vfx/middleexplosion.png")));
- //frames[5] = new Image(Objects.requireNonNull(getClass().getResourceAsStream("/textures/objects/vfx/smallexplosion.png")));
}
@Override
@@ -94,7 +91,6 @@ public class BigBomb implements IEntity {
if (frameCounter > 17) {
if (frameIndex == 0) {
frameIndex = 1;
- //PLayer.spawnExplosion();
} else if (frameIndex == 1) {
frameIndex = 2;
}else if (frameIndex == 2){
@@ -201,7 +197,7 @@ public class BigBomb implements IEntity {
IEntity explosion = EntityFactory.createGameplayObject(ObjectType.EXPLOSION, spawnCordY * scaledTileSize, spawnCordX * scaledTileSize, graphicsContext);
gameplayObjects.add(explosion);
runtimeInfo.setGameplayObjects(gameplayObjects);
- log.debug("explosion placed");
+ log.info("Big Bomb explosion placed");
changeCheckedTileDestructable(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 2049cc72..8702e6ed 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
@@ -215,7 +215,7 @@ public class Bomb implements IEntity {
IEntity explosion = EntityFactory.createGameplayObject(ObjectType.EXPLOSION, spawnCordY * scaledTileSize, spawnCordX * scaledTileSize, graphicsContext);
gameplayObjects.add(explosion);
runtimeInfo.setGameplayObjects(gameplayObjects);
- log.debug("explosion placed");
+ log.debug("Normal Bomb explosion placed");
changeCheckedTileDestructable(graphicsContext);
}
@@ -237,7 +237,7 @@ public class Bomb implements IEntity {
IEntity bigBombItemFrame = EntityFactory.createGameplayObject(ObjectType.HEART, x, y, graphicsContext);
gameplayObjects.add(bigBombItemFrame);
runtimeInfo.setGameplayObjects(gameplayObjects);
- log.info("BigBombItemFrame dropped");
+ log.debug("BigBombItemFrame dropped");
}
else if (randomDropChance < dropChanceHeart + dropChanceBigBombItemFrame + dropChanceBlastUpItemFrame) {
List<IEntity> gameplayObjects = runtimeInfo.getGameplayObjects();
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 c736dc1c..4a3a4f52 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
@@ -364,8 +364,8 @@ class Player implements IEntity {
}
} else if (gameplayObject.getOBJECT_TYPE() == ObjectType.EXPLOSION) {
if (gameplayObject.getBoxCollider().intersects(boxCollider)) {
- log.debug("Collision with explosion");
- gotHit(10);
+ log.info("Collision with explosion");
+ gotHit(10); //TODO: Player still takes way too much damage
}
}
}
@@ -379,7 +379,7 @@ class Player implements IEntity {
inputHandler.isSdBomb() && PLAYER_MODE == PlayerMode.PLAYER_TWO && bombPlacementRate == 0) {
if(isBigBombItemFrame){
- log.debug("We have Itemframes in the List");
+ log.debug("We have Big_Bomb Itemframes in the List");
bombPlacementRate = 100;
int xTile = mapPosX / scaledTileSize;
int yTile = mapPosY / scaledTileSize;
@@ -525,7 +525,7 @@ class Player implements IEntity {
health = 0;
log.debug("Dead");
}
- log.debug("DamageTaken, current Health: " + health);
+ log.info("DamageTaken, current Health: " + health);
}
}
--
GitLab