From a2dc09f48ce92f6bda327224c1aa4169b079d00c Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Thu, 16 Apr 2020 15:33:31 +0200 Subject: [PATCH] Legger til manglende mellomrom for bedre kodestil --- .../gamewrapper/screens/BoardActiveScreen.java | 16 ++++++++-------- .../inf112/fiasko/roborally/objects/Board.java | 6 +++--- .../fiasko/roborally/objects/RoboRallyGame.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java index 70671b8..ba4e586 100644 --- a/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java +++ b/src/main/java/inf112/fiasko/roborally/gamewrapper/screens/BoardActiveScreen.java @@ -206,17 +206,17 @@ public class BoardActiveScreen extends AbstractScreen implements InputProcessor int cameraUpX = Math.round(camera.up.x); int cameraUpY = Math.round(camera.up.y); if (cameraUpX == 0 && Math.round(camera.up.y) == 1) { - outX = (int)-x; - outY = (int)y; + outX = (int) -x; + outY = (int) y; } else if (cameraUpX == 0 && cameraUpY == -1) { - outX = (int)x; - outY = (int)-y; + outX = (int) x; + outY = (int) -y; } else if (cameraUpX == -1 && cameraUpY == 0) { - outX = (int)-y; - outY = (int)-x; + outX = (int) -y; + outY = (int) -x; } else if (cameraUpX == 1 && cameraUpY == 0) { - outX = (int)y; - outY = (int)x; + outX = (int) y; + outY = (int) x; } return new int[]{outX, outY}; } diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java index 75d85b0..b0aebd9 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Board.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java @@ -174,7 +174,7 @@ public class Board { * sets the damage taken of robots in powerdown to 0 */ public void executePowerdown() { - for (Robot robot:robots.values()) { + for (Robot robot : robots.values()) { if (robot.isInPowerDown()) { robot.setDamageTaken(0); } @@ -655,7 +655,7 @@ public class Board { Direction laserDirection = Direction.getReverseDirection(wallLaser.getElement().getDirection()); List laserTargets = new ArrayList<>(); getLaserTarget(laserDirection, wallLaser.getPosition(), laserTargets); - Position hitPosition = laserTargets.get(laserTargets.size()-1); + Position hitPosition = laserTargets.get(laserTargets.size() - 1); WallType laserType = wallLaser.getElement().getWallType(); updateLaserDisplay(laserTargets, laserDirection, laserType); if (getRobotOnPosition(hitPosition) != null) { @@ -675,7 +675,7 @@ public class Board { } List laserTargets = new ArrayList<>(); getLaserTarget(robotDirection, positionInFront, laserTargets); - Position hitPosition = laserTargets.get(laserTargets.size()-1); + Position hitPosition = laserTargets.get(laserTargets.size() - 1); WallType laserType = WallType.WALL_LASER_SINGLE; updateLaserDisplay(laserTargets, robotDirection, laserType); if (getRobotOnPosition(hitPosition) != null) { diff --git a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java index 1ec8c9c..411aabe 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java +++ b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java @@ -580,7 +580,7 @@ public class RoboRallyGame implements IRoboRallyGame { * Checks all flags for robots. Tries to update the flag of the robot. */ private void checkAllFlags() { - for (BoardElementContainer flag:flags) { + for (BoardElementContainer flag : flags) { Position flagPosition = flag.getPosition(); if (gameBoard.hasRobotOnPosition(flagPosition)) { RobotID robotID = gameBoard.getRobotOnPosition(flagPosition);