Skip to content

Commit

Permalink
Merge pull request #326 from kaedys/feature/auto-saber-dance
Browse files Browse the repository at this point in the history 
[FEATURE] Automatic Saber Dance
  • Loading branch information
@MKhayle
MKhayle authored Jul 14, 2024
2 parents 2aed5ee + 4e79f9e commit a818195
Show file tree
Hide file tree
Showing 3 changed files with 147 additions and 13 deletions.
111 changes: 109 additions & 2 deletions XIVComboExpanded/Combos/DNC.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,14 @@ public const ushort
SilkenSymmetry = 2693,
SilkenFlow = 2694,
StandardStep = 1818,
StandardFinish = 1821,
TechnicalStep = 1819,
TechnicalFinish = 1822,
ThreefoldFanDance = 1820,
FourfoldFanDance = 2699,
LastDanceReady = 3867,
FinishingMoveReady = 3868;
FinishingMoveReady = 3868,
DanceOfTheDawnReady = 3869;
}

public static class Debuffs
Expand All @@ -83,11 +86,13 @@ public const byte
FanDance3 = 66,
TechnicalStep = 70,
Flourish = 72,
SaberDance = 76,
Tillana = 82,
FanDance4 = 86,
StarfallDance = 90,
LastDance = 92,
FinishingMove = 96;
FinishingMove = 96,
DanceOfTheDawn = 100;
}
}

Expand Down Expand Up @@ -252,6 +257,22 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (actionID == DNC.Cascade)
{
var gauge = GetJobGauge<DNCGauge>();

if (level >= DNC.Levels.SaberDance && !HasEffect(DNC.Buffs.StandardStep) && !HasEffect(DNC.Buffs.TechnicalStep))
{
if (IsEnabled(CustomComboPreset.DancerSingleTargetDanceOfTheDawn) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.DanceOfTheDawnReady))
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerSingleTargetSabreDance) && gauge.Esprit >= 85)
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerSingleTargetSabreDanceTech) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.TechnicalFinish))
return OriginalHook(DNC.SaberDance);
}

if (IsEnabled(CustomComboPreset.DancerSingleTargetMultibutton))
{
if (level >= DNC.Levels.Fountainfall && (HasEffect(DNC.Buffs.FlourishingFlow) || HasEffect(DNC.Buffs.SilkenFlow)))
Expand All @@ -273,13 +294,48 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

if (actionID == DNC.Fountain)
{
var gauge = GetJobGauge<DNCGauge>();

if (level >= DNC.Levels.SaberDance && !HasEffect(DNC.Buffs.StandardStep) && !HasEffect(DNC.Buffs.TechnicalStep))
{
if (IsEnabled(CustomComboPreset.DancerSingleTargetDanceOfTheDawn) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.DanceOfTheDawnReady))
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerSingleTargetSabreDance) && gauge.Esprit >= 85)
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerSingleTargetSabreDanceTech) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.TechnicalFinish))
return OriginalHook(DNC.SaberDance);
}

if (IsEnabled(CustomComboPreset.DancerSingleTargetProcs))
{
if (level >= DNC.Levels.Fountainfall && (HasEffect(DNC.Buffs.FlourishingFlow) || HasEffect(DNC.Buffs.SilkenFlow)))
return DNC.Fountainfall;
}
}

if (actionID == DNC.ReverseCascade || actionID == DNC.Fountainfall)
{
var gauge = GetJobGauge<DNCGauge>();

if (level >= DNC.Levels.SaberDance && !HasEffect(DNC.Buffs.StandardStep) && !HasEffect(DNC.Buffs.TechnicalStep))
{
if (IsEnabled(CustomComboPreset.DancerSingleTargetDanceOfTheDawn) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.DanceOfTheDawnReady))
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerSingleTargetSabreDance) && gauge.Esprit >= 85)
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerSingleTargetSabreDanceTech) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.TechnicalFinish))
return OriginalHook(DNC.SaberDance);
}
}

return actionID;
}
}
Expand All @@ -292,6 +348,22 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (actionID == DNC.Windmill)
{
var gauge = GetJobGauge<DNCGauge>();

if (level >= DNC.Levels.SaberDance && !HasEffect(DNC.Buffs.StandardStep) && !HasEffect(DNC.Buffs.TechnicalStep))
{
if (IsEnabled(CustomComboPreset.DancerAoeDanceOfTheDawn) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.DanceOfTheDawnReady))
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerAoeSabreDance) && gauge.Esprit >= 85)
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerAoeSabreDanceTech) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.TechnicalFinish))
return OriginalHook(DNC.SaberDance);
}

if (IsEnabled(CustomComboPreset.DancerAoeMultibutton))
{
if (level >= DNC.Levels.Bloodshower && (HasEffect(DNC.Buffs.FlourishingFlow) || HasEffect(DNC.Buffs.SilkenFlow)))
Expand All @@ -313,13 +385,48 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

if (actionID == DNC.Bladeshower)
{
var gauge = GetJobGauge<DNCGauge>();

if (level >= DNC.Levels.SaberDance && !HasEffect(DNC.Buffs.StandardStep) && !HasEffect(DNC.Buffs.TechnicalStep))
{
if (IsEnabled(CustomComboPreset.DancerAoeDanceOfTheDawn) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.DanceOfTheDawnReady))
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerAoeSabreDance) && gauge.Esprit >= 85)
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerAoeSabreDanceTech) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.TechnicalFinish))
return OriginalHook(DNC.SaberDance);
}

if (IsEnabled(CustomComboPreset.DancerAoeProcs))
{
if (level >= DNC.Levels.Bloodshower && (HasEffect(DNC.Buffs.FlourishingFlow) || HasEffect(DNC.Buffs.SilkenFlow)))
return DNC.Bloodshower;
}
}

