fix: changing the raising logic when gcd is not cooling down.

ArchiDog1998 · Feb 13, 2023 · 5787e92 · 5787e92
1 parent 5ba6c4d
commit 5787e92
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/RotationSolver/Configuration/RotationConfig/RotationConfigCombo.cs b/RotationSolver/Configuration/RotationConfig/RotationConfigCombo.cs
@@ -35,7 +35,6 @@ public override void Draw(RotationConfigSet set, bool canAddButton)
                     ImGui.SameLine();
                     ImGuiHelper.Spacing();
                     RSCommands.DisplayCommandHelp(OtherCommandType.Rotations, Name + " " + Items[comboIndex]);
-
                 }
             }
             ImGui.EndCombo();

diff --git a/RotationSolver/Rotations/CustomRotation/CustomRotation_GCD.cs b/RotationSolver/Rotations/CustomRotation/CustomRotation_GCD.cs
@@ -60,19 +60,25 @@ private bool RaiseSpell(SpecialCommandType specialType, out IAction act, byte ac
         if (Raise == null) return false;
         if (Player.CurrentMp <= Service.Configuration.LessMPNoRaise) return false;
 
-        if (Service.Configuration.RaiseAll ? TargetUpdater.DeathPeopleAll.Any() : TargetUpdater.DeathPeopleParty.Any())
+        if ((Service.Configuration.RaiseAll ? TargetUpdater.DeathPeopleAll.Any() : TargetUpdater.DeathPeopleParty.Any())
+            && Raise.CanUse(out act))
         {
-            if (Job.RowId == (uint)ClassJobID.RedMage)
+            if (specialType == SpecialCommandType.RaiseShirk || HasSwift)
             {
-                if (HasSwift && Raise.CanUse(out act)) return true;
+                return true;
             }
-            else if (specialType == SpecialCommandType.RaiseShirk || HasSwift || mustUse)
+            else if (mustUse)
             {
-                if (Raise.CanUse(out act)) return true;
+                if(Swiftcast.CanUse(out act)) return true;
+                else
+                {
+                    act = Raise;
+                    return true;
+                }
             }
             else if (Service.Configuration.RaisePlayerBySwift && !Swiftcast.IsCoolingDown && actabilityRemain > 0)
             {
-                if (Raise.CanUse(out act)) return true;
+                return true;
             }
         }
         return false;