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

Yuta12342 · Yuta12342 · commit 566896bcdb87 · 2025-06-22T20:08:44.000-04:00
diff --git a/assets/shared/images/achievements/potato.png b/assets/shared/images/achievements/potato.png
diff --git a/assets/shared/images/achievements/search_songs.png b/assets/shared/images/achievements/search_songs.png
diff --git a/setup/unixLinux.sh b/setup/unixLinux.sh
@@ -11,32 +11,32 @@ echo This might take a few moments depending on your internet speed.
 haxelib install lime 8.1.2
 haxelib install openfl 9.3.3
 haxelib install flixel 5.6.1
-haxelib install flixel-addons 3.2.2
+haxelib install flixel-addons 3.3.2
 haxelib install flixel-tools 1.5.1
 haxelib install hscript-iris 1.1.3
 haxelib install tjson 1.4.0
 haxelib install hxdiscord_rpc 1.2.4
 haxelib install hxvlc 2.0.1 --skip-dependencies
-haxelib install lime 8.1.2
-haxelib install openfl 9.3.3
 haxelib install helder.set 0.3.1
 haxelib install yaml 2.0.1
 haxelib install hxWebSockets 1.4.0
 haxelib install haxe-concurrent 5.1.3
 haxelib install actuate 1.9.0
 haxelib install flixel-ui 2.6.1
 haxelib install hscript 2.5.0
+haxelib install noisehx
+haxelib set lime 8.1.2
+haxelib set openfl 9.3.3
+haxelib git linc_dialogs https://github.com/snowkit/linc_dialogs.git
 haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
 haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
-haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
-haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
-haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
-haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
+haxelib git funkin.vis https://github.com/beihu235/funkVis-FrequencyFixed
 haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
 haxelib git haxeui-core https://github.com/haxeui/haxeui-core 51c23588614397089a5ce182cddea729f0be6fa0
 haxelib git haxeui-flixel https://github.com/haxeui/haxeui-flixel da27e833947f32ef007ed11f523aa5524f5a5d54
 haxelib git flixel-text-input https://github.com/FunkinCrew/flixel-text-input 951a0103a17bfa55eed86703ce50b4fb0d7590bc
 haxelib git FlxPartialSound https://github.com/FunkinCrew/FlxPartialSound.git f986332ba5ab02abd386ce662578baf04904604a
+haxelib git moonchart https://github.com/MaybeMaru/moonchart
 haxelib git tentools https://github.com/TentaRJ/tentools.git
 haxelib git systools https://github.com/haya3218/systools
 haxelib run lime rebuild systools linux
diff --git a/setup/unixMac.sh b/setup/unixMac.sh
@@ -11,33 +11,32 @@ echo This might take a few moments depending on your internet speed.
 haxelib install lime 8.1.2
 haxelib install openfl 9.3.3
 haxelib install flixel 5.6.1
-haxelib install flixel-addons 3.2.2
+haxelib install flixel-addons 3.3.2
 haxelib install flixel-tools 1.5.1
 haxelib install hscript-iris 1.1.3
 haxelib install tjson 1.4.0
 haxelib install hxdiscord_rpc 1.2.4
 haxelib install hxvlc 2.0.1 --skip-dependencies
-haxelib install lime 8.1.2
-haxelib install openfl 9.3.3
 haxelib install helder.set 0.3.1
 haxelib install yaml 2.0.1
 haxelib install hxWebSockets 1.4.0
 haxelib install haxe-concurrent 5.1.3
 haxelib install actuate 1.9.0
 haxelib install flixel-ui 2.6.1
 haxelib install hscript 2.5.0
+haxelib install noisehx
+haxelib set lime 8.1.2
+haxelib set openfl 9.3.3
+haxelib git linc_dialogs https://github.com/snowkit/linc_dialogs.git
 haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
 haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
-haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
-haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
-haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
-haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
-haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
+haxelib git funkin.vis https://github.com/beihu235/funkVis-FrequencyFixed
 haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
 haxelib git haxeui-core https://github.com/haxeui/haxeui-core 51c23588614397089a5ce182cddea729f0be6fa0
 haxelib git haxeui-flixel https://github.com/haxeui/haxeui-flixel da27e833947f32ef007ed11f523aa5524f5a5d54
 haxelib git flixel-text-input https://github.com/FunkinCrew/flixel-text-input 951a0103a17bfa55eed86703ce50b4fb0d7590bc
 haxelib git FlxPartialSound https://github.com/FunkinCrew/FlxPartialSound.git f986332ba5ab02abd386ce662578baf04904604a
+haxelib git moonchart https://github.com/MaybeMaru/moonchart
 haxelib git tentools https://github.com/TentaRJ/tentools.git
 haxelib git systools https://github.com/haya3218/systools
 haxelib run lime rebuild systools mac