if (actionID == DNC.RisingWindmill || actionID == DNC.Bloodshower)
{
var gauge = GetJobGauge<DNCGauge>();

if (level >= DNC.Levels.SaberDance && !HasEffect(DNC.Buffs.StandardStep) && !HasEffect(DNC.Buffs.TechnicalStep))
{
if (IsEnabled(CustomComboPreset.DancerAoeDanceOfTheDawn) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.DanceOfTheDawnReady))
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerAoeSabreDance) && gauge.Esprit >= 85)
return OriginalHook(DNC.SaberDance);

if (IsEnabled(CustomComboPreset.DancerAoeSabreDanceTech) &&
gauge.Esprit >= 50 && HasEffect(DNC.Buffs.TechnicalFinish))
return OriginalHook(DNC.SaberDance);
}
}

return actionID;
}
}
Expand Down
17 changes: 7 additions & 10 deletions XIVComboExpanded/Combos/VPR.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,20 +239,17 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (actionID == VPR.Reawaken && HasEffect(VPR.Buffs.Reawakened))
{
var gauge = GetJobGauge<VPRGauge>();
var maxtribute = 4;

if (level == 100)
if (level >= VPR.Levels.Legacies)
{
if (OriginalHook(VPR.SerpentsTail) == VPR.FirstLegacy)
return VPR.FirstLegacy;
if (OriginalHook(VPR.SerpentsTail) == VPR.SecondLegacy)
return VPR.SecondLegacy;
if (OriginalHook(VPR.SerpentsTail) == VPR.ThirdLegacy)
return VPR.ThirdLegacy;
if (OriginalHook(VPR.SerpentsTail) == VPR.FourthLegacy)
return VPR.FourthLegacy;
if (OriginalHook(VPR.SerpentsTail) == VPR.FirstLegacy ||
OriginalHook(VPR.SerpentsTail) == VPR.SecondLegacy ||
OriginalHook(VPR.SerpentsTail) == VPR.ThirdLegacy ||
OriginalHook(VPR.SerpentsTail) == VPR.FourthLegacy)
return OriginalHook(VPR.SerpentsTail);
}

var maxtribute = 4;
if (level >= VPR.Levels.Ouroboros)
maxtribute = 5;
if (gauge.AnguineTribute == maxtribute)
Expand Down
32 changes: 31 additions & 1 deletion XIVComboExpanded/CustomComboPreset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,20 +312,50 @@ public enum CustomComboPreset
[CustomComboInfo("Flourishing Fan Dance 4", "Replace Flourish with Fan Dance 4 when available.", DNC.JobID)]
DancerFlourishFan4Feature = 3808,

[SecretCustomCombo]
[ConflictingCombos(DancerSingleTargetProcs)]
[CustomComboInfo("Single Target Multibutton", "Replace Cascade with its procs and combos as they activate.", DNC.JobID)]
DancerSingleTargetMultibutton = 3804,

[SecretCustomCombo]
[ConflictingCombos(DancerSingleTargetMultibutton)]
[CustomComboInfo("Single Target to Procs", "Replace Cascade and Fountain with Reverse Cascade and Fountainfall respectively when available.", DNC.JobID)]
DancerSingleTargetProcs = 3811,

[SecretCustomCombo]
[CustomComboInfo("Single Target Saber Dance", "Replace Cascade, Reverse Cascade, Fountain, and Fountainfall with Saber Dance when at >= 85 Esprit.", DNC.JobID)]
DancerSingleTargetSabreDance = 3817,

[SecretCustomCombo]
[ParentCombo(DancerSingleTargetSabreDance)]
[CustomComboInfo("Single Target Saber Dance Tech Step", "Use Saber Dance at >= 50 Esprit during Technical Step.", DNC.JobID)]
DancerSingleTargetSabreDanceTech = 3818,

[SecretCustomCombo]
[CustomComboInfo("Single Target Dance of the Dawn", "Replace Cascade, Reverse Cascade, Fountain, and Fountainfall with Dance of the Dawn when available and >= 50 Esprit.", DNC.JobID)]
DancerSingleTargetDanceOfTheDawn = 3819,

[SecretCustomCombo]
[CustomComboInfo("AoE Multibutton", "Replace Windmill with its procs and combos as they activate.", DNC.JobID)]
DancerAoeMultibutton = 3805,

[CustomComboInfo("AoE to Procs", "Replace Windmill and Bladeshower with Rising Wiindmill and Bloodshower respectively when available.", DNC.JobID)]
[SecretCustomCombo]
[CustomComboInfo("AoE to Procs", "Replace Windmill and Bladeshower with Rising Windmill and Bloodshower respectively when available.", DNC.JobID)]
DancerAoeProcs = 3812,

[SecretCustomCombo]
[CustomComboInfo("AoE Saber Dance", "Replace Windmill, Rising Windmill, Bladeshower, and Bloodshower with Saber Dance when at >= 85 Esprit.", DNC.JobID)]
DancerAoeSabreDance = 3820,

[SecretCustomCombo]
[ParentCombo(DancerAoeSabreDance)]
[CustomComboInfo("AoE Saber Dance Tech Step", "Use Saber Dance at >= 50 Esprit during Technical Step.", DNC.JobID)]
DancerAoeSabreDanceTech = 3821,

[SecretCustomCombo]
[CustomComboInfo("AoE Dance of the Dawn", "Replace Windmill, Rising Windmill, Bladeshower, and Bloodshower with Dance of the Dawn when available and >= 50 Esprit.", DNC.JobID)]
DancerAoeDanceOfTheDawn = 3822,

[ConflictingCombos(DancerDanceStepCombo)]
[CustomComboInfo(
"Dance Step Feature",
Expand Down

0 comments on commit a818195

Please sign in to comment.