some stuff

Vortex2Oblivion · Nov 18, 2023 · 07b743b · 07b743b
1 parent 8ec5447
commit 07b743b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/source/game/NoteSplash.hx b/source/game/NoteSplash.hx
@@ -18,7 +18,7 @@ class NoteSplash extends FlxSprite {
 	public var affectedbycolor:Bool = false;
 	public var jsonData:JsonData;
 
-	public function setup_splash(noteData:Int, target:FlxSprite, ?isPlayer:Bool = false) {
+	public function setup_splash(noteData:Int, target:FlxSprite, ?isPlayer:Bool = false, ?ui_Skin:String) {
 		this.target = target;
 
 		var localKeyCount = isPlayer ? PlayState.SONG.playerKeyCount : PlayState.SONG.keyCount;
@@ -43,8 +43,11 @@ 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")));	
+		if (ui_Skin == null)
+			ui_Skin = PlayState.SONG.ui_Skin;
+
+		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;
 			}

diff --git a/source/modding/ModchartUtilities.hx b/source/modding/ModchartUtilities.hx
@@ -2670,7 +2670,7 @@ class ModchartUtilities {
 		});
 
 		setLuaFunction("createCustomShader", function(id:String, file:String, ?glslVersion:Int = 120){
-			var funnyCustomShader:CustomShader = new CustomShader(Assets.getText(Paths.frag(file)));
+			var funnyCustomShader:CustomShader = new CustomShader(Assets.getText(Paths.frag(file)), null, glslVersion);
 			lua_Custom_Shaders.set(id, funnyCustomShader);
 		});
 

diff --git a/source/modding/scripts/languages/HScript.hx b/source/modding/scripts/languages/HScript.hx
@@ -108,6 +108,7 @@ class HScript
 		// haxeflixel classes
 		interp.variables.set("FlxG", flixel.FlxG);
 		interp.variables.set("FlxSprite", flixel.FlxSprite);
+		interp.variables.set("FlxSound", flixel.sound.FlxSound);
 		interp.variables.set('FlxCamera', flixel.FlxCamera);
 		interp.variables.set("FlxMath", flixel.math.FlxMath);
 		interp.variables.set('FlxTimer', flixel.util.FlxTimer);

diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -4934,22 +4934,20 @@ class PlayState extends MusicBeatState {
 				splash_group.clear();
 				if(Options.getData("middlescroll"))
 					{
-						generateStaticArrows(50, false);
-						generateStaticArrows(0.5, true);
+						generateStaticArrows(50, false, false);
+						generateStaticArrows(0.5, true, false);
 					}
 					else
 					{
 						if(characterPlayingAs == 0)
 						{
-							generateStaticArrows(0, false);
-							generateStaticArrows(1, true);
-							playerStrums.add(babyArrow);	
+							generateStaticArrows(0, false, false);
+							generateStaticArrows(1, true, false);
 						}
 						else
 						{
-							generateStaticArrows(1, false);
-							generateStaticArrows(0, true);
-							enemyStrums.add(babyArrow);
+							generateStaticArrows(1, false, false);
+							generateStaticArrows(0, true, false);
 						}
 					}
 				for (note in unspawnNotes) {