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

Author: Yuta12342

source/objects/Note.hx

@@ -765,15 +765,15 @@ class Note extends NoteObject
 					ignoreNote = mustPress;
 					reloadNote('noteSkins/mechanicsmod/KILLNOTE_assets');
 					noteSplashData.texture = 'noteSplashes/HURTnoteSplashes';
-					doRGBShader = false;
+					rgbShader.enabled = false;
 					missHealth = FlxMath.MAX_VALUE_FLOAT;
 					lowPriority = true;
 					hitCausesMiss = true;
 				case 'Burst Note':
 					ignoreNote = mustPress;
 					reloadNote('noteSkins/mechanicsmod/BURSTNOTE_assets');
 					noteSplashData.disabled = true;
-					doRGBShader = false;
+					rgbShader.enabled = false;
 					if (isSustainNote)
 					{
 						missHealth = 0.0475 / 2;
@@ -788,7 +788,7 @@ class Note extends NoteObject
 					ignoreNote = mustPress;
 					reloadNote('noteSkins/mechanicsmod/SLEEPYNOTE_assets');
 					noteSplashData.disabled = true;
-					doRGBShader = false;
+					rgbShader.enabled = false;
 					if (isSustainNote)
 					{
 						missHealth = 0.0475 / 2;

source/objects/StrumNote.hx

@@ -143,6 +143,15 @@ class StrumNote extends NoteObject
 			}
 		}
 
+		//Now lets do a psych 0.6.x and below check to see if the notes ARE there, just not in a noteSkins folder
+		var pixelFolder:String = PlayState.isPixelStage ? 'pixelUI/' : '';
+		var skinPostfix:String = Note.getNoteSkinPostfix();
+		if (Paths.fileExists('images/$pixelFolder$texture$skinPostfix.png', IMAGE)) { // If a varient of a skin exists and is selected, load it
+			skin = texture + skinPostfix;
+		} else if (Paths.fileExists('images/${pixelFolder}noteSkins/$texture.png', IMAGE)) { // If a noteSkins folder exists and the note is in it, use that
+			skin = 'noteSkins/$texture$skinPostfix';
+		}
+
 		if (PlayState.isPixelStage || postfix.toLowerCase() == '-retribution')
 			useRGBShader = false;
 
@@ -156,12 +165,12 @@ class StrumNote extends NoteObject
 
 		if(PlayState.isPixelStage)
 		{
-			loadGraphic(Paths.image('pixelUI/noteSkins/' + skin));
+			loadGraphic(Paths.image('pixelUI/' + skin));
 			pxDV = Note.pixelNotesDivisionValue[width == 306 ? 1 : 0];
 			width = width / pxDV;
 			height = height / 5;
 			antialiasing = false;
-			loadGraphic(Paths.image('pixelUI/noteSkins/' + skin), true, Math.floor(width), Math.floor(height));
+			loadGraphic(Paths.image('pixelUI/' + skin), true, Math.floor(width), Math.floor(height));
 			var daFrames:Array<Int> = Note.keysShit.get(PlayState.mania).get('pixelAnimIndex');
 
 			setGraphicSize(Std.int(width * PlayState.daPixelZoom * Note.pixelScales[PlayState.mania]));

source/psychlua/ReflectionFunctions.hx

@@ -2,7 +2,6 @@ package psychlua;
 
 import Type.ValueType;
 import haxe.Constraints;
-
 import substates.GameOverSubstate;
 
 //
@@ -33,14 +32,15 @@ class ReflectionFunctions
 		});
 		Lua_helper.add_callback(lua, "getPropertyFromClass", function(classVar:String, variable:String, ?allowMaps:Bool = false) {
 			var trueVar:String = variable;
+			if (trueVar == "globalAntialiasing") trueVar = "antialiasing";
 			switch(classVar) {
 				case "PlayState":
 					classVar = "states.PlayState";
 				case "ClientPrefs":
 					classVar = "backend.ClientPrefs";
 					variable = 'data.$trueVar';
 			}
-			
+
 			var myClass:Dynamic = Type.resolveClass(classVar);
 			if(myClass == null)
 			{
@@ -67,7 +67,7 @@ class ReflectionFunctions
 					classVar = "backend.ClientPrefs";
 					variable = 'data.$trueVar';
 			}
-			
+
 			var myClass:Dynamic = Type.resolveClass(classVar);
 			if(myClass == null)
 			{
@@ -214,7 +214,7 @@ class ReflectionFunctions
 					if(destroy) obj.destroy();
 			}
 		});
-		
+
 		Lua_helper.add_callback(lua, "callMethod", function(funcToRun:String, ?args:Array<Dynamic>) {
 			var parent:Dynamic = PlayState.instance;
 			var split:Array<String> = funcToRun.split('.');
@@ -224,13 +224,13 @@ class ReflectionFunctions
 				funcToRun = split.join('.').trim();
 				parent = varParent;
 			}
-			
+
 			if(funcToRun.length > 0) {
 				return callMethodFromObject(parent, funcToRun, parseInstances(args));
 			}
 			return Reflect.callMethod(null, parent, parseInstances(args));
 		});
