EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2024-10-16 18:23:38 +02:00
Code Issues Projects Releases Wiki Activity

Fikset imports og lagt til funksjon for merkering for døde spillere.

Browse Source
This commit is contained in:
Steinar Aalstad Lillesund 2020-04-14 16:04:32 +02:00
parent 911a725a26
commit bd8090a987
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.ParticleType; import inf112.fiasko.roborally.elementproperties.ParticleType;
import inf112.fiasko.roborally.element_properties.Position; import inf112.fiasko.roborally.elementproperties.Position;
import inf112.fiasko.roborally.element_properties.RobotID; import inf112.fiasko.roborally.elementproperties.RobotID;
import inf112.fiasko.roborally.element_properties.TileType; import inf112.fiasko.roborally.elementproperties.TileType;
import inf112.fiasko.roborally.element_properties.WallType; import inf112.fiasko.roborally.elementproperties.WallType;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
@ -23,7 +23,7 @@ public class Board {
private IGrid<Particle> particles; private IGrid<Particle> particles;
private Map<RobotID, Robot> robots; private Map<RobotID, Robot> robots;
private List<Robot> deadRobots; private List<Robot> deadRobots;
private List<Robot> realDeadRobots; private List<RobotID> realDeadRobots;
/** /**
* Initializes the board * Initializes the board
@ -55,7 +55,7 @@ public class Board {
* All the Real dead player's robots. * All the Real dead player's robots.
* @return A list of Robots. * @return A list of Robots.
*/ */
public List<Robot> getRealDeadRobots() { return realDeadRobots; } public List<RobotID> getRealDeadRobots() { return realDeadRobots; }
/** /**
* Gets the height of the board * Gets the height of the board
@ -358,7 +358,7 @@ public class Board {
robots.put(robot.getRobotId(), robot); robots.put(robot.getRobotId(), robot);
} }
else { else {
realDeadRobots.add(robot); realDeadRobots.add(robot.getRobotId());
} }
} }
deadRobots = new ArrayList<>(); deadRobots = new ArrayList<>();