Merge pull request #414 from Vivelin/bug-fixes

Bug fixes
TheTrackerCouncil · Oct 24, 2023 · 1b3b1e1 · 1b3b1e1
2 parents 0935394 + cf2ff67
commit 1b3b1e1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 13 deletions.
diff --git a/src/Randomizer.App/Controls/RomListPanel.cs b/src/Randomizer.App/Controls/RomListPanel.cs
@@ -76,7 +76,7 @@ protected void CheckSpeechRecognition()
         /// <param name="rom">The rom to launch</param>
         public void QuickLaunchRom(GeneratedRom rom)
         {
-            var launchButtonOptions = (LaunchButtonOptions)Options.GeneralOptions.LaunchButton;
+            var launchButtonOptions = Options.GeneralOptions.LaunchButtonOption;
 
             if (launchButtonOptions is LaunchButtonOptions.PlayAndTrack or LaunchButtonOptions.OpenFolderAndTrack or LaunchButtonOptions.TrackOnly)
             {

diff --git a/src/Randomizer.SMZ3.Tracking/AutoTracking/ZeldaStateChecks/ViewedMap.cs b/src/Randomizer.SMZ3.Tracking/AutoTracking/ZeldaStateChecks/ViewedMap.cs
@@ -101,13 +101,16 @@ private void UpdateLightWorldRewards()
                 }
             }
 
-            if (!World.Config.ZeldaKeysanity && rewards.Count(x => x == RewardType.CrystalRed || x == RewardType.CrystalBlue) == 3)
+            if (!World.Config.ZeldaKeysanity)
             {
-                _tracker.SayOnce(x => x.AutoTracker.LightWorldAllCrystals);
-            }
-            else if (rewards.Count == 0)
-            {
-                _tracker.Say(x => x.AutoTracker.LookedAtNothing);
+                if (rewards.Count(x => x == RewardType.CrystalRed || x == RewardType.CrystalBlue) == 3)
+                {
+                    _tracker.SayOnce(x => x.AutoTracker.LightWorldAllCrystals);
+                }
+                else if (rewards.Count == 0)
+                {
+                    _tracker.Say(x => x.AutoTracker.LookedAtNothing);
+                }
             }
 
             // If all dungeons are marked, save the light world as updated
@@ -154,13 +157,16 @@ protected void UpdateDarkWorldRewards()
             var isMiseryMirePendant = (World.MiseryMire as IDungeon).IsPendantDungeon;
             var isTurtleRockPendant = (World.TurtleRock as IDungeon).IsPendantDungeon;
 
-            if (!World.Config.ZeldaKeysanity && isMiseryMirePendant && isTurtleRockPendant)
+            if (!World.Config.ZeldaKeysanity)
             {
-                _tracker.SayOnce(x => x.AutoTracker.DarkWorldNoMedallions);
-            }
-            else if (rewards.Count == 0)
-            {
-                _tracker.Say(x => x.AutoTracker.LookedAtNothing);
+                if (isMiseryMirePendant && isTurtleRockPendant)
+                {
+                    _tracker.SayOnce(x => x.AutoTracker.DarkWorldNoMedallions);
+                }
+                else if (rewards.Count == 0)
+                {
+                    _tracker.Say(x => x.AutoTracker.LookedAtNothing);
+                }
             }
 
             // If all dungeons are marked, save the light world as updated