Skip to content

Commit

Permalink
[PUSH] 1.5.0.15 - SMN Lux Solaris
Browse files Browse the repository at this point in the history
  • Loading branch information
MKhayle committed Jul 4, 2024
1 parent ba41c04 commit 0ca9eb5
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
20 changes: 18 additions & 2 deletions XIVComboExpanded/Combos/SMN.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ public const ushort
SearingLight = 2703,
IfritsFavor = 2724,
GarudasFavor = 2725,
TitansFavor = 2853;
TitansFavor = 2853,
LuxSolarisReady = 3874;
}

public static class Debuffs
Expand Down Expand Up @@ -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;

Expand All @@ -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;
}
}
3 changes: 3 additions & 0 deletions XIVComboExpanded/CustomComboPreset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion XIVComboExpanded/XIVComboExpanded.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Authors>attick, daemitus</Authors>
<Company>-</Company>
<Version>1.5.0.14</Version>
<Version>1.5.0.15</Version>
<Description>This plugin condenses combos and mutually exclusive abilities onto a single button.</Description>
<Copyright>Copyleft attick 2020 baybeeee</Copyright>
<PackageProjectUrl>https://github.com/daemitus/XIVComboPlugin</PackageProjectUrl>
Expand Down

0 comments on commit 0ca9eb5

Please sign in to comment.