From 8417ee4fc59e53e9735b363a3c89063c5de8bb98 Mon Sep 17 00:00:00 2001 From: Asriel Camora Date: Sat, 15 Jul 2023 23:54:26 +0400 Subject: [PATCH] Remove combo actions from view --- Craftimizer/Configuration.cs | 1 - Craftimizer/Windows/SettingsWindow.cs | 8 -------- Craftimizer/Windows/SimulatorWindowDrawer.cs | 4 +--- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Craftimizer/Configuration.cs b/Craftimizer/Configuration.cs index cb7ea2b..825acab 100644 --- a/Craftimizer/Configuration.cs +++ b/Craftimizer/Configuration.cs @@ -31,7 +31,6 @@ public class Configuration : IPluginConfiguration public bool OverrideUncraftability { get; set; } = true; public bool HideUnlearnedActions { get; set; } = true; - public bool HideCombos { get; set; } = true; public List Macros { get; set; } = new(); public SolverConfig SolverConfig { get; set; } = new(); public SolverAlgorithm SolverAlgorithm { get; set; } = SolverAlgorithm.StepwiseFurcated; diff --git a/Craftimizer/Windows/SettingsWindow.cs b/Craftimizer/Windows/SettingsWindow.cs index 9813122..b8e7672 100644 --- a/Craftimizer/Windows/SettingsWindow.cs +++ b/Craftimizer/Windows/SettingsWindow.cs @@ -106,14 +106,6 @@ public class SettingsWindow : Window ref isDirty ); - DrawOption( - "Hide combo actions", - "Don't show combo actions on the simulator sidebar", - Config.HideCombos, - v => Config.HideCombos = v, - ref isDirty - ); - DrawOption( "Condition randomness", "Allows the simulator condition to fluctuate randomly like a real craft.\nTurns off when generating a macro.", diff --git a/Craftimizer/Windows/SimulatorWindowDrawer.cs b/Craftimizer/Windows/SimulatorWindowDrawer.cs index a6f7720..f8abe09 100644 --- a/Craftimizer/Windows/SimulatorWindowDrawer.cs +++ b/Craftimizer/Windows/SimulatorWindowDrawer.cs @@ -39,6 +39,7 @@ public sealed partial class SimulatorWindow : Window, IDisposable static SimulatorWindow() { SortedActions = Enum.GetValues() + .Where(a => a.Category() != ActionCategory.Combo) .GroupBy(a => a.Category()) .Select(g => (g.Key, g.OrderBy(a => a.Level()).ToArray())) .ToArray(); @@ -78,9 +79,6 @@ public sealed partial class SimulatorWindow : Window, IDisposable foreach (var (category, actions) in SortedActions) { - if (category == ActionCategory.Combo && Configuration.HideCombos) - continue; - var i = 0; ImGuiUtils.BeginGroupPanel(category.GetDisplayName(), ActionColumnSize); foreach (var action in actions)