From cfa374b20f59ec75ad77ca27424a579d0c288ba4 Mon Sep 17 00:00:00 2001 From: Khayle Date: Sun, 11 Aug 2024 02:12:34 +0200 Subject: [PATCH] SGE has no more children good for them tbh fixes #413 definitively --- XIVComboExpanded/Combos/SGE.cs | 1 - XIVComboExpanded/CustomComboPreset.cs | 16 +++++++--------- XIVComboExpanded/Interface/Changelog.cs | 7 +++++++ XIVComboExpanded/XIVComboExpanded.csproj | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/XIVComboExpanded/Combos/SGE.cs b/XIVComboExpanded/Combos/SGE.cs index 7d1160e9..77ac35a5 100644 --- a/XIVComboExpanded/Combos/SGE.cs +++ b/XIVComboExpanded/Combos/SGE.cs @@ -142,7 +142,6 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim { if (level >= SGE.Levels.Psyche && IsCooldownUsable(SGE.Psyche)) return OriginalHook(SGE.Psyche); - } if (IsEnabled(CustomComboPreset.SageToxikonPhlegma)) diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs index 1cc931a4..928f9e37 100644 --- a/XIVComboExpanded/CustomComboPreset.cs +++ b/XIVComboExpanded/CustomComboPreset.cs @@ -1881,14 +1881,13 @@ public enum CustomComboPreset [IconsCombo([SGE.Dosis, UTL.ArrowLeft, SGE.Psyche, UTL.Blank, SGE.Psyche, UTL.Clock])] [SectionCombo("Single Target")] - [AccessibilityCustomCombo] - [ParentCombo(SageDoTFeature)] + [ExpandedCustomCombo] [CustomComboInfo("Dosis Psyche Feature", "Replace Dosis with Psyche when cooldown is available.", SGE.JobID)] SageDosisPsyche = 4014, [IconsCombo([SGE.Dyskrasia, UTL.ArrowLeft, SGE.Psyche, UTL.Blank, SGE.Psyche, UTL.Clock])] [SectionCombo("Area of Effect")] - [AccessibilityCustomCombo] + [ExpandedCustomCombo] [CustomComboInfo("Dyskrasia Psyche Feature", "Replace Dyskrasia with Psyche when cooldown is available.", SGE.JobID)] SagePsycheDyskrasiaFeature = 4015, @@ -1947,16 +1946,15 @@ public enum CustomComboPreset SagePhlegmaToxikon = 4007, [IconsCombo([SGE.Toxikon, UTL.ArrowLeft, SGE.Phlegma, UTL.Blank, SGE.Phlegma, UTL.Checkmark])] - [SectionCombo("Toxicon features")] + [SectionCombo("Toxikon features")] [ExpandedCustomCombo] - [CustomComboInfo("Toxikon into Phlegma Feature", "Replace Toxikon with Phlegma when charges are available.", SGE.JobID)] + [CustomComboInfo("Toxikon into Phlegma", "Replace Toxikon with Phlegma when charges are available.", SGE.JobID)] SageToxikonPhlegma = 4011, [IconsCombo([SGE.Toxikon, UTL.ArrowLeft, SGE.Psyche, UTL.Blank, SGE.Psyche, UTL.Checkmark])] - [SectionCombo("Toxicon features")] - [AccessibilityCustomCombo] - [ParentCombo(SageToxikonPhlegma)] - [CustomComboInfo("Psyche Combo", "Adds Psyche to the Toxikon combo", SGE.JobID)] + [SectionCombo("Toxikon features")] + [ExpandedCustomCombo] + [CustomComboInfo("Toxikon into Psyche", "Replace Toxicon with Psyche when Psyche is available", SGE.JobID)] SagePsycheToxikonFeature = 4013, [IconsCombo([SGE.Druochole, UTL.ArrowLeft, SGE.Taurochole, UTL.Blank, SGE.Druochole, UTL.Checkmark])] diff --git a/XIVComboExpanded/Interface/Changelog.cs b/XIVComboExpanded/Interface/Changelog.cs index 04b938d4..7b7922aa 100644 --- a/XIVComboExpanded/Interface/Changelog.cs +++ b/XIVComboExpanded/Interface/Changelog.cs @@ -12,6 +12,13 @@ public static Dictionary GetChangelog() { return new Dictionary() { + { + "v2.0.0.9", + [ + "Fixed SGE's Dosis Psyche Feature being a child combo of the Auto Eukrasian Dosis feature.", + "Fixed SGE's Toxikon into Psyche being a child combo of the Toxikon into Phlegma.", + ] + }, { "v2.0.0.8", [ diff --git a/XIVComboExpanded/XIVComboExpanded.csproj b/XIVComboExpanded/XIVComboExpanded.csproj index 4bda15e2..fdfe7d96 100644 --- a/XIVComboExpanded/XIVComboExpanded.csproj +++ b/XIVComboExpanded/XIVComboExpanded.csproj @@ -3,7 +3,7 @@ attick, daemitus, Khayle - - 2.0.0.8 + 2.0.0.9 This plugin condenses combos and mutually exclusive abilities onto a single button. Copyleft attick 2020 baybeeee https://github.com/daemitus/XIVComboPlugin