fixes for strums and splashes

assets/preload/data/ui skins/default/config.json

@@ -0,0 +1,7 @@
+{
+    "values": [
+        {
+            "affectedbycolor": true
+        }
+    ]
+}

assets/preload/data/ui skins/pixel/config.json

@@ -0,0 +1,7 @@
+{
+    "values": [
+        {
+            "affectedbycolor": true
+        }
+    ]
+}

source/game/Note.hx

@@ -261,3 +261,10 @@ typedef NoteType = {
 	var hitDamage:Float;
 	var missDamage:Float;
 }
+typedef StrumJson = {
+	var affectedbycolor:Bool;
+}
+typedef JsonData = {
+	var values:Array<StrumJson>;
+}
+

source/game/NoteSplash.hx

@@ -1,5 +1,8 @@
 package game;
 
+import game.Note.JsonData;
+import haxe.Json;
+import openfl.Assets;
 import shaders.NoteColors;
 import shaders.ColorSwap;
 import utilities.NoteVariables;
@@ -9,8 +12,11 @@ import flixel.FlxSprite;
 
 class NoteSplash extends FlxSprite {
 	public var target:FlxSprite;
-
+	
 	public var colorSwap:ColorSwap;
+	public var noteColor:Array<Int> = [255,0,0];
+	public var affectedbycolor:Bool = false;
+	public var jsonData:JsonData;
 
 	public function setup_splash(noteData:Int, target:FlxSprite, ?isPlayer:Bool = false) {
 		this.target = target;
@@ -37,21 +43,28 @@ class NoteSplash extends FlxSprite {
 		updateHitbox();
 		centerOffsets();
 
+		if(Assets.exists(Paths.json("ui skins/" + PlayState.SONG.ui_Skin + "/config"))){
+			jsonData = Json.parse(Assets.getText(Paths.json("ui skins/" + PlayState.SONG.ui_Skin + "/config")));	
+			for (value in jsonData.values) {
+				this.affectedbycolor = value.affectedbycolor;
+			}
+		}
+
 		colorSwap = new ColorSwap();
 		shader = colorSwap.shader;
 
 		var charColors = (isPlayer) ? PlayState.boyfriend : PlayState.dad;
-		var noteColor;
 
-		if (!Options.getData("customNoteColors"))
-			noteColor = charColors.noteColors[localKeyCount - 1][noteData];
-		else
-			noteColor = NoteColors.getNoteColor(NoteVariables.Other_Note_Anim_Stuff[PlayState.SONG.keyCount - 1][noteData]);
-
-		colorSwap.r = noteColor[0];
-		colorSwap.g = noteColor[1];
-		colorSwap.b = noteColor[2];
+		if(affectedbycolor){
+			if (!Options.getData("customNoteColors"))
+				noteColor = charColors.noteColors[localKeyCount - 1][noteData];
+			else
+				noteColor = NoteColors.getNoteColor(NoteVariables.Other_Note_Anim_Stuff[PlayState.SONG.keyCount - 1][noteData]);
 
+			colorSwap.r = noteColor[0];
+			colorSwap.g = noteColor[1];
+			colorSwap.b = noteColor[2];
+		}
 		update(0);
 	}
 
@@ -70,4 +83,4 @@ class NoteSplash extends FlxSprite {
 
 		super.update(elapsed);
 	}
-}
+}

source/game/StrumNote.hx

@@ -1,5 +1,8 @@
 package game;
 
+import game.Note.JsonData;
+import openfl.Assets;
+import haxe.Json;
 import flixel.FlxG;
 import utilities.NoteVariables;
 import shaders.ColorSwap;
@@ -26,11 +29,14 @@ class StrumNote extends FlxSprite
 	public var keyCount:Int;
 
 	public var colorSwap:ColorSwap;
-
 	public var noteColor:Array<Int> = [255,0,0];
+	public var affectedbycolor:Bool = false;
 
 	public var isPlayer:Float;
 
+	public var jsonData:JsonData;
+
+
 	public function new(x:Float, y:Float, leData:Int, ?ui_Skin:String, ?ui_settings:Array<String>, ?mania_size:Array<String>, ?keyCount:Int, ?isPlayer:Float, customColors:Bool = false)
 	{
 		if (ui_Skin == null)
@@ -55,31 +61,40 @@ class StrumNote extends FlxSprite
 		this.keyCount = keyCount;
 		this.isPlayer = isPlayer;
 
+		if(Assets.exists(Paths.json("ui skins/" + ui_Skin + "/config"))){
+			jsonData = Json.parse(Assets.getText(Paths.json("ui skins/" + ui_Skin + "/config")));	
+			for (value in jsonData.values) {
+				this.affectedbycolor = value.affectedbycolor;
+			}
+		}
+
 		super(x, y);
 
 		colorSwap = new ColorSwap();
 		shader = colorSwap.shader;
 
 		var charColors;
 
-		if(Options.getData("middlescroll")){
-			charColors = (isPlayer == 1) ? PlayState.dad : PlayState.boyfriend;
-		}
-		else{
-			charColors = (isPlayer == 1) ? PlayState.boyfriend : PlayState.dad;
-		}
-		if (!customColors) 
-			noteColor = charColors.noteColors[localKeyCount - 1][noteData]; 
-		else 
-			noteColor = NoteColors.getNoteColor(NoteVariables.Other_Note_Anim_Stuff[keyCount - 1][noteData]);
-
-		//idk why || doesnt work??
-		if(Options.getData("customNoteColors"))
-			noteColor = NoteColors.getNoteColor(NoteVariables.Other_Note_Anim_Stuff[keyCount - 1][noteData]);
-
-		colorSwap.r = noteColor[0];
-		colorSwap.g = noteColor[1];
-		colorSwap.b = noteColor[2];
+		if(affectedbycolor){
+			if(Options.getData("middlescroll")){
+				charColors = (isPlayer == 1) ? PlayState.dad : PlayState.boyfriend;
+			}
+			else{
+				charColors = (isPlayer == 1) ? PlayState.boyfriend : PlayState.dad;
+			}
+			if (!customColors) 
+				noteColor = charColors.noteColors[localKeyCount - 1][noteData]; 
+			else 
+				noteColor = NoteColors.getNoteColor(NoteVariables.Other_Note_Anim_Stuff[keyCount - 1][noteData]);
+
+			//idk why || doesnt work??
+			if(Options.getData("customNoteColors"))
+				noteColor = NoteColors.getNoteColor(NoteVariables.Other_Note_Anim_Stuff[keyCount - 1][noteData]);
+
+			colorSwap.r = noteColor[0];
+			colorSwap.g = noteColor[1];
+			colorSwap.b = noteColor[2];
+	}
 	}
 
 	override function update(elapsed:Float)

source/modding/custom/CustomState.hx

@@ -1,7 +1,25 @@
 package modding.custom;
 
+import modding.scripts.languages.HScript;
 import states.MusicBeatState;
 
 class CustomState extends MusicBeatState {
-
+    public var script:HScript;
+    override function new(script:String){
+        this.script = new HScript(Paths.hx("classes/states/" + script));
+        super();
+    }
+    override function create(){
+        allScriptCall("create");
+        super.create();
+        allScriptCall("createPost");
+    }
+    override function update(elapsed:Float){
+        allScriptCall("update", [elapsed]);
+		super.update(elapsed);
+		allScriptCall("updatePost", [elapsed]);
+    }
+    private function allScriptCall(func:String, ?args:Array<Dynamic>) {
+		script.call(func, args);
+	}
 }