Skip to content

Commit

Permalink
Add Glare IV Combo and Glare of Mind presets for WHM (#114)
Browse files Browse the repository at this point in the history
Include new custom combo presets to replace Glare with Glare IV when under Sacred Sight and replace Glare with Presence of Mind when off cooldown. Update WHM Levels constants to support these changes.
  • Loading branch information
arty-maus authored Aug 9, 2024
1 parent 3c334ee commit e665864
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
18 changes: 15 additions & 3 deletions XIVComboVX/Combos/WHM.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@ public const ushort
}

public static class Debuffs {
public const ushort
public const ushort
Aero = 143,
Aero2 = 144,
Dia = 1871;
}

public static class Levels {
public const byte
PresenceOfMind = 30,
Cure2 = 30,
AfflatusSolace = 52,
AfflatusMisery = 74,
Expand Down Expand Up @@ -86,19 +87,30 @@ protected override uint Invoke(uint actionID, uint lastComboActionId, float comb

if (Common.CheckLucidWeave(CustomComboPreset.WhiteMageLucidWeave, level, Service.Configuration.WhiteMageLucidWeaveManaThreshold, actionID))
return Common.LucidDreaming;

if (IsEnabled(CustomComboPreset.WhiteMageDotRefresh)){
ushort effectIdToTrack = OriginalHook(WHM.Aero) switch {
WHM.Aero => WHM.Debuffs.Aero,
WHM.Aero2 => WHM.Debuffs.Aero2,
WHM.Dia => WHM.Debuffs.Dia,
_ => 0,
};

if (effectIdToTrack > 0 && HasTarget && TargetOwnEffectDuration(effectIdToTrack) < Service.Configuration.WhiteMageDotRefreshDuration)
return OriginalHook(WHM.Aero);
}

if (IsEnabled(CustomComboPreset.WhiteMageGlareIVCombo)) {
if (level >= WHM.Levels.Glare4 && SelfHasEffect(WHM.Buffs.SacredSight))
return WHM.Glare4;
}

if (IsEnabled(CustomComboPreset.WhiteMageGlareOfMind)) {
if (level >= WHM.Levels.PresenceOfMind && IsOffCooldown(WHM.PresenceOfMind))
return WHM.PresenceOfMind;
}


return actionID;
}
}
Expand Down
6 changes: 6 additions & 0 deletions XIVComboVX/CustomComboPreset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1553,6 +1553,12 @@ public enum CustomComboPreset {
[CustomComboInfo("Divine Temperance", "Replace Temperance with Divine Caress when under Divine Grace.", WHM.JobID)]
WhiteMageTemperanceDivineCaress = 24009,

[CustomComboInfo("Glare IV Combo", "Replace Glare with Glare IV when under Sacred Sight.", WHM.JobID)]
WhiteMageGlareIVCombo = 24010,

[CustomComboInfo("Glare of Mind", "Replace Glare with Presence of Mind when off cooldown", WHM.JobID)]
WhiteMageGlareOfMind = 24011,

#endregion
// ====================================================================================
#region DoH (98xxx)
Expand Down

0 comments on commit e665864

Please sign in to comment.