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 allocatedIDs = mockRace.getRaceDataSource().getParticipants(); + List 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 @@ RACE_CREATION_TIME - - - - - - + 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 @@ RACE_CREATION_TIME - - - - - - + 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 @@ RACE_CREATION_TIME - - - - - - + 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 @@ - +