Merge pull request #678 from TheTrackerCouncil/fix-ap-goal-markers

Fix goal map markers not showing up properly on AP seeds

Author: MattEqualsCoder

src/TrackerCouncil.Smz3.Data/ParsedRom/ParsedRomDetails.cs

@@ -16,6 +16,7 @@ public class ParsedRomDetails
     public required int GanonsTowerCrystalCount { get; set; }
     public required int GanonCrystalCount { get; set; }
     public required int TourianBossCount { get; set; }
+    public required bool OpenPyarmid { get; set; }
     public required bool SkipTourianBossDoor { get; set; }
     public required List<ParsedRomPlayer> Players { get; set; }
     public required List<ParsedRomLocationDetails> Locations { get; set; }

src/TrackerCouncil.Smz3.Data/WorldData/Regions/SuperMetroid/Crateria/WestCrateria.cs

@@ -144,7 +144,7 @@ public void UpdateMotherBrainAccessibility(Progression progression)
                                       (!World.Config.MetroidKeysanity || World.Config.SkipTourianBossDoor ||
                                        progression.CardCrateriaBoss);
 
-            var canEnterTourian = World.GoldenBosses.Count(x => x.Defeated) >= tourianBossRequirement;
+            var canEnterTourian = World.Rewards.Count(x => x.MarkedReward?.IsInCategory(RewardCategory.Metroid) == true && x.HasReceivedReward) >= tourianBossRequirement;
 
             NewAccessibility = canAccessStatueRoom && canEnterTourian
                 ? Accessibility.Available

src/TrackerCouncil.Smz3.Data/WorldData/Regions/Zelda/DarkWorld/DarkWorldNorthEast.cs

@@ -74,6 +74,9 @@ public void UpdateGanonAccessibility(Progression progression, Progression assume
             ? Config.GanonCrystalCount
             : World.State?.MarkedGanonCrystalCount ?? 7;
 
+        var numAcquiredCrystals = World.Rewards.Count(x =>
+            x.MarkedReward?.IsInAnyCategory(RewardCategory.Crystal) == true && x.HasReceivedReward);
+
         if (World.Bosses.First(x => x.Type == BossType.Ganon).Defeated)
         {
             NewAccessibility = Accessibility.Cleared;
@@ -88,7 +91,7 @@ public void UpdateGanonAccessibility(Progression progression, Progression assume
                               World.GanonsTower.CanBeatBoss(assumedKeyProgression, true));
 
             var isPyramidOpen = World.Config.OpenPyramid || canClimbGt;
-            var canHurtGanon = progression.CrystalCount >= ganonCrystalRequirement && progression.MasterSword &&
+            var canHurtGanon = numAcquiredCrystals >= ganonCrystalRequirement && progression.MasterSword &&
                                (progression.Lamp || progression.FireRod);
 
             NewAccessibility = canAccessPyramid && isPyramidOpen && canHurtGanon
@@ -107,7 +110,7 @@ public void UpdateGanonAccessibility(Progression progression, Progression assume
                                                                assumedKeyProgression.LegacyProgression)));
 
             var isPyramidOpen = World.Config.OpenPyramid || canClimbGt;
-            var canHurtGanon = progression.CrystalCount >= ganonCrystalRequirement && progression.MasterSword &&
+            var canHurtGanon = numAcquiredCrystals >= ganonCrystalRequirement && progression.MasterSword &&
                                (progression.Lamp || progression.FireRod);
 
             NewAccessibility = canAccessPyramid && isPyramidOpen && canHurtGanon

src/TrackerCouncil.Smz3.SeedGenerator/FileData/Patches/GoalsPatch.cs

@@ -53,4 +53,9 @@ public static int GetTourianBossCountFromRom(byte[] rom, bool isCasRom)
             return BitConverter.ToInt16(rom.Skip(Snes(0xF47200)).Take(2).ToArray());
         }
     }
+
+    public static bool GetOpenPyramid(byte[] rom)
+    {
+        return rom[Snes(0x30808B)] == 0x01;
+    }
 }

src/TrackerCouncil.Smz3.SeedGenerator/Generation/Smz3RomParser.cs

