Skip to content
Snippets Groups Projects
Commit 19035aee authored by Scherbaum Maximilian's avatar Scherbaum Maximilian
Browse files

update: reorganized imports

parent d6f12c4f
No related branches found
No related tags found
5 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!27Player can now place bombs that have a explosion radius that dont go through the wall.,!24Player can now place bombs that have a explosion radius that dont go through the wall.
......@@ -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;
......
......@@ -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) {
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment