Skip to content

Commit

Permalink
update DRG
Browse files Browse the repository at this point in the history
  • Loading branch information
@xhabit
xhabit committed Aug 24, 2024
1 parent 545c7da commit 43a501a
Show file tree
Hide file tree
Showing 3 changed files with 302 additions and 206 deletions.
80 changes: 56 additions & 24 deletions XIVSlothComboX/Combos/CustomComboPreset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1275,15 +1275,19 @@ public enum CustomComboPreset

[ParentCombo(DRG_ST_AdvancedMode)]
[CustomComboInfo("Cooldowns Option", "Adds various cooldowns to the rotation.", DRG.JobID)]
DRG_ST_CDs = 6106,
DRG_ST_CDs = 6105,

[ParentCombo(DRG_ST_CDs)]
[CustomComboInfo("Life Surge Option", "Adds Life Surge, on the proper GCD, to the rotation.", DRG.JobID)]
DRG_ST_LifeSurge = 6107,
DRG_ST_LifeSurge = 6106,

[ParentCombo(DRG_ST_CDs)]
[CustomComboInfo("Dragonfire Dive Option", "Adds Dragonfire Dive to the rotation.", DRG.JobID)]
DRG_ST_Dives_Dragonfire = 6108,
DRG_ST_DragonfireDive = 6107,

[ParentCombo(DRG_ST_DragonfireDive)]
[CustomComboInfo("Dragonfire Dive movement option", "Adds Dragonfire Dive to the rotation when not moving.", DRG.JobID)]
DRG_ST_DragonfireDive_Movement = 6108,

[ParentCombo(DRG_ST_CDs)]
[CustomComboInfo("Rise of the Dragon Option", "Adds Rise of the Dragon to the rotation.", DRG.JobID)]
Expand All @@ -1293,43 +1297,51 @@ public enum CustomComboPreset
[CustomComboInfo("Stardiver Option", "Adds Stardiver to the rotation.", DRG.JobID)]
DRG_ST_Stardiver = 6110,

[ParentCombo(DRG_ST_Stardiver)]
[CustomComboInfo("Stardiver movement option", "Adds Stardiver to the rotation when not moving.", DRG.JobID)]
DRG_ST_Stardiver_Movement = 6111,

[ParentCombo(DRG_ST_CDs)]
[CustomComboInfo("Starcross Option", "Adds Starcross to the rotation.", DRG.JobID)]
DRG_ST_Starcross = 6111,
DRG_ST_Starcross = 6112,

[ParentCombo(DRG_ST_CDs)]
[CustomComboInfo("High Jump Option", "Adds (High) Jump to the rotation.", DRG.JobID)]
DRG_ST_HighJump = 6112,
DRG_ST_HighJump = 6113,

[ParentCombo(DRG_ST_HighJump)]
[CustomComboInfo("(High) Jump movement option", "Adds (High) Jump to the rotation when not moving.", DRG.JobID)]
DRG_ST_HighJump_Movement = 6114,

[ParentCombo(DRG_ST_HighJump)]
[CustomComboInfo("Mirage Dive Option", "Adds Mirage Dive to the rotation.", DRG.JobID)]
DRG_ST_Mirage = 6113,
DRG_ST_Mirage = 6115,

[ParentCombo(DRG_ST_CDs)]
[CustomComboInfo("Geirskogul Option", "Adds Geirskogul to the rotation.", DRG.JobID)]
DRG_ST_Geirskogul = 6114,
DRG_ST_Geirskogul = 6116,

[ParentCombo(DRG_ST_CDs)]
[CustomComboInfo("Nastrond Option", "Adds Nastrond to the rotation.", DRG.JobID)]
DRG_ST_Nastrond = 6115,
DRG_ST_Nastrond = 6117,

[ParentCombo(DRG_ST_CDs)]
[CustomComboInfo("Wyrmwind Thrust Option", "Adds Wyrmwind Thrust to the rotation.", DRG.JobID)]
DRG_ST_Wyrmwind = 6116,
DRG_ST_Wyrmwind = 6118,

#endregion

[ParentCombo(DRG_ST_AdvancedMode)]
[CustomComboInfo("Ranged Uptime Option", "Adds Piercing Talon to the rotation when you are out of melee range.", DRG.JobID)]
DRG_ST_RangedUptime = 6117,
DRG_ST_RangedUptime = 6197,

[ParentCombo(DRG_ST_AdvancedMode)]
[CustomComboInfo("Combo Heals Option", "Adds Bloodbath and Second Wind to the rotation.", DRG.JobID)]
DRG_ST_ComboHeals = 6118,
DRG_ST_ComboHeals = 6198,

[ParentCombo(DRG_ST_AdvancedMode)]
[CustomComboInfo("Dynamic True North Option", "Adds True North before Chaos Thrust/Chaotic Spring, Fang And Claw and Wheeling Thrust when you are not in the correct position for the enhanced potency bonus.", DRG.JobID)]
DRG_TrueNorthDynamic = 6119,
DRG_TrueNorthDynamic = 6199,

#endregion

Expand Down Expand Up @@ -1361,7 +1373,7 @@ public enum CustomComboPreset

#endregion

#region CDs AoE
#region cooldowns AoE

[ParentCombo(DRG_AOE_AdvancedMode)]
[CustomComboInfo("Cooldowns Option", "Adds various cooldowns to the rotation.", DRG.JobID)]
Expand All @@ -1373,49 +1385,65 @@ public enum CustomComboPreset

[ParentCombo(DRG_AoE_CDs)]
[CustomComboInfo("Dragonfire Dive Option", "Adds Dragonfire Dive to the rotation.", DRG.JobID)]
DRG_AoE_Dragonfire_Dive = 6207,
DRG_AoE_DragonfireDive = 6207,

[ParentCombo(DRG_AoE_DragonfireDive)]
[CustomComboInfo("Dragonfire Dive movement option", "Adds Dragonfire Dive to the rotation when not moving.", DRG.JobID)]
DRG_AoE_DragonfireDive_Movement = 6208,

[ParentCombo(DRG_AoE_CDs)]
[CustomComboInfo("Rise of the Dragon Option", "Adds Rise of the Dragonj to the rotation.", DRG.JobID)]
DRG_AoE_RiseOfTheDragon = 6208,
DRG_AoE_RiseOfTheDragon = 6209,

[ParentCombo(DRG_AoE_CDs)]
[CustomComboInfo("Stardiver Option", "Adds Stardiver to the rotation.", DRG.JobID)]
DRG_AoE_Stardiver = 6209,
DRG_AoE_Stardiver = 6210,

[ParentCombo(DRG_AoE_Stardiver)]
[CustomComboInfo("Stardiver movement option", "Adds Stardiver to the rotation when not moving.", DRG.JobID)]
DRG_AoE_Stardiver_Movement = 6211,

[ParentCombo(DRG_AoE_CDs)]
[CustomComboInfo("Starcross Option", "Adds Starcross to the rotation.", DRG.JobID)]
DRG_AoE_Starcross = 6210,
DRG_AoE_Starcross = 6212,

[ParentCombo(DRG_AoE_CDs)]
[CustomComboInfo("High Jump Option", "Adds (High) Jump to the rotation.", DRG.JobID)]
DRG_AoE_HighJump = 6211,
DRG_AoE_HighJump = 6213,

[ParentCombo(DRG_AoE_HighJump)]
[CustomComboInfo("(High) Jump movement option", "Adds (High) Jump to the rotation when not moving.", DRG.JobID)]
DRG_AoE_HighJump_Movement = 6214,

[ParentCombo(DRG_AoE_HighJump)]
[CustomComboInfo("Mirage Dive Option", "Adds Mirage Dive to the rotation.", DRG.JobID)]
DRG_AoE_Mirage = 6212,
DRG_AoE_Mirage = 6215,

[ParentCombo(DRG_AoE_CDs)]
[CustomComboInfo("Geirskogul Option", "Adds Geirskogul to the rotation.", DRG.JobID)]
DRG_AoE_Geirskogul = 6213,
DRG_AoE_Geirskogul = 6216,

[ParentCombo(DRG_AoE_CDs)]
[CustomComboInfo("Nastrond Option", "Adds Nastrond to the rotation.", DRG.JobID)]
DRG_AoE_Nastrond = 6214,
DRG_AoE_Nastrond = 6217,