diff --git a/setup/windows.bat b/setup/windows.bat
@@ -20,16 +20,19 @@ haxelib install haxe-concurrent 5.1.3
 haxelib install actuate 1.9.0
 haxelib install flixel-ui 2.6.1
 haxelib install hscript 2.5.0
+haxelib install noisehx
 haxelib set lime 8.1.2
 haxelib set openfl 9.3.3
+haxelib git linc_dialogs https://github.com/snowkit/linc_dialogs.git
 haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
 haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7
-haxelib git funkin.vis https://github.com/FunkinCrew/funkVis 22b1ce089dd924f15cdc4632397ef3504d464e90
+haxelib git funkin.vis https://github.com/beihu235/funkVis-FrequencyFixed
 haxelib git grig.audio https://gitlab.com/haxe-grig/grig.audio.git cbf91e2180fd2e374924fe74844086aab7891666
 haxelib git haxeui-core https://github.com/haxeui/haxeui-core 51c23588614397089a5ce182cddea729f0be6fa0
 haxelib git haxeui-flixel https://github.com/haxeui/haxeui-flixel da27e833947f32ef007ed11f523aa5524f5a5d54
 haxelib git flixel-text-input https://github.com/FunkinCrew/flixel-text-input 951a0103a17bfa55eed86703ce50b4fb0d7590bc
 haxelib git FlxPartialSound https://github.com/FunkinCrew/FlxPartialSound.git f986332ba5ab02abd386ce662578baf04904604a
+haxelib git moonchart https://github.com/MaybeMaru/moonchart
 haxelib git tentools https://github.com/TentaRJ/tentools.git
 haxelib git systools https://github.com/haya3218/systools
 haxelib run lime rebuild systools windows
diff --git a/source/backend/Achievements.hx b/source/backend/Achievements.hx
@@ -91,7 +91,9 @@ class Achievements {
 		createAchievement('hype',					{name: "Hyperactive", description: "Finish a Song without going back to Idle."});
 		createAchievement('two_keys',				{name: "Just the Two of Us", description: "Finish a Song pressing only two keys."});
 		createAchievement('toastie',				{name: "Toaster Gamer", description: "Have you tried to run the game on a toaster?"});
+		createAchievement('potato',					{name: "The Ultimate Potato", description: "The minimum requirement to run the game on a potato."});
 		createAchievement('debugger',				{name: "Debugger", description: "Beat the \"Test\" Stage from the Chart Editor.", hidden: true});
+		createAchievement('search_songs',			{name: "The Music Lost to Time", description: "Find all 3 secret freeplay songs\n(And no, playing them in archipelago mode doesn't count)", maxScore: 3, maxDecimals: 0});
 		
 		// Secret achievements
 		createAchievement('pessy_easter_egg',		{name: "Engine Gal Pal", description: "Teehee, you found me~!", hidden: true});
@@ -132,7 +134,7 @@ class Achievements {
 			_firstLoad = false;
 		}
 	}
