From 40da7918a872e4feca6584742495ad8616062363 Mon Sep 17 00:00:00 2001
From: lahm86 <33758420+lahm86@users.noreply.github.com>
Date: Fri, 31 May 2024 15:45:23 +0100
Subject: [PATCH 1/2] Update UI

---
 .../Model/BoolItemControlClass.cs             |   2 +
 TRRandomizerView/Model/ControllerOptions.cs   | 111 ++++--
 TRRandomizerView/Model/OptionGenerator.cs     |   5 -
 TRRandomizerView/Windows/AdvancedWindow.xaml  | 327 ++++++------------
 .../Windows/AdvancedWindow.xaml.cs            |  55 ---
 5 files changed, 198 insertions(+), 302 deletions(-)

diff --git a/TRRandomizerView/Model/BoolItemControlClass.cs b/TRRandomizerView/Model/BoolItemControlClass.cs
index 1680c22fb..26904ba28 100644
--- a/TRRandomizerView/Model/BoolItemControlClass.cs
+++ b/TRRandomizerView/Model/BoolItemControlClass.cs
@@ -41,6 +41,8 @@ public bool IsActive
 
     public string Title { get; set; }
     public string Description { get; set; }
+    public string HelpURL { get; set; }
+    public bool HasHelpURL => HelpURL != null;
 
     public event PropertyChangedEventHandler PropertyChanged;
 
diff --git a/TRRandomizerView/Model/ControllerOptions.cs b/TRRandomizerView/Model/ControllerOptions.cs
index 79d476844..8feb6a90c 100644
--- a/TRRandomizerView/Model/ControllerOptions.cs
+++ b/TRRandomizerView/Model/ControllerOptions.cs
@@ -38,7 +38,7 @@ public class ControllerOptions : INotifyPropertyChanged
     private bool _useRewardRoomCameras;
     private uint _minSecretCount, _maxSecretCount;
     private BoolItemControlClass _includeKeyItems, _allowReturnPathLocations, _includeExtraPickups, _randomizeItemTypes, _randomizeItemLocations, _allowEnemyKeyDrops, _maintainKeyContinuity, _oneItemDifficulty;
-    private BoolItemControlClass _crossLevelEnemies, _protectMonks, _docileWillard, _swapEnemyAppearance, _allowEmptyEggs, _hideEnemies, _removeLevelEndingLarson, _giveUnarmedItems;
+    private BoolItemControlClass _crossLevelEnemies, _protectMonks, _docileWillard, _swapEnemyAppearance, _allowEmptyEggs, _hideEnemies, _removeLevelEndingLarson, _giveUnarmedItems, _unrestrictedEnemyDifficulty;
     private BoolItemControlClass _persistTextures, _randomizeWaterColour, _retainLevelTextures, _retainKeySpriteTextures, _retainSecretSpriteTextures, _retainEnemyTextures, _retainLaraTextures;
     private BoolItemControlClass _changeAmbientTracks, _includeBlankTracks, _changeTriggerTracks, _separateSecretTracks, _changeWeaponSFX, _changeCrashSFX, _changeEnemySFX, _changeDoorSFX, _linkCreatureSFX, _randomizeWibble;
     private BoolItemControlClass _persistOutfits, _removeRobeDagger, _allowGymOutfit;
@@ -90,13 +90,18 @@ public class ControllerOptions : INotifyPropertyChanged
     private List<BoolItemIDControlClass> _selectableEnemies;
     private bool _useEnemyExclusions, _showExclusionWarnings;
 
-    private RandoDifficulty _randoEnemyDifficulty;
+    private ItemRange[] _itemRanges;
     private ItemRange _keyItemRange;
+
+    private GlobeDisplayOption[] _globeDisplayOptions;
     private GlobeDisplayOption _globeDisplayOption;
+
+    private BirdMonsterBehaviour[] _birdMonsterBehaviours;
     private BirdMonsterBehaviour _birdMonsterBehaviour;
+
+    private DragonSpawnType[] _dragonSpawnTypes;
     private DragonSpawnType _dragonSpawnType;
 
-    private ItemRange[] _itemRanges;
     private Language[] _availableLanguages;
     private Language _gameStringLanguage;
 
@@ -1096,6 +1101,16 @@ public GlobeDisplayOption GlobeDisplay
         }
     }
 
+    public GlobeDisplayOption[] GlobeDisplayOptions
+    {
+        get => _globeDisplayOptions;
+        private set
+        {
+            _globeDisplayOptions = value;
+            FirePropertyChanged();
+        }
+    }
+
     public int LevelSequencingSeed
     {
         get => _gameModeControl.Seed;
@@ -2455,6 +2470,16 @@ public BirdMonsterBehaviour BirdMonsterBehaviour
         }
     }
 
+    public BirdMonsterBehaviour[] BirdMonsterBehaviours
+    {
+        get => _birdMonsterBehaviours;
+        private set
+        {
+            _birdMonsterBehaviours = value;
+            FirePropertyChanged();
+        }
+    }
+
     public DragonSpawnType DragonSpawnType
     {
         get => _dragonSpawnType;
@@ -2465,6 +2490,16 @@ public DragonSpawnType DragonSpawnType
         }
     }
 
