From d8628b42891730d4ccd807d7ff3aec64a5c59126 Mon Sep 17 00:00:00 2001 From: Joseph Gardner Date: Thu, 10 Aug 2017 13:25:57 +1200 Subject: [PATCH] Boats now start the race with sails out. #story[1098] --- racevisionGame/src/main/java/mock/model/MockRace.java | 2 +- racevisionGame/src/main/java/shared/model/Boat.java | 2 +- racevisionGame/src/main/java/visualiser/model/ThisBoat.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java index 496d1299..b9e655d9 100644 --- a/racevisionGame/src/main/java/mock/model/MockRace.java +++ b/racevisionGame/src/main/java/mock/model/MockRace.java @@ -319,7 +319,7 @@ public class MockRace extends Race { //Checks if the current boat has finished the race or not. boolean finish = this.isLastLeg(boat.getCurrentLeg()); - if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds && !boat.isSailsOut()) { + if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds && boat.isSailsOut()) { // if (boat.getCurrentSpeed() == 0) { // newOptimalVMG(boat); diff --git a/racevisionGame/src/main/java/shared/model/Boat.java b/racevisionGame/src/main/java/shared/model/Boat.java index 78b4aba6..6fbd5471 100644 --- a/racevisionGame/src/main/java/shared/model/Boat.java +++ b/racevisionGame/src/main/java/shared/model/Boat.java @@ -93,7 +93,7 @@ public class Boat { /** * The state of the boats sails. True if sails are out. */ - private boolean sailsOut = false; + private boolean sailsOut = true; /** * Constructs a boat object with a given sourceID, name, country/team abbreviation, and polars table. diff --git a/racevisionGame/src/main/java/visualiser/model/ThisBoat.java b/racevisionGame/src/main/java/visualiser/model/ThisBoat.java index a4660d07..e7f1675f 100644 --- a/racevisionGame/src/main/java/visualiser/model/ThisBoat.java +++ b/racevisionGame/src/main/java/visualiser/model/ThisBoat.java @@ -6,7 +6,7 @@ package visualiser.model; public class ThisBoat { // TODO Initialise sourceID to the sourceID given by the network private int sourceID = 125; - private boolean sailsOut = false; + private boolean sailsOut = true; private static ThisBoat instance = new ThisBoat(); private ThisBoat(){}