-
+	
 	public static function save():Void
 	{
 		FlxG.save.data.achievementsUnlocked = achievementsUnlocked;
diff --git a/source/backend/MusicBeatChartingState.hx b/source/backend/MusicBeatChartingState.hx
@@ -1,7 +1,9 @@
 package backend;
 
 import flixel.addons.ui.FlxUIState;
+#if windows
 import backend.window.CppAPI;
+#end
 import flixel.FlxState;
 import backend.PsychCamera;
 import archipelago.APEntryState;
@@ -135,10 +137,12 @@ class MusicBeatChartingState extends FlxUIState
 
 	override function update(elapsed:Float)
 	{
+		#if windows
 		if (emergencyOpacityFix) {
 			CppAPI.setWindowOppacity(1);
 			emergencyOpacityFix = false;
 		}
+		#end
 
 		if (Main.audioDisconnected && getState() == PlayState.instance)
 		{
diff --git a/source/backend/MusicBeatState.hx b/source/backend/MusicBeatState.hx
@@ -1,7 +1,9 @@
 package backend;
 
 import haxe.ds.HashMap;
+#if windows
 import backend.window.CppAPI;
+#end
 import flixel.FlxState;
 import backend.PsychCamera;
 import archipelago.APEntryState;
@@ -166,6 +168,7 @@ class MusicBeatState extends FlxState
 
 	override function update(elapsed:Float)
 	{
+		#if windows
 		if (emergencyOpacityFix) {
 			CppAPI.setWindowOppacity(1);
 			emergencyOpacityFix = false;
@@ -179,6 +182,7 @@ class MusicBeatState extends FlxState
 			FlxG.resetState();
 		}
 		else if (Main.audioDisconnected) FlxG.resetState();
+		#end
 		
 		// everyStep();
 		var oldStep:Int = curStep;
diff --git a/source/backend/Paths.hx b/source/backend/Paths.hx
@@ -234,9 +234,7 @@ class Paths
 
 			return new FlxRuntimeShader(
 				fragFile==null ? null : File.getContent(fragPath), 
-				vertFile==null ? null : File.getContent(vertPath),
-				//version
-			);
+				vertFile==null ? null : File.getContent(vertPath));
 		}catch(e:Dynamic){
 			trace("Shader compilation error:" + e.message);
 		}
diff --git a/source/backend/TransitionState.hx b/source/backend/TransitionState.hx
@@ -499,7 +499,8 @@ class TransitionState {
                     CppAPI.setWindowOppacity(num);
                 });
                 #end
-            case 'transparent close': var psPause = states.PlayState.instance?.paused;
+            case 'transparent close': 
+                var psPause = states.PlayState.instance?.paused;
                 if (FlxG.sound.music != null && FlxG.sound.music.playing)
                 {
                     try {
diff --git a/source/flixel/animation/FlxAnimationController.hx b/source/flixel/animation/FlxAnimationController.hx
@@ -772,7 +772,7 @@ class FlxAnimationController implements IFlxDestroyable
 		final name = frames[0].name;
 		final postIndex = name.indexOf(".", prefix.length);
 		final suffix = name.substring(postIndex == -1 ? name.length : postIndex, name.length);
-		FlxFrame.sortFrames(frames, prefix, suffix);
+		FlxFrame.sort(frames, prefix.length, suffix.length);
 		
 		for (frame in frames)
 		{
diff --git a/source/states/PlayState.hx b/source/states/PlayState.hx
@@ -6217,7 +6217,7 @@ class PlayState extends MusicBeatState
 		#if ACHIEVEMENTS_ALLOWED
 		var weekNoMiss:String = WeekData.getWeekFileName() + '_nomiss';
 		var week:String = WeekData.getWeekFileName();
-		checkForAchievement([weekNoMiss, week, 'ur_bad', 'ur_good', 'hype', 'two_keys', 'toastie', 'debugger', 'play_fnf', 'pico_mixed', 'pico_stressed', 'l', 'a_freaky', 'true_funker', 'nice', 'mfc', 'sfc', 'gfc', 'afc', 'fc', 'sdcb', 'clear', 'erect', 'nightmare']);
+		checkForAchievement([weekNoMiss, week, 'ur_bad', 'ur_good', 'hype', 'two_keys', 'toastie', 'potato', 'debugger', 'play_fnf', 'pico_mixed', 'pico_stressed', 'l', 'a_freaky', 'true_funker', 'nice', 'mfc', 'sfc', 'gfc', 'afc', 'fc', 'sdcb', 'clear', 'erect', 'nightmare']);
 		#end
 
 		var ret:Dynamic = callOnScripts('onEndSong', null, true);
@@ -8132,6 +8132,25 @@ class PlayState extends MusicBeatState
 					case 'toastie':
 						unlock = (!ClientPrefs.data.shaders && ClientPrefs.data.lowQuality && !ClientPrefs.data.antialiasing);
 
+						// The ultimate potato gamer
+					case 'potato':
+						unlock = (!ClientPrefs.data.shaders 
+							&& ClientPrefs.data.lowQuality 
+							&& !ClientPrefs.data.antialiasing 
+							&& ClientPrefs.data.framerate <= 30
+							&& !ClientPrefs.data.comboStacking
+							&& !ClientPrefs.data.opponentNotes
+							&& !ClientPrefs.data.gimmicksAllowed
+							&& !ClientPrefs.data.modcharts
+							&& ClientPrefs.data.hitsoundVolume == 0
+							&& !ClientPrefs.data.doubleGhosts
+							&& !ClientPrefs.data.stageGimmick
+							&& ClientPrefs.data.optimizeHolds
+							&& ClientPrefs.data.holdSubdivs == 1
+							&& ClientPrefs.data.drawDistanceModifier == 0.8
+							&& !ClientPrefs.data.allowVis
+							&& !ClientPrefs.data.allowEvents);
+
 					case 'debugger':
 						unlock = (songName == 'test' && !usedPractice);
 
diff --git a/source/states/freeplay/FreeplayState.hx b/source/states/freeplay/FreeplayState.hx
@@ -116,9 +116,9 @@ class FreeplayState extends MusicBeatState
 
 	var hh:Array<Chance> = [
 		{item: "normal error", chance: 95}, // 95% chance to got the normal error screen
-		{item: "small argument", chance: FlxG.save.data.gotsmallargument || APEntryState.inArchipelagoMode ? 0 : 5}, // 5% chance to play Small Argument if not already unlocked or in Archipelago Mode
-		{item: "beat battle", chance: FlxG.save.data.gotbeatbattle || APEntryState.inArchipelagoMode ? 0 : 5}, // 5% chance to play Beat Battle if not already unlocked or in Archipelago Mode
-		{item: "beat battle 2", chance: FlxG.save.data.gotbeatbattle2 || APEntryState.inArchipelagoMode ? 0 : 5} // 5% chance to do Beat Battle 2 if not already unlocked or in Archipelago Mode
+		if (!FlxG.save.data.gotsmallargument && !APEntryState.inArchipelagoMode) {item: "small argument", chance: 5}, // 5% chance to play Small Argument if not already unlocked or in Archipelago Mode
+		if (!FlxG.save.data.gotbeatbattle && !APEntryState.inArchipelagoMode) {item: "beat battle", chance: 5}, // 5% chance to play Beat Battle if not already unlocked or in Archipelago Mode
+		if (!FlxG.save.data.gotbeatbattle2 && !APEntryState.inArchipelagoMode) {item: "beat battle 2", chance: 5} // 5% chance to do Beat Battle 2 if not already unlocked or in Archipelago Mode
 	];
 
 	var ticketCounter:FlxText = null;
@@ -856,14 +856,17 @@ class FreeplayState extends MusicBeatState
 									Song.loadFromJson('small-argument-hard', 'small-argument');
 									FlxG.save.data.gotIntoAnArgument = true;
 									FlxG.save.flush();
+									Achievements.addScore("search_songs");
 								case "beat battle":
 									Song.loadFromJson('beat-battle-reasonable', 'beat-battle');
 									FlxG.save.data.gotbeatbattle = true;
 									FlxG.save.flush();
+									Achievements.addScore("search_songs");
 								case "beat battle 2":
 									Song.loadFromJson('beat-battle-2-hard', 'beat-battle-2');
 									FlxG.save.data.gotbeatbattle2 = true;
 									FlxG.save.flush();
+									Achievements.addScore("search_songs");
 								case "normal error":
 									trace('ERROR! NO SONGS FOUND!');
 
diff --git a/vscode-project.hxml b/vscode-project.hxml
@@ -0,0 +1,3 @@
+#automatically generated do not edit
+#@date Fri Jun 20 2025 21:16:51 GMT-0400 (Eastern Daylight Time)
+-cp c:\users\zanez\appdata\local\temp\e3d3b987f152bdbcb9d4b909e0ad11b21ae95112

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,9 @@ class Achievements {`
`91`	`91`	`createAchievement('hype', {name: "Hyperactive", description: "Finish a Song without going back to Idle."});`
`92`	`92`	`createAchievement('two_keys', {name: "Just the Two of Us", description: "Finish a Song pressing only two keys."});`
`93`	`93`	`createAchievement('toastie', {name: "Toaster Gamer", description: "Have you tried to run the game on a toaster?"});`
	`94`	`+ createAchievement('potato', {name: "The Ultimate Potato", description: "The minimum requirement to run the game on a potato."});`
`94`	`95`	`createAchievement('debugger', {name: "Debugger", description: "Beat the \"Test\" Stage from the Chart Editor.", hidden: true});`
	`96`	`+ createAchievement('search_songs', {name: "The Music Lost to Time", description: "Find all 3 secret freeplay songs\n(And no, playing them in archipelago mode doesn't count)", maxScore: 3, maxDecimals: 0});`
`95`	`97`
`96`	`98`	`// Secret achievements`
`97`	`99`	`createAchievement('pessy_easter_egg', {name: "Engine Gal Pal", description: "Teehee, you found me~!", hidden: true});`
`@@ -132,7 +134,7 @@ class Achievements {`
`132`	`134`	`_firstLoad = false;`
`133`	`135`	`}`
`134`	`136`	`}`
`135`		`-`
	`137`	`+`
`136`	`138`	`public static function save():Void`
`137`	`139`	`{`
`138`	`140`	`FlxG.save.data.achievementsUnlocked = achievementsUnlocked;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`package backend;`
`2`	`2`
`3`	`3`	`import flixel.addons.ui.FlxUIState;`
	`4`	`+#if windows`
`4`	`5`	`import backend.window.CppAPI;`
	`6`	`+#end`
`5`	`7`	`import flixel.FlxState;`
`6`	`8`	`import backend.PsychCamera;`
`7`	`9`	`import archipelago.APEntryState;`
`@@ -135,10 +137,12 @@ class MusicBeatChartingState extends FlxUIState`
`135`	`137`
`136`	`138`	`override function update(elapsed:Float)`
`137`	`139`	`{`
	`140`	`+ #if windows`
`138`	`141`	`if (emergencyOpacityFix) {`
`139`	`142`	`CppAPI.setWindowOppacity(1);`
`140`	`143`	`emergencyOpacityFix = false;`
`141`	`144`	`}`
	`145`	`+ #end`
`142`	`146`
`143`	`147`	`if (Main.audioDisconnected && getState() == PlayState.instance)`
`144`	`148`	`{`