From 72a68ffe2ec7ae924de87d0ee41d1d9312c3e1b4 Mon Sep 17 00:00:00 2001 From: Taurenkey Date: Thu, 11 Jul 2024 07:11:52 +0100 Subject: [PATCH] Oracle --- XIVSlothCombo/Combos/CustomComboPreset.cs | 6 +++++- XIVSlothCombo/Combos/PvE/AST.cs | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs index b0f206729..35f41777e 100644 --- a/XIVSlothCombo/Combos/CustomComboPreset.cs +++ b/XIVSlothCombo/Combos/CustomComboPreset.cs @@ -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)] @@ -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 diff --git a/XIVSlothCombo/Combos/PvE/AST.cs b/XIVSlothCombo/Combos/PvE/AST.cs index d84fccaf2..1b17b5d51 100644 --- a/XIVSlothCombo/Combos/PvE/AST.cs +++ b/XIVSlothCombo/Combos/PvE/AST.cs @@ -26,6 +26,7 @@ internal const uint FallMalefic = 25871, Gravity = 3615, Gravity2 = 25872, + Oracle = 37029, //Cards AstralDraw = 37017, @@ -101,7 +102,8 @@ internal const ushort SpireBuff = 3892, Lightspeed = 841, SelfSynastry = 845, - TargetSynastry = 846; + TargetSynastry = 846, + Divining = 3893; } internal static class Debuffs @@ -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 &&