Merge branch 'master' into 'mainMenuLogo'

# Conflicts:
#   src/main/java/nl/hsleiden/joshuabloch/menu/MainMenu.java

Author: jely2002

src/main/java/nl/hsleiden/joshuabloch/menu/MainMenu.java

@@ -28,7 +28,6 @@
 
 public class MainMenu extends FXGLMenu {
     private static final int SIZE = 250;
-    private final Animation<?> animation;
     private final Rectangle buttonLevel1;
     private final Rectangle buttonLevel2;
     private final Rectangle buttonLevel3;
@@ -148,12 +147,14 @@ public MainMenu(MenuType menuType, LevelManager levelManager) {
         buttonLogin.setArcWidth(15);
         buttonLogin.strokeProperty().bind(Bindings.when(buttonLogin.hoverProperty()).then(Color.web("425622",1.0)).otherwise(Color.web("6E834C",1.0)));
         buttonLogin.fillProperty().bind(Bindings.when(buttonLogin.pressedProperty()).then(Color.web("425622",1.0)).otherwise(Color.web("6E834C",1.0)));
-        buttonLogin.setOnMouseClicked(e -> getDialogService().showInputBox("Please enter your name:", answer -> levelManager.setName(answer, c -> {
-            textLogin.setText("LOGGED IN");
-            lockButtons(levelManager.levelProgress);
-            showHighscores();
-            return null;
-        })));
+        buttonLogin.setOnMouseClicked(e -> getDialogService().showInputBox("Please enter your name:", answer -> {
+            levelManager.setName(answer.toLowerCase(), c -> {
+                textLogin.setText("LOGGED IN");
+                lockButtons(levelManager.levelProgress);
+                showHighscores();
+                return null;
+            });
+        }));
 
         // Button Quit
         var buttonQuit = new Rectangle(SIZE, 60);
@@ -222,19 +223,19 @@ public MainMenu(MenuType menuType, LevelManager levelManager) {
 
 
         // HighScore Level 1
-        highScoreLevel1 = FXGL.getUIFactoryService().newText("", Color.RED, FontType.GAME, 24.0);
+        highScoreLevel1 = FXGL.getUIFactoryService().newText("", Color.web("9db379",1.0), FontType.GAME, 24.0);
         highScoreLevel1.setTextAlignment(TextAlignment.CENTER);
 
         // HighScore Level 2
-        highScoreLevel2 = FXGL.getUIFactoryService().newText("", Color.RED, FontType.GAME, 24.0);
+        highScoreLevel2 = FXGL.getUIFactoryService().newText("", Color.web("9db379",1.0), FontType.GAME, 24.0);
         highScoreLevel2.setTextAlignment(TextAlignment.CENTER);
 
         // HighScore Level 3
-        highScoreLevel3 = FXGL.getUIFactoryService().newText("", Color.RED, FontType.GAME, 24.0);
+        highScoreLevel3 = FXGL.getUIFactoryService().newText("", Color.web("9db379",1.0), FontType.GAME, 24.0);
         highScoreLevel3.setTextAlignment(TextAlignment.CENTER);
 
         // HighScore Level 4
-        highScoreLevel4 = FXGL.getUIFactoryService().newText("", Color.RED, FontType.GAME, 24.0);
+        highScoreLevel4 = FXGL.getUIFactoryService().newText("", Color.web("9db379",1.0), FontType.GAME, 24.0);
         highScoreLevel4.setTextAlignment(TextAlignment.CENTER);
 
 

src/main/resources/assets/levels/tmx/barrel.png

@@ -4,7 +4,7 @@
   <property name="background" value="snow_background.png"/>
   <property name="cost" value="28"/>
  </properties>
- <tileset firstgid="1" name="tiles" tilewidth="32" tileheight="32" tilecount="13" columns="0">
+ <tileset firstgid="1" name="tiles" tilewidth="32" tileheight="32" tilecount="22" columns="0"> //13
   <grid orientation="orthogonal" width="1" height="1"/>
   <tile id="0">
    <image width="32" height="32" source="Dirt.png"/>