+    public DragonSpawnType[] DragonSpawnTypes
+    {
+        get => _dragonSpawnTypes;
+        private set
+        {
+            _dragonSpawnTypes = value;
+            FirePropertyChanged();
+        }
+    }
+
     public BoolItemControlClass SwapEnemyAppearance
     {
         get => _swapEnemyAppearance;
@@ -2515,12 +2550,12 @@ public BoolItemControlClass GiveUnarmedItems
         }
     }
 
-    public RandoDifficulty RandoEnemyDifficulty
+    public BoolItemControlClass UnrestrictedEnemyDifficulty
     {
-        get => _randoEnemyDifficulty;
+        get => _unrestrictedEnemyDifficulty;
         set
         {
-            _randoEnemyDifficulty = value;
+            _unrestrictedEnemyDifficulty = value;
             FirePropertyChanged();
         }
     }
@@ -3099,6 +3134,13 @@ public ControllerOptions()
             Description = "If a level is unarmed, give extra ammo, medipacks and a weapon other than the pistols (based on enemy difficulty)."
         };
         BindingOperations.SetBinding(GiveUnarmedItems, BoolItemControlClass.IsActiveProperty, randomizeEnemiesBinding);
+        UnrestrictedEnemyDifficulty = new()
+        {
+            Title = "Unrestricted difficulty",
+            Description = "Disables virtually all cross-level enemy restrictions except for technical ones.",
+            HelpURL = "https://github.com/LostArtefacts/TR-Rando/blob/master/Resources/Documentation/ENEMIES.md",
+        };
+        BindingOperations.SetBinding(UnrestrictedEnemyDifficulty, BoolItemControlClass.IsActiveProperty, randomizeEnemiesBinding);
 
         // Textures
         Binding randomizeTexturesBinding = new(nameof(RandomizeTextures)) { Source = this };
@@ -3339,52 +3381,78 @@ public ControllerOptions()
         {
             _randomizeLevelSequencing
         };
-        SecretBoolItemControls = new List<BoolItemControlClass>()
+        SecretBoolItemControls = new()
         {
             _isHardSecrets, _allowGlitched, _guaranteeSecrets, _useRandomSecretModels
         };
-        ItemBoolItemControls = new List<BoolItemControlClass>()
+        ItemBoolItemControls = new()
         {
             _randomizeItemTypes, _randomizeItemLocations, _includeKeyItems, _allowReturnPathLocations, _allowEnemyKeyDrops, _oneItemDifficulty, _maintainKeyContinuity, _includeExtraPickups
         };
-        EnemyBoolItemControls = new List<BoolItemControlClass>()
+        EnemyBoolItemControls = new()
         {
-            _crossLevelEnemies, _docileWillard, _protectMonks, _swapEnemyAppearance, _allowEmptyEggs, _hideEnemies, _removeLevelEndingLarson, _giveUnarmedItems,_allowEnemyKeyDrops
+            _crossLevelEnemies, _docileWillard, _protectMonks, _swapEnemyAppearance, _allowEmptyEggs, _hideEnemies, _removeLevelEndingLarson, _giveUnarmedItems,_allowEnemyKeyDrops, _unrestrictedEnemyDifficulty
         };
-        TextureBoolItemControls = new List<BoolItemControlClass>()
+        TextureBoolItemControls = new()
         {
             _persistTextures, _randomizeWaterColour, _retainLevelTextures, _retainLaraTextures, _retainEnemyTextures, _retainKeySpriteTextures, _retainSecretSpriteTextures
         };
-        AudioBoolItemControls = new List<BoolItemControlClass>()
+        AudioBoolItemControls = new()
         {
             _changeAmbientTracks, _includeBlankTracks, _changeTriggerTracks, _separateSecretTracks, _changeWeaponSFX,
             _changeCrashSFX, _changeEnemySFX, _changeDoorSFX, _linkCreatureSFX, _randomizeWibble
         };
-        OutfitBoolItemControls = new List<BoolItemControlClass>()
+        OutfitBoolItemControls = new()
         {
             _persistOutfits, _removeRobeDagger, _allowGymOutfit
         };
-        TextBoolItemControls = new List<BoolItemControlClass>
+        TextBoolItemControls = new()
         {
             _retainKeyItemNames, _retainLevelNames
         };
-        StartBoolItemControls = new List<BoolItemControlClass>
+        StartBoolItemControls = new()
         {
             _rotateStartPosition
         };
-        EnvironmentBoolItemControls = new List<BoolItemControlClass>
+        EnvironmentBoolItemControls = new()
         {
             _randomizeWaterLevels, _randomizeSlotPositions, _randomizeLadders, _randomizeTraps,
             _randomizeChallengeRooms, _hardEnvironmentMode, _blockShortcuts
         };
-        HealthBoolItemControls = new List<BoolItemControlClass>
+        HealthBoolItemControls = new()
         {
             _disableHealingBetweenLevels, _disableMedpacks
         };
