[PUSH] 1.5.0.5 - DRK & DRG lvl 96 fixes

MKhayle · Jul 2, 2024 · 669867c · 669867c
1 parent 87e8016
commit 669867c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/XIVComboExpanded/Combos/DRG.cs b/XIVComboExpanded/Combos/DRG.cs
@@ -19,6 +19,8 @@ public const uint
         WheelingThrust = 3556,
         FangAndClaw = 3554,
         RaidenThrust = 16479,
+        BarrageThrust = 36901,
+        ExplosiveThrust = 36903,
         Drakesbane = 36952,
         // AoE
         DoomSpike = 86,
@@ -140,7 +142,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         // Wheeling
                         return OriginalHook(DRG.WheelingThrust);
 
-                    if (lastComboMove == DRG.Disembowel && level >= DRG.Levels.ChaosThrust)
+                    if ((lastComboMove == DRG.Disembowel || lastComboMove == DRG.ExplosiveThrust) && level >= DRG.Levels.ChaosThrust)
                         // ChaoticSpring
                         return OriginalHook(DRG.ChaosThrust);
 
@@ -179,7 +181,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         // Claw
                         return OriginalHook(DRG.FangAndClaw);
 
-                    if (lastComboMove == DRG.VorpalThrust && level >= DRG.Levels.FullThrust)
+                    if ((lastComboMove == DRG.VorpalThrust || lastComboMove == DRG.BarrageThrust) && level >= DRG.Levels.FullThrust)
                         // Heavens' Thrust
                         return OriginalHook(DRG.FullThrust);
 

diff --git a/XIVComboExpanded/Combos/DRK.cs b/XIVComboExpanded/Combos/DRK.cs
@@ -75,15 +75,15 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
             if (IsEnabled(CustomComboPreset.DarkDeliriumFeature))
             {
                 if (level >= DRK.Levels.Bloodspiller && level >= DRK.Levels.Delirium && HasEffect(DRK.Buffs.Delirium))
-                    return DRK.Bloodspiller;
+                    return OriginalHook(DRK.Bloodspiller);
             }
 
             if (IsEnabled(CustomComboPreset.DarkSouleaterCombo))
             {
                 if (IsEnabled(CustomComboPreset.DarkSouleaterOvercapFeature))
                 {
                     if (level >= DRK.Levels.Bloodspiller && gauge.Blood > 90 && HasEffect(DRK.Buffs.BloodWeapon))
-                        return DRK.Bloodspiller;
+                        return OriginalHook(DRK.Bloodspiller);
                 }
 
                 if (comboTime > 0)
@@ -93,7 +93,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         if (IsEnabled(CustomComboPreset.DarkSouleaterOvercapFeature))
                         {
                             if (level >= DRK.Levels.Bloodspiller && (gauge.Blood > 80 || (gauge.Blood > 70 && HasEffect(DRK.Buffs.BloodWeapon))))
-                                return DRK.Bloodspiller;
+                                return OriginalHook(DRK.Bloodspiller);
                         }
 
                         return DRK.Souleater;
@@ -124,15 +124,15 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
             if (IsEnabled(CustomComboPreset.DarkDeliriumFeature))
             {
                 if (level >= DRK.Levels.Quietus && level >= DRK.Levels.Delirium && HasEffect(DRK.Buffs.Delirium))
-                    return DRK.Quietus;
+                    return OriginalHook(DRK.Quietus);
             }
 
             if (IsEnabled(CustomComboPreset.DarkStalwartSoulCombo))
             {
                 if (IsEnabled(CustomComboPreset.DarkStalwartSoulOvercapFeature))
                 {
                     if (level >= DRK.Levels.Quietus && gauge.Blood > 90 && HasEffect(DRK.Buffs.BloodWeapon))
-                        return DRK.Quietus;
+                        return OriginalHook(DRK.Quietus);
                 }
 
                 if (comboTime > 0)
@@ -142,7 +142,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                         if (IsEnabled(CustomComboPreset.DarkStalwartSoulOvercapFeature))
                         {
                             if (level >= DRK.Levels.Quietus && (gauge.Blood > 80 || (gauge.Blood > 70 && HasEffect(DRK.Buffs.BloodWeapon))))
-                                return DRK.Quietus;
+                                return OriginalHook(DRK.Quietus);
                         }
 
                         return DRK.StalwartSoul;