From dce3d5ae20caa721074b8bb78a1ba25d70322881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Tue, 9 May 2023 10:06:48 +0800 Subject: [PATCH] feat: add disable action sequence. --- RotationSolver/UI/RotationConfigWindow_Action.cs | 16 ++++++++++++++-- .../Updaters/ActionSequencerUpdater.cs | 4 ++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/RotationSolver/UI/RotationConfigWindow_Action.cs b/RotationSolver/UI/RotationConfigWindow_Action.cs index be28e32a6..d3e5f6a47 100644 --- a/RotationSolver/UI/RotationConfigWindow_Action.cs +++ b/RotationSolver/UI/RotationConfigWindow_Action.cs @@ -61,10 +61,22 @@ private static void DrawActionSequencerCondition() var set = ActionSequencerUpdater.RightSet; if (set == null) return; - if (!set.Conditions.TryGetValue(ActiveAction.ID, out var conditionSet)) + ConditionSet conditionSet; + if (ActionSequencerUpdater.IsDisableCondition) { - conditionSet = set.Conditions[ActiveAction.ID] = new ConditionSet(); + if (!set.DiableConditions.TryGetValue(ActiveAction.ID, out conditionSet)) + { + conditionSet = set.DiableConditions[ActiveAction.ID] = new ConditionSet(); + } } + else + { + if (!set.Conditions.TryGetValue(ActiveAction.ID, out conditionSet)) + { + conditionSet = set.Conditions[ActiveAction.ID] = new ConditionSet(); + } + } + conditionSet?.Draw(rotation, ActiveAction.IsActionSequencer); } diff --git a/RotationSolver/Updaters/ActionSequencerUpdater.cs b/RotationSolver/Updaters/ActionSequencerUpdater.cs index 00bd5975b..f23d756d1 100644 --- a/RotationSolver/Updaters/ActionSequencerUpdater.cs +++ b/RotationSolver/Updaters/ActionSequencerUpdater.cs @@ -15,6 +15,8 @@ internal class ActionSequencerUpdater public static string[] ConditionSetsName => _conditionSet?.Select(s => s.Name).ToArray() ?? Array.Empty(); + public static bool IsDisableCondition = false; + public static void UpdateActionSequencerAction() { if (_conditionSet == null) return; @@ -116,6 +118,8 @@ public static void DrawHeader() ImGui.Combo("##MajorConditionCombo", ref Service.Config.ActionSequencerIndex, combos, combos.Length); + ImGui.Checkbox("Is Disabled Condition", ref IsDisableCondition); + if (hasSet) { ImGui.SameLine();