EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-06-26 11:14:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/inf112-v20/Fiasko

Browse Source
This commit is contained in:
Kristian Knarvik
2020-03-31 14:45:00 +02:00
parent 548c7978c6 15d6c6dc77
commit cf3012b78f
3 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/inf112/fiasko/roborally/objects/Board.java
View File

@ -158,7 +158,7 @@ public class Board {
*/
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);
}

13
src/main/java/inf112/fiasko/roborally/objects/RoboRallyGame.java
View File

@ -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<BoardElementContainer<Tile>> listOfRepareTiles = gameBoard.getPositionsOfTileOnBoard(TileType.FLAG_1,
TileType.FLAG_2, TileType.FLAG_3, TileType.FLAG_4, TileType.WRENCH, TileType.WRENCH_AND_HAMMER);
for (BoardElementContainer<Tile> repareTile:listOfRepareTiles) {
@ -437,4 +437,13 @@ public class RoboRallyGame implements IDrawableGame {
player.setPowerDownNextRound(false);
}
}
/**
* sets the powerdown status of a robots
* @param player the player that owns the robot
* @param powerdownStatus the powerdown status
*/
private void setRobotPowerDown(Player player,Boolean powerdownStatus){
gameBoard.setPowerDown(player.getRobotID(),powerdownStatus);
}
}