-        WeatherBoolItemControls = new List<BoolItemControlClass>
+        WeatherBoolItemControls = new()
         {
             _rainyAssaultCourse, _snowyAssaultCourse, _coldAssaultCourse
         };
+
+        IEnumerable<BoolItemControlClass> controls = GameOrderBoolItemControls
+            .Concat(SecretBoolItemControls)
+            .Concat(ItemBoolItemControls)
+            .Concat(EnemyBoolItemControls)
+            .Concat(TextureBoolItemControls)
+            .Concat(AudioBoolItemControls)
+            .Concat(OutfitBoolItemControls)
+            .Concat(TextureBoolItemControls)
+            .Concat(StartBoolItemControls)
+            .Concat(EnvironmentBoolItemControls)
+            .Concat(HealthBoolItemControls)
+            .Concat(WeatherBoolItemControls);
+
+        foreach (BoolItemControlClass control in controls)
+        {
+            control.PropertyChanged += BoolControl_PropertyChanged;
+        }
+    }
+
+    private void BoolControl_PropertyChanged(object sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(BoolItemControlClass.Value))
+        {
+            FirePropertyChanged(e.PropertyName);
+        }
     }
 
     private void IncludeKeyItems_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -3456,6 +3524,7 @@ public void Load(TRRandomizerController controller)
         RandomizeLevelSequencing.Value = _controller.RandomizeSequencing;
         LevelSequencingSeed = _controller.LevelSequencingSeed;
         PlayableLevelCount = _controller.PlayableLevelCount;
+        GlobeDisplayOptions = Enum.GetValues<GlobeDisplayOption>();
         GlobeDisplay = _controller.GlobeDisplay;
 
         RandomizeUnarmedLevels = _controller.RandomizeUnarmedLevels;
@@ -3543,14 +3612,16 @@ public void Load(TRRandomizerController controller)
         CrossLevelEnemies.Value = _controller.CrossLevelEnemies;
         ProtectMonks.Value = _controller.ProtectMonks;
         DocileWillard.Value = _controller.DocileWillard;
+        BirdMonsterBehaviours = Enum.GetValues<BirdMonsterBehaviour>();
         BirdMonsterBehaviour = _controller.BirdMonsterBehaviour;
+        DragonSpawnTypes = Enum.GetValues<DragonSpawnType>();
         DragonSpawnType = _controller.DragonSpawnType;
         SwapEnemyAppearance.Value = _controller.SwapEnemyAppearance;
         AllowEmptyEggs.Value = _controller.AllowEmptyEggs;
         HideEnemies.Value = _controller.HideEnemiesUntilTriggered;
         RemoveLevelEndingLarson.Value = _controller.RemoveLevelEndingLarson;
         GiveUnarmedItems.Value = _controller.GiveUnarmedItems;
-        RandoEnemyDifficulty = _controller.RandoEnemyDifficulty;
+        UnrestrictedEnemyDifficulty.Value = _controller.RandoEnemyDifficulty == RandoDifficulty.NoRestrictions;
         UseEnemyExclusions = _controller.UseEnemyExclusions;
         ShowExclusionWarnings = _controller.ShowExclusionWarnings;
         LoadEnemyExclusions();
@@ -3859,7 +3930,7 @@ public void Save()
         _controller.HideEnemiesUntilTriggered = HideEnemies.Value;
         _controller.RemoveLevelEndingLarson = RemoveLevelEndingLarson.Value;
         _controller.GiveUnarmedItems = GiveUnarmedItems.Value;
-        _controller.RandoEnemyDifficulty = RandoEnemyDifficulty;
+        _controller.RandoEnemyDifficulty = UnrestrictedEnemyDifficulty.Value ? RandoDifficulty.NoRestrictions : RandoDifficulty.Default;
         _controller.UseEnemyExclusions = UseEnemyExclusions;
         _controller.ShowExclusionWarnings = ShowExclusionWarnings;
 
