Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago

Author: Yuta12342

source/objects/playfields/NoteField.hx

@@ -199,7 +199,7 @@ class NoteField extends FieldBase
 				continue;
 
 			if (tryForceHoldsBehind)
-				object.zIndex -= 2; // so that way strums are always behind no matter what
+				object.zIndex -= 4; // so that way strums are always behind no matter what
 
 			lookupMap.set(obj, object);
 			drawQueue.push(object);

source/psychlua/FunkinLua.hx

@@ -248,51 +248,52 @@ class FunkinLua {
 			PlayState.instance.initPlayfield(field);
 		});
 
+		//// mod manager
 		Lua_helper.add_callback(lua, "setPercent", function(modName:String, val:Float, player:Int = -1)
-		{
-			PlayState.instance.modManager.setPercent(modName, val, player);
-		});
-		
-		Lua_helper.add_callback(lua, "addBlankMod", function(modName:String, defaultVal:Float = 0, player:Int = -1)
-		{
-			PlayState.instance.modManager.quickRegister(new SubModifier(modName, PlayState.instance.modManager));
-			PlayState.instance.modManager.setValue(modName, defaultVal);
+			PlayState.instance.modManager.setPercent(modName, val, player)
+		);
+
+		Lua_helper.add_callback(lua, "addBlankMod", function(modName:String, defaultVal:Float = 0, player:Int = -1) {
+			PlayState.instance.modManager.registerBlankMod(modName, defaultVal, player);
 		});
-		
+
 		Lua_helper.add_callback(lua, "setValue", function(modName:String, val:Float, player:Int = -1)
-		{
-			PlayState.instance.modManager.setValue(modName, val, player);
-		});
-		
+			PlayState.instance.modManager.setValue(modName, val, player)
+		);
+
 		Lua_helper.add_callback(lua, "getPercent", function(modName:String, player:Int)
-		{
-			return PlayState.instance.modManager.getPercent(modName, player);
-		});
-		
+			return PlayState.instance.modManager.getPercent(modName, player)
+		);
+
 		Lua_helper.add_callback(lua, "getValue", function(modName:String, player:Int)
-		{
-			return PlayState.instance.modManager.getValue(modName, player);
+			return PlayState.instance.modManager.getValue(modName, player)
+		);
+
+		Lua_helper.add_callback(lua, "setCurrentValue", function(modName:String, val:Float, player:Int){
+			return PlayState.instance.modManager.setCurrentValue(modName, val, player);
 		});
 
-		Lua_helper.add_callback(lua, "queueSet", function(step:Float, modName:String, target:Float, player:Int = -1)
-		{
-			PlayState.instance.modManager.queueSet(step, modName, target, player);
+		Lua_helper.add_callback(lua, "getTargetValue", function(modName:String, player:Int){
+			return PlayState.instance.modManager.getTargetValue(modName, player);
 		});
-		
+
+		Lua_helper.add_callback(lua, "queueSet", function(step:Float, modName:String, target:Float, player:Int = -1)
+			PlayState.instance.modManager.queueSet(step, modName, target, player)
+		);
+
 		Lua_helper.add_callback(lua, "queueSetP", function(step:Float, modName:String, perc:Float, player:Int = -1)
-		{
-			PlayState.instance.modManager.queueSetP(step, modName, perc, player);
-		});
-		
-		Lua_helper.add_callback(lua, "queueEase", function(step:Float, endStep:Float, modName:String, percent:Float, style:String = 'linear', player:Int = -1, ?startVal:Float) // lua is autistic and can only accept 5 args
-		{
-			PlayState.instance.modManager.queueEase(step, endStep, modName, percent, style, player, startVal);
-		});
+			PlayState.instance.modManager.queueSetP(step, modName, perc, player)
+		);
 
-		Lua_helper.add_callback(lua, "queueEaseP", function(step:Float, endStep:Float, modName:String, percent:Float, style:String = 'linear', player:Int = -1, ?startVal:Float) // lua is autistic and can only accept 5 args
-		{
-			PlayState.instance.modManager.queueEaseP(step, endStep, modName, percent, style, player, startVal);
-		});
+		Lua_helper.add_callback(lua, "queueEase",
+			function(step:Float, endStep:Float, modName:String, percent:Float, style:String = 'linear', player:Int = -1, ?startVal:Float)
+				PlayState.instance.modManager.queueEase(step, endStep, modName, percent, style, player, startVal)
+		);
+
+		Lua_helper.add_callback(lua, "queueEaseP",
+			function(step:Float, endStep:Float, modName:String, percent:Float, style:String = 'linear', player:Int = -1, ?startVal:Float)
+				PlayState.instance.modManager.queueEaseP(step, endStep, modName, percent, style, player, startVal)
+		);
 
 		//
 		Lua_helper.add_callback(lua, "getRunningScripts", function() {
@@ -1343,7 +1344,7 @@ class FunkinLua {
 			if(!Assets.exists(path, TEXT))
 			#end
 			#end
-				path = Paths.getPath('data/$songPath/$dialogueFile.json', TEXT);
+			path = Paths.getPath('data/$songPath/$dialogueFile.json', TEXT);
 
 			luaTrace('startDialogue: Trying to load dialogue: ' + path);