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

Author: Yuta12342

source/archipelago/APPlayState.hx

@@ -1691,7 +1691,6 @@ class APPlayState extends PlayState {
 			randoTimer.cancel();
 
         instance = null;
-
 		super.destroy();
 	}
 

source/backend/Song.hx

@@ -138,6 +138,12 @@ class Song
 			//trace("Song mania value is NULL, set to " + Note.defaultMania);
 		}
 
+		if (songJson.startMania == null)
+		{
+			songJson.startMania = Note.defaultMania;
+			//trace("Song mania value is NULL, set to " + Note.defaultMania);
+		}
+
 		if(songJson.events == null)
 		{
 			songJson.events = [];

source/backend/modchart/modifiers/AccelModifier.hx

@@ -1,12 +1,12 @@
 package backend.modchart.modifiers;
 
-import backend.ui.*;
+import backend.math.*;
+import backend.math.Vector3;
 import backend.modchart.*;
-import flixel.math.FlxPoint;
-import flixel.math.FlxMath;
+import backend.ui.*;
 import flixel.FlxG;
-import backend.math.Vector3;
-import backend.math.*;
+import flixel.math.FlxMath;
+import flixel.math.FlxPoint;
 import objects.playfields.NoteField;
 
 class AccelModifier extends NoteModifier
@@ -22,8 +22,8 @@ class AccelModifier extends NoteModifier
 	override function getPos(visualDiff:Float, timeDiff:Float, beat:Float, pos:Vector3, data:Int, player:Int, obj:FlxSprite, field:NoteField)
 	{
 		if (getOtherValue("movePastReceptors", player) == 0 && visualDiff<=0)
-            return pos;
-        
+      return pos;
+
 		var wave = getSubmodValue("wave", player);
 		var brake = getSubmodValue("brake", player);
 		var boost = getValue(player);
@@ -47,7 +47,7 @@ class AccelModifier extends NoteModifier
 			yAdjust += CoolUtil.clamp(boost * (off - visualDiff), -600, 600);
 		}
 
-		if (getSubmodValue("wavePeriod", player) != -1 /**< no division by 0**/ && wave != 0) 
+		if (getSubmodValue("wavePeriod", player) != -1 /**< no division by 0**/ && wave != 0)
 		    yAdjust += wave * 40 * FlxMath.fastSin(visualDiff / ((114 * getSubmodValue("wavePeriod", player)) + 114));
 
 		pos.y += yAdjust * mult;
@@ -59,4 +59,4 @@ class AccelModifier extends NoteModifier
 		var subMods:Array<String> = ["brake", "wave", "wavePeriod"];
 		return subMods;
 	}
-}
+}

source/backend/modchart/modifiers/RotateModifier.hx

@@ -1,14 +1,14 @@
 package backend.modchart.modifiers;
 
-import flixel.math.FlxAngle;
-import flixel.FlxSprite;
-import backend.ui.*;
+import backend.math.*;
+import backend.math.Vector3;
 import backend.modchart.*;
-import flixel.math.FlxPoint;
-import flixel.math.FlxMath;
+import backend.ui.*;
 import flixel.FlxG;
-import backend.math.Vector3;
-import backend.math.*;
+import flixel.FlxSprite;
+import flixel.math.FlxAngle;
+import flixel.math.FlxMath;
+import flixel.math.FlxPoint;
 import objects.playfields.NoteField;
 
 class RotateModifier extends NoteModifier { // this'll be rotateX in ModManager
@@ -23,11 +23,10 @@ class RotateModifier extends NoteModifier { // this'll be rotateX in ModManager
     }
     var daOrigin:Vector3;
     var prefix:String;
-	public function new(modMgr:ModManager, ?prefix:String = '', ?origin:Vector3, ?parent:Modifier){
-        this.prefix=prefix;
-        this.daOrigin=origin;
-        super(modMgr, parent);
-
+		public function new(modMgr:ModManager, ?prefix:String = '', ?origin:Vector3, ?parent:Modifier){
+			this.prefix=prefix;
+			this.daOrigin=origin;
+			super(modMgr, parent);
     }
 
 
@@ -57,4 +56,4 @@ class RotateModifier extends NoteModifier { // this'll be rotateX in ModManager
 		submods.push('${prefix}rotateZ');
 		return submods;
     }
-}
+}

