Everything works. Needs a bit of polish, and possibly look at boat shapes next.

tags: #story[1142]
This commit is contained in:
Alistair McIntyre
2017-08-16 20:38:11 +12:00
parent 02a7b804c1
commit 67f0c213c2
7 changed files with 61 additions and 18 deletions
@@ -241,7 +241,7 @@ public class GameClient {
);
clientLobbyList.clear();
allBoatsMap.forEach((id, boat) ->
clientLobbyList.add(id + " " + boat.getBoatName())
clientLobbyList.add(boat.getBoatName())
);
break;
@@ -25,6 +25,8 @@ public class CustomizationController {
public void initialize() {
boatColorPicker.setValue(new Color(0.0, 0.0, 0.0, 1.0));
}
public void setServerThread(ClientToServerThread ctsThread) {
@@ -56,6 +58,9 @@ public class CustomizationController {
this.windowStage = stage;
}
public void setPlayerName(String name) {
this.nameField.setText(name);
}
}
@@ -149,9 +149,11 @@ public class LobbyController {
try {
FXMLLoader fxmlLoader = new FXMLLoader(LobbyController.class.getResource("/views/customizeView.fxml"));
root = fxmlLoader.load();
root.getStylesheets().add("/css/master.css");
Stage customizeStage = new Stage();
CustomizationController cc = fxmlLoader.getController();
cc.setServerThread(this.socketThread);
cc.setPlayerName(this.players.get(playerID - 1));
customizeStage.setTitle("Customize Boat");
customizeStage.setScene(new Scene(root, 700, 450));
cc.setStage(customizeStage); // pass the stage through so it can be closed later.