RDM Hotfix [PUSH]

Grand Impact no longer makes melee combo lockouts stop working.
Grammernatzi · Aug 19, 2024 · e158039 · e158039
1 parent 221722f
commit e158039
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/XIVComboExpanded/Combos/RDM.cs b/XIVComboExpanded/Combos/RDM.cs
@@ -114,7 +114,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
         {
             var gauge = GetJobGauge<RDMGauge>();
 
-            return ((gauge.BlackMana < 50 || gauge.WhiteMana < 50) && !HasEffect(RDM.Buffs.MagickedSwordplay)) && gauge.ManaStacks == 0 && level >= RDM.Levels.Verflare && OriginalHook(RDM.Verthunder2) != RDM.Verflare && (OriginalHook(RDM.Jolt2) == RDM.Jolt2 || OriginalHook(RDM.Jolt3) == RDM.Jolt3) ? SMN.Physick : actionID;
+            return ((gauge.BlackMana < 50 || gauge.WhiteMana < 50) && !HasEffect(RDM.Buffs.MagickedSwordplay)) && gauge.ManaStacks == 0 && level >= RDM.Levels.Verflare && OriginalHook(RDM.Verthunder2) != RDM.Verflare && (OriginalHook(RDM.Jolt2) != RDM.Scorch && OriginalHook(RDM.Jolt2) != RDM.Redoublement) ? SMN.Physick : actionID;
         }
     }
 
@@ -190,7 +190,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         return OriginalHook(RDM.Reprise);
                 }
 
-                if (level >= RDM.Levels.Verflare && IsEnabled(CustomComboPreset.RedMageComboReminderFeature) && actionID == RDM.Redoublement && gauge.ManaStacks == 0 && OriginalHook(RDM.Verthunder2) != RDM.Verflare && (OriginalHook(RDM.Jolt2) == RDM.Jolt2 || OriginalHook(RDM.Jolt3) == RDM.Jolt3) && ((gauge.BlackMana < manaCheck || gauge.WhiteMana < manaCheck) && !HasEffect(RDM.Buffs.MagickedSwordplay)))
+                if (level >= RDM.Levels.Verflare && IsEnabled(CustomComboPreset.RedMageComboReminderFeature) && actionID == RDM.Redoublement && gauge.ManaStacks == 0 && OriginalHook(RDM.Verthunder2) != RDM.Verflare && (OriginalHook(RDM.Jolt2) != RDM.Scorch && OriginalHook(RDM.Jolt2) != RDM.Redoublement) && ((gauge.BlackMana < manaCheck || gauge.WhiteMana < manaCheck) && !HasEffect(RDM.Buffs.MagickedSwordplay)))
                 {
                     if (IsEnabled(CustomComboPreset.RedMageComboReminderOption))
                         return IsEnabled(CustomComboPreset.RedMageMeleeComboPlusVerholy) ? WHM.Holy : BLM.Flare;

diff --git a/XIVComboExpanded/XIVComboExpanded.csproj b/XIVComboExpanded/XIVComboExpanded.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors>attick, daemitus, alymphocyte, grammernatzi</Authors>
     <Company>-</Company>
-    <Version>1.5.0.62</Version>
+    <Version>1.5.0.63</Version>
     <Description>This plugin condenses combos and mutually exclusive abilities onto a single button.</Description>
     <Copyright>Copyaaaaaaaaaaaa</Copyright>
     <PackageProjectUrl>https://github.com/grammernatzi/XIVComboPluginExpandedest</PackageProjectUrl>