im eeepy

Author: Z11Coding

assets/shared/images/noteSkins/NOTE_assets-retribution.png

@@ -1,2 +1,3 @@
 Future
-Chip
+Chip
+Retribution

assets/shared/images/noteSkins/NOTE_assets-retribution.xml

@@ -150,7 +150,7 @@ class APAdvancedSettingsState extends MusicBeatState
 	var victorySongData:Dynamic = null;
 	var deathlink:Bool = false;
 
-	// Filler weight settings
+	// Filler/Trap weight settings
 	var bbcWeight:Int = 3;
 	var ghostChatWeight:Int = 3;
 	var tutorialWeight:Int = 3;
@@ -160,6 +160,7 @@ class APAdvancedSettingsState extends MusicBeatState
 	var resistanceWeight:Int = 3;
 	var unoWeight:Int = 3;
 	var pongWeight:Int = 3;
+	var ultConfusionWeight:Int = 3;
 	var shieldWeight:Int = 3;
 	var exLifeWeight:Int = 3;
 	var MHPWeight:Int = 3;
@@ -388,6 +389,8 @@ class APAdvancedSettingsState extends MusicBeatState
 							unoWeight = value;
 						case "pongWeight":
 							pongWeight = value;
+						case "ultConfusionWeight":
+							ultConfusionWeight = value;
 						case "svcWeight":
 							svcWeight = value;
 						case "fakeTransWeight":
@@ -700,6 +703,13 @@ class APAdvancedSettingsState extends MusicBeatState
 				locked: false,
 				contextMenu: createEditContextMenu(() -> adjustPongWeight())
 			},
+			{
+				name: "Ultimate Confusion Trap Weight",
+				description: "Weight for the Ultimate Confusion Trap items (0-10)",
+				callback: () -> adjustConfusionWeight(),
+				locked: false,
+				contextMenu: createEditContextMenu(() -> adjustConfusionWeight())
+			},
 			{
 				name: "Extra Life Weight",
 				description: "Weight for Extra Life items (0-10)",
@@ -1365,6 +1375,7 @@ class APAdvancedSettingsState extends MusicBeatState
 			case "Resistance Trap Weight": Std.string(resistanceWeight);
 			case "UNO Challenge Trap Weight": Std.string(unoWeight);
 			case "Pong Challenge Trap Weight": Std.string(pongWeight);
+			case "Ultimate Confusion Trap Weight": Std.string(ultConfusionWeight);
 			case "SVC Weight": Std.string(svcWeight);
 			case "Fake Transition Weight": Std.string(fakeTransWeight);
 			case "Shield Weight": Std.string(shieldWeight);
@@ -1681,6 +1692,15 @@ class APAdvancedSettingsState extends MusicBeatState
 		});
 	}
 
