e

Author: Yuta12342

source/archipelago/APAdvancedSettingsState.hx

@@ -1853,6 +1853,24 @@ class APAdvancedSettingsState extends MusicBeatState
 			if (songData.folder != null && songData.folder.length > 0)
 			{
 				formattedName = songData.songName + " (" + songData.folder + ")";
+
+				// Check if this is a modded song and mods are disabled
+				if (!allowMods)
+				{
+					allowMods = true;
+					startingSong = formattedName;
+					startingSongData = songData;
+					updateSongStats();
+					refreshCurrentPage();
+
+					// Show info notification about enabling mods
+					var infoPanel = new InfoPanelSubstate("Mods Auto-Enabled",
+						"Mods have been automatically enabled because you selected a modded song:\n\n" +
+						formattedName + "\n\nThis setting has been updated in your configuration.",
+						FlxColor.LIME);
+					openSubState(infoPanel);
+					return;
+				}
 			}
 
 			startingSong = formattedName;
@@ -1883,6 +1901,24 @@ class APAdvancedSettingsState extends MusicBeatState
 			if (songData.folder != null && songData.folder.length > 0)
 			{
 				formattedName = songData.songName + " (" + songData.folder + ")";
+
+				// Check if this is a modded song and mods are disabled
+				if (!allowMods)
+				{
+					allowMods = true;
+					victorySong = formattedName;
+					victorySongData = songData;
+					updateSongStats();
+					refreshCurrentPage();
+
+					// Show info notification about enabling mods
+					var infoPanel = new InfoPanelSubstate("Mods Auto-Enabled",
+						"Mods have been automatically enabled because you selected a modded song:\n\n" +
+						formattedName + "\n\nThis setting has been updated in your configuration.",
+						FlxColor.LIME);
+					openSubState(infoPanel);
+					return;
+				}
 			}
 
 			victorySong = formattedName;

source/archipelago/APPlayState.hx

@@ -2239,10 +2239,12 @@ class APPlayState extends PlayState {
                 cause = "???\n[pause:0.5](Someone died... somehow...)\n[pause:0.5](Unsure how...)";
             }
             COD.setCOD(null, cause);
-            if (!alreadyKilledByLink) {
+            if (alreadyKilledByLink) {
+                FlxG.switchState(new substates.GameOverSubstate(boyfriend, new PlayState()));
+            } else {
                 alreadyKilledByLink = true;
                 die();
-            } else {FlxG.state.openSubState(new substates.GameOverSubstate(boyfriend));}
+            }
             trace("Triggering DeathLink!");
         }
         #if cpp

source/backend/ClientPrefs.hx

@@ -193,6 +193,7 @@ import states.TitleState;
 	public var menuTheme:String = 'Light';
 	public var showRenderText:Bool = false;
 	public var garbageCollection:Bool = true;
+	public var dontAllowScriptOverride:Bool = true;
 
 	// Experimental Settings
 	public var useExperimentalNotePool:Bool = false;

source/objects/playfields/NotefieldRenderer.hx

@@ -1,5 +1,5 @@
 package objects.playfields;
-/* 
+/*
 	if ((FlxG.state is PlayState))
 		PlayState.instance.callOnHScripts("notefieldDraw", [this], ["drawQueue" => drawQueue]); // lets you do custom rendering in scripts, if needed
 
@@ -8,14 +8,14 @@ package objects.playfields;
 	var glowB = modManager.getValue("flashB", modNumber);
  */
 
-import flixel.util.FlxDestroyUtil;
 import flixel.math.FlxPoint;
-import openfl.geom.ColorTransform;
 import flixel.util.FlxColor;
-import objects.playfields.NoteField;
+import flixel.util.FlxDestroyUtil;
+import flixel.util.FlxSort;
 import objects.playfields.FieldBase;
+import objects.playfields.NoteField;
 import objects.proxies.ProxyField;
