[PUSH] 3.1.0.4

Nik-Potokar · Oct 15, 2023 · 962265a · 962265a
1 parent 6fbe722
commit 962265a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/XIVSlothCombo/Combos/JobHelpers/BLM.cs b/XIVSlothCombo/Combos/JobHelpers/BLM.cs
@@ -36,7 +36,7 @@ private static bool HasCooldowns()
 
         private static uint OpenerLevel => 90;
 
-        public uint PrePullStep = 1;
+        public uint PrePullStep = 0;
 
         public uint OpenerStep = 1;
 
@@ -59,7 +59,6 @@ public OpenerState CurrentState
                     if (value == OpenerState.PrePull)
                     {
                         Svc.Log.Debug($"Entered PrePull Opener");
-                        PrePullStep = 1;
                     }
                     if (value == OpenerState.InOpener) OpenerStep = 1;
                     if (value == OpenerState.OpenerFinished || value == OpenerState.FailedOpener)
@@ -80,7 +79,13 @@ private bool DoPrePullSteps(ref uint actionID)
         {
             if (!LevelChecked) return false;
 
-            if (CanOpener && PrePullStep == 0 && !CustomComboFunctions.InCombat()) { CurrentState = OpenerState.PrePull; }
+            if (CanOpener && PrePullStep == 0)
+            {
+                PrePullStep = 1;
+            }
+
+            if (PrePullStep < 1)
+                return false;
 
             if (CurrentState == OpenerState.PrePull)
             {

diff --git a/XIVSlothCombo/Combos/PvE/BLM.cs b/XIVSlothCombo/Combos/PvE/BLM.cs
@@ -5,6 +5,7 @@
 using XIVSlothCombo.Combos.PvE.Content;
 using XIVSlothCombo.CustomComboNS;
 using XIVSlothCombo.CustomComboNS.Functions;
+using XIVSlothCombo.Extensions;
 
 namespace XIVSlothCombo.Combos.PvE
 {
@@ -302,7 +303,7 @@ protected override uint Invoke(uint actionID, uint lastComboMove, float comboTim
                             return Manafont;
 
                         // Cast Fire IV after Manafont
-                        if (IsOnCooldown(Manafont) && WasLastAction(Manafont))
+                        if (IsOnCooldown(Manafont) && WasLastAction(Manafont) && Fire4.LevelChecked())
                             return Fire4;
 
                         // Blizzard III/Despair when below Fire IV + Despair MP

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.3</Version>
+		<Version>3.1.0.4</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>