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

Author: Yuta12342

.flight/icons/z11.png

@@ -0,0 +1,32 @@
+
+{
+  "metadata_version": 1,
+  "name": "Mixtape Engine",
+  "version": "4.8.0",
+  "description": "It's about time we mix things a bit!\nAn engine that aims to be a one-stop shop for all mods, while keeping the simplicity of Psych Engine.\n\nA Work-in-Progress, but we'll get there!\n\nAlso supports Archipelago!",
+  "logo_position": "middle",
+  "contributors": [
+    {
+      "group": "Mixtape Team",
+      "members": [
+        {
+          "name": "Z11Gaming",
+          "icon": "icons/z11.webp",
+          "role": "Main Creater of the engine"
+        },
+        {
+          "name": "Yutamon",
+          "icon": "icons/yuta.webp",
+          "role": "Co-Creater of the engine"
+        }
+      ]
+    }
+  ],
+  "engine": {
+    "engine_type": "psych",
+    "engine_name": "Mixtape Engine",
+    "engine_icon": "",
+    "mods_folder": true,
+    "mods_folder_path": "mods"
+  }
+}

.flight/logo.png

@@ -79,6 +79,7 @@
 	<define name="CRASH_HANDLER" if="desktop" />
 
 	<!-- Assets -->
+	<assets path=".flight" />
 	<assets path="assets/fonts" />
 	<assets path="assets/shared"        exclude="*.ogg" if="web"/>
 	<assets path="assets/shared"        exclude="*.mp3" unless="web"/>

.flight/metadata.json

@@ -1793,6 +1793,9 @@ class PlayState extends MusicBeatState
 				modManager.registerDefaultModifiers();
 
 				if (ClientPrefs.data.middleScroll) {
+					altNoteMove = true;
+					//strumOffsetspacebcauseitsstupid = 0;
+					//strumOffsetbcauseitsstupid = 0;
 					var off:Float = Math.min(FlxG.width, 1280) / 4;
 					var opp:Int = opponentmode ? 0 : 1;
 
@@ -4314,7 +4317,7 @@ class PlayState extends MusicBeatState
 
 	public var initY:Float;
 	var lastHealth:Float = -1;
-	public var manualDisable:Bool = false; // for modcharts that need the variables otherwise lol
+	public var enableBaseMovement:Bool = false; // for modcharts that need the variables otherwise lol
 	override public function update(elapsed:Float)
 	{
 		if(!inCutscene && !paused && !freezeCamera) {
@@ -4365,7 +4368,7 @@ class PlayState extends MusicBeatState
 		modManager.update(elapsed, curDecBeat, curDecStep);
 
 		//Band-Aid patch but HEY IT WORKS SO I AM NOT COMPLAINING LMAO
-		if (!startingSong && !manualDisable)
+		if (!startingSong && enableBaseMovement)
 			modchartSync(false);
 
 		// TODO: Figure this out
@@ -7977,7 +7980,7 @@ class PlayState extends MusicBeatState
 							} else {
 								// Sync X position
 								var offsetX = strumNote.x - field.baseXPositions[i];
-								modManager.setValue('transform${i}X', (altNoteMove ? offsetX : strumNote.x) - (strumOffsetspacebcauseitsstupid * i) - strumOffsetbcauseitsstupid, field.playerId);
+								modManager.setValue('transform${i}X-a', (altNoteMove ? offsetX : strumNote.x) - (strumOffsetspacebcauseitsstupid * i) - strumOffsetbcauseitsstupid, field.playerId);
 								//strumNote.x = strumNote.x;
 
 								// Sync Y position

Project.xml

@@ -198,8 +198,8 @@ class RankingSubstate extends MusicBeatSubstate
 					TransitionState.transitionState(states.StoryMenuState, {transitionType: "stickers"});
 				case "Freeplay":
 					trace('WENT BACK TO FREEPLAY??');
-					//TransitionState.transitionState(FreeplayManager.getFreeplayState(), {transitionType: "stickers"});
-					MusicManager.playMenuMusic();
+					TransitionState.transitionState(FreeplayManager.getFreeplayState(), {transitionType: "stickers"});
+					//MusicManager.playMenuMusic();
 				case "APFreeplay":
 					trace('WENT BACK TO ARCHIPELAGO FREEPLAY??');
 					//MusicManager.playMenuMusic();