Skip to content

Commit

Permalink
Merge pull request #434 from lhn1703/features
Browse files Browse the repository at this point in the history 
DRK: handle level 91+
  • Loading branch information
@MKhayle
MKhayle authored Sep 11, 2024
2 parents a529f16 + 2dd3815 commit 6b47ecd
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 5 deletions.
38 changes: 35 additions & 3 deletions XIVComboExpanded/Combos/DRK.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ public const uint
SaltAndDarkness = 25755,
Shadowbringer = 25757,
GritRemoval = 32067,
Delirium = 7390,
ScarletDelirium = 36928,
Comeuppance = 36929,
Torcleaver = 36930,
Impalement = 36931;
Impalement = 36931,
Disesteem = 36932;

public static class Buffs
{
Expand All @@ -39,7 +41,8 @@ public const ushort
Grit = 743,
Darkside = 751,
Delirium = 1972,
ScarletDelirium = 3836;
ScarletDelirium = 3836,
Scorn = 3837;
}

public static class Debuffs
Expand Down Expand Up @@ -71,7 +74,8 @@ public const byte
ScarletDelirium = 96,
Comeuppance = 96,
Torcleaver = 96,
Impalement = 96;
Impalement = 96,
Disesteem = 100;
}
}

Expand All @@ -98,10 +102,21 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (IsEnabled(CustomComboPreset.DarkSouleaterOvercapFeature))
{
if (IsEnabled(CustomComboPreset.DarkSouleaterOvercapOptimizedFeature))
{
if (level >= DRK.Levels.Bloodspiller && gauge.Blood > 70 && GetCooldown(DRK.Delirium).CooldownRemaining < 5.0)
return OriginalHook(DRK.Bloodspiller);
}
if (level >= DRK.Levels.Bloodspiller && gauge.Blood > 90 && HasEffect(DRK.Buffs.BloodWeapon))
return OriginalHook(DRK.Bloodspiller);
}

if (IsEnabled(CustomComboPreset.DarkDisesteemComboFeature))
{
if (level >= DRK.Levels.Disesteem && HasEffect(DRK.Buffs.Scorn))
return DRK.Disesteem;
}

if (comboTime > 0)
{
if (lastComboMove == DRK.SyphonStrike && level >= DRK.Levels.Souleater)
Expand Down Expand Up @@ -150,10 +165,21 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (IsEnabled(CustomComboPreset.DarkStalwartSoulOvercapFeature))
{
if (IsEnabled(CustomComboPreset.DarkStalwartSoulOvercapOptimizedFeature))
{
if (level >= DRK.Levels.Quietus && gauge.Blood > 70 && GetCooldown(DRK.Delirium).CooldownRemaining < 5.0)
return OriginalHook(DRK.Quietus);
}
if (level >= DRK.Levels.Quietus && gauge.Blood > 90 && HasEffect(DRK.Buffs.BloodWeapon))
return OriginalHook(DRK.Quietus);
}

if (IsEnabled(CustomComboPreset.DarkDisesteemComboFeature))
{
if (level >= DRK.Levels.Disesteem && HasEffect(DRK.Buffs.Scorn))
return DRK.Disesteem;
}

if (comboTime > 0)
{
if (lastComboMove == DRK.Unleash && level >= DRK.Levels.StalwartSoul)
Expand Down Expand Up @@ -216,6 +242,12 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (level >= DRK.Levels.LivingShadow && IsCooldownUsable(DRK.LivingShadow))
return DRK.LivingShadow;
}

if (IsEnabled(CustomComboPreset.DarkDisesteemFeature))
{
if (level >= DRK.Levels.Disesteem && HasEffect(DRK.Buffs.Scorn))
return DRK.Disesteem;
}
}

return actionID;
Expand Down
30 changes: 28 additions & 2 deletions XIVComboExpanded/CustomComboPreset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -698,9 +698,16 @@ public enum CustomComboPreset
[IconsCombo([DRK.Souleater, UTL.ArrowLeft, DRK.Bloodspiller, UTL.Blank, UTL.Danger])]
[ParentCombo(DarkSouleaterCombo)]
[ExpandedCustomCombo]
[CustomComboInfo("Souleater Overcap Feature", "Replace Souleater with Bloodspiller when the next combo action would cause the Blood Gauge to overcap.", WAR.JobID)]
[CustomComboInfo("Souleater Overcap Feature", "Replace Souleater with Bloodspiller when the next combo action would cause the Blood Gauge to overcap.", DRK.JobID)]
DarkSouleaterOvercapFeature = 3206,

