From 86f1a608e45a2f468414dc51a6e24b757178c42d Mon Sep 17 00:00:00 2001 From: David Wu Date: Wed, 30 Aug 2017 14:51:56 +1200 Subject: [PATCH] Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189] --- .../src/main/java/mock/app/Event.java | 6 +- .../src/main/java/visualiser/app/App.java | 6 +- .../resources/mock/mockXML/boatTutorial.xml | 41 +++++++++ .../resources/mock/mockXML/raceTutorial.xml | 43 +++++++++ .../mock/mockXML/raceXML/raceTutorial.xml | 91 +++++++++++++++++++ 5 files changed, 182 insertions(+), 5 deletions(-) create mode 100644 racevisionGame/src/main/resources/mock/mockXML/boatTutorial.xml create mode 100644 racevisionGame/src/main/resources/mock/mockXML/raceTutorial.xml create mode 100644 racevisionGame/src/main/resources/visualiser/mock/mockXML/raceXML/raceTutorial.xml diff --git a/racevisionGame/src/main/java/mock/app/Event.java b/racevisionGame/src/main/java/mock/app/Event.java index c054e2fb..a9089350 100644 --- a/racevisionGame/src/main/java/mock/app/Event.java +++ b/racevisionGame/src/main/java/mock/app/Event.java @@ -79,8 +79,10 @@ public class Event { */ public Event(boolean singlePlayer) throws EventConstructionException { - String raceXMLFile = "mock/mockXML/raceTest.xml"; - String boatsXMLFile = "mock/mockXML/boatTest.xml"; + //String raceXMLFile = "mock/mockXML/raceTest.xml"; + String raceXMLFile = "mock/mockXML/raceTutorial.xml"; + //String boatsXMLFile = "mock/mockXML/boatTest.xml"; + String boatsXMLFile = "mock/mockXML/boatTutorial.xml"; String regattaXMLFile = "mock/mockXML/regattaTest.xml"; if (singlePlayer) { diff --git a/racevisionGame/src/main/java/visualiser/app/App.java b/racevisionGame/src/main/java/visualiser/app/App.java index eeae5a5d..6a7d47f2 100644 --- a/racevisionGame/src/main/java/visualiser/app/App.java +++ b/racevisionGame/src/main/java/visualiser/app/App.java @@ -96,15 +96,15 @@ public class App extends Application { ); updateMessage("Preparing ingredients . . ."); - Thread.sleep(1000); + Thread.sleep(100); for (int i = 0; i < burgerFilling.size(); i++) { - Thread.sleep(800); + Thread.sleep(100); updateProgress(i + 1, burgerFilling.size()); String nextFilling = burgerFilling.get(i); addedFilling.add(nextFilling); updateMessage("Adding the " + nextFilling + " . . ."); } - Thread.sleep(400); + Thread.sleep(100); updateMessage("Burger's done!"); return addedFilling; diff --git a/racevisionGame/src/main/resources/mock/mockXML/boatTutorial.xml b/racevisionGame/src/main/resources/mock/mockXML/boatTutorial.xml new file mode 100644 index 00000000..90fad37c --- /dev/null +++ b/racevisionGame/src/main/resources/mock/mockXML/boatTutorial.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/racevisionGame/src/main/resources/mock/mockXML/raceTutorial.xml b/racevisionGame/src/main/resources/mock/mockXML/raceTutorial.xml new file mode 100644 index 00000000..19d358cd --- /dev/null +++ b/racevisionGame/src/main/resources/mock/mockXML/raceTutorial.xml @@ -0,0 +1,43 @@ + + + 9999 + FLEET + RACE_CREATION_TIME + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/racevisionGame/src/main/resources/visualiser/mock/mockXML/raceXML/raceTutorial.xml b/racevisionGame/src/main/resources/visualiser/mock/mockXML/raceXML/raceTutorial.xml new file mode 100644 index 00000000..db7a6978 --- /dev/null +++ b/racevisionGame/src/main/resources/visualiser/mock/mockXML/raceXML/raceTutorial.xml @@ -0,0 +1,91 @@ + + + + + 99999999 + + Match + + 2011-08-06T13:25:00-0000 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file