SONG LIMITING YEAAAAAAAAAAAAAAAAHHHHHHHHH

Author: Z11Coding

assets/embed/apworld/fridaynightfunkin.apworld

@@ -106,7 +106,7 @@ class Main extends Sprite
 		Lib.current.addChild(new Main());
 		//Stolen from Psych Online. Thanks for making the next hour of my life not hell.
 		Lib.current.addChild(new archipelago.console.SideUI());
-		Lib.current.addChild(new objects.Nightlight());
+		//Lib.current.addChild(new objects.Nightlight());
 	}
 
 	@:dox(hide)

source/Main.hx

@@ -21,10 +21,10 @@ class APCategoryState extends states.CategoryState {
         };
 
         var quitFunc = function() {
-            AP.disconnect_socket();
+            try{AP.disconnect_socket();}
+            catch(e){}
             states.ExitState.addExitCallback(function() {
                 var restartProcess = new Process("Mixtape.exe", ["APDisconnectError", "restart"]);
-                
             });
             FlxG.switchState(new states.ExitState());
         };

source/archipelago/APCategoryState.hx

@@ -20,6 +20,11 @@ class APConnectingSubState extends FlxSubState
 
 	override function create()
 	{
+		var bg = new FlxSprite();
+		bg.makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
+		bg.screenCenter();
+
+
 		var connectingText = new FlxText(0, 0, 0, "Connecting...", 20);
 		connectingText.color = FlxColor.WHITE;
 
@@ -39,6 +44,8 @@ class APConnectingSubState extends FlxSubState
 
 		connectingText.y = backdrop.y + 5;
 		cancelButton.y = connectingText.y + connectingText.height + 5;
+		
+		add(bg);
 
 		for (item in [backdrop, connectingText, cancelButton])
 		{

source/archipelago/APConnectingSubState.hx

@@ -64,6 +64,7 @@ typedef APOptions =
     var	fakeTransWeight:Int;
     var	shieldWeight:Int;
     var	MHPWeight:Int;
+	var	song_limit:Int;
 }
 
 enum ComboRank {
@@ -161,7 +162,8 @@ class APEntryState extends MusicBeatState
 			tutorialWeight: 15,
 			fakeTransWeight: 15,
 			shieldWeight: 15,
-			MHPWeight: 15 
+			MHPWeight: 15,
+			song_limit: 320,
 		}
 	};
 
@@ -311,7 +313,7 @@ class APEntryState extends MusicBeatState
 		{
 			if(!fileDialog.completed) return;
 			lowFilterAmount = 0.0134;
-			fileDialog.open(_slotInput.text, [new FileFilter('YAML', 'yaml')], function()
+			/*fileDialog.open(_slotInput.text, [new FileFilter('YAML', 'yaml')], function()
 			{
 				FlxTween.num(0.0134, 1, 1, {ease: FlxEase.sineInOut}, function(t) {
 					APEntryState.lowFilterAmount = t;
@@ -345,12 +347,13 @@ class APEntryState extends MusicBeatState
 					gameSettings.FNF.MHPWeight = Std.parseInt(fnfData.get('MHPWeight'));
 					gameSettings.FNF.accrequirement = fnfData.get('accrequirement');
 					gameSettings.FNF.graderequirement = fnfData.get('graderequirement');
+				    gameSettings.FNF.song_limit = fnfData.get('song_limit');
 				}
 				catch(e:Exception)
 				{
 					trace(e.stack);
 				}
-			});
+			});*/
 		});
 		yamlImport.x = (FlxG.width / 2) + 10 + yamlImport.width;
 		yamlImport.y = yamlGen.y - 50;
@@ -472,10 +475,10 @@ class APEntryState extends MusicBeatState
 		fullSongCount = slotData.fullSongCount;
 		APInfo.ticketWinCount = slotData.ticketWinCount;
 		APInfo.ticketCount = 0;
-		FlxG.save.data.gradesandacc = [slotData.gradeNeeded, slotData.accuracyNeeded];
-		FlxG.save.flush();
+		APInfo.grabLimits(slotData.gradeNeeded, slotData.accuracyNeeded);
 		APInfo.unlockMethod = slotData.locationType;
 		//APInfo.unlockType = slotData.locationMethod;
+		FlxG.save.flush();
 		trace(APInfo.unlockMethod);
 		closeSubState();
 		inArchipelagoMode = true;
@@ -788,7 +791,9 @@ class APEntryState extends MusicBeatState
 				+ "\nShield Weight: "
 				+ gameSettings.FNF.shieldWeight
 				+ "\nMax HP Weight: "
