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

Author: Yuta12342

.flight/icons/yuta.png

@@ -11,12 +11,12 @@
       "members": [
         {
           "name": "Z11Gaming",
-          "icon": "icons/z11.webp",
+          "icon": "icons/z11.png",
           "role": "Main Creater of the engine"
         },
         {
           "name": "Yutamon",
-          "icon": "icons/yuta.webp",
+          "icon": "icons/yuta.png",
           "role": "Co-Creater of the engine"
         }
       ]

.flight/metadata.json

@@ -1,6 +1,6 @@
 {	
-	"titlex":150,
-	"titley":6500,
+	"titlex":50,
+	"titley":50,
 	"startx":100,
 	"starty":576,
 	"gfChar":true,

assets/shared/images/credits/yuta.png

@@ -47,6 +47,7 @@ import sys.io.Process;
 import haxe.io.BytesOutput;
 #end
 
+import backend.modules.*;
 import backend.Highscore;
 
 // NATIVE API STUFF, YOU CAN IGNORE THIS AND SCROLL //
@@ -446,9 +447,10 @@ class Main extends Sprite
 			handleStateBasedClosing();
 		}
 
-		backend.modules.EvacuateDebugPlugin.initialize();
-		backend.modules.ForceCrashPlugin.initialize();
-		backend.modules.MemoryGCPlugin.initialize();
+		EvacuateDebugPlugin.initialize();
+		ForceCrashPlugin.initialize();
+		MemoryGCPlugin.initialize();
+		FullScreenPlugin.initialize();
 
 
 		// trace("Game Dialog Test 1: " + dialogs.Dialogs.open('Test for Open', [{ext:'txt', desc:'Text files'}]));

assets/shared/images/gfDanceTitle.json

@@ -419,9 +419,12 @@ class APSettingsSubState extends MusicBeatSubstate {
 
         comment += "# This YAML file was generated by Mixtape Engine.\n";
         comment += "# The amount of songs in this YAML is " + Reflect.field(yamlThing, "songList").length + ".\n";
-        comment += "# The amount of checks possible is " + APEntryState.gameSettings.FNF.songList.length * 5 + ".\n";
-        comment += "# The amount of checks if just Song Completion is used is " + APEntryState.gameSettings.FNF.songList.length * 2 + ".\n";
-        comment += "# The amount of checks if just Note Checks is used is " + APEntryState.gameSettings.FNF.songList.length * 3 + ".\n";
+        comment += "# The amount of checks (total) possible is " + APEntryState.gameSettings.FNF.songList.length * 5 + ".\n";
+        comment += "# The amount of checks (total) if just Song Completion is used is " + APEntryState.gameSettings.FNF.songList.length * 2 + ".\n";
+        comment += "# The amount of checks (total) if just Note Checks is used is " + APEntryState.gameSettings.FNF.songList.length * 3 + ".\n";
+        comment += "# The amount of checks (currently) possible is " + ((APEntryState.gameSettings.FNF.songList.length * 5) - APEntryState.gameSettings.FNF.song_limit) + ".\n";
+        comment += "# The amount of checks (currently) if just Song Completion is used is " + ((APEntryState.gameSettings.FNF.songList.length * 2) - APEntryState.gameSettings.FNF.song_limit) + ".\n";
+        comment += "# The amount of checks (currently) if just Note Checks is used is " + ((APEntryState.gameSettings.FNF.songList.length * 3) - APEntryState.gameSettings.FNF.song_limit) + ".\n";
         comment += "\n";
 
         var yamlString = "Friday Night Funkin:\n";

source/Main.hx

@@ -346,15 +346,15 @@ class MusicBeatState extends FlxState
 				@:privateAccess
 				(cast state:PlayState).preGenerateNotes();
 			}
-		}
-		// "FreeplayState" => function(state:FlxState) {
+		}/*,
+		"FreeplayState" => function(state:FlxState) {
 
-		// 		FreeplayManager.reloadFreeplay();
+				FreeplayManager.reloadFreeplay();
 
-		// },
-		// "OsuFreeplayState" => function(state:FlxState) {
-		// 		FreeplayManager.reloadFreeplay();
-		// }
+		},
+		"OsuFreeplayState" => function(state:FlxState) {
+				FreeplayManager.reloadFreeplay();
+		}*/
 	];
 
 	public function hashCode():Int

source/archipelago/APSettingsSubState.hx

@@ -0,0 +1,35 @@
+package backend.modules;
+
+import flixel.FlxBasic;
+
+/**
+ * A plugin which enables and disables fullscreen.
+ */
+class FullScreenPlugin extends FlxBasic
+{
+  public function new()
+  {
+    super();
+  }
+
+  public static function initialize():Void
+  {
+    FlxG.plugins.addPlugin(new FullScreenPlugin());
+  }
+
+  public override function update(elapsed:Float):Void
+  {
+    super.update(elapsed);
+
+    // Fullscreen Keybind = Toggles Fullscreen lol
+    if (Controls.instance?.justPressed('fullscreen'))
+    {
+      FlxG.fullscreen = !FlxG.fullscreen;
+    }
+  }
+
+  public override function destroy():Void
+  {
+    super.destroy();
+  }
+}

source/backend/MusicBeatState.hx

@@ -125,13 +125,6 @@ class MixtapeSettingsSubState extends BaseOptionsMenu
 		addOption(option);
 		option.displayFormat = '< %v >';
 
-		var option:Option = new Option('Ghost Effect', 
-			"If checked, does the ever-so-popular double/triple/quadrouple ghost effect.", 
-			'doubleGhosts', 
-			BOOL
-		);
-		addOption(option);
-
 		var option:Option = new Option('Show Keybinds on Start Song',
 			"If checked, your keybinds will be shown on the strum that they correspond to when you start a song.",
 			'showKeybindsOnStart',
@@ -178,13 +171,13 @@ class MixtapeSettingsSubState extends BaseOptionsMenu
 			LABEL);
 		addOption(option);
 
-		// var freemenus:Array<String> = ['Mixtape', 'Osu', 'Base Game'];
-		// for (theme in Mods.mergeAllTextsNamed('menus/'))
+		var freemenus:Array<String> = ['Mixtape', 'Osu', 'Base Game'];
+		//for (theme in Mods.mergeAllTextsNamed('menus/'))
 		var option:Option = new Option('Freeplay Menu:',
 			"Which freeplay menu do you prefer?\n(This has no effect on Archipelago Mode)\nBASE GAME DOES NOTHING FOR NOW!",
 			'freeplayMenu',
 			STRING,
-			['Mixtape', 'Osu', 'Base Game']);
+			freemenus);
 		addOption(option);
 		option.displayFormat = '< %v >';
 

source/backend/modules/FullScreenPlugin.hx

@@ -5,6 +5,8 @@ import archipelago.APEntryState;
 import yutautil.modules.SyncUtils;
 import flixel.input.keyboard.FlxKey;
 import backend.AudioSwitchFix;
+import backend.util.NativeAPI;
+
 class FirstCheckState extends MusicBeatState
 {
 	public static var muteKeys:Array<FlxKey> = [FlxKey.ZERO];
@@ -44,6 +46,10 @@ class FirstCheckState extends MusicBeatState
 			ClientPrefs.loadPrefs();
 			Language.reloadPhrases();
 			AudioSwitchFix.init();
+			if (!Paths.exists(Paths.imagePath('fred'))) {
+				NativeAPI.showMessageBox('WHERE IS HE!?!?', "WHERE'S FRED???\nYOU CAN'T COME HERE WITHOUT FRED!", MSG_ERROR);
+				Sys.exit(1);
+			}
 		}
 
 		super.create();