nathanwoodburn/comp1110-ass2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Nathan Woodburn 2023-03-24 14:56:41 +11:00
commit 08c2eee299
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/comp1110/ass2/gui/Viewer.java
View File

@ -126,7 +126,7 @@ public class Viewer extends Application {
// To group the root and adjust their Px sizes accordingly
// to each other
StackPane rootGroup = new StackPane();
// StackPane rootGroup = new StackPane();
// Part 1 done (Game Arrangement State)
String[] parts = stateString.split(";");
@ -152,9 +152,11 @@ public class Viewer extends Application {
switch(currentArrangementPhaseParts) {
case "E": {
currentArrangementActualPhase = "Exploration";
break;
}
case "S": {
currentArrangementActualPhase = "Settler";
break;
}
}
@ -170,7 +172,7 @@ public class Viewer extends Application {
root.getChildren().add(currentStateText);
currentStateText.setFill(Color.GREEN);
rootGroup.getChildren().addAll(currentStateText,board);
// rootGroup.getChildren().addAll(currentStateText,board);
//Before doing part 3, make the board and the current state adjustable to each
// by that I mean, when the board size adjusted, the current state is also