From 15d6c6dc775c732554dbfdae9387fa76c6bed272 Mon Sep 17 00:00:00 2001 From: Steinar Aalstad Lillesund Date: Tue, 31 Mar 2020 13:45:35 +0200 Subject: [PATCH 1/3] fixed typos --- .../java/inf112/fiasko/roborally/objects/RoboRallyGame.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java index d76c278..4470f40 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java +++ b/src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java @@ -414,9 +414,9 @@ public class RoboRallyGame implements IDrawableGame { } /** - * repair all robots standing on a reparer tile + * repair all robots standing on a repair tile */ - private void repairAllRobotsOnReparerTiles(){ + private void repairAllRobotsOnRepairTiles(){ List> listOfRepareTiles = gameBoard.getPositionsOfTileOnBoard(TileType.FLAG_1, TileType.FLAG_2, TileType.FLAG_3, TileType.FLAG_4, TileType.WRENCH, TileType.WRENCH_AND_HAMMER); for (BoardElementContainer repareTile:listOfRepareTiles) { From 548c7978c62efc399a737009affc3723f7461a02 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 31 Mar 2020 14:44:53 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Legger=20til=20en=20metode=20i=20Board=20fo?= =?UTF-8?q?r=20=C3=A5=20f=C3=A5=20power=20down=20status=20fra=20en=20spesi?= =?UTF-8?q?fikk=20robot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inf112/fiasko/roborally/objects/Board.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java index 8f69397..b5e1ff3 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Board.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java @@ -136,14 +136,22 @@ public class Board { } /** - * sets the powerdown status of the robot - * @param robotID the robotid of the robot - * @param powerdown the status of the powerdown + * Sets the power down status of the robot + * @param robotID The robot id of the robot + * @param powerdown The status of the powerdown */ public void setPowerDown(RobotID robotID,Boolean powerdown){ robots.get(robotID).setPowerDown(powerdown); } + /** + * Gets the power down status of the robot + * @param robotID The robot id of the robot + */ + public void getPowerDown(RobotID robotID) { + robots.get(robotID).isInPowerDown(); + } + /** * removes one damage for a given robot given that it has taken som damage before * @param robotID the ID of the robot From b6c7f808d282e94848ea8cc085ebcffc32329b5c Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Tue, 31 Mar 2020 14:49:19 +0200 Subject: [PATCH 3/3] Fikser returtype for getPowerDown --- .../inf112/fiasko/roborally/objects/Board.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/inf112/fiasko/roborally/objects/Board.java b/src/main/java/inf112/fiasko/roborally/objects/Board.java index e6b5e76..95a57a3 100644 --- a/src/main/java/inf112/fiasko/roborally/objects/Board.java +++ b/src/main/java/inf112/fiasko/roborally/objects/Board.java @@ -140,7 +140,7 @@ public class Board { * @param robotID The robot id of the robot * @param powerdown The status of the powerdown */ - public void setPowerDown(RobotID robotID,Boolean powerdown){ + public void setPowerDown(RobotID robotID, Boolean powerdown) { robots.get(robotID).setPowerDown(powerdown); } @@ -148,26 +148,26 @@ public class Board { * Gets the power down status of the robot * @param robotID The robot id of the robot */ - public void getPowerDown(RobotID robotID) { - robots.get(robotID).isInPowerDown(); + public boolean getPowerDown(RobotID robotID) { + return robots.get(robotID).isInPowerDown(); } /** * removes one damage for a given robot given that it has taken som damage before * @param robotID the ID of the robot */ - public void repairRobotOnTile(RobotID robotID){ + public void repairRobotOnTile(RobotID robotID) { Robot robot = robots.get(robotID); - int newDamage = Math.max(robot.getDamageTaken()-1,0); + int newDamage = Math.max(robot.getDamageTaken() - 1, 0); robot.setDamageTaken(newDamage); } /** * sets the damage taken of robots in powerdown to 0 */ - public void executePowerdown(){ + public void executePowerdown() { for (Robot robot:robots.values()) { - if(robot.isInPowerDown()){ + if (robot.isInPowerDown()) { robot.setDamageTaken(0); } }