Add Open DHC + Pedestal goal

MinishCapRandomizerCLI/CommandFileParser.cs

@@ -42,6 +42,9 @@ internal static void ParseCommandsFile(string filename)
                 case "LoadSettings":
                     GenericCommands.LoadSettings(inputs[1]);
                     break;
+                case "LoadCosmetics":
+                    GenericCommands.LoadCosmetics(inputs[1]);
+                    break;
                 case "Logging":
                     GenericCommands.Logging(inputs[1], inputs.Length > 2 ? inputs[2] : null, inputs.Length > 2 ? inputs[2] : null);
                     break;
@@ -87,6 +90,7 @@ internal static void ParseCommandsFile(string filename)
                         totalSeeds++;
 
                         GenericCommands.Seed("R");
+                        GenericCommands.SettingsMode("1");
 
                         if (shuffleSettingsEachAttempt && !lastRunFailure) ShuffleAllOptions();
 
@@ -155,7 +159,7 @@ private static void ShuffleAllOptions()
                     lf.Active = rand.Next() % 2 == 0;
                     break;
                 case LogicDropdown ld:
-                    ld.Selection = ld.Selections.Keys.ToList()[rand.Next() % ld.Selections.Keys.Count];
+                    ld.Selection = ld.SelectionOptions[rand.Next() % ld.SelectionOptions.Length];
                     break;
                 // case LogicNumberBox lnb:
                 //     lnb.Value = $"{rand.Next(lnb.MinValue, lnb.MaxValue + 1)}";

MinishCapRandomizerCLI/GenericCommands.cs

@@ -21,6 +21,7 @@ internal static class GenericCommands
     private static string? _cachedYAMLPathLogic;
     private static string? _cachedYAMLPathCosmetics;
     private static bool _cachedUseGlobalYAML = false;
+    private static bool _useCompactSettings = false;
     private static bool _strict = false;
 
     internal static void LoadRom(string? path = null)
@@ -192,23 +193,44 @@ internal static void LoadYAML(string? yamlFile = null, string? optionTypes = nul
                 ShufflerController.LoadCosmeticsFromCosmeticsString(YamlController.GetSelectedCosmeticsString());
                 break;
         }
-
+        if (number != 0)
+        {
+            SwitchToNormalSettingsIfIncompatible();
+        }
+
         Console.WriteLine("Settings loaded successfully!");
     }
 
     internal static void LoadSettings(string? settings = null)
     {
         Console.Write("Please enter the setting string to load: ");
         var input = settings ?? Console.ReadLine();
-        if (!string.IsNullOrEmpty(input)) ShufflerController.LoadSettingsFromSettingString(input);
+        if (!string.IsNullOrEmpty(input))
+        {
+            ShufflerController.LoadSettingsFromSettingString(input);
+            SwitchToNormalSettingsIfIncompatible();
+        }
         Console.WriteLine("Settings loaded successfully!");
     }
 
-    // This option is not supported for use by command files, use the settings string option instead
+    internal static void LoadCosmetics(string? cosmetics = null)
+    {
+        Console.Write("Please enter the cosmetics string to load: ");
+        var input = cosmetics ?? Console.ReadLine();
+        if (!string.IsNullOrEmpty(input))
+        {
+            ShufflerController.LoadCosmeticsFromCosmeticsString(input);
+            SwitchToNormalSettingsIfIncompatible();
+        }
+        Console.WriteLine("Cosmetics loaded successfully!");
+    }
+
+    // This option is not supported for use by command files, use the settings string or YAML option instead
     internal static void Options()
     {
-        Console.WriteLine("Options for current logic file:");
-        var options = ShufflerController.GetSelectedOptions();
+        var settingsModeDescription = ShufflerController.IsCompactModeSupported() ? (_useCompactSettings ? " (compact settings mode)" : " (normal settings mode)") : "";
+        Console.WriteLine($"Options for current logic file{settingsModeDescription}:");
+        var options = _useCompactSettings && ShufflerController.IsCompactModeSupported() ? ShufflerController.GetCompactOptions() : ShufflerController.GetSelectedOptions();
         for (var i = 0; i < options.Count; )
         {
             var option = options[i];
@@ -270,6 +292,60 @@ internal static void Options()
         }
     }
 
