From c4a6113f6cb74bd00d3fc167d9c24c3269a3cead Mon Sep 17 00:00:00 2001 From: Kusal Ekanayake Date: Wed, 20 Sep 2017 21:07:49 +1200 Subject: [PATCH] Minor bug fixes (like all enemy sails being toggled in when they should be out) #story[1274] --- src/main/java/seng302/model/ClientYacht.java | 2 +- src/main/java/seng302/visualiser/GameView3D.java | 1 + .../visualiser/controllers/dialogs/BoatCustomizeController.java | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/seng302/model/ClientYacht.java b/src/main/java/seng302/model/ClientYacht.java index 89715852..1ebaa3fc 100644 --- a/src/main/java/seng302/model/ClientYacht.java +++ b/src/main/java/seng302/model/ClientYacht.java @@ -46,7 +46,7 @@ public class ClientYacht extends Observable { private Integer position; private Long estimateTimeAtFinish; - private Boolean sailIn = false; + private Boolean sailIn = true; private Integer currentMarkSeqID = 0; private Long markRoundTime; private Long timeTillNext; diff --git a/src/main/java/seng302/visualiser/GameView3D.java b/src/main/java/seng302/visualiser/GameView3D.java index 8cc6bb9b..73815023 100644 --- a/src/main/java/seng302/visualiser/GameView3D.java +++ b/src/main/java/seng302/visualiser/GameView3D.java @@ -569,6 +569,7 @@ public class GameView3D { } public void setBoatAsPlayer (ClientYacht playerYacht) { + playerYacht.toggleSail(); playerBoatAnimationTimer = new AnimationTimer() { double count = 60; diff --git a/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java b/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java index a418fe41..55f0b7e6 100644 --- a/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java +++ b/src/main/java/seng302/visualiser/controllers/dialogs/BoatCustomizeController.java @@ -115,7 +115,6 @@ public class BoatCustomizeController implements Initializable{ public void setCurrentBoat(String boatType) { Group group = new Group(); this.currentBoat = BoatMeshType.getBoatMeshType(boatType); - System.out.println(boatType.toString()); boatPane.setBackground(new Background(new BackgroundFill(Color.SKYBLUE, CornerRadii.EMPTY, Insets.EMPTY))); boatPane.getChildren().add(group); BoatModel bo = ModelFactory.boatCustomiseView(currentBoat, colorPicker.getValue());