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

Author: Yuta12342

source/archipelago/APItem.hx

@@ -1676,7 +1676,7 @@ class APItem {
             "Pong Challenge",
             "Math Problem Trap",
             "Pocket Lens",
-            "Nothing"
+            "Lonely Friday Night"
         ];
         for (name in itemNames) {
             createItemByName(name);
@@ -2223,9 +2223,49 @@ class APrilFools extends APTrap {
                         "The void is coming."
                     ];
 
+                    var funnySpamMessages = [
+                        "I CAN [[I See You!]]...",
+                        "DID YOU [[Hearing-Aid]] THAT?",
+                        "DON'T LOOK [[RUN! RUN AWAY!]].",
+                        "YOUR [[Time is a valuable thing]] is [[Drifting Away]].",
+                        "IS SOMEONE [[watching from afar!]]?",
+                        "CHECK YOUR [[Surround-Sound Speaker System]].",
+                        "WHAT WAS [[Sound Around Town]]?",
+                        "ARE YOU [[all alone on a friday afternoon]]?",
+                        "SOMETHING [[FEEL YOUR]] [[Power Off]].",
+                        "WHY IS IT SO [[it's quiet. too quiet]]?",
+                        "YOUR [[Smart Device]] IS NOW [[Where am I? What is this??]]. JUST [[clowning around]]!",
+                        "WHY DID THE [[creator of all things technology]] [[GIVE UP!]]? THEY DIDN'T GET [[Group your strings into in array]].",
+                        "404: [[lucky number 9]] [[MISSING]].",
+                        "DID YOU JUST [[Feeling lucky]]? [[THE BOLD AND THE BRAVE]] move.",
+                        "YOUR [[TYPING MECHANIC]] IS [[I HATE YOU SO MUCH]].",
+                        "[[Congratulations!]] YOU'VE WON [[absolutely nothing]]!",
+                        "THIS IS NOT A [[hyperlink blocked]], IT'S A [[FEATURE PRESENTATION]].",
+                        "YOUR [[rodent]] JUST [[go of my own will]]. OR DID IT?",
+                        "DON'T WORRY, THE [[Spagetti Code]] IS 100% [[insect repellent]]. MAYBE.",
+                        "[[fun fact]]: [[The following message is]] [[what's the point to life]].",
+                        "YOUR [[LORD OF SCREENS]] IS NOW [[10% brighter on kids]]. JUST [[it was a joke calm down, CALM DOWN]]!",
+                        "[[Did you know?]] This message is [[it all feels like a waste of time]].",
+                        "Your [[CPU]] is [[STOP LAUGHING AT ME]].",
+                        "[[ERR]] 42: [[Life, the universe, and everything sweet]].",
+                        "Your [[Raw, Artifical Memory]] just said [[Hello, World!]].",
+                        "This is a [[testing, testing]]. [[Or is it?]]",
+                        "Your [[Projection Device]] wants [[a break from all of you]].",
+                        "[[GOD]] is [[I See You]].",
+                        "[[GOD]][[2]] is [[I See You]].",
+                        "[[GOD]][[2]] is [[I'm always watching]].",
+                        "[[GOD]] is [[I'm always watching]].",
+                        "[[GOD]][[2]] and [[GOD]] are [[I'm always watching]].",
+                        "[[GOD]][[2]] and [[GOD]] are [[you're adorable when you sleep!]].",
+                        "[[GOD]][[2]] and [[GOD]] are [[go play, children! I'll watch from here]].",
+                        "[[GOD]][[2]] and [[GOD]] are [[STOP LOOKING AT MY DECK YOU FILTHY CHEATER!]].",
+                        "[[the void is coming.]]"
+                    ];
+
                     var randomMessage = Std.random(100) < 20 // 20% chance for creepy messages
                         ? creepyMessages[Std.random(creepyMessages.length)]
                         : funnyMessages[Std.random(funnyMessages.length)];
+                    if FlxG.random.bool(1) randomMessage = funnySpamMessages[Std.random(funnySpamMessages.length)];
                     if (!PlatformUtil.sendWindowsNotification("Archipelago", randomMessage)) {
                         APItem.popup(randomMessage, "Archipelago", true);
                     }

source/backend/Paths.hx

@@ -178,6 +178,7 @@ class Paths
 					return;
 				}
 			}
+			catch(r) {}
 
 			//trace('check...');
 			try
@@ -189,7 +190,7 @@ class Paths
 					//trace('gfx added to the list successfully!');
 				}
 			}
-			//catch(haxe.Exception) {}
+			catch(r) {}
 		}
 
 		for (member in FlxG.state.members)