+    internal static void SettingsMode(string? option = null)
+    {
+        if (_useCompactSettings)
+        {
+            Console.WriteLine("Currently in compact settings mode.");
+        }
+        else
+        {
+            Console.WriteLine("Currently in normal settings mode.");
+            var isCompatible = !ShufflerController.IsCompactModeSupported() || ShufflerController.UpdateCompactOptionValues(false);
+            if (isCompatible)
+            {
+                Console.WriteLine("Switching to compact mode would not affect the currently selected options.");
+            }
+            else
+            {
+                Console.WriteLine("Warning: The currently selected options are not compatible with compact mode, so switching to compact mode would reset conflicting settings to their default values.");
+            }
+        }
+        if (!ShufflerController.IsCompactModeSupported())
+        {
+            Console.WriteLine("Note: The current logic file does not support compact mode, so this will have no effect unless you load a different logic file.");
+        }
+        Console.WriteLine("With which settings mode would you like to continue?");
+        Console.WriteLine("1) Normal settings");
+        Console.WriteLine("2) Compact settings");
+        Console.Write("Please enter the number of the mode you would like to use, or enter \"Exit\" to stop editing: ");
+        var input = option ?? Console.ReadLine();
+        if (!string.IsNullOrEmpty(input))
+        {
+            if (input.Equals("exit", StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+            if (!int.TryParse(input, out var i) || i < 1 || i > 2)
+            {
+                PrintError("Invalid Input!");
+                return;
+            }
+            if (i == 1)
+            {
+                _useCompactSettings = false;
+                Console.WriteLine("Successfully enabled normal settings mode!");
+            }
+            else
+            {
+                ShufflerController.UpdateCompactOptionValues(true);
+                _useCompactSettings = true;
+                Console.WriteLine("Successfully enabled compact settings mode!");
+            }
+        }
+        else PrintError("Invalid Input!");
+    }
+
     internal static void Logging(string? option = null, string? verbosityOption = null, string? logPath = null)
     {
         Console.WriteLine("1) Logger verbosity");
@@ -529,7 +605,7 @@ internal static string GetOptionValue(LogicOptionBase option)
             }
             case LogicDropdown dropdown:
             {
-                return dropdown.Selection;
+                return dropdown.OptionsToNames[dropdown.Selection];
             }
             case LogicColorPicker colorPicker:
             {
@@ -568,8 +644,8 @@ internal static void EditOption(LogicOptionBase option)
             }
             case LogicDropdown dropdown:
             {
-                var keys = dropdown.Selections.Keys.ToList();
-                for (var i = 0; i < keys.Count; )
+                var keys = dropdown.SelectionOptionNames;
+                for (var i = 0; i < keys.Length; )
                 {
                     var selection = keys[i];
                     Console.WriteLine($"{++i}) {selection}");
@@ -578,7 +654,7 @@ internal static void EditOption(LogicOptionBase option)
                 Console.Write("Enter the number of the option you want for the dropdown: ");
                 var input = Console.ReadLine();
 
-                if (string.IsNullOrEmpty(input) || !int.TryParse(input, out var o) || o < 1 || o > keys.Count)
+                if (string.IsNullOrEmpty(input) || !int.TryParse(input, out var o) || o < 1 || o > keys.Length)
                 {
                     if (!input!.Equals("exit", StringComparison.OrdinalIgnoreCase))
                     {
@@ -587,7 +663,7 @@ internal static void EditOption(LogicOptionBase option)
                     break;
                 }
 
-                dropdown.Selection = keys[o - 1];
+                dropdown.Selection = dropdown.SelectionOptions[o - 1];
                 Console.WriteLine("Dropdown option set successfully!");
                 break;
             }
@@ -672,6 +748,7 @@ internal static void EditOption(LogicOptionBase option)
                 break;
             }
         }
+        option.NotifyChildren();
     }
 
     internal static void PrintError(string msg)
@@ -683,6 +760,23 @@ internal static void PrintError(string msg)
         }
     }
 
