diff --git a/XIVComboPlugin/Configuration/CustomComboPreset.cs b/XIVComboPlugin/Configuration/CustomComboPreset.cs index 8f360be6d..714197d49 100644 --- a/XIVComboPlugin/Configuration/CustomComboPreset.cs +++ b/XIVComboPlugin/Configuration/CustomComboPreset.cs @@ -48,7 +48,7 @@ public enum CustomComboPreset : long [CustomComboInfo("Mythril Tempest Combo", "Replace Mythril Tempest with its combo chain", 21)] WarriorMythrilTempestCombo = 1L << 10, - [CustomComboInfo("IR to Primal Rend", "Replace Inner Release with Primal Rend when Primal Rend Ready", 21)] + [CustomComboInfo("IR Combo", "Replace Inner Release with Primal Rend or Primal Ruination when ready and not Wrathful", 21)] WarriorIRCombo = 1L << 63, // SAMURAI diff --git a/XIVComboPlugin/IconReplacer.cs b/XIVComboPlugin/IconReplacer.cs index 19420a1db..4183af500 100644 --- a/XIVComboPlugin/IconReplacer.cs +++ b/XIVComboPlugin/IconReplacer.cs @@ -306,8 +306,13 @@ private ulong GetIconDetour(byte self, uint actionID) if (Configuration.ComboPresets.HasFlag(CustomComboPreset.WarriorIRCombo)) if (actionID == WAR.InnerRelease || actionID == WAR.Berserk) { - if (SearchBuffArray(WAR.BuffPrimalRendReady)) - return WAR.PrimalRend; + if (!SearchBuffArray(WAR.BuffWrathful) + { + if (SearchBuffArray(WAR.BuffPrimalRendReady)) + return WAR.PrimalRend; + if (SearchBuffArray(WAR.BuffPrimalRuinationReady)) + return WAR.PrimalRuination; + } return iconHook.Original(self, actionID); } @@ -591,7 +596,7 @@ private ulong GetIconDetour(byte self, uint actionID) } // ASTROLOGIAN - + /** // Make cards on the same button as play if (Configuration.ComboPresets.HasFlag(CustomComboPreset.AstrologianCardsOnDrawFeature)) if (actionID == AST.Play) @@ -615,6 +620,7 @@ private ulong GetIconDetour(byte self, uint actionID) return AST.Draw; } } + */ // SUMMONER // Change Fester into Energy Drain diff --git a/XIVComboPlugin/JobActions/WAR.cs b/XIVComboPlugin/JobActions/WAR.cs index da4d1af28..9e6f3883b 100644 --- a/XIVComboPlugin/JobActions/WAR.cs +++ b/XIVComboPlugin/JobActions/WAR.cs @@ -11,9 +11,12 @@ public const uint Overpower = 41, InnerRelease = 7389, PrimalRend = 25753, + PrimalRuination = 36925, Berserk = 38; public const ushort - BuffPrimalRendReady = 2624; + BuffPrimalRendReady = 2624, + BuffWrathful = 3901, + BuffPrimalRuinationReady = 3834; } }