-		
+
 		Lua_helper.add_callback(lua, "callMethodFromClass", function(className:String, funcToRun:String, ?args:Array<Dynamic>) {
 			return callMethodFromObject(Type.resolveClass(className), funcToRun, parseInstances(args));
 		});
@@ -242,7 +242,7 @@ class ReflectionFunctions
 			{
 				if(args == null) args = [];
 				var myType:Dynamic = Type.resolveClass(className);
-		
+
 				if(myType == null)
 				{
 					FunkinLua.luaTrace('createInstance: Class $className not found', false, false, FlxColor.RED);
@@ -292,23 +292,23 @@ class ReflectionFunctions
 		// 		obj = LuaUtils.getVarInArray(LuaUtils.getTargetInstance(), variable);
 		// 	cpp.Pointer.addressOf(obj);
 		// 	#if cpp
-		// 	return cpp.RawPointer.addressOf(obj); 
+		// 	return cpp.RawPointer.addressOf(obj);
 		// 	#else
 		// 	return obj;
 		// 	#end
 		// });
 		// Lua_helper.add_callback(lua, "getPointerRef", function(pointer:Dynamic) {
 		// 	if(pointer == null) return null;
 		// 	#if cpp
-		// 	return cpp.Pointer.fromRaw(cpp.RawPointer.addressOf(pointer)).ref; 
+		// 	return cpp.Pointer.fromRaw(cpp.RawPointer.addressOf(pointer)).ref;
 		// 	#else
 		// 	return pointer;
 		// 	#end
 		// });
 		// Lua_helper.add_callback(lua, "getRefromPointer", function(pointer:Dynamic) {
 		// 	if(pointer == null) return null;
 		// 	#if cpp
-		// 	return cpp.Pointer.fromRaw((pointer)).ref; 
+		// 	return cpp.Pointer.fromRaw((pointer)).ref;
 		// 	#else
 		// 	return pointer;
 		// 	#end
@@ -317,13 +317,13 @@ class ReflectionFunctions
 		Lua_helper.add_callback(lua, "newInstance", function(className:String, ?args:Array<Dynamic>) {
 			if (!Std.isOfType(args, Array)) args = [];
 			var myType:Dynamic = Type.resolveClass(className);
-	
+
 			if(myType == null)
 			{
 				FunkinLua.luaTrace('newInstance: Class $className not found', false, false, FlxColor.RED);
 				return null;
 			}
-	
+
 			var obj:Dynamic = null;
 			try {
 				obj = Type.createInstance(myType, parseInstances(args));
@@ -334,7 +334,7 @@ class ReflectionFunctions
 				return instArray[instArray.push(obj) - 1];
 			else
 				FunkinLua.luaTrace('newInstance: Failed to create instance of $className, arguments are possibly wrong.', false, false, FlxColor.RED);
-	
+
 			return null;
 		});
 	}
@@ -349,7 +349,7 @@ class ReflectionFunctions
 	}
 	public static function parseInstances(arg:Dynamic):Dynamic {
 		if (arg == null) return null;
-		
+
 		if (Std.isOfType(arg, Array)) {
 			return parseInstanceArray(arg);
 		} else {

source/states/PlayState.hx

@@ -2604,10 +2604,9 @@ class PlayState extends MusicBeatState
 		insert(members.indexOf(dadGroup2) + 1, obj);
 	}
 
-
 	public function addNoteToField(note:Note, ?field:Int = 0)
 	{
-		if (field < 0 || field >= playfields.length)
+		if (field < 0 || field >= playfields.members.length)
 			field = if (note.mustPress) 0 else 1;
 		playfields.members[field].queue(note);
 	}

source/states/freeplay/FreeplayState.hx

@@ -1392,7 +1392,7 @@ class FreeplayState extends MusicBeatState
 
 				switch (fpManager.songList[curSelected].songName)
 				{
-					case 'Small Argument' | 'Beat Battle 2' | 'GeoStar' | 'Zeventeen' | 'Tag And Seek' | 'Rawr' | 'Funky Fanta' | 'Fightback' | 'Fangirl Frenzy' | 'Slowdown' | 'Pack-A-Punch' | 'Slowdown':
+					case 'Small Argument' | 'Beat Battle 2' | 'GeoStar' | 'Zeventeen' | 'Tag And Seek' | 'Rawr' | 'Funky Fanta' | 'Fightback' | 'Fangirl Frenzy' | 'Slowdown' | 'Pack-A-Punch':
 						Difficulty.list = ['Hard'];
 					case 'Rise' | 'Test Field' | 'Pack A Punch' | 'Driller':
 						Difficulty.list = ['Normal'];