+    private static void SwitchToNormalSettingsIfIncompatible()
+    {
+        if (_useCompactSettings && ShufflerController.IsCompactModeSupported())
+        {
+            var isCompatible = ShufflerController.UpdateCompactOptionValues(false);
+            if (!isCompatible)
+            {
+                _useCompactSettings = false;
+                Console.WriteLine("Note: Settings mode was switched to normal to avoid incompatibilities with the loaded options.");
+            }
+            else
+            {
+                ShufflerController.UpdateCompactOptionValues(true);
+            }
+        }
+    }
+
     private static bool ValidatePreviouslyUsedController()
     {
         if (PreviouslyUsedController == null)

MinishCapRandomizerCLI/Program.cs

@@ -61,7 +61,9 @@ private static void LoadCommands()
             {"UseYAML", UseYAML},
             {"LoadYAML", LoadYAML},
             {"LoadSettings", LoadSettings},
+            {"LoadCosmetics", LoadCosmetics},
             {"Options", Options},
+            {"SettingsMode", SettingsMode},
             {"Logging", Logging},
             {"Randomize", Randomize},
             {"SaveRom", SaveRom},
@@ -88,8 +90,10 @@ LoadPatch               Load custom patch file
 ClearYAML               Clears the cached YAML options and resets all logic options to defaults
 LoadYAML                Load YAML file to use as a Preset, replaces the selected options
 UseYAML                 Use YAML file to use as a Preset or Mystery weights, instead of using the selected options
-LoadSettings            Load a setting string, replaces the selected options
+LoadSettings            Load a setting string, replaces the selected logic options
+LoadCosmetics           Load a cosmetics string, replaces the selected cosmetic options
 Options                 Display options, allows editing of option values
+SettingsMode            Allows switching between normal and compact settings mode and shows whether there are any incompatibilities
 Logging                 Allows you to change logger settings
 Randomize               Generates a randomized ROM
 SaveRom                 Saves and patches the ROM, requires Randomize to have been called
@@ -125,6 +129,7 @@ private static void LoadPatch()
     {
         GenericCommands.LoadPatch();
     }
+
     private static void ClearYAML()
     {
         GenericCommands.ClearYAMLConfig();
@@ -145,11 +150,21 @@ private static void LoadSettings()
         GenericCommands.LoadSettings();
     }
 
+    private static void LoadCosmetics()
+    {
+        GenericCommands.LoadCosmetics();
+    }
+
     private static void Options()
     {
         GenericCommands.Options();
     }
 
+    private static void SettingsMode()
+    {
+        GenericCommands.SettingsMode();
+    }
+
     private static void Logging()
     {
         GenericCommands.Logging();

MinishCapRandomizerUI/Elements/ColorPickerWrapper.cs

@@ -138,10 +138,12 @@ public override List<Control> GetControls(int initialX, int initialY)
             _selectColorButton.Enabled = !_checkBox.Checked;
             _selectRandomColorButton.Enabled = !_checkBox.Checked;
             _useDefaultColorButton.Enabled = !_checkBox.Checked;
-            if (_checkBox.Checked) _colorPreview.BackColor = Color.Transparent;
-            else _colorPreview.BackColor = _colorPicker.DefinedColor;
+            _colorPreview.BackColor = _checkBox.Checked ? Color.Transparent : _colorPicker.DefinedColor;
+            _colorPicker.NotifyChildren();
         };
 
+        if (_colorPicker.UseRandomColor) _checkBox.Checked = true;
+
         tip.SetToolTip(_checkBox, CheckboxToolTip);
 
         return new List<Control>
@@ -191,30 +193,33 @@ private void SelectColor()
         if (colorPicker.ShowDialog() != DialogResult.OK) return;
         _colorPicker.DefinedColor = new GbaColor(colorPicker.Color).ToColor();
         UpdateColorPreview();
+        _colorPicker.NotifyChildren();
     }
 
     private void SelectRandomColor()
     {
         _colorPicker.PickRandomColor();
         UpdateColorPreview();
+        _colorPicker.NotifyChildren();
     }
 
     private void SelectDefaultColor()
     {
         _colorPicker.DefinedColor = _colorPicker.BaseColor;
         UpdateColorPreview();
+        _colorPicker.NotifyChildren();
     }
 
     private void UpdateColorPreview()
     {
         if (_colorPreview == null) return;
 
-        _colorPreview.BackColor = _colorPicker.DefinedColor;
+        _colorPreview.BackColor = _checkBox!.Checked ? Color.Transparent : _colorPicker.DefinedColor;
     }
 
     public void NotifyObserver()
     {
-        UpdateColorPreview();
         _checkBox!.Checked = _colorPicker.UseRandomColor;
+        UpdateColorPreview();
     }
 }

MinishCapRandomizerUI/Elements/DropdownWrapper.cs

@@ -56,12 +56,13 @@ public override List<Control> GetControls(int initialX, int initialY)
         };
 
         var selectedDefaultItem = false;
-        foreach (var key in _dropdown.Selections.Keys) 
+        var selectionName = _dropdown.OptionsToNames[_dropdown.Selection];
+        foreach (var key in _dropdown.SelectionOptionNames) 
         {
             _comboBox.Items.Add(key);
-            if (!selectedDefaultItem && key == _dropdown.Selection) 
+            if (!selectedDefaultItem && key == selectionName)
             {
-                _comboBox.SelectedItem = _dropdown.Selection; 
+                _comboBox.SelectedItem = selectionName;
                 selectedDefaultItem = true;
             }
         }
@@ -82,12 +83,14 @@ public override List<Control> GetControls(int initialX, int initialY)
 
         _comboBox.SelectedIndexChanged += (object? sender, EventArgs e) =>
         {
-            _dropdown.Selection = (string)_comboBox.SelectedItem!;
+            _dropdown.Selection = _dropdown.NamesToOptions[(string)_comboBox.SelectedItem!];
+            _dropdown.NotifyChildren();
         };
 
         _comboBox.SelectedValueChanged += (object? sender, EventArgs e) =>
         {
-            _dropdown.Selection = (string)_comboBox.SelectedItem!;
+            _dropdown.Selection = _dropdown.NamesToOptions[(string)_comboBox.SelectedItem!];
+            _dropdown.NotifyChildren();
         };
 
         _comboBox.KeyPress += (object? sender, KeyPressEventArgs e) =>
@@ -100,7 +103,7 @@ public override List<Control> GetControls(int initialX, int initialY)
 
 	public void NotifyObserver()
 	{
-        var index = _dropdown.Selections.Keys.ToList().IndexOf(_dropdown.Selection);
+        var index = _dropdown.SelectionOptions.ToList().IndexOf(_dropdown.Selection);
         _comboBox!.SelectedIndex = index;
 	}
 }

MinishCapRandomizerUI/Elements/FlagWrapper.cs

@@ -52,6 +52,7 @@ public override List<Control> GetControls(int initialX, int initialY)
         _checkBox.CheckedChanged += (object? sender, EventArgs e) =>
         {
             _flag.Active = _checkBox.Checked;
+            _flag.NotifyChildren();
         };
 
         return new List<Control> { _checkBox };