EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-01-31 23:29:36 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
GabrielMagnus 2020-02-26 20:27:33 +01:00
commit 943886152e
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ public class Board {
private IGrid<Wall> walls; private IGrid<Wall> walls;
private IGrid<Tile> tiles; private IGrid<Tile> tiles;
private Map<RobotID, Robot> robots; private Map<RobotID, Robot> robots;
private List<Robot> deadRobots;
/** /**
* Initializes the board * Initializes the board
@ -41,6 +42,7 @@ public class Board {
this.boardHeight = tiles.getHeight(); this.boardHeight = tiles.getHeight();
this.walls = walls; this.walls = walls;
this.tiles = tiles; this.tiles = tiles;
this.deadRobots = new ArrayList<>();
} }
/** /**
@ -207,6 +209,7 @@ public class Board {
private void killRobot(Robot robot) { private void killRobot(Robot robot) {
robot.setAmountOfLives(robot.getAmountOfLives() - 1); robot.setAmountOfLives(robot.getAmountOfLives() - 1);
removeDeadRobotFromBoard(robot); removeDeadRobotFromBoard(robot);
deadRobots.add(robot);
} }
/** /**
@ -289,4 +292,28 @@ public class Board {
} }
return elements; return elements;
} }
/**
* Moves all dead robots to their backups and makes them part of the board again, and if a robot has no lives
* it will be removed from the game.
*/
public void respawnRobots() {
for (Robot robot : deadRobots) {
if (robot.getAmountOfLives() > 0) {
robot.setPosition(robot.getBackupPosition());
robot.setFacingDirection(Direction.NORTH);
robots.put(robot.getRobotId(), robot);
}
else {
deadRobots.remove(robot);
}
}
}
/**
* Checks if a specific robot is currently alive on the board
* @param robot the ID of the robot you want to check
* @return True/False based on if the robot was found.
*/
public boolean isRobotAlive(RobotID robot) { return robots.containsKey(robot); }
} }

19
src/test/java/inf112/fiasko/roborally/objects/BoardTest.java
View File

@ -129,4 +129,23 @@ public class BoardTest {
board.moveRobot(robot.getRobotId(), Direction.NORTH); board.moveRobot(robot.getRobotId(), Direction.NORTH);
assertEquals(2, robot.getAmountOfLives()); assertEquals(2, robot.getAmountOfLives());
} }
@Test
public void respawnRobotAtBackupPosition() {
Robot robot = board.getAliveRobots().get(0);
board.moveRobot(robot.getRobotId(), Direction.NORTH);
board.removeDeadRobotFromBoard(robot);
board.respawnRobots();
assertEquals(robot.getBackupPosition(), someValidPosition1);
}
@Test
public void respawnRobotDoesNotRespawnARobotWithNoLives() {
Robot robot = board.getAliveRobots().get(0);
robot.setAmountOfLives(1);
board.moveRobot(robot.getRobotId(), Direction.NORTH);
board.removeDeadRobotFromBoard(robot);
board.respawnRobots();
assertFalse(board.isRobotAlive(robot.getRobotId()));
}
} }