[ParentCombo(DRG_AoE_CDs)]
[CustomComboInfo("Wyrmwind Option", "Adds Wyrmwind Thrust to the rotation.", DRG.JobID)]
DRG_AoE_Wyrmwind = 6215,
DRG_AoE_Wyrmwind = 6218,

#endregion

[ParentCombo(DRG_AOE_AdvancedMode)]
[CustomComboInfo("Low Level Disembowel", "Adds Disembowel combo to the rotation when you are or synced below level 62.", DRG.JobID)]
DRG_AoE_Disembowel = 6297,

[ParentCombo(DRG_AOE_AdvancedMode)]
[CustomComboInfo("Ranged Uptime Option", "Adds Piercing Talon to the rotation when you are out of melee range.", DRG.JobID)]
DRG_AoE_RangedUptime = 6216,
DRG_AoE_RangedUptime = 6298,

[ParentCombo(DRG_AOE_AdvancedMode)]
[CustomComboInfo("Combo Heals Option", "Adds Bloodbath and Second Wind to the rotation.", DRG.JobID)]
DRG_AoE_ComboHeals = 6217,
DRG_AoE_ComboHeals = 6299,

#endregion

Expand All @@ -1433,8 +1461,12 @@ public enum CustomComboPreset
[CustomComboInfo("Rampart Option", "Use Variant Rampart on cooldown.", DRG.JobID)]
DRG_Variant_Rampart = 6303,


// Last value = 6117 - 6216 - 6303

#endregion


#region GUNBREAKER

[ReplaceSkill(GNB.残暴弹BrutalShell)]
Expand Down
20 changes: 9 additions & 11 deletions XIVSlothComboX/Combos/JobHelpers/DRGOpenerLogic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ private static bool HasCooldowns()

public OpenerState CurrentState
{
get { return currentState; }
get
{
return currentState;
}
set
{
if (value != currentState)
Expand All @@ -50,7 +53,6 @@ public OpenerState CurrentState
{
Svc.Log.Debug($"Entered PrePull Opener");
}

if (value == OpenerState.InOpener) OpenerStep = 1;
if (value == OpenerState.OpenerFinished || value == OpenerState.FailedOpener)
{
Expand All @@ -59,7 +61,6 @@ public OpenerState CurrentState

ResetOpener();
}

if (value == OpenerState.OpenerFinished) Svc.Log.Information("Opener Finished");

currentState = value;
Expand Down Expand Up @@ -184,17 +185,15 @@ private bool DoOpener(ref uint actionID)
CurrentState = OpenerState.FailedOpener;

if (((actionID == DragonfireDive && CustomComboFunctions.IsOnCooldown(DragonfireDive)) ||
(actionID == BattleLitany && CustomComboFunctions.IsOnCooldown(BattleLitany)) ||
(actionID == LanceCharge && CustomComboFunctions.IsOnCooldown(LanceCharge)) ||
(actionID == LifeSurge && CustomComboFunctions.GetRemainingCharges(LifeSurge) < 2)) && ActionWatching.TimeSinceLastAction.TotalSeconds >= 3)
(actionID == BattleLitany && CustomComboFunctions.IsOnCooldown(BattleLitany)) ||
(actionID == LanceCharge && CustomComboFunctions.IsOnCooldown(LanceCharge)) ||
(actionID == LifeSurge && CustomComboFunctions.GetRemainingCharges(LifeSurge) < 2)) && ActionWatching.TimeSinceLastAction.TotalSeconds >= 3)
{
CurrentState = OpenerState.FailedOpener;
return false;
}

return true;
}

return false;
}

Expand Down Expand Up @@ -224,11 +223,9 @@ public bool DoFullOpener(ref uint actionID)
ResetOpener();
CurrentState = OpenerState.PrePull;
}

return false;
}
}

internal class AnimationLock
{
internal static readonly List<uint> FastLocks =
Expand All @@ -242,7 +239,8 @@ internal class AnimationLock
DRG.WyrmwindThrust,
DRG.RiseOfTheDragon,
DRG.Starcross,
PvE.Content.Variant.VariantRampart
PvE.Content.Variant.VariantRampart,
PvE.All.TrueNorth
];

internal static readonly List<uint> MidLocks =
Expand Down
Loading

0 comments on commit 43a501a

Please sign in to comment.