Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
Oracle
Browse files Browse the repository at this point in the history
  • Loading branch information
Taurenkey committed Jul 11, 2024
1 parent c6955e6 commit 72a68ff
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
6 changes: 5 additions & 1 deletion XIVSlothCombo/Combos/CustomComboPreset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public enum CustomComboPreset

[ReplaceSkill(AST.Gravity, AST.Gravity2)]
[ParentCombo(AST_ST_DPS)]
[CustomComboInfo("AoE DPS Option", "Every option below (Lucid/AutoDraws/Astrodyne/etc) will also be added to Gravity", AST.JobID, 1, "", "")]
[CustomComboInfo("AoE DPS Option", "Every option below (Lucid/AutoDraws/etc) will also be added to Gravity", AST.JobID, 1, "", "")]
AST_AoE_DPS = 1013,

[ParentCombo(AST_ST_DPS)]
Expand All @@ -212,6 +212,10 @@ public enum CustomComboPreset
[ParentCombo(AST_ST_DPS)]
[CustomComboInfo("Lord of Crowns Weave Option", "Adds Lord Of Crowns", AST.JobID, 10, "", "")]
AST_DPS_LazyLord = 1014,

[ParentCombo(AST_ST_DPS)]
[CustomComboInfo("Oracle Option", "Adds Oracle after Divination", AST.JobID)]
AST_DPS_Oracle = 1015,
#endregion

#region Healing
Expand Down
9 changes: 8 additions & 1 deletion XIVSlothCombo/Combos/PvE/AST.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ internal const uint
FallMalefic = 25871,
Gravity = 3615,
Gravity2 = 25872,
Oracle = 37029,

//Cards
AstralDraw = 37017,
Expand Down Expand Up @@ -101,7 +102,8 @@ internal const ushort
SpireBuff = 3892,
Lightspeed = 841,
SelfSynastry = 845,
TargetSynastry = 846;
TargetSynastry = 846,
Divining = 3893;
}

internal static class Debuffs
Expand Down Expand Up @@ -241,6 +243,11 @@ Gauge.DrawnCards[0] is not CardType.NONE &&
ActionWatching.NumberOfGcdsUsed >= 3)
return Divination;

if (IsEnabled(CustomComboPreset.AST_DPS_Oracle) &&
HasEffect(Buffs.Divining) &&
CanSpellWeave(actionID))
return Oracle;

//Minor Arcana / Lord of Crowns
if (ActionReady(OriginalHook(MinorArcana)) &&
IsEnabled(CustomComboPreset.AST_DPS_LazyLord) && Gauge.DrawnCrownCard is CardType.LORD &&
Expand Down

0 comments on commit 72a68ff

Please sign in to comment.