@@ -269,21 +270,22 @@ class Paths
 
 			//super.destroy();
 		} else {
-			try {
-				clearStoredWithoutStickers();
-				freeGraphicsFromMemory();
-				Paths.clearStoredMemory();
-				Paths.clearUnusedMemory();
-				//MemoryUtilBase.compact();
-				//MemoryUtilBase.collect(true);
-				currentTrackedSounds.clear();
-				@:privateAccess {
-					for (key => asset in FlxG.bitmap._cache)
-						asset.destroy();
-				}
+			clearStoredWithoutStickers();
+			freeGraphicsFromMemory();
+			MemoryUtilBase.compact();
+			MemoryUtilBase.collect(true);
+			Paths.clearStoredMemory();
+			Paths.clearUnusedMemory();
+			currentTrackedSounds.clear();
+			@:privateAccess {
+				for (key => asset in FlxG.bitmap._cache)
+					asset.destroy();
+			}
+			/*try {
+
 			} catch(e) {
 				trace('ERROR: Couldn\'t' );
-			}
+			}*/
 		}
 	}
 

source/objects/Note.hx

@@ -687,6 +687,8 @@ class Note extends NoteObject
 	public var hitsound:String = 'hitsound';
 	public var doRGBShader:Bool = true;
 
+	public var noteSplashTexture:String = "";
+
 	private function set_multSpeed(value:Float):Float {
 		resizeByRatio(value / multSpeed);
 		multSpeed = value;
@@ -875,6 +877,8 @@ class Note extends NoteObject
 		super();
 		isNotePool = inNotePool;
 
+		if (noteSplashTexture != '') noteSplashData.texture = noteSplashTexture;
+
 		animation = new PsychAnimationController(this);
 
 		antialiasing = ClientPrefs.data.antialiasing;

source/objects/NoteSplash.hx

@@ -52,18 +52,43 @@ class NoteSplash extends NoteObject
 	public static var defaultNoteSplash(default, never):String = "noteSplashes/noteSplashes";
 	public static var configs:Map<String, NoteSplashConfig> = new Map();
 
-	public function new(?x:Float = 0, ?y:Float = 0, ?splash:String)
+	public function new(?x:Float = 0, ?y:Float = 0, ?strum:Int = 0, ?splash:String)
 	{
 		super(x, y);
+		this.objType = SPLASH;
 
 		animation = new PsychAnimationController(this);
 
 		rgbShader = new PixelSplashShaderRef();
 		shader = rgbShader.shader;
+		setupNoteSplash(x, y, strum, splash);
+		visible = false;
+	}
 
-		this.objType = SPLASH;
+	public var animationAmount:Int = 2;
+	public function setupNoteSplash(x:Float, y:Float, ?column:Int = 0, ?texture:String = null)
+	{
+		visible = true;
+		/*var doR:Bool = false;
+		if (note != null && note.genScript != null){
+			var ret:Dynamic = note.genScript.call("preSetupNoteSplash", [x, y, column, texture, hueColor, satColor, brtColor, note], ["this" => this, "noteData" => noteData, "column" => column]);
+			if(ret == Globals.Function_Stop) doR = true;
+		}
+
+		if (callOnHScripts("preSetupNoteSplash", [x, y, column, texture, hueColor, satColor, brtColor, note], ["this" => this, "noteData" => noteData, "column" => column]) == Globals.Function_Stop)
+			return;
+
+		if (doR)return;*/ //TODO: Psych-ify this later
+
+		loadSplash(texture);
+		setPosition(x, y);
+		animationAmount = 2;
+		alpha = 0.6;
+		scale.set(0.8, 0.8);
+		updateHitbox();
+
+		this.column = column;
 
-		loadSplash(splash);
 	}
 
 	public var maxAnims(default, set):Int = 0;

source/objects/playfields/PlayField.hx

@@ -222,13 +222,12 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 		add(strumAttachments);
 
 		// Pre-allocate a few note splashes for better performance
-		for (i in 0...4) {
-			var splash:NoteSplash = new NoteSplash();
-			splash.handleRendering = false;
-			splash.alpha = 0.0;
-			splash.kill(); // Start them as killed objects in the pool
-			grpNoteSplashes.add(splash);
-		}
+		// No need, you only need one. It creates everything else for you
+		var splash:NoteSplash = new NoteSplash();
+		splash.handleRendering = false;
+		grpNoteSplashes.add(splash);
+		grpNoteSplashes.visible = false; // so they dont get drawn
+		splash.alpha = 0.0;
 
 		////
 		noteField = new NoteField(this, modMgr);
@@ -927,7 +926,7 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 	public function spawnSplash(note:Note, ?splashSkin:String):NoteSplash {
 		if (note == null) return null;
 
-		var splash:NoteSplash = grpNoteSplashes.recycle(NoteSplash);
+		/*var splash:NoteSplash = grpNoteSplashes.recycle(NoteSplash);
 		if (splash == null) {
 			splash = new NoteSplash();
 			grpNoteSplashes.add(splash);
@@ -961,7 +960,13 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 		}
 
 		splash.spawnSplashNote(strumX, strumY, note.noteData, note);
+		splash.handleRendering = false;*/
+
+		// do it the way god (troll engine) intended
+		var splash:NoteSplash = grpNoteSplashes.recycle(NoteSplash);
+		splash.setupNoteSplash(0, 0, note.column, splashSkin);
 		splash.handleRendering = false;
+		grpNoteSplashes.add(splash);
 
 		return splash;
 	}