From 8240ee6970d115229b0168c348b2601834f96746 Mon Sep 17 00:00:00 2001 From: Frigidwalrus Date: Mon, 5 Aug 2024 08:31:00 -0500 Subject: [PATCH] BLM and SMN Updates -Updated SMN and BLM Levels and ActionIDs -Checks for combos to start soon --- XIVComboVX/Combos/BLM.cs | 31 +++++++ XIVComboVX/Combos/SMN.cs | 139 +++++++++++++++++++++++++------- XIVComboVX/CustomComboPreset.cs | 7 ++ 3 files changed, 150 insertions(+), 27 deletions(-) diff --git a/XIVComboVX/Combos/BLM.cs b/XIVComboVX/Combos/BLM.cs index fdcc33a8..a98b776f 100644 --- a/XIVComboVX/Combos/BLM.cs +++ b/XIVComboVX/Combos/BLM.cs @@ -295,4 +295,35 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim return actionID; } } + + + +internal class BlackFireToIce3: CustomCombo { + public override CustomComboPreset Preset { get;} = CustomComboPreset.BlackFireToIce3; + public override uint[] ActionIDs => [BLM.Blizzard3]; + protected override uint Invoke(uint actionID, uint lastComboActionId, float comboTime, byte level) { + BLMGauge gauge = GetJobGauge(); + + if (gauge.InAstralFire && LocalPlayer.CurrentMp >= 1600 && level >= BLM.Blizzard3) + return BLM.Blizzard; + + return BLM.Blizzard3; + + } +} + +internal class BlackIceToFire3: CustomCombo { + public override CustomComboPreset Preset { get; } = CustomComboPreset.BlackIceToFire3; + public override uint[] ActionIDs => [BLM.Fire3]; + protected override uint Invoke(uint actionID, uint lastComboActionId, float comboTime, byte level) { + BLMGauge gauge = GetJobGauge(); + + if (gauge.InUmbralIce && level >= BLM.Fire3) + return BLM.Fire; + + return BLM.Fire3; + + } +} + */ diff --git a/XIVComboVX/Combos/SMN.cs b/XIVComboVX/Combos/SMN.cs index 85fe7bd7..08909c0e 100644 --- a/XIVComboVX/Combos/SMN.cs +++ b/XIVComboVX/Combos/SMN.cs @@ -6,31 +6,67 @@ internal static class SMN { public const byte JobID = 27; public const uint - Resurrection = 173, - Ruin = 163, - Ruin2 = 172, - Ruin3 = 3579, - Ruin4 = 7426, - Fester = 181, - Painflare = 3578, - DreadwyrmTrance = 3581, - SummonBahamut = 7427, - EnkindleBahamut = 7429, - EnergySyphon = 16510, - Outburst = 16511, - EnergyDrain = 16508, - SummonCarbuncle = 25798, - RadiantAegis = 25799, - Aethercharge = 25800, - SearingLight = 25801, - AstralFlow = 25822, - TriDisaster = 25826, - CrimsonCyclone = 25835, - MountainBuster = 25836, - Slipstream = 25837, - CrimsonStrike = 25885, - Gemshine = 25883, - PreciousBrilliance = 25884; + //Buttons that can be put on the bar + Ruin = 173, + SummonCarbuncle = 25798, + RadiantAegis = 25799, + Physick = 16230, + Aethercharge = 25800, + Gemshine = 25883, + EnergyDrain = 25883, + Fester = 181, + Resurrection = 173, + SummonTopaz = 25803, + SummonEmerald = 25804, + Outburst = 16511, + PreciousBrilliance = 25884, + Ruin2 = 172, + SummonIfrit = 25805, + SummonTitan = 25806, + Painflare = 3578, + SummonGardua = 25807, + EnergySyphon = 16510, + Ruin3 = 3579, + AstralFlow = 25822, + Ruin4 = 7426, + SearingLight = 7426, + EnkindleBahamut = 7429, + SummonIfrit2 = 25838, + SummonGaruda2 = 25807, + SummonTitan2 = 25839, + SearingFlash = 36991, + LuxSolaris = 36997, + //Buttons that cannot be put on the bar + AstralImpulse = 25820, + AstralFlare = 25821, + Deathflare = 3582, + Wyrmwave = 7428, + AkhMorn = 7449, + RubyRite = 25823, + TopazRite = 25824, + EmeraldRite = 25825, + SummonPhoenix = 25831, + FountainOfFire = 16514, + BrandOfPurgatory = 16515, + Rekindle = 25830, + EnkindlePhoenix = 16516, + EverlastingFlight = 16517, + ScarletFlame = 16519, + Revelation = 16518, + RubyCatastrophe = 25832, + TopazCatastrophe = 25833, + EmeraldCatastrophe = 25834, + CrimsonCyclone = 25835, + CrimsonStrike = 25885, + MountainBuster = 25836, + Slipstream = 25837, + SummonSolarBahamut = 36992, + UmbralImpulse = 36994, + UmbralFlare = 36995, + Sunflare = 36996, + EnkindleSolarBahamut = 36998, + Luxwave = 36993, + Exodus = 36999; public static class Buffs { public const ushort @@ -46,20 +82,69 @@ public static class Debuffs { public static class Levels { public const byte + //Buttons that can be put on the bar + Ruin = 1, SummonCarbuncle = 2, RadiantAegis = 2, + Physick = 4, + Aethercharge = 6, Gemshine = 6, EnergyDrain = 10, + Fester = 10, + Resurrection = 12, + SummonTopaz = 15, + SummonEmerald = 22, + Outburst = 26, PreciousBrilliance = 26, + Ruin2 = 30, + SummonIfrit = 30, + SummonTitan = 35, Painflare = 40, + SummonGaruda = 45, EnergySyphon = 52, Ruin3 = 54, + AstralFlow = 60, Ruin4 = 62, SearingLight = 66, EnkindleBahamut = 70, + SummonIfrit2 = 90, + SummonGaruda2 = 90, + SummonTitan2 = 90, + SearingFlash = 96, + LuxSolaris = 100, + //Buttons that cannot be put on the bar + AstralImpulse = 58, + AstralFlare = 58, + Deathflare = 60, + Wyrmwave = 70, + AkhMorn = 70, + RubyRite = 72, + TopazRite = 72, + EmeraldRite = 72, + SummonPhoenix = 80, + FountainOfFire = 80, + BrandOfPurgatory = 80, Rekindle = 80, - ElementalMastery = 86, - SummonPhoenix = 80; + EnkindlePhoenix = 80, + EverlastingFlight = 80, + ScarletFlame = 80, + Revelation = 80, + RubyCatastrophe = 82, + TopazCatastrophe = 82, + EmeraldCatastrophe = 82, + CrimsonCyclone = 86, + CrimsonStrike = 86, + MountainBuster = 86, + Slipstream = 86, + SummonSolarBahamut = 100, + UmbralImpulse = 100, + UmbralFlare = 100, + Sunflare = 100, + EnkindleSolarBahamut = 100, + Luxwave = 100, + Exodus = 100; + + } } diff --git a/XIVComboVX/CustomComboPreset.cs b/XIVComboVX/CustomComboPreset.cs index 7e94fd82..9197063c 100644 --- a/XIVComboVX/CustomComboPreset.cs +++ b/XIVComboVX/CustomComboPreset.cs @@ -152,6 +152,13 @@ public enum CustomComboPreset { //[CustomComboInfo("Scathe/Xenoglossy Feature", "Scathe becomes Xenoglossy when available.", BLM.JobID)] //BlackScatheFeature = 25006, + //[CustomComboInfo("Fire to Ice 3 Feature", "When under 1600 MP and in Astral Fire, Blizzard will become Blizzard 3", BLM.JobID)] + //BlackFireToIce3 = 25019, + + //[CustomComboInfo("Ice to Fire 3 Feature", "When in Umbral Ice, Fire will become Fire 3", BLM.JobID)] + //BlackIceToFire3 = 25020, + + #endregion // ==================================================================================== #region BARD (23xxx)