Add default color customizationdev2

2 files changed, 7 insertions, 2 deletions

diff --git a/src/main/java/net/sowgro/npehero/gameplay/Block.java b/src/main/java/net/sowgro/npehero/gameplay/Block.java
index 5d35ccc..04579fc 100755
--- a/src/main/java/net/sowgro/npehero/gameplay/Block.java
+++ b/src/main/java/net/sowgro/npehero/gameplay/Block.java
@@ -34,7 +34,7 @@ public class Block extends Rectangle
 
     public void enableDropShadow() {
         DropShadow dropShadow = new DropShadow();
-        dropShadow.setRadius(200.0);
+        dropShadow.setRadius(100.0);
         dropShadow.setColor(color);
         dropShadow.setBlurType(BlurType.GAUSSIAN);
         super.setEffect(dropShadow);
diff --git a/src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java b/src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java
index fb95eb7..fc9269e 100755
--- a/src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java
+++ b/src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java
@@ -1,6 +1,7 @@
 package net.sowgro.npehero.gameplay;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
@@ -74,7 +75,11 @@ public class SongPlayer extends HBox {
         // create targets
         for (int i = 0; i < lanes.length; i++) {
             lanes[i] = new Lane();
-            var tmp = new Target(level.colors[i], Control.lanes[i].targetString());
+            var tmp = new Target(
+                    Settings.forceDefaultColors
+                            ? Settings.defaultColors[i]
+                            : Objects.requireNonNullElse(level.colors[i], Settings.defaultColors[i]),
+                    Control.lanes[i].targetString());
             bindTarget(tmp);
             lanes[i].target = tmp;
         }