Merge remote-tracking branch 'origin/main' into abstractions-project

TheTrackerCouncil · Oct 24, 2023 · 0114e1b · 0114e1b
2 parents 8caebc1 + 1b3b1e1
commit 0114e1b
Show file tree

Hide file tree

Showing 103 changed files with 21 additions and 15 deletions.
diff --git a/src/Randomizer.App/Controls/RomListPanel.cs b/src/Randomizer.App/Controls/RomListPanel.cs
@@ -77,7 +77,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.App/Windows/SpriteWindow.xaml b/src/Randomizer.App/Windows/SpriteWindow.xaml
@@ -37,8 +37,8 @@
         <StackPanel Grid.Column="1" Orientation="Vertical" Margin="10 0 0 0">
           <TextBlock>Filter</TextBlock>
           <ComboBox Name="SpriteFilterComboBox"
-                    SelectedItem="{Binding SpriteFilter, Converter={StaticResource EnumDescriptionConverter}}"
-                    ItemsSource="{Binding Source={app:EnumDescriptionBindingSource {x:Type options:SpriteFilter}}}"
+                    SelectedItem="{Binding SpriteFilter}"
+                    ItemsSource="{Binding Source={app:EnumBindingSource {x:Type options:SpriteFilter}}}"
                     HorizontalAlignment="Left"
                     MinWidth="125"
                     SelectionChanged="SpriteFilterComboBox_OnSelectionChanged">

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

