Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
Endwalker update #1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nik-Potokar
Nik-Potokar committed Dec 6, 2021
1 parent e57ba84 commit dca6978
Show file tree
Hide file tree
Showing 9 changed files with 142 additions and 186 deletions.
12 changes: 8 additions & 4 deletions XIVComboExpanded/Combos/AST.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ public const uint
LucidDreaming = 7562,
Ascend = 3603,
Swiftcast = 7561,
CrownPlay = 25869,
Astrodyne = 25870,
FallMalefic = 25871,
Play = 17055;

public static class Buffs
Expand Down Expand Up @@ -62,17 +65,17 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
}
}

internal class AstrologianSleeveDrawFeature : CustomCombo
internal class AstrologianCrownPlayFeature : CustomCombo
{
protected override CustomComboPreset Preset => CustomComboPreset.AstrologianSleeveDrawFeature;
protected override CustomComboPreset Preset => CustomComboPreset.AstrologianCrownPlayFeature;

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
{
if (actionID == AST.MinorArcana)
{
var gauge = GetJobGauge<ASTGauge>().DrawnCard;
if (gauge == CardType.NONE && level >= AST.Levels.SleeveDraw)
return AST.SleeveDraw;
if (gauge == CardType.NONE && level >= 70)
return AST.CrownPlay;
}

return actionID;
Expand Down Expand Up @@ -106,6 +109,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (HasEffect(AST.Buffs.Swiftcast))
return AST.Ascend;
}
return OriginalHook(AST.Swiftcast);
}
return actionID;
}
Expand Down
73 changes: 43 additions & 30 deletions XIVComboExpanded/Combos/BLM.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public const uint
Fire = 141,
Blizzard = 142,
Thunder = 144,
Blizzard2 = 146,
Blizzard2 = 25793,
Transpose = 149,
Fire3 = 152,
Thunder3 = 153,
Expand All @@ -21,12 +21,15 @@ public const uint
Freeze = 159,
Flare = 162,
LeyLines = 3573,
Enochian = 3575,
Blizzard4 = 3576,
Fire4 = 3577,
BetweenTheLines = 7419,
Despair = 16505,
UmbralSoul = 16506,
Paradox = 25797,
Amplifier = 25796,
HighFireII = 25794,
HighBlizzardII = 25795,
Xenoglossy = 16507;

