Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update WAR to 7.0 #299

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update WAR to 7.0 #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e5e453
Update WAR to 7.0
glen-lee Jul 8, 2024
3c72bc6
Update XIVComboPlugin/IconReplacer.cs
glen-lee Jul 15, 2024
60ac6fa
Update XIVComboPlugin/Configuration/CustomComboPreset.cs
glen-lee Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion XIVComboPlugin/Configuration/CustomComboPreset.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 9 additions & 3 deletions XIVComboPlugin/IconReplacer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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)
Expand All @@ -615,6 +620,7 @@ private ulong GetIconDetour(byte self, uint actionID)
return AST.Draw;
}
}
*/

// SUMMONER
// Change Fester into Energy Drain
Expand Down
5 changes: 4 additions & 1 deletion XIVComboPlugin/JobActions/WAR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}