Gaming.

Author: Yuta12342

art/flashFiles/mixtape/note_assets/AP_NOTE.fla

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextureAtlas imagePath="NOTE_assets.png">
+	<!-- Created with Adobe Animate version 22.0.0.93 -->
+	<!-- http://www.adobe.com/products/animate.html -->
+	<SubTexture name="ap0000" x="100" y="0" width="137" height="142"/>
+	<SubTexture name="ap hold end0000" x="0" y="0" width="50" height="64"/>
+	<SubTexture name="ap hold piece0000" x="50" y="0" width="50" height="44"/>
+	<SubTexture name="arrowAP0000" x="237" y="0" width="137" height="142"/>
+</TextureAtlas>

assets/shared/images/noteSkins/ap_assets/AP_NOTE.png

@@ -297,7 +297,7 @@ typedef SetNotifyPacket =
 typedef ProcessedItemsResult =
 {
 	tickets:Int,
-	nonSongs:Map<String, Int>,
+	nonSongs:haxe.DynamicAccess<Int>,
 	nonSongsNames:Array<String>,
 	unlockedSongs:Array<{song:String, mod:String}>,
 	itemsToTrigger:Array<String>,
@@ -326,7 +326,7 @@ class APGameState
 	// Sanity-related variables
 	public var unlockedSanityItems:Map<String, SanityItemData> = new Map<String, SanityItemData>();
 	public var sanitySettings:SanitySettings = {enable_sanity_locations: false, sanity_completion_type: "on_getting", sanity_types: []};
-	public var sanityLocationIds:Map<String, Int> = new Map<String, Int>();
+	public var sanityLocationIds:haxe.DynamicAccess<Int> = new haxe.DynamicAccess<Int>();
 
 	public function locationData(songName:String, modName:String):Array<Int>
 	{
@@ -532,8 +532,6 @@ class APGameState
 	{
 		var locations:Array<Int> = [];
 
-		trace('is setting on: ${sanitySettings.enable_sanity_locations}');
-
 		if (!sanitySettings.enable_sanity_locations)
 			return locations;
 
@@ -586,7 +584,7 @@ class APGameState
 			// First try slot data lookup
 			if (_slotData != null && Reflect.hasField(_slotData, "sanityLocationData"))
 			{
-				var sanityLocationData:Map<String, SanityLocationData> = Reflect.field(_slotData, "sanityLocationData");
+				var sanityLocationData:haxe.DynamicAccess<SanityLocationData> = Reflect.field(_slotData, "sanityLocationData");
 				if (sanityLocationData != null)
 				{
 					var locationName = "Use " + itemType + ": " + itemName;
@@ -820,19 +818,19 @@ class APGameState
 		// Initialize sanity location IDs from slot data
 		if (_slotData != null && Reflect.hasField(_slotData, "sanityLocationData"))
 		{
-			var sanityLocationData:Map<String, SanityLocationData> = Reflect.field(_slotData, "sanityLocationData");
+			var sanityLocationData:haxe.DynamicAccess<SanityLocationData> = Reflect.field(_slotData, "sanityLocationData");
 			if (sanityLocationData != null)
 			{
 				for (locationName => locationData in sanityLocationData)
 				{
 					sanityLocationIds.set(locationName, locationData.id);
 				}
-				trace("Loaded " + Lambda.count(sanityLocationIds) + " sanity location IDs");
+				trace("Loaded " + [for (key in sanityLocationIds.keys()) key].length + " sanity location IDs");
 			}
 		}
 
 		// Initialize unlocked sanity items (empty at start - will be populated as items are received)
-		unlockedSanityItems.clear();
+		unlockedSanityItems = new Map<String, SanityItemData>();
 		trace("Sanity system initialized");
 	}
 
@@ -1097,7 +1095,7 @@ class APGameState
 			{
 				unlockedSanityItems.set(item.name, item.data);
 			}
-			trace("Loaded " + Lambda.count(unlockedSanityItems) + " unlocked sanity items from save");
+			trace("Loaded " + [for (key in unlockedSanityItems.keys()) key].length + " unlocked sanity items from save");
 		}
 
 		_saveData.save();
@@ -1201,7 +1199,7 @@ class APGameState
 			if (reg.match(trapName))
 			{
 				var modifier = reg.matched(1);
-				archipelago.APItem.APChartModifier.restoreFromSave(modifier).fromTrapLink = true;
+				archipelago.APItem.APChartModifier.restoreFromSave(modifier, true).fromTrapLink = true;
 			}
 			else
 			{
@@ -1552,7 +1550,7 @@ class APGameState
 					specialItems.set(itemName, currentPackages["Friday Night Funkin"].item_name_to_id.get(item));
 				}
 			}
-			//trace("Special Items: " + specialItems);
+			trace("Special Items: " + specialItems);
 
 			return specialItems;
 		}
@@ -1615,7 +1613,7 @@ class APGameState
 		function processItemsSync(songs:Array<NetworkItem>):ProcessedItemsResult
 		{
 			var tickets = 0;
-			var nonSongs:Map<String, Int> = [];
+			var nonSongs:haxe.DynamicAccess<Int> = new haxe.DynamicAccess<Int>();
 			var nonSongsNames:Array<String> = [];
 			var unlockedSongs:Array<{song:String, mod:String}> = [];
 			var itemsToTrigger:Array<String> = [];
@@ -1637,8 +1635,25 @@ class APGameState
 				// Use the realName function to convert special keywords back to actual brackets
 				itemName = APInfo.realName(itemName);
 
-				// Check if this is a sanity item
-				if (itemName.indexOf("Stage: ") == 0 || itemName.indexOf("Character: ") == 0)
+				// Check if this is a sanity item by ID instead of name
+				var isSanityItem = false;
+				if (_slotData != null && _slotData.sanityData != null)
+				{
+					// Check if the item ID exists in the sanity data
+					for (sanityItemName in _slotData.sanityData.keys())
+					{
+						var sanityItemData = _slotData.sanityData.get(sanityItemName);
+						if (sanityItemData != null && sanityItemData.id == songName.item)
+						{
+							isSanityItem = true;
+							// Use the sanity item name from slot data for consistency
+							itemName = sanityItemName;
+							break;
+						}
+					}
+				}
+
+				if (isSanityItem)
 				{
 					// This is a sanity item - add to sanity tracking
 					sanityItems.push(itemName);
@@ -1727,7 +1742,6 @@ class APGameState
 			// Handle sanity items
 			for (sanityItemName in result.sanityItems)
 			{
-				trace('Sanity Item: $sanityItemName');
 				handleSanityItemReceived(sanityItemName);
 			}
 
@@ -1767,8 +1781,7 @@ class APGameState
 			// Get sanity item data from slot data
 			if (_slotData != null && Reflect.hasField(_slotData, "sanityData"))
 			{
-				var sanityData:DynamicAccess<SanityItemData> = Reflect.field(_slotData, "sanityData");
-				trace('SlotData: $_slotData\nSanityData: $sanityData');
+				var sanityData:haxe.DynamicAccess<SanityItemData> = Reflect.field(_slotData, "sanityData");
 				if (sanityData != null && sanityData.exists(itemName))
 				{
 					var sanityItemData = sanityData.get(itemName);
@@ -1881,14 +1894,24 @@ class APGameState
 
 		public function isSanityItemUnlocked(itemType:String, itemName:String):Bool
 		{
+			// If no sanity system exists at all, everything is unlocked
+			var unlockedSanityCount = [for (key in unlockedSanityItems.keys()) key].length;
+			var sanityLocationCount = [for (key in sanityLocationIds.keys()) key].length;
+			if (unlockedSanityCount == 0 && sanityLocationCount == 0) return true;
+
+
+
 			var key = itemType + ": " + itemName;
 			return unlockedSanityItems.exists(key);
 		}
 
 		public function checkSongCharactersAndStageUnlocked(song:backend.Song.SwagSong):Array<String>
 		{
-			trace('Unlocked Sanity Items: $unlockedSanityItems\nSanity Location ID\'s: $sanityLocationIds');
 			// Check if sanity system exists at all (regardless of location settings)
+			var unlockedSanityCount = [for (key in unlockedSanityItems.keys()) key].length;
+			var sanityLocationCount = [for (key in sanityLocationIds.keys()) key].length;
+			if (unlockedSanityCount == 0 && sanityLocationCount == 0) return [];
+
 			var missingItems:Array<String> = [];
 
 			// Check what types of sanity items we should look for

assets/shared/images/noteSkins/ap_assets/AP_NOTE.xml

@@ -39,13 +39,13 @@ typedef APSlotDataType = {
 	locationType: String,
 	locationMethod: String,
 	selectedSongs: Array<String>,
-	songData: Map<String, SongDetailData>,
+	songData: haxe.DynamicAccess<SongDetailData>,
 	?custom_weeks: Dynamic, // Custom weeks data from HScript processing
 	?song_modifications: Dynamic, // Song additions/exclusions data
 	?unoColorsUsed:Array<{name:String, color_code:String}>, // Uno mod colors used in the slot
 	?highQualityExpected: Bool, // Whether high quality trap content is expected to be available
-	?sanityData: Map<String, SanityItemData>, // Sanity items for this player
-	?sanityLocationData: Map<String, SanityLocationData>, // Sanity locations for this player
+	?sanityData: haxe.DynamicAccess<SanityItemData>, // Sanity items for this player
+	?sanityLocationData: haxe.DynamicAccess<SanityLocationData>, // Sanity locations for this player
 	?sanitySettings: SanitySettings // Sanity settings for this player
 }
 
@@ -62,7 +62,7 @@ abstract APSlotData(APSlotDataType) from APSlotDataType to APSlotDataType {
 			locationType: "Song Completion",
 			locationMethod: "Per Song",
 			selectedSongs: [],
-			songData: new Map<String, SongDetailData>(),
+			songData: new haxe.DynamicAccess<SongDetailData>(),
 			custom_weeks: null,
 			song_modifications: null,
 			highQualityExpected: false
@@ -79,13 +79,13 @@ abstract APSlotData(APSlotDataType) from APSlotDataType to APSlotDataType {
 	public var locationType(get, never):String;
 	public var locationMethod(get, never):String;
 	public var selectedSongs(get, never):Array<String>;
-	public var songData(get, never):Map<String, SongDetailData>;
+	public var songData(get, never):haxe.DynamicAccess<SongDetailData>;
 	public var custom_weeks(get, never):Dynamic;
 	public var song_modifications(get, never):Dynamic;
 	public var unoColorsUsed(get, never):Array<{name:String, color_code:String}>;
 	public var highQualityExpected(get, never):Bool;
-	public var sanityData(get, never):Map<String, SanityItemData>;
-	public var sanityLocationData(get, never):Map<String, SanityLocationData>;
+	public var sanityData(get, never):haxe.DynamicAccess<SanityItemData>;
+	public var sanityLocationData(get, never):haxe.DynamicAccess<SanityLocationData>;
 	public var sanitySettings(get, never):SanitySettings;
 
 	private function get_deathLink():Bool return this.deathLink;
@@ -98,13 +98,13 @@ abstract APSlotData(APSlotDataType) from APSlotDataType to APSlotDataType {
 	private function get_locationType():String return this.locationType;
 	private function get_locationMethod():String return this.locationMethod;
 	private function get_selectedSongs():Array<String> return this.selectedSongs;
-	private function get_songData():Map<String, SongDetailData> return this.songData;
+	private function get_songData():haxe.DynamicAccess<SongDetailData> return this.songData;
 	private function get_custom_weeks():Dynamic return this.custom_weeks;
 	private function get_song_modifications():Dynamic return this.song_modifications;
 	private function get_unoColorsUsed():Array<{name:String, color_code:String}> return this.unoColorsUsed;
 	private function get_highQualityExpected():Bool return this.highQualityExpected != null ? this.highQualityExpected : false;
-	private function get_sanityData():Map<String, SanityItemData> return this.sanityData != null ? this.sanityData : new Map<String, SanityItemData>();
-	private function get_sanityLocationData():Map<String, SanityLocationData> return this.sanityLocationData != null ? this.sanityLocationData : new Map<String, SanityLocationData>();
+	private function get_sanityData():haxe.DynamicAccess<SanityItemData> return this.sanityData != null ? this.sanityData : new haxe.DynamicAccess<SanityItemData>();
+	private function get_sanityLocationData():haxe.DynamicAccess<SanityLocationData> return this.sanityLocationData != null ? this.sanityLocationData : new haxe.DynamicAccess<SanityLocationData>();
 	private function get_sanitySettings():SanitySettings return this.sanitySettings != null ? this.sanitySettings : {enable_sanity_locations: false, sanity_completion_type: "on_getting", sanity_types: []};
 
 	public function get(key:String):Dynamic {

source/archipelago/APGameState.hx

@@ -2046,8 +2046,8 @@ class APChartModifier extends APTrap {
         }, false, false, false, fromTrapLink);
     }
 
-    public static function restoreFromSave(modifier:String):APChartModifier {
-        return new APChartModifier(modifier);
+    public static function restoreFromSave(modifier:String, ?fromTrapLink:Bool):APChartModifier {
+        return new APChartModifier(modifier, fromTrapLink);
     }
 }