diff --git a/TRRandomizerView/Model/OptionGenerator.cs b/TRRandomizerView/Model/OptionGenerator.cs
index 7f6f0a92d..afd7cbdcc 100644
--- a/TRRandomizerView/Model/OptionGenerator.cs
+++ b/TRRandomizerView/Model/OptionGenerator.cs
@@ -272,11 +272,6 @@ private void RandomizeItemOptions()
     private void RandomizeEnemyOptions()
     {
         RandomizeBoolItems(_options.EnemyBoolItemControls);
-        do
-        {
-            _options.RandoEnemyDifficulty = GetRandomEnumValue<RandoDifficulty>(typeof(RandoDifficulty));
-        }
-        while (_options.RandoEnemyDifficulty == RandoDifficulty.DefaultOrNoRestrictions); // Used internally only and is not a UI option
         if (_options.IsBirdMonsterBehaviourTypeSupported)
         {
             _options.BirdMonsterBehaviour = GetRandomEnumValue<BirdMonsterBehaviour>(typeof(BirdMonsterBehaviour));
diff --git a/TRRandomizerView/Windows/AdvancedWindow.xaml b/TRRandomizerView/Windows/AdvancedWindow.xaml
index 1ef0544b0..213ff6d51 100644
--- a/TRRandomizerView/Windows/AdvancedWindow.xaml
+++ b/TRRandomizerView/Windows/AdvancedWindow.xaml
@@ -14,7 +14,6 @@
         ShowInTaskbar="False"
         SizeToContent="WidthAndHeight"
         Loaded="Window_Loaded"
-        IsVisibleChanged="Window_IsVisibleChanged"
         Closing="Window_Closing"
         Title="Advanced">
     <Window.Resources>
@@ -95,7 +94,6 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
             <Grid.ColumnDefinitions>
@@ -166,25 +164,40 @@
                                 </Grid.ColumnDefinitions>
 
                                 <Border Margin="0,5,0,0">
-                                    <CheckBox IsEnabled="{Binding IsActive}"
-                                              IsChecked="{Binding Value, Mode=TwoWay}"
-                                              VerticalAlignment="Top">
-                                        <Label Padding="0"
-                                               Content="{Binding Title}" />
+                                    <CheckBox
+                                        IsEnabled="{Binding IsActive}"
+                                        IsChecked="{Binding Value, Mode=TwoWay}"
+                                        VerticalAlignment="Top">
+                                        <Label
+                                            Padding="0"
+                                            Content="{Binding Title}" />
                                     </CheckBox>
                                 </Border>
 
-                                <Border Grid.Column="1"
-                                        Margin="0,5,0,0"
-                                        IsEnabled="{Binding IsActive}">
-                                    <Label Style="{StaticResource OptionDescriptionStyle}"
-                                           Content="{Binding Description}">
-                                        <Label.Resources>
-                                            <Style TargetType="TextBlock">
-                                                <Setter Property="TextWrapping" Value="Wrap" />
-                                            </Style>
-                                        </Label.Resources>
-                                    </Label>
+                                <Border
+                                    Grid.Column="1"
+                                    Margin="0,5,0,0"
+                                    IsEnabled="{Binding IsActive}">
+                                    <StackPanel Orientation="Horizontal">
+                                        <Label
+                                            Style="{StaticResource OptionDescriptionStyle}"
+                                            Content="{Binding Description}"/>
+                                        <Label
+                                            Style="{StaticResource OptionDescriptionStyle}"
+                                            Margin="3,0,0,0"
+                                            Visibility="{Binding HasHelpURL, Converter={StaticResource BoolToCollapsedConverter}}">
+                                            <Label.Content>
+                                                <TextBlock>
+                                                    <Run>See</Run>
+                                                    <Hyperlink
+                                                        ToolTip="{Binding HelpURL}"
+                                                        NavigateUri="{Binding HelpURL}"
+                                                        RequestNavigate="Hyperlink_RequestNavigate">GitHub</Hyperlink>
+                                                    <Run>for details.</Run>
+                                                </TextBlock>
+                                            </Label.Content>
+                                        </Label>
+                                    </StackPanel>
                                 </Border>
                             </Grid>
                         </DataTemplate>
@@ -370,69 +383,39 @@
                 <Grid Margin="0,5,0,0">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" SharedSizeGroup="SSG1"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
-                    <Border>
-                        <RadioButton Content="Default"
-                                     GroupName="birdMonsterBehaviour"
-                                     x:Name="_defaultBirdBehaviourButton"
-                                     VerticalAlignment="Center"
-                                     Padding="4,0,0,0"
-                                     IsChecked="{Binding ControllerProxy.BirdMonsterBehaviour, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static helpers:BirdMonsterBehaviour.Default}, Mode=TwoWay}"/>
+                    <Border VerticalAlignment="Top">
+                        <ComboBox
+                            ItemsSource="{Binding ControllerProxy.BirdMonsterBehaviours}"
+                            SelectedItem="{Binding ControllerProxy.BirdMonsterBehaviour, Mode=TwoWay}"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"/>
                     </Border>
 
                     <Border Grid.Column="1">
-                        <Label Style="{StaticResource OptionDescriptionStyle}"
-                               Content="Bird monsters will be aggressive and will end the level when killed."/>
-                    </Border>
-
-                    <Border Grid.Row="1">
-                        <RadioButton Content="Unconditional"
-                                     GroupName="birdMonsterBehaviour"
-                                     x:Name="_unconditionalBirdBehaviourButton"
-                                     VerticalAlignment="Center"
-                                     Padding="4,0,0,0"
-                                     IsChecked="{Binding ControllerProxy.BirdMonsterBehaviour, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static helpers:BirdMonsterBehaviour.Unconditional}, Mode=TwoWay}"/>
-                    </Border>
-
-                    <Border Grid.Row="1"
-                            Grid.Column="1">
-                        <Label Style="{StaticResource OptionDescriptionStyle}">
-                            <TextBlock>
-                                <Run>Bird monsters will be aggressive but will </Run>
-                                <Run TextDecorations="Underline">not </Run>
-                                <Run>end the level when killed.</Run>
-                            </TextBlock>
-                        </Label>
-                    </Border>
-
-                    <Border Grid.Row="2"
-                            Visibility="{Binding ControllerProxy.IsDocileBirdMonsterTypeSupported, Converter={StaticResource BoolToCollapsedConverter}}">
-                        <RadioButton Content="Docile"
-                                     GroupName="birdMonsterBehaviour"
-                                     x:Name="_docileBirdBehaviourButton"
-                                     VerticalAlignment="Center"
-                                     Padding="4,0,0,0"
-                                     IsChecked="{Binding ControllerProxy.BirdMonsterBehaviour, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static helpers:BirdMonsterBehaviour.Docile}, Mode=TwoWay}"/>
-                    </Border>
-
-                    <Border Grid.Row="2"
-                            Grid.Column="1"
-                            Visibility="{Binding ControllerProxy.IsDocileBirdMonsterTypeSupported, Converter={StaticResource BoolToCollapsedConverter}}">
                         <Label Style="{StaticResource OptionDescriptionStyle}">
-                            <TextBlock>
-                                <Run>Bird monsters will </Run>
-                                <Run TextDecorations="Underline">not </Run>
-                                <Run>be aggressive and will </Run>
-                                <Run TextDecorations="Underline">not </Run>
-                                <Run>end the level when killed.</Run>
-                            </TextBlock>
+                            <Label.Content>
+                                <TextBlock>
+                                    <Run>Choose how bird monsters behave.</Run>
+                                    <LineBreak/>
+                                    <Run>- Default: bird monsters will be aggressive and will end the level when killed.</Run>
+                                    <LineBreak/>
+                                    <Run>- Unconditional: bird monsters will be aggressive but will </Run>
+                                    <Run TextDecorations="Underline">not </Run>
+                                    <Run>end the level when killed.</Run>
+                                    <LineBreak/>
+                                    <Run>- Docile: bird monsters will </Run>
+                                    <Run TextDecorations="Underline">not </Run>
+                                    <Run>be aggressive and will </Run>
+                                    <Run TextDecorations="Underline">not </Run>
+                                    <Run>end the level when killed.</Run>
+                                </TextBlock>
+                            </Label.Content>
                         </Label>
                     </Border>
                 </Grid>
@@ -447,118 +430,40 @@
                 <Grid Margin="0,5,0,0">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" SharedSizeGroup="SSG1"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-
-                    <Border>
-                        <RadioButton Content="Default"
-                                     GroupName="dragonSpawn"
-                                     x:Name="_defaultDragonSpawnButton"
-                                     VerticalAlignment="Center"
-                                     Padding="4,0,0,0"
-                                     IsChecked="{Binding ControllerProxy.DragonSpawnType, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static helpers:DragonSpawnType.Default}, Mode=TwoWay}"/>
-                    </Border>
-
-                    <Border Grid.Column="1">
-                        <Label Style="{StaticResource OptionDescriptionStyle}"
-                               Content="Use the normal randomization selection method for dragons."/>
-                    </Border>
-
-                    <Border Grid.Row="1">
-                        <RadioButton Content="Maximum"
-                                     GroupName="dragonSpawn"
-                                     x:Name="_maximumDragonSpawnButton"
-                                     VerticalAlignment="Center"
-                                     Padding="4,0,0,0"
-                                     IsChecked="{Binding ControllerProxy.DragonSpawnType, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static helpers:DragonSpawnType.Maximum}, Mode=TwoWay}"/>
-                    </Border>
-
-                    <Border Grid.Row="1"
-                            Grid.Column="1">
-                        <Label Style="{StaticResource OptionDescriptionStyle}"
-                               Content="Make a best effort attempt to have as many dragons as possible in the game."/>
-                    </Border>
-
-                    <Border Grid.Row="2">
-                        <RadioButton Content="Minimum"
-                                     GroupName="dragonSpawn"
-                                     x:Name="_minimumDragonSpawnButton"
-                                     VerticalAlignment="Center"
-                                     Padding="4,0,0,0"
-                                     IsChecked="{Binding ControllerProxy.DragonSpawnType, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static helpers:DragonSpawnType.Minimum}, Mode=TwoWay}"/>
-                    </Border>
-
-                    <Border Grid.Row="2"
-                            Grid.Column="1">
-                        <Label Style="{StaticResource OptionDescriptionStyle}"
-                               Content="Only the original dragon will spawn."/>
-                    </Border>
-                </Grid>
-            </StackPanel>
-
-            <!-- (Enemy) Difficulty -->
-            <StackPanel Grid.Row="8"
-                        Visibility="{Binding HasDifficulty, Converter={StaticResource BoolToCollapsedConverter}}">
-                <TextBlock Style="{StaticResource HeaderStyle}"
-                           Text="Difficulty"/>
-
-                <Grid Margin="0,5,0,0">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" SharedSizeGroup="SSG1"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
-                    <Border>
-                        <RadioButton Content="Default"
-                                     GroupName="randoEnemyDifficulty"
-                                     x:Name="_defaultDifficultyButton"
-                                     VerticalAlignment="Center"
-                                     Padding="4,0,0,0"
-                                     IsChecked="{Binding ControllerProxy.RandoEnemyDifficulty, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static helpers:RandoDifficulty.Default}, Mode=TwoWay}"/>
+                    <Border VerticalAlignment="Top">
+                        <ComboBox
+                            ItemsSource="{Binding ControllerProxy.DragonSpawnTypes}"
+                            SelectedItem="{Binding ControllerProxy.DragonSpawnType, Mode=TwoWay}"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"/>
                     </Border>
 
                     <Border Grid.Column="1">
                         <Label Style="{StaticResource OptionDescriptionStyle}">
                             <Label.Content>
                                 <TextBlock>
-                                    Standard restrictions will apply for cross-level enemies. See
-                                    <Hyperlink ToolTip="https://github.com/LostArtefacts/TR-Rando/blob/master/Resources/Documentation/ENEMIES.md"
-                                               NavigateUri="https://github.com/LostArtefacts/TR-Rando/blob/master/Resources/Documentation/ENEMIES.md"
-                                               RequestNavigate="Hyperlink_RequestNavigate">GitHub</Hyperlink>
-                                    for details.
+                                    <Run>Choose how many dragons can potentially spawn in the game.</Run>
+                                    <LineBreak/>
+                                    <Run>- Default: use the normal randomization selection method for dragons.</Run>
+                                    <LineBreak/>
+                                    <Run>- Maximum: make a best effort attempt to have as many dragons as possible in the game.</Run>
+                                    <LineBreak/>
+                                    <Run>- Minimum: only the original dragon will spawn.</Run>
                                 </TextBlock>
                             </Label.Content>
                         </Label>
                     </Border>
-
-                    <Border Grid.Row="1">
-                        <RadioButton Content="No Restrictions"
-                                     GroupName="randoEnemyDifficulty"
-                                     x:Name="_unrestrictedButton"
-                                     VerticalAlignment="Center"
-                                     Padding="4,0,0,0"
-                                     IsChecked="{Binding ControllerProxy.RandoEnemyDifficulty, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static helpers:RandoDifficulty.NoRestrictions}, Mode=TwoWay}" />
-                    </Border>
-
-                    <Border Grid.Row="1"
-                            Grid.Column="1">
-                        <Label Style="{StaticResource OptionDescriptionStyle}"
-                               Content="Disables virtually all cross-level enemy restrictions except for technical ones."/>
-                    </Border>
                 </Grid>
             </StackPanel>
 
             <!-- Enemy Exclusions -->
-            <StackPanel Grid.Row="9"
+            <StackPanel Grid.Row="8"
                         Visibility="{Binding HasDifficulty, Converter={StaticResource BoolToCollapsedConverter}}">
                 <TextBlock Style="{StaticResource HeaderStyle}"
                            Text="Excluded Enemies"/>
@@ -597,7 +502,7 @@
             </StackPanel>
 
             <!-- Language -->
-            <StackPanel Grid.Row="10"
+            <StackPanel Grid.Row="9"
                         Visibility="{Binding HasLanguage, Converter={StaticResource BoolToCollapsedConverter}}">
 
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -625,7 +530,7 @@
             </StackPanel>
 
             <!-- Mirrored Levels -->
-            <StackPanel Grid.Row="11"
+            <StackPanel Grid.Row="10"
                         Visibility="{Binding HasMirroring, Converter={StaticResource BoolToCollapsedConverter}}">
 
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -679,7 +584,7 @@
             </StackPanel>
 
             <!-- Haircuts -->
-            <StackPanel Grid.Row="12"
+            <StackPanel Grid.Row="11"
                         Visibility="{Binding HasHaircuts, Converter={StaticResource BoolToCollapsedConverter}}">
 
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -752,7 +657,7 @@
             </StackPanel>
 
             <!-- Invisibility -->
-            <StackPanel Grid.Row="13"
+            <StackPanel Grid.Row="12"
                         Visibility="{Binding HasInvisibility, Converter={StaticResource BoolToCollapsedConverter}}">
 
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -806,7 +711,7 @@
             </StackPanel>
 
             <!-- Night Mode general -->
-            <StackPanel Grid.Row="14"
+            <StackPanel Grid.Row="13"
                         Visibility="{Binding HasNightMode, Converter={StaticResource BoolToCollapsedConverter}}">
 
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -997,7 +902,7 @@
             </StackPanel>
 
             <!-- Intensity -->
-            <StackPanel Grid.Row="15"
+            <StackPanel Grid.Row="14"
                         Visibility="{Binding HasNightMode, Converter={StaticResource BoolToCollapsedConverter}}">
 
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -1053,7 +958,7 @@
             </StackPanel>
 
             <!-- TR3 Globe Options -->
-            <StackPanel Grid.Row="16"
+            <StackPanel Grid.Row="15"
                         Visibility="{Binding HasGlobeOptions, Converter={StaticResource BoolToCollapsedConverter}}">
                 <TextBlock Style="{StaticResource HeaderStyle}"
                            Text="Globe Display"/>
@@ -1061,63 +966,41 @@
                 <Grid Margin="0,5,0,0">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" SharedSizeGroup="SSG1"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
 
-                    <Border>
-                        <RadioButton Content="Default"
-                                     GroupName="globeTextDisplay"
-                                     x:Name="_globeDefaultButton"
-                                     VerticalAlignment="Center"
-                                     Padding="4,0,0,0"
-                                     IsChecked="{Binding ControllerProxy.GlobeDisplay, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static helpers:GlobeDisplayOption.Default}, Mode=TwoWay}"/>
+                    <Border VerticalAlignment="Top">
+                        <ComboBox
+                            ItemsSource="{Binding ControllerProxy.GlobeDisplayOptions}"
+                            SelectedItem="{Binding ControllerProxy.GlobeDisplay, Mode=TwoWay}"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"/>
                     </Border>
 
                     <Border Grid.Column="1">
-                        <Label Style="{StaticResource OptionDescriptionStyle}"
-                               Content="Leave the default in place - displayed locations may or may not match the next level."/>
-                    </Border>
-
-                    <Border Grid.Row="1">
-                        <RadioButton Content="Show next area"
-                                     GroupName="globeTextDisplay"
-                                     x:Name="_globeAreaButton"
-                                     VerticalAlignment="Center"
-                                     Padding="4,0,0,0"
-                                     IsChecked="{Binding ControllerProxy.GlobeDisplay, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static helpers:GlobeDisplayOption.Area}, Mode=TwoWay}"/>
-                    </Border>
-
-                    <Border Grid.Row="1"
-                            Grid.Column="1">
-                        <Label Style="{StaticResource OptionDescriptionStyle}"
-                               Content="Show the next area name when selecting a globe location."/>
-                    </Border>
-
-                    <Border Grid.Row="2">
-                        <RadioButton Content="Show next level"
-                                     GroupName="globeTextDisplay"
-                                     x:Name="_globeLevelButton"
-                                     VerticalAlignment="Center"
-                                     Padding="4,0,0,0"
-                                     IsChecked="{Binding ControllerProxy.GlobeDisplay, Converter={StaticResource ComparisonConverter}, ConverterParameter={x:Static helpers:GlobeDisplayOption.Level}, Mode=TwoWay}" />
-                    </Border>
-
-                    <Border Grid.Row="2"
-                            Grid.Column="1">
-                        <Label Style="{StaticResource OptionDescriptionStyle}"
-                               Content="Show the next level name when selecting a globe location."/>
+                        <Label Style="{StaticResource OptionDescriptionStyle}">
+                            <Label.Content>
+                                <TextBlock>
+                                    <Run>Choose the wording on the level select globe.</Run>
+                                    <LineBreak/>
+                                    <Run>- Default: displayed locations may or may not match the next level.</Run>
+                                    <LineBreak/>
+                                    <Run>- Area: show the next area name when selecting a globe location e.g. India, South Pacific etc.</Run>
+                                    <LineBreak/>
+                                    <Run>- Level: show the next level name when selecting a globe location e.g. Thames Wharf, Temple Ruins etc.</Run>
+                                </TextBlock>
+                            </Label.Content>
+                        </Label>
                     </Border>
                 </Grid>
             </StackPanel>
 
             <!-- Game Mode -->
             <StackPanel
-                Grid.Row="17"
+                Grid.Row="16"
                 Visibility="{Binding HasGameModeOptions, Converter={StaticResource BoolToCollapsedConverter}}">
                 <TextBlock
                     Style="{StaticResource HeaderStyle}"
@@ -1159,7 +1042,7 @@
             </StackPanel>
 
             <!-- Level Count -->
-            <StackPanel Grid.Row="18"
+            <StackPanel Grid.Row="17"
                         Visibility="{Binding HasLevelCount, Converter={StaticResource BoolToCollapsedConverter}}">
 
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -1206,7 +1089,7 @@
             </StackPanel>
 
             <!-- Wireframing -->
-            <StackPanel Grid.Row="19"
+            <StackPanel Grid.Row="18"
                         Visibility="{Binding HasTextureOptions, Converter={StaticResource BoolToCollapsedConverter}}">
 
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -1368,7 +1251,7 @@
             </StackPanel>
 
             <!-- SFX -->
-            <StackPanel Grid.Row="20"
+            <StackPanel Grid.Row="19"
                         Visibility="{Binding HasSFXOptions, Converter={StaticResource BoolToCollapsedConverter}}">
 
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -1422,7 +1305,7 @@
             </StackPanel>
 
             <!-- Mediless -->
-            <StackPanel Grid.Row="21"
+            <StackPanel Grid.Row="20"
                         Visibility="{Binding HasHealthMode, Converter={StaticResource BoolToCollapsedConverter}}"
                         IsEnabled="{Binding ControllerProxy.IsMedilessTypeSupported}">
 
@@ -1469,7 +1352,7 @@
             </StackPanel>
 
             <!-- Starting Health -->
-            <StackPanel Grid.Row="22"
+            <StackPanel Grid.Row="21"
                         Visibility="{Binding HasHealthMode, Converter={StaticResource BoolToCollapsedConverter}}">
 
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -1549,7 +1432,7 @@
 
             <!-- Reward Mode -->
             <StackPanel
-                Grid.Row="23"
+                Grid.Row="22"
                 Visibility="{Binding HasSecretRewardMode, Converter={StaticResource BoolToCollapsedConverter}}">
                 <TextBlock
                     Style="{StaticResource HeaderStyle}"
@@ -1612,7 +1495,7 @@
             </StackPanel>
             
             <!-- Secret Count -->
-            <StackPanel Grid.Row="24"
+            <StackPanel Grid.Row="23"
                         Visibility="{Binding HasSecretCountMode, Converter={StaticResource BoolToCollapsedConverter}}"
                         IsEnabled="{Binding ControllerProxy.UseGenericSecrets}">
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -1684,7 +1567,7 @@
             </StackPanel>
 
             <!-- Secret Packs -->
-            <StackPanel Grid.Row="25"
+            <StackPanel Grid.Row="24"
                         Visibility="{Binding HasSecretPackMode, Converter={StaticResource BoolToCollapsedConverter}}">
                 <TextBlock Style="{StaticResource HeaderStyle}"
                            Text="Secret Packs"/>
@@ -1732,7 +1615,7 @@
             </StackPanel>
 
             <!-- Weather -->
-            <StackPanel Grid.Row="26"
+            <StackPanel Grid.Row="25"
                         Visibility="{Binding HasWeatherMode, Converter={StaticResource BoolToCollapsedConverter}}">
 
                 <TextBlock Style="{StaticResource HeaderStyle}"
@@ -1844,7 +1727,7 @@
             
             <!-- Enemy Clones -->
             <StackPanel
-                Grid.Row="27"
+                Grid.Row="26"
                 Visibility="{Binding HasClonedEnemyMode, Converter={StaticResource BoolToCollapsedConverter}}">
                 <TextBlock
                     Style="{StaticResource HeaderStyle}"
diff --git a/TRRandomizerView/Windows/AdvancedWindow.xaml.cs b/TRRandomizerView/Windows/AdvancedWindow.xaml.cs
index 9d95b5f78..0b35f8415 100644
--- a/TRRandomizerView/Windows/AdvancedWindow.xaml.cs
+++ b/TRRandomizerView/Windows/AdvancedWindow.xaml.cs
@@ -321,61 +321,6 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
         Visibility = Visibility.Hidden;
     }
 
-    private void Window_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
-    {
-        // This should not be here, but in some cases both radio buttons can remain unchecked on load
-        // TODO: This causes opening an AdvancedWindow to automatically become "unsaved"
-        if (HasDifficulty)
-        {
-            _unrestrictedButton.IsChecked = !(_defaultDifficultyButton.IsChecked = ControllerProxy.RandoEnemyDifficulty == RandoDifficulty.Default);
-        }
-        if (HasGlobeOptions)
-        {
-            switch (ControllerProxy.GlobeDisplay)
-            {
-                case GlobeDisplayOption.Default:
-                    _globeDefaultButton.IsChecked = true;
-                    break;
-                case GlobeDisplayOption.Area:
-                    _globeAreaButton.IsChecked = true;
-                    break;
-                case GlobeDisplayOption.Level:
-                    _globeLevelButton.IsChecked = true;
-                    break;
-            }
-        }
-        if (HasBirdMonsterBehaviour)
-        {
-            switch (ControllerProxy.BirdMonsterBehaviour)
-            {
-                case BirdMonsterBehaviour.Default:
-                    _defaultBirdBehaviourButton.IsChecked = true;
-                    break;
-                case BirdMonsterBehaviour.Unconditional:
-                    _unconditionalBirdBehaviourButton.IsChecked = true;
-                    break;
-                case BirdMonsterBehaviour.Docile:
-                    _docileBirdBehaviourButton.IsChecked = true;
-                    break;
-            }
-        }
-        if (HasDragonSpawn)
-        {
-            switch (ControllerProxy.DragonSpawnType)
-            {
-                case DragonSpawnType.Default:
-                    _defaultDragonSpawnButton.IsChecked = true;
-                    break;
-                case DragonSpawnType.Maximum:
-                    _maximumDragonSpawnButton.IsChecked = true;
-                    break;
-                case DragonSpawnType.Minimum:
-                    _minimumDragonSpawnButton.IsChecked = true;
-                    break;
-            }
-        }
-    }
-
     private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
     {
         ProcessUtils.OpenURL(e.Uri.AbsoluteUri);

From 58c9d8656d4f0c945bd9d73324d36dd19756e0a1 Mon Sep 17 00:00:00 2001
From: lahm86 <33758420+lahm86@users.noreply.github.com>
Date: Fri, 31 May 2024 15:54:31 +0100
Subject: [PATCH 2/2] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fc31ecdd..313b16ce4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
 - fixed a key item softlock in Crash Site (#662)
 - fixed incorrect item and mesh positions in Home Sweet Home when mirrored (#676)
 - fixed uncontrolled SFX in gym/assault course levels not being linked to the correct setting (#684)
+- improved the layout of some options in the UI (#694)
 
 ## [V1.8.4](https://github.com/LostArtefacts/TR-Rando/compare/V1.8.3...V1.8.4) - 2024-02-12
 - fixed item locking logic so that secrets that rely on specific enemies will always be obtainable (#570)