-import flixel.util.FlxSort;
+import openfl.geom.ColorTransform;
 import states.PlayState;
 @:structInit
 class FinalRenderObject extends RenderObject {
@@ -36,7 +36,7 @@ class NotefieldRenderer extends FlxBasic {
 		if (members.contains(field))
 			members.remove(field);
 	}
-	
+
 	static inline function zindexSort(Order:Int, Obj1:FinalRenderObject, Obj2:FinalRenderObject):Int {
 		var result:Int = 0;
 		var Value1:Float = Obj1.zIndex;
@@ -63,12 +63,12 @@ class NotefieldRenderer extends FlxBasic {
 	static function drawQueueSort(Obj1:FinalRenderObject, Obj2:FinalRenderObject) {
 		return zindexSort(FlxSort.ASCENDING, Obj1, Obj2);
 	}
-	
+
 	var point:FlxPoint = FlxPoint.get(0, 0);
-	
+
 	inline function getFlashComponent(field:NoteField, component:String, column:Int)
 		return field.modManager.getValue('flash$component', field.modNumber) * field.modManager.getValue('flash$column$component', field.modNumber);
-	
+
 	/**
 	 * Check if a ProxyField is in PlayState's members list
 	 * If it is, PlayState will handle rendering it at the correct layer
@@ -77,16 +77,16 @@ class NotefieldRenderer extends FlxBasic {
 		// Only check ProxyFields
 		if (!Std.isOfType(field, ProxyField))
 			return false;
-			
+
 		// Check if PlayState exists and has the field in its members
 		var playState = PlayState.instance;
 		if (playState != null && playState.members != null) {
 			return playState.members.contains(field);
 		}
-		
+
 		return false;
 	}
-	
+
 
 	override function draw(){
 		var finalDrawQueue:Array<FinalRenderObject> = [];
@@ -102,27 +102,27 @@ class NotefieldRenderer extends FlxBasic {
 
 			field.preDraw(); // Collects all the drawing information
 		}
-		
+
 		// Now that the main draw queues should have been populated, it's time to push them into the final draw queue for sorting
-		
-		
+
+
 		for (field in members){
 			// Skip ProxyFields that are in PlayState's members - they'll be rendered by PlayState
 			if (isProxyFieldInPlayState(field))
 				continue;
-				
-			field.draw(); // Just incase they want to do something before gathering happens (i.e ProxyFields grabbing their host's draw queue) 
+
+			field.draw(); // Just incase they want to do something before gathering happens (i.e ProxyFields grabbing their host's draw queue)
 
 			if (!field.exists || !field.visible)
 				continue;
-			
+
 			var realField:NoteField = field.getNotefield();
 
 			var queue:Array<RenderObject> = field.drawQueue;
 			for (object in queue){
 				var glowColour = realField.modManager == null ? FlxColor.WHITE : FlxColor.fromRGBFloat(getFlashComponent(realField, 'R', object.column),
 					getFlashComponent(realField, 'G', object.column), getFlashComponent(realField, 'B', object.column));
-					
+
 				finalDrawQueue.push({
 					graphic: object.graphic,
 					shader: object.shader,
@@ -180,7 +180,7 @@ class NotefieldRenderer extends FlxBasic {
 						continue;
 					for (shit in transforms)
 						shit.alphaMultiplier *= camera.alpha;
-					
+
 					object.sourceField.getScreenPosition(point, camera);
 					var drawItem = camera.startTrianglesBatch(graphic, object.antialiasing, true, null, true, shader);
 					@:privateAccess
@@ -197,7 +197,7 @@ class NotefieldRenderer extends FlxBasic {
 
 	override function update(elapsed:Float){
 		super.update(elapsed);
-		
+
 		for(field in members)
 			field.update(elapsed);
 	}
@@ -207,8 +207,8 @@ class NotefieldRenderer extends FlxBasic {
 		super.destroy();
 
 		while (members.length > 0)
-			members.pop().destroy(); 
-		
+			members.pop().destroy();
+
 		members = null;
 	}
-}
+}