Merge pull request #681 from TheTrackerCouncil/ap-fixes

Additional AP fixes

Author: MattEqualsCoder

src/TrackerCouncil.Smz3.Data/Configuration/ConfigTypes/ItemData.cs

@@ -284,6 +284,9 @@ public bool TryGetTrackingResponse(int trackingState, [NotNullWhen(true)] out Sc
     /// </remarks>
     public bool IsJunk(Config? config)
     {
+        if (InternalItemType == ItemType.OtherGameProgressionItem)
+            return false;
+
         if (config?.ZeldaKeysanity == true && InternalItemType.IsInAnyCategory(new[] { ItemCategory.SmallKey, ItemCategory.BigKey, ItemCategory.Map }))
             return false;
 

src/TrackerCouncil.Smz3.Data/Services/GenerationSettingsWindowService.cs

@@ -501,9 +501,13 @@ public void UpdateSummaryText()
             sb.AppendLine($"  - Player Name: {details.Players.First(x => x.IsLocalPlayer).PlayerName}");
             sb.AppendLine($"  - Player Count: {playerCount}");
 
-            sb.AppendLine($"  - GT Crystal Count: {details.GanonsTowerCrystalCount}");
-            sb.AppendLine($"  - Ganon Crystal Count: {details.GanonCrystalCount}");
-            sb.AppendLine($"  - Tourian Boss Count: {details.TourianBossCount}");
+            if (details.RomGenerator == RomGenerator.Mainline)
+            {
+                sb.AppendLine($"  - GT Crystal Count: {details.GanonsTowerCrystalCount}");
+                sb.AppendLine($"  - Ganon Crystal Count: {details.GanonCrystalCount}");
+                sb.AppendLine($"  - Tourian Boss Count: {details.TourianBossCount}");
+                sb.AppendLine($"  - Open Pyramid: {details.OpenPyarmid}");
+            }
 
             sb.AppendLine($"  - IsMultiworld: {ynResponses[details.IsMultiworld]}");
             sb.AppendLine($"  - IsHardLogic: {ynResponses[details.IsHardLogic]}");

src/TrackerCouncil.Smz3.Data/WorldData/Regions/IHasTreasure.cs

@@ -54,7 +54,7 @@ public int RemainingTreasure
     public int GetTreasureCount()
     {
         var region = (Region)this;
-        return region.Locations.Count(x => x.Item.Type != ItemType.Nothing && (!x.Item.IsDungeonItem || region.World.Config.ZeldaKeysanity) && x.Type != LocationType.NotInDungeon);
+        return region.Locations.Count(x => x.Item.Type != ItemType.Nothing && (!x.Item.IsDungeonItem || region.World.Config.ZeldaKeysanity || !x.Item.IsLocalPlayerItem) && x.Type != LocationType.NotInDungeon);
     }
 
     public void ApplyState(TrackerState? state)