[SectionCombo("Single Target")]
[IconsCombo([DRK.Souleater, UTL.ArrowLeft, DRK.Bloodspiller, UTL.Blank, UTL.Danger, UTL.Blank, DRK.Buffs.Delirium, UTL.Idea])]
[ParentCombo(DarkSouleaterOvercapFeature)]
[SecretCustomCombo]
[CustomComboInfo("Souleater Overcap Optimized Feature", "Replace Souleater with Bloodspiller when the next combo action would cause the Blood Gauge to exceed 70 when Delirium is about to be off cooldown.\nUpon using Delirium the next 3 gcds will generate 10 gauge each so any banked Blood Gauge over 70 is wasted.", DRK.JobID)]
DarkSouleaterOvercapOptimizedFeature = 3212,

[SectionCombo("Area of Effect")]
[IconsCombo([DRK.StalwartSoul, UTL.ArrowLeft, DRK.Unleash])]
[CustomComboInfo("Stalwart Soul Combo", "Replace Stalwart Soul with its combo chain.", DRK.JobID)]
Expand All @@ -710,9 +717,16 @@ public enum CustomComboPreset
[IconsCombo([DRK.StalwartSoul, UTL.ArrowLeft, DRK.Quietus, UTL.Blank, UTL.Danger])]
[ParentCombo(DarkStalwartSoulCombo)]
[ExpandedCustomCombo]
[CustomComboInfo("Stalwart Soul Overcap Feature", "Replace Stalwart Soul with Quietus when the next combo action would cause the Blood Gauge to overcap.", WAR.JobID)]
[CustomComboInfo("Stalwart Soul Overcap Feature", "Replace Stalwart Soul with Quietus when the next combo action would cause the Blood Gauge to overcap.", DRK.JobID)]
DarkStalwartSoulOvercapFeature = 3207,

[SectionCombo("Area of Effect")]
[IconsCombo([DRK.StalwartSoul, UTL.ArrowLeft, DRK.Quietus, UTL.Blank, UTL.Danger, UTL.Blank, DRK.Buffs.Delirium, UTL.Idea])]
[ParentCombo(DarkStalwartSoulCombo)]
[SecretCustomCombo]
[CustomComboInfo("Stalwart Soul Overcap Optimized Feature", "Replace Stalwart Soul with Quietus when the next combo action would cause the Blood Gauge to exceed 70 when Delirium is about to be off cooldown.\nUpon using Delirium the next 3 gcds will generate 10 gauge each so any banked Blood Gauge over 70 is wasted.", DRK.JobID)]
DarkStalwartSoulOvercapOptimizedFeature = 3213,

[SectionCombo("Blood Weapon")]
[IconsCombo([DRK.Souleater, DRK.StalwartSoul, UTL.ArrowLeft, DRK.Bloodspiller, DRK.Quietus, UTL.Blank, DRK.Buffs.Delirium, UTL.Checkmark])]
[ExpandedCustomCombo]
Expand Down Expand Up @@ -743,6 +757,18 @@ public enum CustomComboPreset
[CustomComboInfo("Missing Shadowbringer Feature", "Replace Living Shadow with Shadowbringer when charges are available and Living Shadow is on cooldown.", DRK.JobID)]
DarkLivingShadowbringerHpFeature = 3209,

[SectionCombo("Living Shadow")]
[IconsCombo([DRK.Bloodspiller, DRK.Quietus, UTL.ArrowLeft, DRK.Disesteem, UTL.Blank, DRK.Buffs.Scorn, UTL.Checkmark])]
[ExpandedCustomCombo]
[CustomComboInfo("Disesteem Feature", "Replace Bloodspiller and Quietus with Disesteem when Scorn is active.", DRK.JobID)]
DarkDisesteemFeature = 3210,

[SectionCombo("Living Shadow")]
[IconsCombo([DRK.Souleater, DRK.StalwartSoul, UTL.ArrowLeft, DRK.Disesteem, UTL.Blank, DRK.Buffs.Scorn, UTL.Checkmark])]
[AccessibilityCustomCombo]
[CustomComboInfo("Disesteem Souleater Feature", "Replace Souleater and Stalwart Soul with Disesteem when Scorn is active.", DRK.JobID)]
DarkDisesteemComboFeature = 3211,

#endregion
// ====================================================================================
#region DRAGOON
Expand Down

0 comments on commit 6b47ecd

Please sign in to comment.