aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java
diff options
context:
space:
mode:
authorsowgro <tpoke.ferrari@gmail.com>2024-10-18 00:25:28 -0400
committersowgro <tpoke.ferrari@gmail.com>2024-10-18 00:25:28 -0400
commitb3cc60eba7f1bc646c0cc6356a338fcfeb0ee0f5 (patch)
tree3fa547dce2fc1a3a7a8fa36c6449848960628b54 /src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java
parent28ade1fce71064db5c95a0d69fe94e3097042e36 (diff)
downloadNPEhero-b3cc60eba7f1bc646c0cc6356a338fcfeb0ee0f5.tar.gz
NPEhero-b3cc60eba7f1bc646c0cc6356a338fcfeb0ee0f5.tar.bz2
NPEhero-b3cc60eba7f1bc646c0cc6356a338fcfeb0ee0f5.zip
Add default color customizationdev2
Diffstat (limited to 'src/main/java/net/sowgro/npehero/gameplay/SongPlayer.java')
-rwxr-xr-xsrc/main/java/net/sowgro/npehero/gameplay/SongPlayer.java7
1 files changed, 6 insertions, 1 deletions
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;
}