From a20566ce72ad3968eaf2354eb85680df642c16b5 Mon Sep 17 00:00:00 2001
From: yschl <ys037@hdm-stuttgart.de>
Date: Fri, 26 Jan 2024 16:55:12 +0100
Subject: [PATCH] Add: BigBombItemFrame to pick up and be able to spawn
BigBombs, more Destructible Tiles Update: Spawn/ Spawnrate of different items
Fix: Destruction of Boxes behind Boxes
Forgot #83 #79
---
.../hdm_stuttgart/battlearena/Model/Entity/Player.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
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 abecbf2f..f607972f 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
@@ -354,7 +354,6 @@ class Player implements IEntity {
@Override
public void placeBomb(IEntity entity, GraphicsContext graphicsContext) {
- int x, y;
List<IEntity> gameplayObjects = runtimeInfo.getGameplayObjects(); //TODO: This is 0?
if (inputHandler.isBomb() && PLAYER_MODE == PlayerMode.PLAYER_ONE && bombPlacementRate == 0 ||
inputHandler.isSdBomb() && PLAYER_MODE == PlayerMode.PLAYER_TWO && bombPlacementRate == 0) {
@@ -576,10 +575,10 @@ class Player implements IEntity {
int x,y; //TODO Fix Explosion
List<IEntity> gameplayObjects = runtimeInfo.getGameplayObjects();
List<IEntity> explosionList = gameplayObjects.stream().filter(obj -> obj.getOBJECT_TYPE() == ObjectType.EXPLOSION)
- .collect(Collectors.toList());
- for (int i =0; i < explosionList.size(); i++) {
- y = (explosionList.get(i).getMapPosY()) / scaledTileSize;
- x = (explosionList.get(i).getMapPosX()) / scaledTileSize;
+ .toList();
+ for (IEntity entity : explosionList) {
+ y = (entity.getMapPosY()) / scaledTileSize;
+ x = (entity.getMapPosX()) / scaledTileSize;
if (TileManager.tileMap[y][x] > 19) {
TileManager.tileMap[y][x] = 0;
--
GitLab