diff --git a/bin/de/deadlocker8/roadgame/logic/Board.class b/bin/de/deadlocker8/roadgame/logic/Board.class
index 77923361b15e8e4cda50856b9180924b288ff65d..9fd0b006b733e31bb2191558e7944e02ebf33685 100644
Binary files a/bin/de/deadlocker8/roadgame/logic/Board.class and b/bin/de/deadlocker8/roadgame/logic/Board.class differ
diff --git a/bin/de/deadlocker8/roadgame/main/Main.class b/bin/de/deadlocker8/roadgame/main/Main.class
index 21285c4b3198c6dfb578579917e75d7aad60f1a4..09cb31520171ee82eea141cfe59d8915c0d023ec 100644
Binary files a/bin/de/deadlocker8/roadgame/main/Main.class and b/bin/de/deadlocker8/roadgame/main/Main.class differ
diff --git a/bin/de/deadlocker8/roadgame/ui/Controller$1.class b/bin/de/deadlocker8/roadgame/ui/Controller$1.class
index 4e053851e8c3cbe0d8718bff2acf9e8545bf0414..fac104422568b470fecae66091041010efa41bb4 100644
Binary files a/bin/de/deadlocker8/roadgame/ui/Controller$1.class and b/bin/de/deadlocker8/roadgame/ui/Controller$1.class differ
diff --git a/bin/de/deadlocker8/roadgame/ui/Controller$2.class b/bin/de/deadlocker8/roadgame/ui/Controller$2.class
index 96d6c60f6b62215bc8af9008d96194a98f7dc941..e08927c5a6515dd52686bd09aa54fa43cf73acaf 100644
Binary files a/bin/de/deadlocker8/roadgame/ui/Controller$2.class and b/bin/de/deadlocker8/roadgame/ui/Controller$2.class differ
diff --git a/bin/de/deadlocker8/roadgame/ui/Controller.class b/bin/de/deadlocker8/roadgame/ui/Controller.class
index 125ef454b418ee3c37fa4114307dd6a209ce8bb8..0f4c297b9a397c2c17b14932eca93ae0e0abecf1 100644
Binary files a/bin/de/deadlocker8/roadgame/ui/Controller.class and b/bin/de/deadlocker8/roadgame/ui/Controller.class differ
diff --git a/bin/de/deadlocker8/roadgame/ui/GUI.fxml b/bin/de/deadlocker8/roadgame/ui/GUI.fxml
index 83ae0d5f1eee3b63d1f64a00dc8c85d792d8b8b9..0b3219e3994897a4d2113727d45a2dd713e31408 100644
--- a/bin/de/deadlocker8/roadgame/ui/GUI.fxml
+++ b/bin/de/deadlocker8/roadgame/ui/GUI.fxml
@@ -2,6 +2,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuBar?>
<?import javafx.scene.control.MenuItem?>
@@ -9,6 +10,7 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
<AnchorPane prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.roadgame.ui.Controller">
<children>
@@ -26,6 +28,22 @@
<Insets top="14.0" />
</VBox.margin>
</Button>
+ <Label text="Tiles remaining:">
+ <font>
+ <Font name="System Bold" size="12.0" />
+ </font>
+ <VBox.margin>
+ <Insets top="30.0" />
+ </VBox.margin>
+ </Label>
+ <Label fx:id="labelTilesRemaining" text="120">
+ <font>
+ <Font name="System Bold" size="18.0" />
+ </font>
+ <VBox.margin>
+ <Insets top="10.0" />
+ </VBox.margin>
+ </Label>
</children>
</VBox>
</children>
diff --git a/src/de/deadlocker8/roadgame/logic/Board.java b/src/de/deadlocker8/roadgame/logic/Board.java
index dd774fb76cdb624efc6b3c64e4ce7e0331426dcd..77927eaee62c5531f3c0abfda0e4cd5dcb670ded 100644
--- a/src/de/deadlocker8/roadgame/logic/Board.java
+++ b/src/de/deadlocker8/roadgame/logic/Board.java
@@ -28,6 +28,11 @@ public class Board
tiles.add(startTile);
}
}
+
+ public TilePack getTilePack()
+ {
+ return tilePack;
+ }
public ArrayList<Tile> getTiles()
{
diff --git a/src/de/deadlocker8/roadgame/main/Main.java b/src/de/deadlocker8/roadgame/main/Main.java
index 4557da8c979fba0b1273d0d28daab1f1dc5649a1..dcb4a595cc054c1d64ce44b6c68a0cf54b76b164 100644
--- a/src/de/deadlocker8/roadgame/main/Main.java
+++ b/src/de/deadlocker8/roadgame/main/Main.java
@@ -24,11 +24,13 @@ public class Main extends Application
FXMLLoader loader = new FXMLLoader(getClass().getClassLoader().getResource("de/deadlocker8/roadgame/ui/GUI.fxml"));
Parent root = (Parent)loader.load();
- Scene scene = new Scene(root, 800, 600);
+ Scene scene = new Scene(root, 800, 600);
((Controller)loader.getController()).init(stage);
stage.setResizable(true);
+ stage.setMinWidth(800);
+ stage.setMinHeight(600);
stage.getIcons().add(new Image("de/deadlocker8/roadgame/resources/icon.png"));
stage.setTitle("RoadGame");
stage.setScene(scene);
diff --git a/src/de/deadlocker8/roadgame/ui/Controller.java b/src/de/deadlocker8/roadgame/ui/Controller.java
index 5e5df99607f1a892fcd30d609643d7ecda71f01d..6bdac12ef00b621b75c2f2f2c1536dbbe578b7f5 100644
--- a/src/de/deadlocker8/roadgame/ui/Controller.java
+++ b/src/de/deadlocker8/roadgame/ui/Controller.java
@@ -38,6 +38,7 @@ public class Controller
@FXML private AnchorPane anchorPaneGame;
@FXML private StackPane stackPaneCurrentTile;
@FXML private Button buttonRotate;
+ @FXML private Label labelTilesRemaining;
private Stage stage;
private Image icon = new Image("de/deadlocker8/roadgame/resources/icon.png");
@@ -55,6 +56,8 @@ public class Controller
anchorPaneGame.setStyle("-fx-border-color: #333333; -fx-border-width: 2px");
stackPaneCurrentTile.setStyle("-fx-border-color: #333333; -fx-border-width: 2px");
+
+ labelTilesRemaining.setText("0");
grid = new GridPane();
grid.setFocusTraversable(false);
@@ -309,8 +312,7 @@ public class Controller
if(nextTile == null)
{
game.setCurrentTile(null);
- stackPaneCurrentTile.getChildren().clear();
- //TODO
+ stackPaneCurrentTile.getChildren().clear();
updateGrid(game.getBoard(), null);
return;
}
@@ -319,8 +321,10 @@ public class Controller
stackPaneCurrentTile.getChildren().clear();
stackPaneCurrentTile.getChildren().add(createStackPaneForTile(game.getCurrentTile(), false, 0, 0));
+
+ labelTilesRemaining.setText(String.valueOf(game.getBoard().getTilePack().getNumberOfTiles()));
- updateGrid(game.getBoard(), game.getPossibleLocations(game.getCurrentTile()));
+ updateGrid(game.getBoard(), game.getPossibleLocations(game.getCurrentTile()));
}
public void rotateRight()
diff --git a/src/de/deadlocker8/roadgame/ui/GUI.fxml b/src/de/deadlocker8/roadgame/ui/GUI.fxml
index 83ae0d5f1eee3b63d1f64a00dc8c85d792d8b8b9..0b3219e3994897a4d2113727d45a2dd713e31408 100644
--- a/src/de/deadlocker8/roadgame/ui/GUI.fxml
+++ b/src/de/deadlocker8/roadgame/ui/GUI.fxml
@@ -2,6 +2,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuBar?>
<?import javafx.scene.control.MenuItem?>
@@ -9,6 +10,7 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
<AnchorPane prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.roadgame.ui.Controller">
<children>
@@ -26,6 +28,22 @@
<Insets top="14.0" />
</VBox.margin>
</Button>
+ <Label text="Tiles remaining:">
+ <font>
+ <Font name="System Bold" size="12.0" />
+ </font>
+ <VBox.margin>
+ <Insets top="30.0" />
+ </VBox.margin>
+ </Label>
+ <Label fx:id="labelTilesRemaining" text="120">
+ <font>
+ <Font name="System Bold" size="18.0" />
+ </font>
+ <VBox.margin>
+ <Insets top="10.0" />
+ </VBox.margin>
+ </Label>
</children>
</VBox>
</children>