Skip to content

Commit

Permalink
Fixed drakebanes combo action
Browse files Browse the repository at this point in the history
  • Loading branch information
jakekcbyrne committed Jul 7, 2024
1 parent 8228118 commit 12cbd8f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
11 changes: 6 additions & 5 deletions XIVComboPlugin/IconReplacer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -162,16 +162,16 @@ private ulong GetIconDetour(byte self, uint actionID)
}
if ((lastMove == DRG.ChaosThrust || lastMove == DRG.ChaoticSpring) && level >= 58)
return DRG.WheelingThrust;
if ((lastMove == DRG.WheelingThrust) && level >= 64) //Drakesbane action
return DRG.FangAndClaw;

if ((lastMove == DRG.WheelingThrust) && level >= 64)
return DRG.Drakesbane;
}
//These buffs no longer exist and are now incorporated into the overall combo
/*if (SearchBuffArray(DRG.BuffFangAndClawReady) && level >= 56)
return DRG.FangAndClaw;
if (SearchBuffArray(DRG.BuffWheelingThrustReady) && level >= 58)
return DRG.WheelingThrust;
*/

if (SearchBuffArray(DRG.BuffDraconianFire) && level >= 76)
return DRG.RaidenThrust;

Expand Down Expand Up @@ -200,15 +200,16 @@ private ulong GetIconDetour(byte self, uint actionID)
}
if ((lastMove == DRG.FullThrust || lastMove == DRG.HeavensThrust) && level >= 56)
return DRG.FangAndClaw;
if ((lastMove == DRG.FangAndClaw) && level >= 64) //Drakesbane action
return DRG.WheelingThrust;
if ((lastMove == DRG.FangAndClaw) && level >= 64)
return DRG.Drakesbane;
}
//These buffs no longer exist and are now incorporated into the overall combo
/*if (SearchBuffArray(DRG.BuffFangAndClawReady) && level >= 56)
return DRG.FangAndClaw;
if (SearchBuffArray(DRG.BuffWheelingThrustReady) && level >= 58)
return DRG.WheelingThrust;
*/

if (SearchBuffArray(DRG.BuffDraconianFire) && level >= 76)
return DRG.RaidenThrust;

Expand Down
3 changes: 2 additions & 1 deletion XIVComboPlugin/JobActions/DRG.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ public const uint
FullThrust = 84,
VorpalThrust = 78,
LanceBarrage = 36901,
SpiralBlow = 36903;
SpiralBlow = 36903,
Drakesbane = 36952;


public const ushort
Expand Down

1 comment on commit 12cbd8f

@jakekcbyrne
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Figured initially you just have to return the opposite of Fang and Claw/Wheeling Thrust, but you do actually need to return the Drakesbane action

Please sign in to comment.