source/psychlua/FunkinLua.hx

@@ -351,6 +351,7 @@ class FunkinLua {
 			}
 			luaTrace("addLuaScript: Script doesn't exist!", false, false, FlxColor.RED);
 		});
+
 		Lua_helper.add_callback(lua, "addHScript", function(scriptFile:String, ?ignoreAlreadyRunning:Bool = false) {
 			#if HSCRIPT_ALLOWED
 			var scriptPath:String = findScript(scriptFile, '.hx');
@@ -372,6 +373,7 @@ class FunkinLua {
 			luaTrace("addHScript: HScript is not supported on this platform!", false, false, FlxColor.RED);
 			#end
 		});
+
 		Lua_helper.add_callback(lua, "removeLuaScript", function(luaFile:String) {
 			var luaPath:String = findScript(luaFile);
 			if(luaPath != null)
@@ -392,6 +394,7 @@ class FunkinLua {
 			luaTrace('removeLuaScript: Script $luaFile isn\'t running!', false, false, FlxColor.RED);
 			return false;
 		});
+
 		Lua_helper.add_callback(lua, "removeHScript", function(scriptFile:String) {
 			#if HSCRIPT_ALLOWED
 			var scriptPath:String = findScript(scriptFile, '.hx');
@@ -459,6 +462,7 @@ class FunkinLua {
 				spr.loadGraphic(Paths.image(image), animated, gridX, gridY);
 			}
 		});
+
 		Lua_helper.add_callback(lua, "loadFrames", function(variable:String, image:String, spriteType:String = 'auto') {
 			var split:Array<String> = variable.split('.');
 			var spr:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
@@ -471,6 +475,7 @@ class FunkinLua {
 				LuaUtils.loadFrames(spr, image, spriteType);
 			}
 		});
+
 		Lua_helper.add_callback(lua, "loadMultipleFrames", function(variable:String, images:Array<String>) {
 			var split:Array<String> = variable.split('.');
 			var spr:FlxSprite = LuaUtils.getObjectDirectly(split[0]);
@@ -514,6 +519,7 @@ class FunkinLua {
 			luaTrace('getObjectOrder: Object $obj doesn\'t exist!', false, false, FlxColor.RED);
 			return -1;
 		});
+
 		Lua_helper.add_callback(lua, "setObjectOrder", function(obj:String, position:Int, ?group:String = null) {
 			var leObj:FlxBasic = LuaUtils.getObjectDirectly(obj);
 			if(leObj != null)
@@ -1767,6 +1773,15 @@ class FunkinLua {
 		var strumNote:StrumNote = PlayState.instance.strumLineNotes.members[note % PlayState.instance.strumLineNotes.length];
 		if(strumNote == null) return null;
 
+		for (field in PlayState.instance.playfields.members) {
+			if (field.strumNotes.contains(strumNote)) {
+				var i = field.strumNotes.indexOf(strumNote);
+				if (i != -1) {
+					strumNote = field.strumNotes[i];
+				}
+			}
+		}
+
 		if(tag != null)
 		{
 			var originalTag:String = tag;

source/states/CategoryState.hx

@@ -150,6 +150,11 @@ class CategoryState extends MusicBeatState
 	{
 		MemoryUtil.clearMajor();
 
+		#if DISCORD_ALLOWED
+		// Updating Discord Rich Presence
+		DiscordClient.changePresence("Picking the Category", null);
+		#end
+
 		menuItems = menuItems.filter(it -> (!it.isEmpty() && Alphabet.isValidText(it)));
 		FlxTransitionableState.skipNextTransOut = false;