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

Fikset imports og lagt til metode for merking av døde spillere

Browse Source
This commit is contained in:
Steinar Aalstad Lillesund 2020-04-14 16:10:16 +02:00
parent 23406f395b
commit 7c74af106c
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,12 @@
package inf112.fiasko.roborally.objects; package inf112.fiasko.roborally.objects;
import com.esotericsoftware.kryonet.Client;
import com.esotericsoftware.kryonet.Connection; import com.esotericsoftware.kryonet.Connection;
import inf112.fiasko.roborally.element_properties.Action; import inf112.fiasko.roborally.elementproperties.Action;
import inf112.fiasko.roborally.element_properties.Direction; import inf112.fiasko.roborally.elementproperties.Direction;
import inf112.fiasko.roborally.element_properties.GameState; import inf112.fiasko.roborally.elementproperties.GameState;
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.networking.RoboRallyClient; import inf112.fiasko.roborally.networking.RoboRallyClient;
import inf112.fiasko.roborally.networking.RoboRallyServer; import inf112.fiasko.roborally.networking.RoboRallyServer;
import inf112.fiasko.roborally.utility.BoardLoaderUtil; import inf112.fiasko.roborally.utility.BoardLoaderUtil;
@ -33,7 +32,7 @@ public class RoboRallyGame implements IDrawableGame {
private final List<Player> playerList; private final List<Player> playerList;
private final boolean host; private final boolean host;
private Deck<ProgrammingCard> mainDeck; private Deck<ProgrammingCard> mainDeck;
private GameState gameState = GameState.INITIAL_SETUP; private GameState gameState = GameState.BEGINNING_OF_GAME;
private String nameOfPlayer; private String nameOfPlayer;
private RoboRallyClient client; private RoboRallyClient client;
private RoboRallyServer server; private RoboRallyServer server;
@ -257,6 +256,9 @@ public class RoboRallyGame implements IDrawableGame {
gameBoard.executePowerdown(); gameBoard.executePowerdown();
if (host) { if (host) {
distributeProgrammingCardsToPlayers(); distributeProgrammingCardsToPlayers();
if (server == null) {
System.out.println("Serveren er null");
}
for (Connection connection: server.getPlayerNames().keySet()) { for (Connection connection: server.getPlayerNames().keySet()) {
String playerName = server.getPlayerNames().get(connection); String playerName = server.getPlayerNames().get(connection);
Player player = getPlayerFromName(playerName); Player player = getPlayerFromName(playerName);
@ -290,6 +292,12 @@ public class RoboRallyGame implements IDrawableGame {
resetHasTouchedFlagThisTurnForAllRobots(); resetHasTouchedFlagThisTurnForAllRobots();
} }
private void sendAllDeadPlayersToServer() {
if (host) {
server.setDeadPlayers(gameBoard.getRealDeadRobots());
}
}
/** /**
* Resets the boolean for if the robot has touched a flag this turn, to set up the next turn. * Resets the boolean for if the robot has touched a flag this turn, to set up the next turn.
*/ */