diff --git a/bin/de/bricked/ui/LevelGUI.fxml b/bin/de/bricked/ui/LevelGUI.fxml index 888404131c480cdfbb177323be9dc4a76406bdee..b1e6a1a58e86daeca19d14dedc8087fb95ee9c5e 100644 --- a/bin/de/bricked/ui/LevelGUI.fxml +++ b/bin/de/bricked/ui/LevelGUI.fxml @@ -10,7 +10,7 @@ <AnchorPane fx:id="anchorPane" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.bricked.ui.LevelController"> <children> - <AnchorPane fx:id="anchorPaneGame" layoutX="14.0" layoutY="125.0" minHeight="650.0" minWidth="670.0" prefHeight="650.0" prefWidth="670.0" AnchorPane.bottomAnchor="25.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="116.0" AnchorPane.topAnchor="125.0"> + <AnchorPane fx:id="anchorPaneGame" layoutX="14.0" layoutY="125.0" minHeight="650.0" minWidth="670.0" prefHeight="650.0" prefWidth="670.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="116.0" AnchorPane.topAnchor="125.0"> <children> <Label fx:id="labelMultiplicator" alignment="CENTER" contentDisplay="CENTER" layoutX="301.0" layoutY="502.0" prefHeight="45.0" prefWidth="100.0" textAlignment="CENTER"> <font> @@ -18,7 +18,7 @@ </font> </Label> </children></AnchorPane> - <VBox fx:id="vboxPowerUps" layoutX="745.0" layoutY="125.0" minHeight="338.0" minWidth="40.0" prefHeight="402.0" prefWidth="90.0" AnchorPane.bottomAnchor="273.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="125.0" /> + <VBox fx:id="vboxPowerUps" layoutX="745.0" layoutY="125.0" maxHeight="490.0" minHeight="338.0" minWidth="40.0" prefHeight="490.0" prefWidth="90.0" AnchorPane.bottomAnchor="185.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="125.0" /> <HBox alignment="CENTER" layoutX="34.0" layoutY="23.0" prefHeight="100.0" prefWidth="275.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0"> <children> <Button fx:id="buttonBack" mnemonicParsing="false" onAction="#back" text="Back" /> @@ -64,7 +64,7 @@ </Label> </children> </HBox> - <VBox fx:id="vboxLives" layoutX="745.0" layoutY="603.0" minHeight="71.0" minWidth="40.0" prefHeight="237.0" prefWidth="90.0" AnchorPane.bottomAnchor="24.0" AnchorPane.rightAnchor="14.0" /> + <VBox fx:id="vboxLives" layoutX="745.0" layoutY="603.0" minHeight="71.0" minWidth="40.0" prefHeight="160.0" prefWidth="90.0" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="14.0" /> <Label fx:id="labelFPS" layoutX="770.0" layoutY="6.0" text="0" AnchorPane.rightAnchor="8.0" AnchorPane.topAnchor="8.0"> <font> <Font name="System Bold" size="16.0" /> diff --git a/src/de/bricked/ui/LevelController.java b/src/de/bricked/ui/LevelController.java index c112bb592080e125ec68d4896589d4be2c7ce5dc..bbc4aa457ac0553b2bbf694b7b863b7f3a8cce3c 100644 --- a/src/de/bricked/ui/LevelController.java +++ b/src/de/bricked/ui/LevelController.java @@ -672,8 +672,8 @@ public class LevelController for(int i = 0; i < game.getLivesRemaining() - 1; i++) { - ImageView iv = new ImageView(new Image("de/bricked/resources/textures/paddle/paddle-extra-small.png")); - iv.setFitWidth(30); + ImageView iv = new ImageView(new Image("de/bricked/resources/textures/paddle/paddle-small.png")); + iv.setFitWidth(70); iv.setFitHeight(120 / MAX_LIVES); vboxLives.getChildren().add(iv); } diff --git a/src/de/bricked/ui/LevelGUI.fxml b/src/de/bricked/ui/LevelGUI.fxml index 888404131c480cdfbb177323be9dc4a76406bdee..b1e6a1a58e86daeca19d14dedc8087fb95ee9c5e 100644 --- a/src/de/bricked/ui/LevelGUI.fxml +++ b/src/de/bricked/ui/LevelGUI.fxml @@ -10,7 +10,7 @@ <AnchorPane fx:id="anchorPane" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.bricked.ui.LevelController"> <children> - <AnchorPane fx:id="anchorPaneGame" layoutX="14.0" layoutY="125.0" minHeight="650.0" minWidth="670.0" prefHeight="650.0" prefWidth="670.0" AnchorPane.bottomAnchor="25.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="116.0" AnchorPane.topAnchor="125.0"> + <AnchorPane fx:id="anchorPaneGame" layoutX="14.0" layoutY="125.0" minHeight="650.0" minWidth="670.0" prefHeight="650.0" prefWidth="670.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="116.0" AnchorPane.topAnchor="125.0"> <children> <Label fx:id="labelMultiplicator" alignment="CENTER" contentDisplay="CENTER" layoutX="301.0" layoutY="502.0" prefHeight="45.0" prefWidth="100.0" textAlignment="CENTER"> <font> @@ -18,7 +18,7 @@ </font> </Label> </children></AnchorPane> - <VBox fx:id="vboxPowerUps" layoutX="745.0" layoutY="125.0" minHeight="338.0" minWidth="40.0" prefHeight="402.0" prefWidth="90.0" AnchorPane.bottomAnchor="273.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="125.0" /> + <VBox fx:id="vboxPowerUps" layoutX="745.0" layoutY="125.0" maxHeight="490.0" minHeight="338.0" minWidth="40.0" prefHeight="490.0" prefWidth="90.0" AnchorPane.bottomAnchor="185.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="125.0" /> <HBox alignment="CENTER" layoutX="34.0" layoutY="23.0" prefHeight="100.0" prefWidth="275.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0"> <children> <Button fx:id="buttonBack" mnemonicParsing="false" onAction="#back" text="Back" /> @@ -64,7 +64,7 @@ </Label> </children> </HBox> - <VBox fx:id="vboxLives" layoutX="745.0" layoutY="603.0" minHeight="71.0" minWidth="40.0" prefHeight="237.0" prefWidth="90.0" AnchorPane.bottomAnchor="24.0" AnchorPane.rightAnchor="14.0" /> + <VBox fx:id="vboxLives" layoutX="745.0" layoutY="603.0" minHeight="71.0" minWidth="40.0" prefHeight="160.0" prefWidth="90.0" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="14.0" /> <Label fx:id="labelFPS" layoutX="770.0" layoutY="6.0" text="0" AnchorPane.rightAnchor="8.0" AnchorPane.topAnchor="8.0"> <font> <Font name="System Bold" size="16.0" /> diff --git a/src/de/bricked/utils/CountdownTimer.java b/src/de/bricked/utils/CountdownTimer.java index 6f148ce5e26e2c363b7903f2d7587b7ef149e167..e702bd266f9cea020896f1cd82970ad3ea309e5f 100644 --- a/src/de/bricked/utils/CountdownTimer.java +++ b/src/de/bricked/utils/CountdownTimer.java @@ -20,7 +20,8 @@ public class CountdownTimer public CountdownTimer(int seconds, HBox hbox, LevelController levelController) { this.count = seconds; - this.hbox = hbox; + this.hbox = hbox; + this.levelController = levelController; self = this; start();