public static class Buffs
Expand All @@ -52,7 +55,6 @@ public const byte
Blizzard3 = 40,
Thunder3 = 45,
Flare = 50,
Enochian = 56,
Blizzard4 = 58,
Fire4 = 60,
BetweenTheLines = 62,
Expand All @@ -67,15 +69,15 @@ internal class BlackBlizzardFeature : CustomCombo

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
{
if (actionID == 142)
if (actionID == BLM.Blizzard)
{
var gauge = GetJobGauge<BLMGauge>().InUmbralIce;
if (level >= 40 && !gauge)
{
return 154u;
return BLM.Blizzard3;
}
}
if (actionID == 159 && level < 35)
if (actionID == BLM.Freeze && level < 35)
{
return 146u;
}
Expand All @@ -88,12 +90,12 @@ internal class BlackFireFeature : CustomCombo

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
{
if (actionID == 141)
if (actionID == BLM.Fire)
{
var gauge = CustomCombo.GetJobGauge<BLMGauge>();
if (level >= 34 && !gauge.InAstralFire || CustomCombo.HasEffect(165))
if (level >= 34 && !gauge.InAstralFire || CustomCombo.HasEffect(BLM.Buffs.Firestarter))
{
return CustomCombo.OriginalHook(152u);
return CustomCombo.OriginalHook(BLM.Fire3);
}
}
return actionID;
Expand Down Expand Up @@ -122,7 +124,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
if (actionID == 149)
{
var gauge = CustomCombo.GetJobGauge<BLMGauge>();
if (gauge.InUmbralIce && gauge.IsEnochianActive && level >= 76)
if (gauge.InUmbralIce && level >= 76)
{
return 16506u;
}
Expand All @@ -136,28 +138,36 @@ internal class BlackEnochianFeature : CustomCombo

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
{
if (actionID == BLM.Enochian) ;
if (actionID == BLM.Fire4)
{
var gauge = GetJobGauge<BLMGauge>();
var thundercloudduration = FindEffectAny(BLM.Buffs.Thundercloud);
var thunderdebuffontarget = FindTargetEffect(BLM.Debuffs.Thunder3);
var thunderOneDebuff = FindTargetEffect(BLM.Debuffs.Thunder);
if (gauge.IsEnochianActive)
{
var gauge = GetJobGauge<BLMGauge>();
var thundercloudduration = FindEffectAny(BLM.Buffs.Thundercloud);
var thunderdebuffontarget = FindTargetEffect(BLM.Debuffs.Thunder3);
var thunderOneDebuff = FindTargetEffect(BLM.Debuffs.Thunder);
if (gauge.InUmbralIce && level >= BLM.Levels.Blizzard4)
{
if (gauge.ElementTimeRemaining >= 5000 && CustomCombo.IsEnabled(CustomComboPreset.BlackThunderFeature))
if (HasEffect(BLM.Buffs.Thundercloud))
if ((thundercloudduration.RemainingTime < 4 && thundercloudduration.RemainingTime > 0) || TargetHasEffect(BLM.Debuffs.Thunder3) && thunderdebuffontarget.RemainingTime < 4)
return BLM.Thunder3;
{
if (HasEffect(BLM.Buffs.Thundercloud))
{
if ((thundercloudduration.RemainingTime < 4 && thundercloudduration.RemainingTime > 0) || (TargetHasEffect(BLM.Debuffs.Thunder3) && thunderdebuffontarget.RemainingTime < 4))
return BLM.Thunder3;
}
}

return BLM.Blizzard4;
}
if (level >= BLM.Levels.Fire4)
{
if (gauge.ElementTimeRemaining >= 6000 && CustomCombo.IsEnabled(CustomComboPreset.BlackThunderFeature))
if (HasEffect(BLM.Buffs.Thundercloud))
if ((thundercloudduration.RemainingTime < 4 && thundercloudduration.RemainingTime > 0) || TargetHasEffect(BLM.Debuffs.Thunder3) && thunderdebuffontarget.RemainingTime < 4)
return BLM.Thunder3;
{
if (HasEffect(BLM.Buffs.Thundercloud))
{
if ((thundercloudduration.RemainingTime < 4 && thundercloudduration.RemainingTime > 0) || (TargetHasEffect(BLM.Debuffs.Thunder3) && thunderdebuffontarget.RemainingTime < 4))
return BLM.Thunder3;
}
}

if (gauge.ElementTimeRemaining < 3000 && HasEffect(BLM.Buffs.Firestarter) && CustomCombo.IsEnabled(CustomComboPreset.BlackFire13Feature))
return BLM.Fire3;
if (LocalPlayer.CurrentMp < 2400 && level >= BLM.Levels.Despair && CustomCombo.IsEnabled(CustomComboPreset.BlackDespairFeature))
Expand All @@ -171,19 +181,22 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim


if (gauge.ElementTimeRemaining >= 5000 && CustomCombo.IsEnabled(CustomComboPreset.BlackThunderFeature) && level < BLM.Levels.Thunder3)
if (HasEffect(BLM.Buffs.Thundercloud))
if ((thundercloudduration.RemainingTime < 4 && thundercloudduration.RemainingTime > 0) || TargetHasEffect(BLM.Debuffs.Thunder) && thunderOneDebuff.RemainingTime < 4)
return BLM.Thunder;
if (level < BLM.Levels.Fire3)
{
if (HasEffect(BLM.Buffs.Thundercloud))
{
if ((thundercloudduration.RemainingTime < 4 && thundercloudduration.RemainingTime > 0) || (TargetHasEffect(BLM.Debuffs.Thunder) && thunderOneDebuff.RemainingTime < 4))
return BLM.Thunder;
}
}

if (level < BLM.Levels.Fire3)
return BLM.Fire;
if (gauge.InAstralFire && (level < BLM.Levels.Enochian || gauge.IsEnochianActive))
if (gauge.InAstralFire)
{
if (HasEffect(BLM.Buffs.Firestarter))
return BLM.Fire3;
return BLM.Fire;
}

}
}
return actionID;
}
Expand Down
3 changes: 3 additions & 0 deletions XIVComboExpanded/Combos/BRD.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ public const uint
Stormbite = 7407,
RefulgentArrow = 7409,
BurstShot = 16495,
Ladonsbite = 25783,
BlastArrow = 25784,
RadiantFinale = 25785,
ApexArrow = 16496;

public static class Buffs
Expand Down
2 changes: 2 additions & 0 deletions XIVComboExpanded/Combos/DNC.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public const uint
Fountain = 15990,
ReverseCascade = 15991,
Fountainfall = 15992,
StarfallDance = 25792,
// AoE
Windmill = 15993,
Bladeshower = 15994,
Expand All @@ -32,6 +33,7 @@ public const uint
FanDance1 = 16007,
FanDance2 = 16008,
FanDance3 = 16009,
FanDance4 = 25791,
// Other
SaberDance = 16005,
EnAvant = 16010,
Expand Down
11 changes: 11 additions & 0 deletions XIVComboExpanded/Combos/GNB.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public const uint
BowShock = 16159,
BurstStrike = 16162,
FatedCircle = 16163,
DoubleDown = 25760,
DangerZone = 16144,
Bloodfest = 16164;

public static class Buffs
Expand Down Expand Up @@ -65,6 +67,11 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if (comboTime > 0)
{
var maincomboCD1 = GetCooldown(GNB.KeenEdge);
var maincomboCD2 = GetCooldown(GNB.BrutalShell);
var maincomboCD3 = GetCooldown(GNB.SolidBarrel);
var dangerZoneCD = GetCooldown(GNB.DangerZone);
var doubleDownCD = GetCooldown(GNB.DoubleDown);
var bulletGauge = GetJobGauge<GNBGauge>();
if (lastComboMove == GNB.KeenEdge && level >= GNB.Levels.BrutalShell)
return GNB.BrutalShell;
Expand All @@ -74,6 +81,10 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim

if (lastComboMove == GNB.BrutalShell && level >= GNB.Levels.SolidBarrel)
return GNB.SolidBarrel;
if (maincomboCD1.CooldownRemaining > 0.7 || (maincomboCD2.CooldownRemaining > 0.7) || ((maincomboCD3.CooldownRemaining > 0.7) && !dangerZoneCD.IsCooldown && level > 18 && IsEnabled(CustomComboPreset.GunbreakerDangerZoneFeature)))
return GNB.DangerZone;
if (maincomboCD1.CooldownRemaining > 0.7 || (maincomboCD2.CooldownRemaining > 0.7) || ((maincomboCD3.CooldownRemaining > 0.7) && !doubleDownCD.IsCooldown && HasEffect(GNB.Buffs.NoMercy) && level >= 90 && IsEnabled(CustomComboPreset.GunbreakerDoubleDownFeature)))
return GNB.DoubleDown;
}

return GNB.KeenEdge;
Expand Down
Loading

0 comments on commit dca6978

Please sign in to comment.