Migration ready

Nik-Potokar · Nov 21, 2024 · abe644e · abe644e
2 parents 2ca64e1 + ab54d25
commit abe644e
Show file tree

Hide file tree

Showing 5 changed files with 355 additions and 10 deletions.
diff --git a/XIVSlothCombo/Combos/JobHelpers/BLM.cs b/XIVSlothCombo/Combos/JobHelpers/BLM.cs
@@ -15,11 +15,11 @@ namespace XIVSlothCombo.Combos.JobHelpers;
 internal class BLM
 {
     // BLM Gauge & Extensions
-    public static BLMGauge Gauge = GetJobGauge<BLMGauge>();
+    public static BLMGauge Gauge => GetJobGauge<BLMGauge>();
 
-    public static bool canWeave = CanSpellWeave(ActionWatching.LastSpell);
+    public static bool canWeave => CanSpellWeave(ActionWatching.LastSpell);
 
-    public static uint curMp = LocalPlayer.CurrentMp;
+    public static uint curMp => LocalPlayer.CurrentMp;
     public static BLMOpenerLogic BLMOpener = new();
 
     public static int maxPolyglot => TraitLevelChecked(Traits.EnhancedPolyglotII) ? 3 :

diff --git a/XIVSlothCombo/Combos/PvE/BLM.cs b/XIVSlothCombo/Combos/PvE/BLM.cs
@@ -64,7 +64,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
             }
 
             if (HasEffect(Buffs.Thunderhead) && gcdsInTimer > 1 &&
-                (thunderDebuffST is null || thunderDebuffST.RemainingTime < 3))
+                (thunderDebuffST is null || thunderDebuffST?.RemainingTime < 3))
                 return OriginalHook(Thunder);
 
             if (IsMoving)
@@ -98,7 +98,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         return Triplecast;
 
                     if (HasEffect(Buffs.Thunderhead) && gcdsInTimer > 1 &&
-                        (thunderDebuffST is null || thunderDebuffST.RemainingTime < 3))
+                        (thunderDebuffST is null || thunderDebuffST?.RemainingTime < 3))
                         return OriginalHook(Thunder);
 
                     if (HasPolyglotStacks(Gauge) && gcdsInTimer >= 1 &&
@@ -138,7 +138,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         return Transpose;
 
                     if (HasEffect(Buffs.Thunderhead) &&
-                        (thunderDebuffST is null || thunderDebuffST.RemainingTime < 3))
+                        (thunderDebuffST is null || thunderDebuffST?.RemainingTime < 3))
                         return OriginalHook(Thunder);
 
                     if (HasPolyglotStacks(Gauge))
@@ -245,7 +245,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
             if (IsEnabled(CustomComboPreset.BLM_ST_Thunder) &&
                 HasEffect(Buffs.Thunderhead) && gcdsInTimer > 1 && LevelChecked(Thunder) &&
                 GetTargetHPPercent() >= Config.BLM_ST_ThunderHP &&
-                (thunderDebuffST is null || thunderDebuffST.RemainingTime < 3))
+                (thunderDebuffST is null || thunderDebuffST?.RemainingTime < 3))
                 return OriginalHook(Thunder);
 
             if (IsMoving)
@@ -303,7 +303,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             return Triplecast;
 
                         if (HasEffect(Buffs.Thunderhead) && gcdsInTimer > 1 &&
-                            (thunderDebuffST is null || thunderDebuffST.RemainingTime < 3))
+                            (thunderDebuffST is null || thunderDebuffST?.RemainingTime < 3))
                             return OriginalHook(Thunder);
 
                         if (IsEnabled(CustomComboPreset.BLM_ST_UsePolyglot) &&
@@ -339,7 +339,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
                     if (IsEnabled(CustomComboPreset.BLM_ST_Thunder) &&
                         HasEffect(Buffs.Thunderhead) &&
-                        (thunderDebuffST is null || thunderDebuffST.RemainingTime < 3))
+                        (thunderDebuffST is null || thunderDebuffST?.RemainingTime < 3))
                         return OriginalHook(Thunder);
 
                     if (IsEnabled(CustomComboPreset.BLM_ST_UsePolyglot) &&

diff --git a/XIVSlothCombo/Window/ConfigWindow.cs b/XIVSlothCombo/Window/ConfigWindow.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
+using Dalamud.Interface.Colors;
 using XIVSlothCombo.Attributes;
 using XIVSlothCombo.Combos;
 using XIVSlothCombo.Combos.PvE;
@@ -150,6 +151,24 @@ public override void Draw()
                 ImGui.Spacing();
 #endif
 
+
+                if (Svc.PluginInterface.InternalName == "XIVSlothCombo")
+                {
+                    ImGui.Spacing();
+                    ImGui.Spacing();
+
+                    var smoothChangeColor = GradientColor.Get(ImGuiColors.DalamudRed, ImGuiColors.DalamudYellow, 1500);
+                    ImGui.PushStyleColor(ImGuiCol.Text, smoothChangeColor);
+                    if (ImGui.Selectable("No Longer Updated!"))
+                    {
+                        if (P.MigrationWindow.IsOpen)
+                            P.MigrationWindow.BringToFront();
+                        else
+                            P.MigrationWindow.IsOpen = true;
+                    }
+                    ImGui.PopStyleColor();
+                }
+
             }
 
             ImGui.PopStyleVar();