fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]

Browse Source
This commit is contained in:
David Wu
2017-09-11 15:31:18 +12:00
parent c97706d86e
commit b976186c7d
6 changed files with 64 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+2 -2
View File
@@ -137,9 +137,9 @@ public class HostController extends Controller {
}
public void setGameType(int gameType){
this.gameType = gameType;
this.currentMapIndex = gameType;
}
public int getGameType(){ return this.gameType; }
public int getGameType(){ return this.currentMapIndex; }
}
racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+1 -1
View File
@@ -468,7 +468,7 @@ public class RaceController extends Controller {
//Check if the game is a tutorial
if (parent.getGameType()==2){
if (parent.getGameType()==4){
isTutorial = true;
tutorialText.setVisible(true);
tutorialStates = new ArrayList<>(Arrays.asList(TutorialState.values()));
racevisionGame/src/main/java/visualiser/Controllers/StartController.java
+20 -17
View File
@@ -215,29 +215,32 @@ public class StartController extends Controller {
* Countdown timer until race starts.
*/
private void countdownTimer() {
new AnimationTimer() {
@Override
public void handle(long arg0) {
System.out.println(parent.getGameType());
//Get the current race status.
RaceStatusEnum raceStatus = visualiserRaceEvent.getVisualiserRaceState().getRaceStatusEnum();
new AnimationTimer() {
@Override
public void handle(long arg0) {
//If the race has reached the preparatory phase, or has started...
if (raceStatus == RaceStatusEnum.WARNING
|| raceStatus == RaceStatusEnum.PREPARATORY
|| raceStatus == RaceStatusEnum.STARTED) {
//Stop this timer.
stop();
//Get the current race status.
RaceStatusEnum raceStatus = visualiserRaceEvent.getVisualiserRaceState().getRaceStatusEnum();
//Hide this, and display the race controller.
startWrapper.setVisible(false);
//start.setVisible(false);//TODO is this needed?
//If the race has reached the preparatory phase, or has started...
if (raceStatus == RaceStatusEnum.WARNING
|| raceStatus == RaceStatusEnum.PREPARATORY
|| raceStatus == RaceStatusEnum.STARTED) {
//Stop this timer.
stop();
parent.beginRace(visualiserRaceEvent, controllerClient, isHost);
//Hide this, and display the race controller.
startWrapper.setVisible(false);
//start.setVisible(false);//TODO is this needed?
parent.beginRace(visualiserRaceEvent, controllerClient, isHost);
}
}
}
}.start();
}.start();
}
racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class TitleController extends Controller {
public void tutorialStartPressed() throws IOException {
titleWrapper.setVisible(false);
System.out.println("Start the tutorial!");
parent.setGameType(2);
parent.setGameType(4);
parent.beginGame();
}