From b3cc60eba7f1bc646c0cc6356a338fcfeb0ee0f5 Mon Sep 17 00:00:00 2001 From: sowgro Date: Fri, 18 Oct 2024 00:25:28 -0400 Subject: Add default color customization --- src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java') 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; } -- cgit v1.2.3