diff --git a/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatStateCommand.java b/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatStateCommand.java index 1362e647..85a1e00e 100644 --- a/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatStateCommand.java +++ b/racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatStateCommand.java @@ -24,7 +24,7 @@ public class BoatStateCommand implements Command { VisualiserBoat boat = visualiserRace.getBoat(boatState.getSourceID()); boat.setHealth(boatState.getBoatHealth()); } catch (BoatNotFoundException e) { - e.printStackTrace(); + // Fail silently } } } diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java index 5e5d7ad5..8b8daf4f 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java @@ -85,14 +85,15 @@ public class RaceViewController extends Controller { private @FXML Label timeZone; private @FXML CheckBox showFPS; private @FXML TableView boatInfoTable; - private @FXML TableColumn boatPlacingColumn; private @FXML TableColumn boatTeamColumn; private @FXML TableColumn boatMarkColumn; private @FXML TableColumn boatSpeedColumn; + private @FXML TableColumn boatHealthColumn; private @FXML LineChart sparklineChart; private @FXML Label tutorialText; private @FXML AnchorPane infoWrapper; private @FXML AnchorPane lineChartWrapper; + private @FXML GridPane playerHealthContainer; /** * Displays a specified race. @@ -334,12 +335,9 @@ public class RaceViewController extends Controller { boat.legProperty().addListener((o, prev, curr) -> Platform.runLater(() -> swapColours(curr))); boat.hasCollidedProperty().addListener((o, prev, curr) -> Platform.runLater(() -> showCollision(boat, shockwave))); - boat.healthProperty().addListener((o, prev, curr) -> { - System.out.println("Tab view: " + curr); - }); if(boat.getSourceID() == race.getVisualiserRaceState().getPlayerBoatID()) { boat.healthProperty().addListener((o, prev, curr) -> { - System.out.println("Tomato: " + curr); + System.out.println(curr); }); } } @@ -529,13 +527,17 @@ public class RaceViewController extends Controller { // set table data boatInfoTable.setItems(sortedBoats); boatTeamColumn.setCellValueFactory( - cellData -> cellData.getValue().nameProperty()); + cellData -> cellData.getValue().nameProperty() + ); boatSpeedColumn.setCellValueFactory( - cellData -> cellData.getValue().currentSpeedProperty()); + cellData -> cellData.getValue().currentSpeedProperty() + ); boatMarkColumn.setCellValueFactory( - cellData -> cellData.getValue().legProperty()); - boatPlacingColumn.setCellValueFactory( - cellData -> cellData.getValue().placingProperty()); + cellData -> cellData.getValue().legProperty() + ); + boatHealthColumn.setCellValueFactory( + cellData -> cellData.getValue().healthProperty() + ); //Kind of ugly, but allows for formatting an observed speed. boatSpeedColumn.setCellFactory( diff --git a/racevisionGame/src/main/resources/visualiser/images/tomato.png b/racevisionGame/src/main/resources/visualiser/images/tomato.png new file mode 100644 index 00000000..92cf4c1d Binary files /dev/null and b/racevisionGame/src/main/resources/visualiser/images/tomato.png differ diff --git a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml index 76195416..3a1f61e9 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml @@ -3,26 +3,26 @@ - - - - - - - - - + + + + + + + + + @@ -103,6 +103,17 @@