diff --git a/src/Randomizer.Sprites/Link/adventure-2600.1.png b/src/Randomizer.Sprites/Link/adventure-2600.1.png
diff --git a/src/Randomizer.Sprites/Link/adventure-2600.1.rdc b/src/Randomizer.Sprites/Link/adventure-2600.1.rdc
diff --git a/src/Randomizer.Sprites/Link/agrias.1.png b/src/Randomizer.Sprites/Link/agrias.1.png
diff --git a/src/Randomizer.Sprites/Link/agrias.1.rdc b/src/Randomizer.Sprites/Link/agrias.1.rdc
diff --git a/src/Randomizer.Sprites/Link/alcoon.1.png b/src/Randomizer.Sprites/Link/alcoon.1.png
diff --git a/src/Randomizer.Sprites/Link/alcoon.1.rdc b/src/Randomizer.Sprites/Link/alcoon.1.rdc
diff --git a/src/Randomizer.Sprites/Link/arctic-artemis.1.png b/src/Randomizer.Sprites/Link/arctic-artemis.1.png
diff --git a/src/Randomizer.Sprites/Link/arctic-artemis.1.rdc b/src/Randomizer.Sprites/Link/arctic-artemis.1.rdc
diff --git a/src/Randomizer.Sprites/Link/baby-fro-mocha.1.png b/src/Randomizer.Sprites/Link/baby-fro-mocha.1.png
diff --git a/src/Randomizer.Sprites/Link/baby-fro-mocha.1.rdc b/src/Randomizer.Sprites/Link/baby-fro-mocha.1.rdc
diff --git a/src/Randomizer.Sprites/Link/birdfruit.1.png b/src/Randomizer.Sprites/Link/birdfruit.1.png
diff --git a/src/Randomizer.Sprites/Link/birdfruit.1.rdc b/src/Randomizer.Sprites/Link/birdfruit.1.rdc
diff --git a/src/Randomizer.Sprites/Link/bobross.1.png b/src/Randomizer.Sprites/Link/bobross.1.png
diff --git a/src/Randomizer.Sprites/Link/bobross.1.rdc b/src/Randomizer.Sprites/Link/bobross.1.rdc
diff --git a/src/Randomizer.Sprites/Link/bomberman.1.png b/src/Randomizer.Sprites/Link/bomberman.1.png
diff --git a/src/Randomizer.Sprites/Link/bomberman.1.rdc b/src/Randomizer.Sprites/Link/bomberman.1.rdc
diff --git a/src/Randomizer.Sprites/Link/botw-zelda.1.png b/src/Randomizer.Sprites/Link/botw-zelda.1.png
diff --git a/src/Randomizer.Sprites/Link/botw-zelda.1.rdc b/src/Randomizer.Sprites/Link/botw-zelda.1.rdc
diff --git a/src/Randomizer.Sprites/Link/bronzor.2.png b/src/Randomizer.Sprites/Link/bronzor.2.png
diff --git a/src/Randomizer.Sprites/Link/bronzor.2.rdc b/src/Randomizer.Sprites/Link/bronzor.2.rdc
diff --git a/src/Randomizer.Sprites/Link/cinna.2.png b/src/Randomizer.Sprites/Link/cinna.2.png
diff --git a/src/Randomizer.Sprites/Link/cinna.2.rdc b/src/Randomizer.Sprites/Link/cinna.2.rdc
diff --git a/src/Randomizer.Sprites/Link/clippy.1.png b/src/Randomizer.Sprites/Link/clippy.1.png
diff --git a/src/Randomizer.Sprites/Link/clippy.1.rdc b/src/Randomizer.Sprites/Link/clippy.1.rdc
diff --git a/src/Randomizer.Sprites/Link/cool-90s-link.1.png b/src/Randomizer.Sprites/Link/cool-90s-link.1.png
diff --git a/src/Randomizer.Sprites/Link/cool-90s-link.1.rdc b/src/Randomizer.Sprites/Link/cool-90s-link.1.rdc
diff --git a/src/Randomizer.Sprites/Link/darkgirl.1.png b/src/Randomizer.Sprites/Link/darkgirl.1.png
diff --git a/src/Randomizer.Sprites/Link/darkgirl.1.rdc b/src/Randomizer.Sprites/Link/darkgirl.1.rdc
diff --git a/src/Randomizer.Sprites/Link/darkswatchy.2.png b/src/Randomizer.Sprites/Link/darkswatchy.2.png
diff --git a/src/Randomizer.Sprites/Link/darkswatchy.2.rdc b/src/Randomizer.Sprites/Link/darkswatchy.2.rdc
diff --git a/src/Randomizer.Sprites/Link/darkzelda.1.png b/src/Randomizer.Sprites/Link/darkzelda.1.png
diff --git a/src/Randomizer.Sprites/Link/darkzelda.1.rdc b/src/Randomizer.Sprites/Link/darkzelda.1.rdc
diff --git a/src/Randomizer.Sprites/Link/dennsen86.1.png b/src/Randomizer.Sprites/Link/dennsen86.1.png
diff --git a/src/Randomizer.Sprites/Link/dennsen86.1.rdc b/src/Randomizer.Sprites/Link/dennsen86.1.rdc
diff --git a/src/Randomizer.Sprites/Link/diddy-kong.1.png b/src/Randomizer.Sprites/Link/diddy-kong.1.png
diff --git a/src/Randomizer.Sprites/Link/diddy-kong.1.rdc b/src/Randomizer.Sprites/Link/diddy-kong.1.rdc
diff --git a/src/Randomizer.Sprites/Link/dipper.1.png b/src/Randomizer.Sprites/Link/dipper.1.png
diff --git a/src/Randomizer.Sprites/Link/dipper.1.rdc b/src/Randomizer.Sprites/Link/dipper.1.rdc
diff --git a/src/Randomizer.Sprites/Link/fi.1.png b/src/Randomizer.Sprites/Link/fi.1.png
diff --git a/src/Randomizer.Sprites/Link/fi.1.rdc b/src/Randomizer.Sprites/Link/fi.1.rdc
diff --git a/src/Randomizer.Sprites/Link/head-link.1.png b/src/Randomizer.Sprites/Link/head-link.1.png
diff --git a/src/Randomizer.Sprites/Link/head-link.1.rdc b/src/Randomizer.Sprites/Link/head-link.1.rdc
diff --git a/src/Randomizer.Sprites/Link/jogurt.1.png b/src/Randomizer.Sprites/Link/jogurt.1.png
diff --git a/src/Randomizer.Sprites/Link/jogurt.1.rdc b/src/Randomizer.Sprites/Link/jogurt.1.rdc
diff --git a/src/Randomizer.Sprites/Link/juz.1.png b/src/Randomizer.Sprites/Link/juz.1.png
diff --git a/src/Randomizer.Sprites/Link/juz.1.rdc b/src/Randomizer.Sprites/Link/juz.1.rdc
diff --git a/src/Randomizer.Sprites/Link/kaguya.1.png b/src/Randomizer.Sprites/Link/kaguya.1.png
diff --git a/src/Randomizer.Sprites/Link/kaguya.1.rdc b/src/Randomizer.Sprites/Link/kaguya.1.rdc
diff --git a/src/Randomizer.Sprites/Link/katsura.2.png b/src/Randomizer.Sprites/Link/katsura.2.png
diff --git a/src/Randomizer.Sprites/Link/katsura.2.rdc b/src/Randomizer.Sprites/Link/katsura.2.rdc
diff --git a/src/Randomizer.Sprites/Link/kinu.1.png b/src/Randomizer.Sprites/Link/kinu.1.png
diff --git a/src/Randomizer.Sprites/Link/kinu.1.rdc b/src/Randomizer.Sprites/Link/kinu.1.rdc
diff --git a/src/Randomizer.Sprites/Link/linkhatcolor.1.png b/src/Randomizer.Sprites/Link/linkhatcolor.1.png
diff --git a/src/Randomizer.Sprites/Link/linkhatcolor.1.rdc b/src/Randomizer.Sprites/Link/linkhatcolor.1.rdc
diff --git a/src/Randomizer.Sprites/Link/metaknight.1.png b/src/Randomizer.Sprites/Link/metaknight.1.png
diff --git a/src/Randomizer.Sprites/Link/metaknight.1.rdc b/src/Randomizer.Sprites/Link/metaknight.1.rdc
diff --git a/src/Randomizer.Sprites/Link/missingno.2.png b/src/Randomizer.Sprites/Link/missingno.2.png
diff --git a/src/Randomizer.Sprites/Link/missingno.2.rdc b/src/Randomizer.Sprites/Link/missingno.2.rdc
diff --git a/src/Randomizer.Sprites/Link/negativelink.1.png b/src/Randomizer.Sprites/Link/negativelink.1.png
diff --git a/src/Randomizer.Sprites/Link/negativelink.1.rdc b/src/Randomizer.Sprites/Link/negativelink.1.rdc
diff --git a/src/Randomizer.Sprites/Link/olde-man.1.png b/src/Randomizer.Sprites/Link/olde-man.1.png
diff --git a/src/Randomizer.Sprites/Link/olde-man.1.rdc b/src/Randomizer.Sprites/Link/olde-man.1.rdc
diff --git a/src/Randomizer.Sprites/Link/paul-s-woodman.1.png b/src/Randomizer.Sprites/Link/paul-s-woodman.1.png
diff --git a/src/Randomizer.Sprites/Link/paul-s-woodman.1.rdc b/src/Randomizer.Sprites/Link/paul-s-woodman.1.rdc
diff --git a/src/Randomizer.Sprites/Link/plouni.1.png b/src/Randomizer.Sprites/Link/plouni.1.png
diff --git a/src/Randomizer.Sprites/Link/plouni.1.rdc b/src/Randomizer.Sprites/Link/plouni.1.rdc
diff --git a/src/Randomizer.Sprites/Link/power-pigg.1.png b/src/Randomizer.Sprites/Link/power-pigg.1.png
diff --git a/src/Randomizer.Sprites/Link/power-pigg.1.rdc b/src/Randomizer.Sprites/Link/power-pigg.1.rdc
diff --git a/src/Randomizer.Sprites/Link/professor.1.png b/src/Randomizer.Sprites/Link/professor.1.png
diff --git a/src/Randomizer.Sprites/Link/professor.1.rdc b/src/Randomizer.Sprites/Link/professor.1.rdc
diff --git a/src/Randomizer.Sprites/Link/quadbanger.1.png b/src/Randomizer.Sprites/Link/quadbanger.1.png
diff --git a/src/Randomizer.Sprites/Link/quadbanger.1.rdc b/src/Randomizer.Sprites/Link/quadbanger.1.rdc
diff --git a/src/Randomizer.Sprites/Link/rat.2.png b/src/Randomizer.Sprites/Link/rat.2.png
diff --git a/src/Randomizer.Sprites/Link/rat.2.rdc b/src/Randomizer.Sprites/Link/rat.2.rdc
diff --git a/src/Randomizer.Sprites/Link/rocky.1.png b/src/Randomizer.Sprites/Link/rocky.1.png
diff --git a/src/Randomizer.Sprites/Link/rocky.1.rdc b/src/Randomizer.Sprites/Link/rocky.1.rdc
diff --git a/src/Randomizer.Sprites/Link/rover.1.png b/src/Randomizer.Sprites/Link/rover.1.png
diff --git a/src/Randomizer.Sprites/Link/rover.1.rdc b/src/Randomizer.Sprites/Link/rover.1.rdc
diff --git a/src/Randomizer.Sprites/Link/shiluna.1.png b/src/Randomizer.Sprites/Link/shiluna.1.png
diff --git a/src/Randomizer.Sprites/Link/shiluna.1.rdc b/src/Randomizer.Sprites/Link/shiluna.1.rdc
diff --git a/src/Randomizer.Sprites/Link/soldiersprite.1.png b/src/Randomizer.Sprites/Link/soldiersprite.1.png
diff --git a/src/Randomizer.Sprites/Link/soldiersprite.1.rdc b/src/Randomizer.Sprites/Link/soldiersprite.1.rdc
diff --git a/src/Randomizer.Sprites/Link/spyro.2.png b/src/Randomizer.Sprites/Link/spyro.2.png
diff --git a/src/Randomizer.Sprites/Link/spyro.2.rdc b/src/Randomizer.Sprites/Link/spyro.2.rdc
diff --git a/src/Randomizer.Sprites/Link/steamedhams.1.png b/src/Randomizer.Sprites/Link/steamedhams.1.png
diff --git a/src/Randomizer.Sprites/Link/steamedhams.1.rdc b/src/Randomizer.Sprites/Link/steamedhams.1.rdc
diff --git a/src/Randomizer.Sprites/Link/stitch.1.png b/src/Randomizer.Sprites/Link/stitch.1.png
diff --git a/src/Randomizer.Sprites/Link/stitch.1.rdc b/src/Randomizer.Sprites/Link/stitch.1.rdc
diff --git a/src/Randomizer.Sprites/Link/tasbot.1.png b/src/Randomizer.Sprites/Link/tasbot.1.png
diff --git a/src/Randomizer.Sprites/Link/tasbot.1.rdc b/src/Randomizer.Sprites/Link/tasbot.1.rdc
diff --git a/src/Randomizer.Sprites/Link/the-robot.1.png b/src/Randomizer.Sprites/Link/the-robot.1.png
diff --git a/src/Randomizer.Sprites/Link/the-robot.1.rdc b/src/Randomizer.Sprites/Link/the-robot.1.rdc
diff --git a/src/Randomizer.Sprites/Link/tueffel.1.png b/src/Randomizer.Sprites/Link/tueffel.1.png
diff --git a/src/Randomizer.Sprites/Link/tueffel.1.rdc b/src/Randomizer.Sprites/Link/tueffel.1.rdc
diff --git a/src/Randomizer.Sprites/Link/vitreous.1.png b/src/Randomizer.Sprites/Link/vitreous.1.png
diff --git a/src/Randomizer.Sprites/Link/vitreous.1.rdc b/src/Randomizer.Sprites/Link/vitreous.1.rdc
diff --git a/src/Randomizer.Sprites/Link/whitemage.1.png b/src/Randomizer.Sprites/Link/whitemage.1.png
diff --git a/src/Randomizer.Sprites/Link/whitemage.1.rdc b/src/Randomizer.Sprites/Link/whitemage.1.rdc
diff --git a/src/Randomizer.Sprites/Link/zaruvyen.2.png b/src/Randomizer.Sprites/Link/zaruvyen.2.png
diff --git a/src/Randomizer.Sprites/Link/zaruvyen.2.rdc b/src/Randomizer.Sprites/Link/zaruvyen.2.rdc