+	function adjustConfusionWeight()
+	{
+		openSliderControl("Ultimate Confusion Trap Weight", ultConfusionWeight, 0, 10, 1, function(value:Float)
+		{
+			ultConfusionWeight = Std.int(value);
+			refreshCurrentPage();
+		});
+	}
+
 	function adjustexLifeWeight()
 	{
 		openSliderControl("Extra Life Weight", exLifeWeight, 0, 10, 1, function(value:Float)
@@ -2111,6 +2131,7 @@ class APAdvancedSettingsState extends MusicBeatState
 			resistanceWeight = settings.resistanceWeight;
 			unoWeight = settings.unoWeight;
 			pongWeight = settings.pongWeight;
+			ultConfusionWeight = settings.ultConfusionWeight;
 			svcWeight = settings.svcWeight;
 			fakeTransWeight = settings.fakeTransWeight;
 			shieldWeight = settings.shieldWeight;
@@ -2164,6 +2185,7 @@ class APAdvancedSettingsState extends MusicBeatState
 			settings.resistanceWeight = resistanceWeight;
 			settings.unoWeight = unoWeight;
 			settings.pongWeight = pongWeight;
+			settings.ultConfusionWeight = ultConfusionWeight;
 			settings.svcWeight = svcWeight;
 			settings.fakeTransWeight = fakeTransWeight;
 			settings.shieldWeight = shieldWeight;
@@ -2558,6 +2580,8 @@ class APAdvancedSettingsState extends MusicBeatState
 								unoWeight = value;
 							case "pongWeight":
 								pongWeight = value;
+							case "ultConfusionWeight":
+								ultConfusionWeight = value;
 							case "svcWeight":
 								svcWeight = value;
 							case "fakeTransWeight":
@@ -2875,6 +2899,7 @@ class APAdvancedSettingsState extends MusicBeatState
 			resistanceWeight: resistanceWeight,
 			unoWeight: unoWeight,
 			pongWeight: pongWeight,
+			ultConfusionWeight: ultConfusionWeight,
 			svcWeight: svcWeight,
 			fakeTransWeight: fakeTransWeight,
 			shieldWeight: shieldWeight,
@@ -2934,6 +2959,8 @@ class APAdvancedSettingsState extends MusicBeatState
 				unoWeight = data.unoWeight;
 			if (Reflect.hasField(data, "pongWeight"))
 				pongWeight = data.pongWeight;
+			if (Reflect.hasField(data, "ultConfusionWeight"))
+				ultConfusionWeight = data.ultConfusionWeight;
 			if (Reflect.hasField(data, "svcWeight"))
 				svcWeight = data.svcWeight;
 			if (Reflect.hasField(data, "fakeTransWeight"))
@@ -3210,6 +3237,8 @@ class APAdvancedSettingsState extends MusicBeatState
 				state.unoWeight = data.unoWeight;
 			if (Reflect.hasField(data, "pongWeight"))
 				state.pongWeight = data.pongWeight;
+			if (Reflect.hasField(data, "ultConfusionWeight"))
+				state.ultConfusionWeight = data.ultConfusionWeight;
 			if (Reflect.hasField(data, "svcWeight"))
 				state.svcWeight = data.svcWeight;
 			if (Reflect.hasField(data, "fakeTransWeight"))

assets/shared/images/noteSkins/list.txt

@@ -66,6 +66,7 @@ typedef APOptions =
 	var resistanceWeight:Int;
 	var unoWeight:Int;
 	var pongWeight:Int;
+	var ultConfusionWeight:Int;
 	var	fakeTransWeight:Int;
 	var	shieldWeight:Int;
 	var	MHPWeight:Int;
@@ -178,6 +179,7 @@ class APEntryState extends MusicBeatState
 			resistanceWeight: 5,
 			unoWeight: 5,
 			pongWeight: 5,
+			ultConfusionWeight: 5,
 			fakeTransWeight: 5,
 			shieldWeight: 5,
 			MHPWeight: 5,
@@ -799,6 +801,8 @@ var uri = '${#if sys (_hostInput.text == "localhost" || _hostInput.text == "127.
 				+ gameSettings.FNF.unoWeight
 				+ "\nPong Weight: "
 				+ gameSettings.FNF.pongWeight
+				+ "\nUltimate Confusion Trap: "
+				+ gameSettings.FNF.ultConfusionWeight
 				+ "\nFake Transition Weight: "
 				+ gameSettings.FNF.fakeTransWeight
 				+ "\nShield Weight: "

source/archipelago/APAdvancedSettingsState.hx

@@ -1109,9 +1109,16 @@ class APGameState
 					archipelago.APItem.createItemByName("Pixellation Trap").fromTrapLink = true;
 				case "Swap Trap":
 					archipelago.APItem.createItemByName("Swap Trap").fromTrapLink = true;
+				case "Cutscene Trap":
+					archipelago.APItem.createItemByName("Cutscene Trap").fromTrapLink = true;
 				default:
-					// If it's not a known trap, we can just log it.
-					trace("Unknown trap link received: " + trapName + ".");
+					try {
+						archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
+						trace("TrapLink processed by fallback: " + trapName);
+					} catch (e:Dynamic) {
+						// If it's not a known trap, we can just log it.
+						trace("Unknown trap link received: " + trapName + ".");
+					}
 			}
 		}
 	}