From 5e516b0508b24a98067ef464670892fa4905559f Mon Sep 17 00:00:00 2001 From: hba56 Date: Fri, 8 Sep 2017 18:12:51 +1200 Subject: [PATCH] re added the standard race #story[1193] --- racevisionGame/src/main/java/mock/app/Event.java | 4 ++-- .../src/main/resources/mock/mockXML/mMapLayout.xml | 6 +++++- .../mockXML/{raceThreePlayers.xml => raceSixPlayers.xml} | 3 +++ .../src/main/resources/visualiser/scenes/hostgame.fxml | 8 +++++++- 4 files changed, 17 insertions(+), 4 deletions(-) rename racevisionGame/src/main/resources/mock/mockXML/{raceThreePlayers.xml => raceSixPlayers.xml} (96%) diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java index d9bfd4e8..f0ffd900 100644 --- a/racevisionGame/src/main/java/mock/app/Event.java +++ b/racevisionGame/src/main/java/mock/app/Event.java @@ -85,7 +85,7 @@ public class Event { String raceXMLFile; switch (mapIndex){ - case 0:raceXMLFile = "mock/mockXML/raceTest.xml"; + case 0:raceXMLFile = "mock/mockXML/raceSixPlayers.xml"; break; case 1:raceXMLFile = "mock/mockXML/oMapLayout.xml"; break; @@ -93,7 +93,7 @@ public class Event { break; case 3: raceXMLFile = "mock/mockXML/mMapLayout.xml"; break; - default: raceXMLFile = "mock/mockXML/raceTest.xml"; + default: raceXMLFile = "mock/mockXML/raceSixPlayers.xml"; } String boatsXMLFile = "mock/mockXML/boatTest.xml"; diff --git a/racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml b/racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml index 3f990b09..588d8d36 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml +++ b/racevisionGame/src/main/resources/mock/mockXML/mMapLayout.xml @@ -6,7 +6,11 @@ - + + + + + diff --git a/racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml b/racevisionGame/src/main/resources/mock/mockXML/raceSixPlayers.xml similarity index 96% rename from racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml rename to racevisionGame/src/main/resources/mock/mockXML/raceSixPlayers.xml index e0b81837..ad14d931 100644 --- a/racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml +++ b/racevisionGame/src/main/resources/mock/mockXML/raceSixPlayers.xml @@ -5,6 +5,9 @@ RACE_CREATION_TIME + + + diff --git a/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml index 67473fcb..0767dd44 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml @@ -1,5 +1,11 @@ + + + + + + @@ -10,7 +16,7 @@ - +