Skip to content

Commit

Permalink
v2.0.1.4 : Fix SGE, add PLD feat
Browse files Browse the repository at this point in the history 
"Fixed SGE's Eukrasian Prognosis feature.",
                            "Added PLD's Shield Lob to Holy Spirit feature.",
                            "Sorry New Year!"
  • Loading branch information
@MKhayle
MKhayle committed Dec 31, 2024
1 parent 4a7ba95 commit 88dabab
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 46 deletions.
16 changes: 16 additions & 0 deletions XIVComboExpanded/Combos/PLD.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,22 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
}
}

internal class PaladinShieldLobHolySpirit : PaladinCombo
{
protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.PaladinShieldLobDivineMightFeature;

protected override uint Invoke(uint actionID, uint lastComboMove, float comboTime, byte level)
{
if (actionID == PLD.ShieldLob
&& level >= PLD.Levels.HolySpirit
&& this.HasMp(PLD.HolySpirit)
&& HasEffect(PLD.Buffs.DivineMight))
return PLD.HolySpirit;

return actionID;
}
}

internal class PaladinRequiescat : PaladinCombo
{
protected internal override CustomComboPreset Preset { get; } = CustomComboPreset.PldAny;
Expand Down
40 changes: 20 additions & 20 deletions XIVComboExpanded/Combos/SGE.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,26 +226,26 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
{
if(HasEffect(SGE.Buffs.Eukrasia))
{
if (IsEnabled(CustomComboPreset.SageEukrasianDosisFeature))
{
return OriginalHook(SGE.EukrasianDosis);
}

if (IsEnabled(CustomComboPreset.SageEukrasianDiagnosisFeature))
{
return OriginalHook(SGE.EukrasianDiagnosis);
}
if (IsEnabled(CustomComboPreset.SageEukrasianPrognosisFeature))
{
return OriginalHook(SGE.EukrasianPrognosis);
}

if (IsEnabled(CustomComboPreset.SageEukrasianDyskrasiaFeature))
{
if (level >= SGE.Levels.Dyskrasia)
return OriginalHook(SGE.EukrasianDyskrasia);
}
}
if (IsEnabled(CustomComboPreset.SageEukrasianDosisFeature))
{
return OriginalHook(SGE.Dosis);
}

if (IsEnabled(CustomComboPreset.SageEukrasianDiagnosisFeature))
{
return OriginalHook(SGE.Diagnosis);
}
if (IsEnabled(CustomComboPreset.SageEukrasianPrognosisFeature))
{
return OriginalHook(SGE.Prognosis);
}

if (IsEnabled(CustomComboPreset.SageEukrasianDyskrasiaFeature))
{
if (level >= SGE.Levels.Dyskrasia)
return OriginalHook(SGE.Dyskrasia);
}
}


}
Expand Down
56 changes: 31 additions & 25 deletions XIVComboExpanded/CustomComboPreset.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1400,6 +1400,12 @@ public enum CustomComboPreset
[CustomComboInfo("Royal Authority Divine Might Feature", "Replace Royal Authority with Holy Spirit when Divine Might is active.", PLD.JobID)]
PaladinRoyalAuthorityDivineMightFeature = 1912,

[IconsCombo([PLD.ShieldLob, UTL.ArrowLeft, PLD.HolySpirit, UTL.Blank, PLD.Buffs.DivineMight, UTL.Checkmark])]
[SectionCombo("Single Target")]
[AccessibilityCustomCombo]
[CustomComboInfo("Shield Lob to Holy Spirit", "Replace Shield Lob with Holy Spirit when Divine Might is active and you can use it.", PLD.JobID)]
PaladinShieldLobDivineMightFeature = 1925,

[IconsCombo([PLD.Prominence, UTL.ArrowLeft, PLD.TotalEclipse])]
[SectionCombo("Area of Effect")]
[CustomComboInfo("Prominence Combo", "Replace Prominence with its combo chain.", PLD.JobID)]
Expand Down Expand Up @@ -2034,31 +2040,31 @@ public enum CustomComboPreset
[CustomComboInfo("Soteria Kardia Feature", "Replace Soteria with Kardia when off cooldown and missing Kardion.", SGE.JobID)]
SageSoteriaKardionFeature = 4006,

[IconsCombo([SGE.Eukrasia, UTL.ArrowLeft, SGE.Dosis, UTL.Blank, SGE.Buffs.Eukrasia, UTL.Checkmark])]
[SectionCombo("Eukrasia")]
[AccessibilityCustomCombo]
[CustomComboInfo("Eukrasian Dosis", "Replace Eukrasia with Dosis when Eukrasia is active. Conflicts with the other Eukrasian options.", SGE.JobID)]
SageEukrasianDosisFeature = 4020,