-				+ gameSettings.FNF.MHPWeight;
+				+ gameSettings.FNF.MHPWeight
+				+ "\nSong Limit: "
+				+ gameSettings.FNF.song_limit;
 		} catch (e:Dynamic) {
 			trace("Error updating bpmTxt: " + e);
 		}

source/archipelago/APEntryState.hx

@@ -1,5 +1,6 @@
 package archipelago;
 
+import substates.RankingSubstate;
 class APInfo {
 	public static var ap:Client;
 	public static var apGame:APGameState;
@@ -10,13 +11,46 @@ class APInfo {
 	public static var unlockMethod:String = "Song Completion";
 	public static var unlockType:String = "Per Song";
 
-	public static var hasNoteChecks(get, never):Bool;
+	public static var accRankSetLimit:Int = 0;
+	public static var comboRankSetLimit:Int = 0;
 
+	public static var hasNoteChecks(get, never):Bool;
 	public static var hasSongChecks(get, never):Bool;
-
 	public static var hintPoints(get, never):Int;
 	public static var hintCost(get, never):Int;
 
+	public static var gradeList:Array<String> = 
+	[
+		'Any',
+		"MFC",
+		"SFC",
+		"GFC",
+		"AFC",
+		"FC",
+		"SDCB"
+	];
+
+	public static var accuracyList:Array<String> = 
+	[
+		"Any",
+		"P",
+		"X",
+		"X-",
+		"SS+",
+		"SS",
+		"SS-",
+		"S+",
+		"S",
+		"S-",
+		"A+",
+		"A",
+		"A-",
+		"B",
+		"C",
+		"D",
+		"E",
+	];
+
 	// All things to escape when making song names.
 	public static var YAMLEscapeMap:Map<String, String>  = [
 		"<cOpen>" => "{",
@@ -143,5 +177,62 @@ class APInfo {
 		'Beat Battle 2'
 	];
 
+	// TODO: Make this better lol
+    public static function grabLimits(grade:String, accuracy:String) {
+        switch (grade) {
+            case 'Any':
+                comboRankSetLimit = 0;
+            case "MFC":
+                comboRankSetLimit = 1;
+            case "SFC":
+                comboRankSetLimit = 2;
+            case "GFC":
+                comboRankSetLimit = 3;
+            case "AFC":
+                comboRankSetLimit = 4;
+            case "FC":
+                comboRankSetLimit = 5;
+            case "SDCB":
+                comboRankSetLimit = 6;
+        }
+
+        switch (accuracy) {
+            case "Any":
+                accRankSetLimit = 0;
+            case "P":
+                accRankSetLimit = 1;
+            case "X":
+                accRankSetLimit = 2;
+            case "X-":
+                accRankSetLimit = 3;
+            case "SS+":
+                accRankSetLimit = 4;
+            case "SS":
+                accRankSetLimit = 5;
+            case "SS-":
+                accRankSetLimit = 6;
+            case "S+":
+                accRankSetLimit = 7;
+            case "S":
+                accRankSetLimit = 8;
+            case "S-":
+                accRankSetLimit = 9;
+            case "A+":
+                accRankSetLimit = 10;
+            case "A":
+                accRankSetLimit = 11;
+            case "A-":
+                accRankSetLimit = 12;
+            case "B":
+                accRankSetLimit = 13;
+            case "C":
+                accRankSetLimit = 14;
+            case "D":
+                accRankSetLimit = 15;
+            case "E":
+                accRankSetLimit = 16;
+        }
+    }
+
 
 }

source/archipelago/APInfo.hx

@@ -220,14 +220,14 @@ class APPlayState extends PlayState {
                     dad.shader = originalShaders.get(dad);
                     if (gf != null) gf.shader = originalShaders.get(gf);
                     blurEffect.setStrength(0, 0);
-                    camGamefilters.remove(filterMap.get("BlurLittle").filter);
+                    camGame.filters.remove(filterMap.get("BlurLittle").filter);
                 };
                 var playSound:String = "blur";
                 var playSoundVol:Float = 0.7;
                 var noIcon:Bool = false;
 
                 if (effectsActive["blur"] == null || effectsActive["blur"] <= 0) {
-                    camGamefilters.push(filterMap.get("BlurLittle").filter);
+                    camGame.filters.push(filterMap.get("BlurLittle").filter);
                     if (PlayState.curStage.startsWith('school'))
                         blurEffect.setStrength(2, 2);
                     else
@@ -1047,7 +1047,7 @@ class APPlayState extends PlayState {
                     blurEffect.setStrength(32, 32);
                 }
 
-                applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, 'lowpass');
+                applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, true, 'lowpass');
             },
             'songSwitch' => function() {
                 // var haltTween:NumTween = new NumTween(null, null);

source/archipelago/APPlayState.hx

@@ -35,6 +35,7 @@ class APSettingsSubState extends MusicBeatSubstate {
     var fakeTransWeight:PsychUISlider;
     var shieldWeight:PsychUISlider;
     var MHPWeight:PsychUISlider;
+    var songLimit:PsychUISlider;
     var gradientBar:FlxSprite;
     var dim:FlxSprite;
     public static function generateSongList() {
@@ -123,37 +124,8 @@ class APSettingsSubState extends MusicBeatSubstate {
         unlockType.list = ["Per Song", "Per Week"];
         unlockMethod.list = ["Note Checks", "Song Completion", "Both"];
 
-        gradeRequirement.list =
-        [
-            'Any',
-            "MFC",
-            "SFC",
-            "GFC",
-            "AFC",
-            "FC",
-            "SDCB"
-        ];
-
-        accRequirement.list =
-        [
-            "Any",
-            "P",
-            "X",
-            "X-",
-            "SS+",
-            "SS",
-            "SS-",
-            "S+",
-            "S",
-            "S-",
-            "A+",
-            "A",
-            "A-",
-            "B",
-            "C",
-            "D",
-            "E",
-        ];
+        gradeRequirement.list = APInfo.gradeList;
+        accRequirement.list = APInfo.accuracyList;
 
         setDefaults();
 
@@ -179,6 +151,7 @@ class APSettingsSubState extends MusicBeatSubstate {
         chartmodifierchance.value = APEntryState.gameSettings.FNF.chart_modifier_change_chance;
         shieldWeight.value = APEntryState.gameSettings.FNF.shieldWeight;
         MHPWeight.value = APEntryState.gameSettings.FNF.MHPWeight;
+        songLimit.value = APEntryState.gameSettings.FNF.song_limit;
     }
 
     function addMainSettings()
@@ -249,6 +222,9 @@ class APSettingsSubState extends MusicBeatSubstate {
         {
             APEntryState.gameSettings.FNF.mods_enabled = allowMods.checked;
             generateSongList();
+            songLimit.max = globalSongList.length;
+            if (songLimit.value > songLimit.max)
+                songLimit.value = songLimit.max;
         });
 
         objY += 50;
@@ -265,9 +241,18 @@ class APSettingsSubState extends MusicBeatSubstate {
             trace(id); 
         });
 
+        objX -= 150;
+        objY += 50;
+        songLimit = new PsychUISlider(objX, objY, function(v:Float) APEntryState.gameSettings.FNF.song_limit = Std.int(v));
+        songLimit.decimals = 0;
+        songLimit.min = 5;
+        songLimit.max = globalSongList.length;
+
         tab_group.add(new FlxText(gradeRequirement.x, gradeRequirement.y - 15, 120, 'Grade Requirement:'));
         tab_group.add(new FlxText(accRequirement.x, accRequirement.y - 15, 120, 'Accuracy Requirement:'));
+        tab_group.add(new FlxText(songLimit.x, songLimit.y - 15, 120, 'Song Limit:'));
         tab_group.add(allowMods);
+        tab_group.add(songLimit);
         tab_group.add(accRequirement);
         tab_group.add(gradeRequirement);
     }
@@ -374,6 +359,9 @@ class APSettingsSubState extends MusicBeatSubstate {
             }
         }
 
+        // for that true random type beat
+        FlxG.random.shuffle(APEntryState.gameSettings.FNF.songList);
+
 
         var mainSettings = {name: APEntryState.yamlName, description: APEntryState.gameSettings.description, game: APEntryState.gameSettings.game};
         var document = Yaml.render(mainSettings, Renderer.options().setFlowLevel(1));

source/archipelago/APSettingsSubState.hx

@@ -185,7 +185,7 @@ class FPSCounter extends TextField
 
 		if (ClientPrefs.data.performanceCounter.contains('mem'))
 		{
-			curMemory = _updateMemTimer >= 100.0 ? curMemory : obtainMemory();
+			curMemory = _updateMemTimer >= 100.0 ? curMemory : MemoryUtil.currentMemUsage();
 			if (curMemory >= maxMemory)
 				maxMemory = curMemory;
 			text += 'MEM: ${CoolUtil.formatMemory(Std.int(curMemory))}';
@@ -212,7 +212,7 @@ class FPSCounter extends TextField
 
 	function obtainMemory():Dynamic
 	{
-		return Math.abs(FlxMath.roundDecimal(System.totalMemory / 1000000, 1));
+		return System.totalMemory;
 	}
 	// #end