[PUSH] 3.1.0.2

Nik-Potokar · Oct 15, 2023 · 983376d · 983376d
1 parent f6d72fc
commit 983376d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/XIVSlothCombo/Combos/CustomComboPreset.cs b/XIVSlothCombo/Combos/CustomComboPreset.cs
@@ -372,14 +372,14 @@ public enum CustomComboPreset
 
         #endregion
 
-        [ReplaceSkill(BLM.Blizzard2)]
+        [ReplaceSkill(BLM.Blizzard2, BLM.HighBlizzard2)]
         [ConflictingCombos(BLM_AoE_AdvancedMode)]
         [CustomComboInfo("Simple Black Mage (AoE) Feature", "Replaces Blizzard II with a full one-button rotation.", BLM.JobID, -8, "", "")]
         BLM_AoE_SimpleMode = 2008,
 
         #region Advanced AoE
 
-        [ReplaceSkill(BLM.Blizzard2)]
+        [ReplaceSkill(BLM.Blizzard2, BLM.HighBlizzard2)]
         [ConflictingCombos(BLM_AoE_SimpleMode)]
         [CustomComboInfo("Advanced Black Mage (AoE) Feature", "Replaces Blizzard II with a full one-button rotation.", BLM.JobID, -8, "", "")]
         BLM_AoE_AdvancedMode = 2054,

diff --git a/XIVSlothCombo/Combos/PvE/BLM.cs b/XIVSlothCombo/Combos/PvE/BLM.cs
@@ -665,7 +665,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 uint currentMP = LocalPlayer.CurrentMp;
                 BLMGauge? gauge = GetJobGauge<BLMGauge>();
 
-                if (actionID is Blizzard2)
+                if (actionID is Blizzard2 or HighBlizzard2)
                 {
                     // 2xHF2 Transpose with Freeze [A7]
                     if (gauge.ElementTimeRemaining <= 0)
@@ -784,7 +784,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                 BLMGauge? gauge = GetJobGauge<BLMGauge>();
                 int ThunderHP = Config.BLM_AoE_Adv_ThunderHP;
 
-                if (actionID is Blizzard2)
+                if (actionID is Blizzard2 or HighBlizzard2)
                 {
                     // 2xHF2 Transpose with Freeze [A7]
                     if (gauge.ElementTimeRemaining <= 0)

diff --git a/XIVSlothCombo/Combos/PvE/WAR.cs b/XIVSlothCombo/Combos/PvE/WAR.cs
@@ -135,7 +135,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
 
                     if (comboTime > 0)
                     {
-                        if (LevelChecked(InnerBeast) && (!LevelChecked(StormsEye) || HasEffectAny(Buffs.SurgingTempest)) && gauge >= fellCleaveGaugeSpend)
+                        if (IsEnabled(CustomComboPreset.WAR_ST_StormsPath_FellCleave) && LevelChecked(InnerBeast) && (!LevelChecked(StormsEye) || HasEffectAny(Buffs.SurgingTempest)) && gauge >= fellCleaveGaugeSpend)
                             return OriginalHook(InnerBeast);
 
                         if (lastComboMove == HeavySwing && LevelChecked(Maim))

diff --git a/XIVSlothCombo/XIVSlothCombo.csproj b/XIVSlothCombo/XIVSlothCombo.csproj
@@ -4,7 +4,7 @@
 	<PropertyGroup>
 		<Authors>Team Sloth</Authors>
 		<Company>-</Company>
-		<Version>3.1.0.1</Version>
+		<Version>3.1.0.2</Version>
 		<!-- This is the version that will be used when pushing to the repo.-->
 		<Description>XIVCombo for lazy players</Description>
 		<Copyright>Copyleft attick 2021 thanks attick UwU</Copyright>