[IconsCombo([SGE.Eukrasia, UTL.ArrowLeft, SGE.Diagnosis, UTL.Blank, SGE.Buffs.Eukrasia, UTL.Checkmark])]
[SectionCombo("Eukrasia")]
[AccessibilityCustomCombo]
[CustomComboInfo("Eukrasian Diagnosis", "Replace Eukrasia with Diagnosis when Eukrasia is active. Conflicts with the other Eukrasian options.", SGE.JobID)]
SageEukrasianDiagnosisFeature = 4017,

[IconsCombo([SGE.Eukrasia, UTL.ArrowLeft, SGE.Prognosis, UTL.Blank, SGE.Buffs.Eukrasia, UTL.Checkmark])]
[SectionCombo("Eukrasia")]
[AccessibilityCustomCombo]
[CustomComboInfo("Eukrasian Prognosis", "Replace Eukrasia with Prognosis when Eukrasia is active. Conflicts with the other Eukrasian options.", SGE.JobID)]
SageEukrasianPrognosisFeature = 4018,

[IconsCombo([SGE.Eukrasia, UTL.ArrowLeft, SGE.Dyskrasia, UTL.Blank, SGE.Buffs.Eukrasia, UTL.Checkmark])]
[SectionCombo("Eukrasia")]
[AccessibilityCustomCombo]
[CustomComboInfo("Eukrasian Dyskrasia", "Replace Eukrasia with Dyskrasia when Eukrasia is active. Conflicts with the other Eukrasian options.", SGE.JobID)]
SageEukrasianDyskrasiaFeature = 4019,

[IconsCombo([SGE.Druochole, UTL.ArrowLeft, SGE.Taurochole, UTL.Blank, SGE.Druochole, UTL.Checkmark])]
[IconsCombo([SGE.Eukrasia, UTL.ArrowLeft, SGE.Dosis, UTL.Blank, SGE.Buffs.Eukrasia, UTL.Checkmark])]
[SectionCombo("Eukrasia")]
[AccessibilityCustomCombo]
[CustomComboInfo("Eukrasian Dosis", "Replace Eukrasia with Dosis when Eukrasia is active. Conflicts with the other Eukrasian options.", SGE.JobID)]
SageEukrasianDosisFeature = 4020,

[IconsCombo([SGE.Eukrasia, UTL.ArrowLeft, SGE.Diagnosis, UTL.Blank, SGE.Buffs.Eukrasia, UTL.Checkmark])]
[SectionCombo("Eukrasia")]
[AccessibilityCustomCombo]
[CustomComboInfo("Eukrasian Diagnosis", "Replace Eukrasia with Diagnosis when Eukrasia is active. Conflicts with the other Eukrasian options.", SGE.JobID)]
SageEukrasianDiagnosisFeature = 4017,

[IconsCombo([SGE.Eukrasia, UTL.ArrowLeft, SGE.Prognosis, UTL.Blank, SGE.Buffs.Eukrasia, UTL.Checkmark])]
[SectionCombo("Eukrasia")]
[AccessibilityCustomCombo]
[CustomComboInfo("Eukrasian Prognosis", "Replace Eukrasia with Prognosis when Eukrasia is active. Conflicts with the other Eukrasian options.", SGE.JobID)]
SageEukrasianPrognosisFeature = 4018,

[IconsCombo([SGE.Eukrasia, UTL.ArrowLeft, SGE.Dyskrasia, UTL.Blank, SGE.Buffs.Eukrasia, UTL.Checkmark])]
[SectionCombo("Eukrasia")]
[AccessibilityCustomCombo]
[CustomComboInfo("Eukrasian Dyskrasia", "Replace Eukrasia with Dyskrasia when Eukrasia is active. Conflicts with the other Eukrasian options.", SGE.JobID)]
SageEukrasianDyskrasiaFeature = 4019,

[IconsCombo([SGE.Druochole, UTL.ArrowLeft, SGE.Taurochole, UTL.Blank, SGE.Druochole, UTL.Checkmark])]
[SectionCombo("Addersgall")]
[ExpandedCustomCombo]
[CustomComboInfo("Druochole into Taurochole Feature", "Replace Druochole with Taurochole when off cooldown.\nWarning: This will limit your abiility to use Druochole.", SGE.JobID)]
Expand Down
8 changes: 8 additions & 0 deletions XIVComboExpanded/Interface/Changelog.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ public static Dictionary<string, string[]> GetChangelog()
{
return new Dictionary<string, string[]>()
{
{
"v2.0.1.4",
[
"Fixed SGE's Eukrasian Prognosis feature.",
"Added PLD's Shield Lob to Holy Spirit feature.",
"Sorry New Year!"
]
},
{
"v2.0.1.3",
[
Expand Down
2 changes: 1 addition & 1 deletion XIVComboExpanded/XIVComboExpanded.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Authors>attick, daemitus, Khayle</Authors>
<Company>-</Company>
<Version>2.0.1.3</Version>
<Version>2.0.1.4</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 88dabab

Please sign in to comment.