From ae8fa312a39039521d9898c5d1dc4c2711a969f6 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Sat, 9 Sep 2017 15:37:35 +1200
Subject: [PATCH] removed sout and added a longer startup time. Also fixed race
 xmls to remove set boats

---
 racevisionGame/src/main/java/mock/app/Event.java           | 4 ++--
 .../src/main/java/mock/model/SourceIdAllocator.java        | 1 +
 racevisionGame/src/main/java/shared/model/Constants.java   | 2 +-
 .../src/main/resources/mock/mockXML/iMapLayout.xml         | 7 +------
 .../src/main/resources/mock/mockXML/mMapLayout.xml         | 7 +------
 .../src/main/resources/mock/mockXML/oMapLayout.xml         | 7 +------
 .../src/main/resources/visualiser/scenes/main.fxml         | 2 +-
 7 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java
index 8bbaf161..98476ac1 100644
--- a/racevisionGame/src/main/java/mock/app/Event.java
+++ b/racevisionGame/src/main/java/mock/app/Event.java
@@ -82,8 +82,8 @@ public class Event {
      */
     public Event(boolean singlePlayer, int mapIndex) throws EventConstructionException {
 
-        System.out.println(XMLUtilities.validateXML(this.getClass().getClassLoader().getResource("mock/mockXML/iMapLayout.xml").toString()
-                , this.getClass().getClassLoader().getResource("mock/mockXML/schema/raceSchema.xsd")));
+//        System.out.println(XMLUtilities.validateXML(this.getClass().getClassLoader().getResource("mock/mockXML/iMapLayout.xml").toString()
+//                , this.getClass().getClassLoader().getResource("mock/mockXML/schema/raceSchema.xsd")));
 
         String raceXMLFile;
         switch (mapIndex){
diff --git a/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java b/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java
index 17a7e85f..f590d9b7 100644
--- a/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java
+++ b/racevisionGame/src/main/java/mock/model/SourceIdAllocator.java
@@ -42,6 +42,7 @@ public class SourceIdAllocator {
         }
 
         List<Integer> allocatedIDs = mockRace.getRaceDataSource().getParticipants();
+
         List<Integer> allIDs = new ArrayList<>(mockRace.getBoatDataSource().getBoats().keySet());
 
         //Get list of unallocated ids.
diff --git a/racevisionGame/src/main/java/shared/model/Constants.java b/racevisionGame/src/main/java/shared/model/Constants.java
index 18a2aaed..7a5e2820 100644
--- a/racevisionGame/src/main/java/shared/model/Constants.java
+++ b/racevisionGame/src/main/java/shared/model/Constants.java
@@ -46,7 +46,7 @@ public class Constants {
      * The race preparatory time, in milliseconds. 1 minute.
      */
 //    public static final long RacePreparatoryTime = 60 * 1000;
-    public static final long RacePreparatoryTime = 3 * 1000;
+    public static final long RacePreparatoryTime = 1 * 60 * 1000;
 
 
 
diff --git a/racevisionGame/src/main/resources/mock/mockXML/iMapLayout.xml b/racevisionGame/src/main/resources/mock/mockXML/iMapLayout.xml
index fefb15bf..ca914b12 100644
--- a/racevisionGame/src/main/resources/mock/mockXML/iMapLayout.xml
+++ b/racevisionGame/src/main/resources/mock/mockXML/iMapLayout.xml
@@ -5,12 +5,7 @@
     <CreationTimeDate>RACE_CREATION_TIME</CreationTimeDate>
     <RaceStartTime Postpone="false" Time="RACE_START_TIME"/>
     <Participants>
-        <Yacht SourceID="121"/>
-        <Yacht SourceID="122"/>
-        <Yacht SourceID="123"/>
-        <Yacht SourceID="124"/>
-        <Yacht SourceID="125"/>
-        <Yacht SourceID="126"/>
+
     </Participants>
     <CompoundMarkSequence>
         <Corner SeqID="1" CompoundMarkID="1" Rounding="SP" ZoneSize="3" />
diff --git a/racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml b/racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml
index 588d8d36..ce715ba6 100644
--- a/racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml
+++ b/racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml
@@ -5,12 +5,7 @@
     <CreationTimeDate>RACE_CREATION_TIME</CreationTimeDate>
     <RaceStartTime Postpone="false" Time="RACE_START_TIME"/>
     <Participants>
-        <Yacht SourceID="121"/>
-        <Yacht SourceID="122"/>
-        <Yacht SourceID="123"/>
-        <Yacht SourceID="124"/>
-        <Yacht SourceID="125"/>
-        <Yacht SourceID="126"/>
+
     </Participants>
     <CompoundMarkSequence>
         <Corner SeqID="1" CompoundMarkID="1" Rounding="SP" ZoneSize="3" />
diff --git a/racevisionGame/src/main/resources/mock/mockXML/oMapLayout.xml b/racevisionGame/src/main/resources/mock/mockXML/oMapLayout.xml
index b8cbf54a..5021bbba 100644
--- a/racevisionGame/src/main/resources/mock/mockXML/oMapLayout.xml
+++ b/racevisionGame/src/main/resources/mock/mockXML/oMapLayout.xml
@@ -5,12 +5,7 @@
     <CreationTimeDate>RACE_CREATION_TIME</CreationTimeDate>
     <RaceStartTime Postpone="false" Time="RACE_START_TIME"/>
     <Participants>
-        <Yacht SourceID="121"/>
-        <Yacht SourceID="122"/>
-        <Yacht SourceID="123"/>
-        <Yacht SourceID="124"/>
-        <Yacht SourceID="125"/>
-        <Yacht SourceID="126"/>
+
     </Participants>
     <CompoundMarkSequence>
         <Corner SeqID="1" CompoundMarkID="1" Rounding="SP" ZoneSize="3" />
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/main.fxml b/racevisionGame/src/main/resources/visualiser/scenes/main.fxml
index 7aff44c0..074a9b31 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/main.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/main.fxml
@@ -7,7 +7,7 @@
         <fx:include fx:id="start" source="start.fxml" />
         <fx:include fx:id="connection" source="connect.fxml" />
         <fx:include fx:id="finish" source="finish.fxml" />
-        <fx:include fx:id="host" source="hostlobby.fxml" />
+        <fx:include fx:id="host" source="hostgame.fxml" />
         <fx:include fx:id="title" source="titleScreen.fxml" />
         <fx:include fx:id="lobby" source="lobby.fxml" />
     </children>