@@ -119,6 +119,7 @@ public ParsedRomDetails ParseRomFile(string filePath)
             var gtCrystalCount = GoalsPatch.GetGanonsTowerCrystalCountFromRom(rom);
             var ganonCrystalCount = GoalsPatch.GetGanonCrystalCountFromRom(rom);
             var tourianBossCount = GoalsPatch.GetTourianBossCountFromRom(rom, romGenerator == RomGenerator.Cas);
+            var openPyramid = GoalsPatch.GetOpenPyramid(rom);
             var text = ZeldaTextsPatch.ParseRomText(rom);
 
             logger.LogInformation("Imported {Title} (Seed {SeedNumber})", romTitle, seedNumber);
@@ -135,6 +136,7 @@ public ParsedRomDetails ParseRomFile(string filePath)
                 GanonsTowerCrystalCount = gtCrystalCount,
                 GanonCrystalCount = ganonCrystalCount,
                 TourianBossCount = tourianBossCount,
+                OpenPyarmid = openPyramid,
                 SkipTourianBossDoor = skippedTourianBossDoor,
                 RomGenerator = romGenerator.Value,
                 Players = players,
@@ -166,6 +168,7 @@ public SeedData GenerateSeedData(RandomizerOptions options, ParsedRomDetails par
         config.GanonsTowerCrystalCount = parsedRomDetails.GanonsTowerCrystalCount;
         config.GanonCrystalCount = parsedRomDetails.GanonCrystalCount;
         config.TourianBossCount = parsedRomDetails.TourianBossCount;
+        config.OpenPyramid = parsedRomDetails.OpenPyarmid;
         config.SkipTourianBossDoor = parsedRomDetails.SkipTourianBossDoor;
         config.LocationItems.Clear();
         config.ItemOptions = parsedRomDetails.StartingItems.ToDictionary(x => $"ItemType:{x.Key}", x => x.Value);

src/TrackerCouncil.Smz3.Tracking/TrackingServices/TrackerRewardService.cs

@@ -40,9 +40,12 @@ public void SetAreaReward(IHasReward rewardRegion, RewardType? reward = null, fl
             Tracker.Say(response: Responses.DungeonRewardMarked, args: [rewardRegion.Metadata.Name, rewardObj.Metadata.Name ?? reward.GetDescription()]);
         }
 
+        UpdateAllAccessibility(false);
+
         AddUndo(autoTracked, () =>
         {
             rewardRegion.MarkedReward = originalReward;
+            UpdateAllAccessibility(false);
         });
     }
 

src/TrackerCouncil.Smz3.UI/Services/TrackerWindowService.cs

@@ -598,8 +598,8 @@ private TrackerWindowPanelViewModel GetItemPanelViewModel(UIGridLocation gridLoc
         if (bossRegion != null)
         {
             bossRegion.Boss.UpdatedBossState += (_, _) => model.DungeonCleared = bossRegion.BossDefeated;
-            model.Clicked += (_, _) => tracker.BossTracker.MarkBossAsDefeated(bossRegion);
-            model.ResetCleared += (_, _) => tracker.BossTracker.MarkBossAsNotDefeated(bossRegion);
+            model.Clicked += (_, _) => tracker.BossTracker.MarkBossAsDefeated(bossRegion, force: true);
+            model.ResetCleared += (_, _) => tracker.BossTracker.MarkBossAsNotDefeated(bossRegion, force: true);
         }
 
         dungeon.UpdatedTreasure += (_, _) => model.DungeonTreasure = dungeon.RemainingTreasure;
@@ -666,8 +666,8 @@ private TrackerWindowPanelViewModel GetItemPanelViewModel(UIGridLocation gridLoc
             model.BossDefeated = boss.Defeated;
         };
 
-        model.Clicked += (_, _) => tracker.BossTracker.MarkBossAsDefeated(boss);
-        model.BossRevived += (_, _) => tracker.BossTracker.MarkBossAsNotDefeated(boss);
+        model.Clicked += (_, _) => tracker.BossTracker.MarkBossAsDefeated(boss, force: true);
+        model.BossRevived += (_, _) => tracker.BossTracker.MarkBossAsNotDefeated(boss, force: true);
 
         if (rewardRegion != null)
         {