From 0ca9eb539793277064f9a99c7a8530443a42c46c Mon Sep 17 00:00:00 2001 From: Khayle Date: Thu, 4 Jul 2024 21:35:46 +0200 Subject: [PATCH] [PUSH] 1.5.0.15 - SMN Lux Solaris --- XIVComboExpanded/Combos/SMN.cs | 20 ++++++++++++++++++-- XIVComboExpanded/CustomComboPreset.cs | 3 +++ XIVComboExpanded/XIVComboExpanded.csproj | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/XIVComboExpanded/Combos/SMN.cs b/XIVComboExpanded/Combos/SMN.cs index 9448c6605..848dcf23d 100644 --- a/XIVComboExpanded/Combos/SMN.cs +++ b/XIVComboExpanded/Combos/SMN.cs @@ -61,7 +61,8 @@ public const ushort SearingLight = 2703, IfritsFavor = 2724, GarudasFavor = 2725, - TitansFavor = 2853; + TitansFavor = 2853, + LuxSolarisReady = 3874; } public static class Debuffs @@ -273,7 +274,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim } } -internal class SummonerRadiantCarbundleFeature : CustomCombo +internal class SummonerRadiantCarbuncleFeature : CustomCombo { protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.SummonerRadiantCarbuncleFeature; @@ -290,3 +291,18 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim return actionID; } } +internal class SummonerLuxSolarisFeature : CustomCombo +{ + protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.SummonerLuxSolarisFeature; + + protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level) + { + if (actionID == SMN.SummonBahamut) + { + if (HasEffect(SMN.Buffs.LuxSolarisReady)) + return SMN.LuxSolaris; + } + + return actionID; + } +} diff --git a/XIVComboExpanded/CustomComboPreset.cs b/XIVComboExpanded/CustomComboPreset.cs index 737382e9a..fa3c5fdf0 100644 --- a/XIVComboExpanded/CustomComboPreset.cs +++ b/XIVComboExpanded/CustomComboPreset.cs @@ -1073,6 +1073,9 @@ public enum CustomComboPreset [CustomComboInfo("Demi Carbuncle Feature", "Change Summon Bahamut into Summon Carbuncle when no pet has been summoned.", SMN.JobID)] SummonerDemiCarbuncleFeature = 2716, + [CustomComboInfo("Lux Solaris Feature", "Change Summon Bahamut to Lux Solaris when you have Refulgent Lux ready.", SMN.JobID)] + SummonerLuxSolarisFeature = 2717, + #endregion // ==================================================================================== #region VIPER diff --git a/XIVComboExpanded/XIVComboExpanded.csproj b/XIVComboExpanded/XIVComboExpanded.csproj index ec37fbadf..5a6625ec5 100644 --- a/XIVComboExpanded/XIVComboExpanded.csproj +++ b/XIVComboExpanded/XIVComboExpanded.csproj @@ -3,7 +3,7 @@ attick, daemitus - - 1.5.0.14 + 1.5.0.15 This plugin condenses combos and mutually exclusive abilities onto a single button. Copyleft attick 2020 baybeeee https://github.com/daemitus/XIVComboPlugin