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

Author: Yuta12342

README.md

@@ -1,4 +1,3 @@
-
 # Archipelago Randomizer Configuration / Setup Guide
 
 Archipelago is a Multiworld Randomizer, meaning it randomizes a bunch of games into one randomizer pool, and it challenges you to conplete all of the games.
@@ -21,8 +20,8 @@ When updating the Engine, make sure to use the Update/Install APWorld Button to
 ### Need help?
 Join our [Test Discord Server](https://discord.gg/KJXvEVUfZX) to get assistance with issues, or to submit a bug report.
 
-# Friday Night Funkin' - Psych Engine
-Engine originally used on [Mind Games Mod](https://gamebanana.com/mods/301107), intended to be a fix for the vanilla version's many issues while keeping the casual play aspect of it. Also aiming to be an easier alternative to newbie coders.
+# Mixtape Engine
+Mixtape is a fork of [Psych Engine](https://gamebanana.com/mods/309789) (another one, oh the horror!), with the goal of being the most compatible engine ever. Eventually, we want to be able to have *every* mod from *every* engine compatible all in one *right here*.
 
 ## Installation:
 

source/archipelago/APDisconnectSubstate.hx

@@ -27,7 +27,7 @@ class APDisconnectSubstate extends FlxSubState
 
 		// AP.disconnect_socket();
 		states.ExitState.addExitCallback(function() {
-			var restartProcess = new Process("Mixtape.exe", ["APDisconnectError", "restart"]);
+			//var restartProcess = new Process("Mixtape.exe", ["APDisconnectError", "restart"]);
 
 		});
 		FlxG.switchState(new states.ExitState());

source/archipelago/APPlayState.hx

@@ -81,7 +81,7 @@ class APPlayState extends PlayState {
 	public var effectArray:Array<String> = [
 		'colorblind', 'blur', 'lag', 'mine', 'warning', 'heal', 'spin', 'songslower', 'songfaster', 'scrollswitch', 'scrollfaster', 'scrollslower', 'rainbow',
 		'cover', 'ghost', 'flashbang', 'nostrum', 'jackspam', 'spam', 'sever', 'shake', 'poison', 'dizzy', 'noise', 'flip', 'invuln',
-		'desync', 'mute', 'ice', 'randomize', 'randomizeAlt', 'opponentPlay', 'bothplay', 'fakeheal', 'spell', 'terminate', 'lowpass', #if windows 'notif' #end
+		'desync', 'mute', 'ice', 'fakeheal', 'spell', 'terminate', 'lowpass', #if windows 'notif' #end
 	];
 	var notifs:Array<String> = [
 		"You're crazy...",
@@ -184,15 +184,15 @@ class APPlayState extends PlayState {
             'colorblind' => function() {
                 var ttl:Float = 16;
                 var onEnd:(Void->Void) = function() {
-                    camHUDfilters.remove(filterMap.get("Grayscale").filter);
-                    camGamefilters.remove(filterMap.get("Grayscale").filter);
+                    camHUD.filters.remove(filterMap.get("Grayscale").filter);
+                    camGame.filters.remove(filterMap.get("Grayscale").filter);
                 };
                 var playSound:String = "colorblind";
                 var playSoundVol:Float = 0.8;
                 var noIcon:Bool = false;
 
-                camHUDfilters.push(filterMap.get("Grayscale").filter);
-                camGamefilters.push(filterMap.get("Grayscale").filter);
+                camGame.filters.push(filterMap.get("Grayscale").filter);
+                camGame.filters.push(filterMap.get("Grayscale").filter);
 
                 applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, 'colorblind');
             },
@@ -304,12 +304,12 @@ class APPlayState extends PlayState {
             'spin' => function() {
                 var ttl:Float = 15;
                 var onEnd:(Void->Void) = function() {
-                    modManager.setValue('roll', 0);
+                    modManager.setValue('orient', 0);
                 };
                 var playSound:String = "spin";
                 var playSoundVol:Float = 1;
                 var noIcon:Bool = false;
-                modManager.setValue('roll', (FlxG.random.bool() ? 1 : -1) * FlxG.random.float(333 * 0.8, 333 * 1.15));
+                modManager.setValue('orient', (FlxG.random.bool() ? 1 : -1) * FlxG.random.float(333 * 0.8, 333 * 1.15));
                 applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, 'spin');
             },
             'songslower' => function() {
@@ -691,9 +691,8 @@ class APPlayState extends PlayState {
                 explosion.animation.add("boom", okayden, 60, false);
                 explosion.animation.finishCallback = function(name) {
                     explosion.visible = false;
-                    explosion.kill();
                     remove(explosion);
-                    FlxDestroyUtil.destroy(explosion);
+                    explosion.kill();
                 };
                 explosion.cameras = [camHUD];
                 explosion.x = playerField.strumNotes[picked].x + playerField.strumNotes[picked].width / 2 - explosion.width / 2;
@@ -843,6 +842,7 @@ class APPlayState extends PlayState {
                 var onEnd:(Void->Void) = function() {
                     FlxG.sound.music.time += delayOffset;
                     delayOffset = 0;
+                    resyncVocals();
                 };
                 var playSound:String = "delay";
                 var playSoundVol:Float = 1;
@@ -1027,8 +1027,8 @@ class APPlayState extends PlayState {
                 var ttl:Float = 10;
                 var onEnd:(Void->Void) = function() {
                     blurEffect.setStrength(0, 0);
-                    camHUDfilters.remove(filterMap.get("BlurLittle").filter);
-                    camGamefilters.remove(filterMap.get("BlurLittle").filter);
+                    camHUD.filters.remove(filterMap.get("BlurLittle").filter);
+                    camGame.filters.remove(filterMap.get("BlurLittle").filter);
                     lowFilterAmount = 1;
                     vocalLowFilterAmount = 1;
                 };
@@ -1038,12 +1038,12 @@ class APPlayState extends PlayState {
 
                 if (FlxG.random.bool(40)) {
                     lowFilterAmount = .0134;
-                    camGamefilters.push(filterMap.get("BlurLittle").filter);
+                    camGame.filters.push(filterMap.get("BlurLittle").filter);
                     blurEffect.setStrength(32, 32);
                 } else {
                     vocalLowFilterAmount = .0134;
-                    camHUDfilters.push(filterMap.get("BlurLittle").filter);
-                    camGamefilters.push(filterMap.get("BlurLittle").filter);
+                    camHUD.filters.push(filterMap.get("BlurLittle").filter);
+                    camGame.filters.push(filterMap.get("BlurLittle").filter);
                     blurEffect.setStrength(32, 32);
                 }
 
@@ -1854,12 +1854,6 @@ class APPlayState extends PlayState {
 					note.blockHit = true;
 				else
 					note.blockHit = false;
-
-                if (note is archipelago.APNote) {
-                    note.rgbShader.r = 0xFF313131;
-                    note.rgbShader.g = 0xFFFFFFFF;
-                    note.rgbShader.b = 0xFFB4B4B4;
-                }
 			});
 		}
 
@@ -1982,6 +1976,7 @@ class APPlayState extends PlayState {
         super.update(elapsed);
     }
 
+    var alreadySent:Bool = false;
     override function doDeathCheck(?skipHealthCheck:Bool = false):Bool
     {
         if (activeItems[0] <= 0)
@@ -1996,8 +1991,10 @@ class APPlayState extends PlayState {
                 noiseSound.pause();
             }
         }
-        if (health <= 0 && bfkilledcheck && !deathByLink) 
+        if (health <= 0 && bfkilledcheck && !deathByLink && !alreadySent) { 
+            alreadySent = true; // because indie cross likes to spam this every frame for some reason
             APEntryState.apGame.info().sendDeathLink(COD.COD);
+        }
         super.doDeathCheck();
         return true;
     }
@@ -2219,7 +2216,6 @@ class APPlayState extends PlayState {
 
             if (daNote.specialNote)
 			{
-				specialNoteHit(daNote, field);
 				return;
 			}
             super.noteMiss(daNote, field);
@@ -2379,38 +2375,6 @@ class APPlayState extends PlayState {
 		}
 	}
 
-    override function beatHit()
-    {
-        switch (terminateStep)
-		{
-			case 3:
-				var terminate = new TerminateTimestamp(Math.floor(Conductor.songPosition / Conductor.crochet) * Conductor.crochet + Conductor.crochet * 3);
-				add(terminate);
-				terminateTimestamps.push(terminate);
-				terminateStep--;
-                COD.setPresetCOD('custom');
-                COD.custom = 'You were Terminated.';
-			case 2 | 1 | 0:
-				terminateMessage.loadGraphic(Paths.image("streamervschat/terminate" + terminateStep));
-				terminateMessage.screenCenter(XY);
-				terminateMessage.cameras = [camOther];
-				terminateMessage.visible = true;
-				if (terminateStep > 0)
-				{
-					terminateSound.volume = 0.6;
-					terminateSound.play(true);
-				}
-				else if (terminateStep == 0)
-				{
-					FlxG.sound.play(Paths.sound('streamervschat/beep2'), 0.85);
-				}
-				terminateStep--;
-			case -1:
-				terminateMessage.visible = false;
-		}
-        super.beatHit();
-    }
-
     override function closeSubState()
     {
         setBoyfriendInvuln(1 / 60);

source/backend/ClientPrefs.hx

@@ -165,6 +165,7 @@ import states.TitleState;
 	public var aprilFools:Bool = true;
 	public var freeplayMenu:String = 'Mixtape';
 	public var showMods:Bool = false;
+	public var checkAPWorld:Bool = true;
 }
 
 class ClientPrefs {

source/backend/Conductor.hx

@@ -29,6 +29,8 @@ class Conductor
 	@:noCompletion static function get_jackLimit()
 		return (jackLimit < 0) ? (jackLimit = Conductor.stepCrochet / _internalJackLimit) : jackLimit;
 
+	public static var ROWS_PER_BEAT = 48; // from Stepmania
+
 	public static function judgeNote(arr:Array<Rating>, diff:Float=0):Rating // die
 	{
 		var data:Array<Rating> = arr;
@@ -44,6 +46,9 @@ class Conductor
 		return lastChange.stepCrochet*4;
 	}
 
+	public inline static function secsToRow(sex:Float):Int
+		return Math.round(getBeat(sex) * ROWS_PER_BEAT);
+
 	public static function getBPMFromSeconds(time:Float){
 		var lastChange:BPMChangeEvent = {
 			stepTime: 0,

source/backend/Difficulty.hx

@@ -16,7 +16,7 @@ class Difficulty
 		if(num == null) num = PlayState.storyDifficulty;
 
 		var filePostfix:String = list[num];
-		if(filePostfix != null && Paths.formatToSongPath(filePostfix) != Paths.formatToSongPath(defaultDifficulty))
+		if(filePostfix != null && (Paths.formatToSongPath(filePostfix) != Paths.formatToSongPath(defaultDifficulty) || Paths.formatToSongPath(filePostfix) != Paths.formatToSongPath(defaultDifficulty.toLowerCase())))
 			filePostfix = '-' + filePostfix;
 		else
 			filePostfix = '';

source/backend/Mods.hx

@@ -1,7 +1,6 @@
 package backend;
 
 import openfl.utils.Assets;
-
 import haxe.Json;
 
 typedef ModsList = {
@@ -32,8 +31,6 @@ class Mods
 	];
 
 	private static var globalMods:Array<String> = [];
-	private static var internetModSources:Array<String> = [];
-	private static var githubModSources:Array<String> = [];
 
 	inline public static function getGlobalMods()
 		return globalMods;
@@ -96,13 +93,15 @@ class Mods
 	inline public static function directoriesWithFile(path:String, fileToFind:String, mods:Bool = true)
 	{
 		var foldersToCheck:Array<String> = [];
+		//Main folder
 		if(FileSystem.exists(path + fileToFind))
 			foldersToCheck.push(path + fileToFind);
 
+		// Week folder
 		if(Paths.currentLevel != null && Paths.currentLevel != path)
 		{
 			var pth:String = Paths.getFolderPath(fileToFind, Paths.currentLevel);
-			if(FileSystem.exists(pth))
+			if(!foldersToCheck.contains(pth) && FileSystem.exists(pth))
 				foldersToCheck.push(pth);
 		}
 
@@ -212,40 +211,6 @@ class Mods
 			}
 		}
 
-			// // Add internet mod sources
-			// for (url in internetModSources) {
-			// 	try {
-			// 		var modContent:String = downloadModFromUrl(url);
-			// 		if (modContent != null) {
-			// 			var modFolder:String = extractMod(modContent);
-			// 			if (modFolder != null && !added.contains(modFolder)) {
-			// 				added.push(modFolder);
-			// 				list.push([modFolder, true]);
-			// 			}
-			// 		}
-			// 	} catch (e:Dynamic) {
-			// 		trace('Failed to download mod from URL: ' + url);
-			// 		trace(e);
-			// 	}
-			// }
-
-			// // Add GitHub mod sources
-			// for (repoUrl in githubModSources) {
-			// 	try {
-			// 		var modContent:String = downloadModFromGithub(repoUrl);
-			// 		if (modContent != null) {
-			// 			var modFolder:String = extractMod(modContent);
-			// 			if (modFolder != null && !added.contains(modFolder)) {
-			// 				added.push(modFolder);
-			// 				list.push([modFolder, true]);
-			// 			}
-			// 		}
-			// 	} catch (e:Dynamic) {
-			// 		trace('Failed to download mod from GitHub: ' + repoUrl);
-			// 		trace(e);
-			// 	}
-			// }
-
 		// Now save file
 		var fileStr:String = '';
 		for (values in list)
@@ -270,32 +235,4 @@ class Mods
 			Mods.currentModDirectory = list[0];
 		#end
 	}
-
-	// public static function addInternetModSource(url:String):Void {
-	// 	if (!internetModSources.contains(url)) {
-	// 		internetModSources.push(url);
-	// 		updateModList();
-	// 	}
-	// }
-
-	// public static function removeInternetModSource(url:String):Void {
-	// 	if (internetModSources.contains(url)) {
-	// 		internetModSources.remove(url);
-	// 		updateModList();
-	// 	}
-	// }
-
-	// public static function addGithubModSource(repoUrl:String):Void {
-	// 	if (!githubModSources.contains(repoUrl)) {
-	// 		githubModSources.push(repoUrl);
-	// 		updateModList();
-	// 	}
-	// }
-
-	// public static function removeGithubModSource(repoUrl:String):Void {
-	// 	if (githubModSources.contains(repoUrl)) {
-	// 		githubModSources.remove(repoUrl);
-	// 		updateModList();
-	// 	}
-	// }
 }

source/backend/MusicBeatState.hx

@@ -58,9 +58,6 @@ class MusicBeatState extends FlxState
 
 		// if (backend.window.CppAPI.getWindowOpacity()!=1)
 		#if windows
-		if (emergencyOpacityFix) {
-			CppAPI.setWindowOppacity(1);
-		}
 
 		if (firstRun) {
 			FlxTween.num(0, 1, 0.5, {
@@ -137,6 +134,11 @@ class MusicBeatState extends FlxState
 
 	override function update(elapsed:Float)
 	{
+		if (emergencyOpacityFix) {
+			CppAPI.setWindowOppacity(1);
+			emergencyOpacityFix = false;
+		}
+
 		if (Main.audioDisconnected && getState() == PlayState.instance)
 		{
 			//Save your progress and THEN reset it (I knew there was a common use for this)

source/backend/WeekData.hx

@@ -39,7 +39,6 @@ class WeekData {
 	public var hideFreeplay:Bool;
 	public var difficulties:String;
 	public var category:flixel.util.typeLimit.OneOfTwo<String, Array<String>>;
-
 	public var fileName:String;
 
 	public static function createWeekFile():WeekFile {
@@ -181,14 +180,14 @@ class WeekData {
 		return null;
 	}
 
-	//   FUNCTIONS YOU WILL PROBABLY NEVER NEED TO USE
+	// FUNCTIONS YOU WILL PROBABLY NEVER NEED TO USE
 
-	//To use on PlayState.hx or Highscore stuff
+	// To use on PlayState.hx or Highscore stuff
 	public static function getWeekFileName():String {
 		return weeksList[PlayState.storyWeek];
 	}
 
-	//Used on LoadingState, nothing really too relevant
+	// Used on LoadingState, nothing really too relevant
 	public static function getCurrentWeek():WeekData {
 		return weeksLoaded.get(weeksList[PlayState.storyWeek]);
 	}
@@ -199,4 +198,4 @@ class WeekData {
 			Mods.currentModDirectory = data.folder;
 		}
 	}
-}
+}