2 files changed, 23 insertions, 9 deletions

diff --git a/src/main/java/net/sowgro/npehero/gui/GameOver.java b/src/main/java/net/sowgro/npehero/gui/GameOver.java
index 3b3c8bb..bcdd25e 100755
--- a/src/main/java/net/sowgro/npehero/gui/GameOver.java
+++ b/src/main/java/net/sowgro/npehero/gui/GameOver.java
@@ -3,6 +3,7 @@ package net.sowgro.npehero.gui;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
+import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
@@ -10,6 +11,7 @@ import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import net.sowgro.npehero.Driver;
+import net.sowgro.npehero.gameplay.ScoreController;
 import net.sowgro.npehero.main.ErrorDisplay;
 import net.sowgro.npehero.levelapi.Difficulty;
 import net.sowgro.npehero.levelapi.Level;
@@ -22,7 +24,7 @@ public class GameOver extends Page
 {
     HBox content = new HBox();
 
-    public GameOver(Level level, Difficulty diff, Page prev, int score2)
+    public GameOver(Level level, Difficulty diff, Page prev, ScoreController score2)
     {
         Text topText = new Text();
         topText.setText("Level Complete");
@@ -45,15 +47,21 @@ public class GameOver extends Page
         Text scoreLabel = new Text();
         scoreLabel.setText("Final score");
         scoreLabel.getStyleClass().add("t3");
+        Label maxScoreLabel = new Label("Max possible score");
+        ScoreController maxScoreController = new ScoreController();
+        for (int i = 0; i < diff.notes.list.size(); i++) {
+            maxScoreController.perfect();
+        }
+        Label maxScore = new Label(maxScoreController.score.get() + "");
 
         Text score = new Text();
-        score.setText(score2+"");
+        score.setText(score2.score.get()+"");
         score.getStyleClass().add("t2");
         score.setStyle("-fx-font-size: 30;");
 
         VBox scoreBox = new VBox();
         scoreBox.getStyleClass().add("box");
-        scoreBox.getChildren().addAll(scoreLabel,score);
+        scoreBox.getChildren().addAll(scoreLabel,score, maxScoreLabel, maxScore);
         scoreBox.setPadding(new Insets(5));
 
 
@@ -71,7 +79,7 @@ public class GameOver extends Page
             save.setDisable(true);
             name.setDisable(true);
             try {
-                diff.leaderboard.add(name.getText(), score2);
+                diff.leaderboard.add(name.getText(), score2.score.get());
             } catch (IOException e) {
                 Driver.setMenu(new ErrorDisplay("Failed to save score to leaderboard", e, this));
             }
@@ -110,6 +118,7 @@ public class GameOver extends Page
         centerBox.getChildren().addAll(topText,levelDetailsBox,scoreBox,nameBox,buttonBox);
         centerBox.setSpacing(10);
         centerBox.setAlignment(Pos.CENTER);
+        centerBox.setMaxWidth(300);
 
         content.getChildren().add(centerBox);
         content.setAlignment(Pos.CENTER);
diff --git a/src/main/java/net/sowgro/npehero/gui/LevelSurround.java b/src/main/java/net/sowgro/npehero/gui/LevelSurround.java
index 56bb560..f4d46a3 100755
--- a/src/main/java/net/sowgro/npehero/gui/LevelSurround.java
+++ b/src/main/java/net/sowgro/npehero/gui/LevelSurround.java
@@ -1,6 +1,7 @@
 package net.sowgro.npehero.gui;
 
 import javafx.animation.AnimationTimer;
+import javafx.scene.control.Label;
 import javafx.scene.layout.*;
 import net.sowgro.npehero.Driver;
 import net.sowgro.npehero.gameplay.SongPlayer;
@@ -63,7 +64,7 @@ public class LevelSurround extends Page
         scoreLabel.getStyleClass().add("t3");
 
         Text scoreDisplay = new Text();
-        scoreDisplay.textProperty().bind(sc.scoreProperty);
+        scoreDisplay.textProperty().bind(sc.score.asString());
         scoreDisplay.getStyleClass().add("t1");
 
         VBox scoreTextBox = new VBox();
@@ -84,12 +85,16 @@ public class LevelSurround extends Page
         comboLabel.getStyleClass().add("t3");
 
         Text comboDisplay = new Text();
-        comboDisplay.textProperty().bind(sc.comboProperty);
+        comboDisplay.textProperty().bind(sc.combo.asString());
         comboDisplay.getStyleClass().add("t1");
 
+        Label comboMultiplier = new Label();
+        comboMultiplier.getStyleClass().add("gray");
+        comboMultiplier.textProperty().bind(sc.comboMultiplier.asString().concat("x score multiplier"));
+
         VBox comboTextBox = new VBox();
         comboTextBox.setAlignment(Pos.BOTTOM_RIGHT);
-        comboTextBox.getChildren().addAll(comboLabel,comboDisplay);
+        comboTextBox.getChildren().addAll(comboLabel,comboDisplay, comboMultiplier);
         comboTextBox.setPadding(new Insets(10));
         comboTextBox.getStyleClass().add("box");
         comboTextBox.minWidthProperty().bind(comboTextBox.heightProperty());
@@ -117,10 +122,10 @@ public class LevelSurround extends Page
 
         var widthBind = content.widthProperty().subtract(gameHolder.widthProperty()).divide(2);
         scoreBox.prefWidthProperty().bind(widthBind);
-        scoreBox.prefWidthProperty().bind(widthBind);
+        comboBox.prefWidthProperty().bind(widthBind);
 
         HBox centerBox = new HBox();
-        HBox.setHgrow(gameHolder, Priority.NEVER);
+//        HBox.setHgrow(gameHolder, Priority.NEVER);
         centerBox.getChildren().addAll(comboBox, gameHolder, scoreBox);
         centerBox.setAlignment(Pos.BOTTOM_CENTER);