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 6da32d1e4e10a655b1a0d49540e64ddbbd73a3e3..81dea6bcc942e7e45c1274fa54ed30b494b4b6fd 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 @@ -2,13 +2,13 @@ package de.hdm_stuttgart.battlearena.Model.DataStorage.Classes; import de.hdm_stuttgart.battlearena.Controller.Enum.GameMode; import de.hdm_stuttgart.battlearena.Controller.Enum.GameState; -import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.ENUMs.ThreadStatus; import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.Exceptions.ParserException; import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.Utilities.HashGenerator; import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.Utilities.Parser; import de.hdm_stuttgart.battlearena.Model.Entity.EntityClass; import de.hdm_stuttgart.battlearena.Model.Entity.IEntity; import de.hdm_stuttgart.battlearena.Model.Map.Biom; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; 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 148be0bcf4900af10bf02a825f6947cdc8024ca0..98d1d25c2fdec8b4a97fb8261593414df11d7992 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 @@ -3,12 +3,11 @@ package de.hdm_stuttgart.battlearena.Model.Entity.GameplayObjects; import de.hdm_stuttgart.battlearena.Controller.GameSceneController; import de.hdm_stuttgart.battlearena.Model.Entity.EntityDirection; import de.hdm_stuttgart.battlearena.Model.Entity.IEntity; -import javafx.animation.KeyFrame; -import javafx.animation.Timeline; + import javafx.geometry.BoundingBox; import javafx.scene.canvas.GraphicsContext; import javafx.scene.image.Image; -import javafx.util.Duration; + import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; @@ -83,7 +82,7 @@ public class Bomb implements IEntity { private void updateAnimation() { frameCounter++; - if (frameCounter > 20) { + if (frameCounter > 10) { if (frameIndex == 0) { frameIndex = 1; } else if (frameIndex == 1) { 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 34e66cdf91673dbda65c9bd92a0f6ac5dddc1298..7916d026aea1670d4bec53ea0452a7708486ad7c 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 @@ -6,9 +6,8 @@ import de.hdm_stuttgart.battlearena.Model.DataStorage.Classes.RuntimeInfo; import de.hdm_stuttgart.battlearena.Model.Entity.GameplayObjects.ObjectStatus; import de.hdm_stuttgart.battlearena.Model.Entity.GameplayObjects.ObjectType; import de.hdm_stuttgart.battlearena.Model.Inputs.InputHandler; - import de.hdm_stuttgart.battlearena.Model.Map.TileManager; -import javafx.animation.KeyValue; + import javafx.geometry.BoundingBox; import javafx.scene.canvas.GraphicsContext; import javafx.scene.image.Image; @@ -19,11 +18,6 @@ import org.apache.logging.log4j.LogManager; import java.util.List; import java.util.Objects; -import javafx.animation.KeyFrame; -import javafx.animation.Timeline; -import javafx.event.ActionEvent; -import javafx.util.Duration; - class Player implements IEntity { private static final Logger log = LogManager.getLogger(Player.class);