Made changes to tutorial xmls. Linked button in title menu to start up a race on mouse click. Will need to make it so it starts the tutorial on click. #story[1189]

main
zwu18 8 years ago
parent 86f1a608e4
commit c7af4f2eb7

@ -83,7 +83,8 @@ public class Event {
String raceXMLFile = "mock/mockXML/raceTutorial.xml"; String raceXMLFile = "mock/mockXML/raceTutorial.xml";
//String boatsXMLFile = "mock/mockXML/boatTest.xml"; //String boatsXMLFile = "mock/mockXML/boatTest.xml";
String boatsXMLFile = "mock/mockXML/boatTutorial.xml"; String boatsXMLFile = "mock/mockXML/boatTutorial.xml";
String regattaXMLFile = "mock/mockXML/regattaTest.xml"; //String regattaXMLFile = "mock/mockXML/regattaTest.xml";
String regattaXMLFile = "mock/mockXML/regattaTutorial.xml";
if (singlePlayer) { if (singlePlayer) {
raceXMLFile = "mock/mockXML/raceSinglePlayer.xml"; raceXMLFile = "mock/mockXML/raceSinglePlayer.xml";
@ -206,7 +207,6 @@ public class Event {
raceXML = raceXML.replace("RACE_CREATION_TIME", dateFormat.format(creationTime)); raceXML = raceXML.replace("RACE_CREATION_TIME", dateFormat.format(creationTime));
raceXML = raceXML.replace("RACE_START_TIME", dateFormat.format(creationTime.plusSeconds(secondsToAdd))); raceXML = raceXML.replace("RACE_START_TIME", dateFormat.format(creationTime.plusSeconds(secondsToAdd)));
return raceXML; return raceXML;
} }

@ -86,6 +86,14 @@ public class MainController extends Controller {
*/ */
public void startCss(){titleController.setDayMode();} public void startCss(){titleController.setDayMode();}
/**
* host controller host a game
* @throws IOException throws exception
*/
public void beginGame() throws IOException {
hostController.hostGamePressed();
}
/** /**
* Main Controller for the applications will house the menu and the displayed pane. * Main Controller for the applications will house the menu and the displayed pane.
* *

@ -10,11 +10,15 @@ import javafx.scene.control.RadioButton;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.stage.Modality; import javafx.stage.Modality;
import javafx.stage.Stage; import javafx.stage.Stage;
import mock.app.Event;
import mock.exceptions.EventConstructionException;
import visualiser.app.App; import visualiser.app.App;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import java.util.logging.Level;
import java.util.logging.Logger;
/** /**
* Controller for the opening title window. * Controller for the opening title window.
@ -109,11 +113,12 @@ public class TitleController extends Controller {
} }
} }
/**
* start tutorial event called public void tutorialStartPressed() throws IOException {
*/ titleWrapper.setVisible(false);
public void tutorialStartPressed(){
System.out.println("Start the tutorial!"); System.out.println("Start the tutorial!");
parent.beginGame();
} }
} }

@ -22,7 +22,7 @@
<Boat BoatName="Emirates Team New Zealand" HullNum="RG01" ShapeID="0" ShortName="NZL" SourceID="121" StoweName="NZL" Type="Yacht"> <Boat BoatName="Emirates Team New Zealand" HullNum="RG01" ShapeID="0" ShortName="NZL" SourceID="121" StoweName="NZL" Type="Yacht">
<GPSposition X="-64.854304" Y="32.296577" Z="0"/> <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
</Boat> </Boat>
<Boat BoatName="Land Rover BAR" HullNum="RG01" ShapeID="0" ShortName="GBR" SourceID="122" StoweName="GBR" Type="Yacht"> <!--<Boat BoatName="Land Rover BAR" HullNum="RG01" ShapeID="0" ShortName="GBR" SourceID="122" StoweName="GBR" Type="Yacht">
<GPSposition X="-64.854304" Y="32.296577" Z="0"/> <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
</Boat> </Boat>
<Boat BoatName="SoftBank Team Japan" HullNum="RG01" ShapeID="0" ShortName="JPN" SourceID="123" StoweName="JPN" Type="Yacht"> <Boat BoatName="SoftBank Team Japan" HullNum="RG01" ShapeID="0" ShortName="JPN" SourceID="123" StoweName="JPN" Type="Yacht">
@ -36,6 +36,6 @@
</Boat> </Boat>
<Boat BoatName="ORACLE TEAM USA" HullNum="RG01" ShapeID="0" ShortName="USA" SourceID="126" StoweName="USA" Type="Yacht"> <Boat BoatName="ORACLE TEAM USA" HullNum="RG01" ShapeID="0" ShortName="USA" SourceID="126" StoweName="USA" Type="Yacht">
<GPSposition X="-64.854304" Y="32.296577" Z="0"/> <GPSposition X="-64.854304" Y="32.296577" Z="0"/>
</Boat> </Boat>-->
</Boats> </Boats>
</BoatConfig> </BoatConfig>

@ -0,0 +1,10 @@
<RegattaConfig>
<RegattaID>0</RegattaID>
<RegattaName>Race Tutorial</RegattaName>
<CourseName>Tutorial</CourseName>
<CentralLatitude>-36.82791529</CentralLatitude>
<CentralLongitude>174.81218919</CentralLongitude>
<CentralAltitude>0.00</CentralAltitude>
<UtcOffset>12</UtcOffset>
<MagneticVariation>14.1</MagneticVariation>
</RegattaConfig>
Loading…
Cancel
Save