From: kaiser <carvel.jltjy@simplelogin.com>
Date: Sun, 15 Sep 2024 00:23:43 +0000 (+1000)
Subject: feat: added a way to remove status for gameFunctions.
X-Git-Tag: v3.4~9^2~4
X-Git-Url: https://git.jacobcasper.com/?a=commitdiff_plain;h=b1572f583298f56fa5b109efef1dfdd70138bc61;p=Questionable.git

feat: added a way to remove status for gameFunctions.

Also updated the Action a bit, that way SGE doesn't get stuck when using diagnosis.
---

diff --git a/Questionable/Controller/Steps/Interactions/Action.cs b/Questionable/Controller/Steps/Interactions/Action.cs
index 6d4da220..a39bded4 100644
--- a/Questionable/Controller/Steps/Interactions/Action.cs
+++ b/Questionable/Controller/Steps/Interactions/Action.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Dalamud.Game.ClientState.Conditions;
 using Dalamud.Game.ClientState.Objects.Types;
-using FFXIVClientStructs.FFXIV.Client.Game;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Questionable.Controller.Steps.Common;
 using Questionable.Functions;
@@ -60,6 +57,21 @@ internal static class Action
 
                 if (gameObject.IsTargetable)
                 {
+                    if (action == EAction.Diagnosis)
+                    {
+                        uint eukrasiaAura = 2606;
+                        // If SGE have Eukrasia status, we need to remove it.
+                        if (gameFunctions.HasStatus(eukrasiaAura))
+                        {
+                            if (GameFunctions.RemoveStatus(eukrasiaAura))
+                            {
+                                // Introduce a delay of 2 seconds before using the next action (otherwise it will try and use Eukrasia Diagnosis)
+                                _continueAt = DateTime.Now.AddSeconds(2);
+                                return true; 
+                            }
+                        }
+                    }
+                    
                     _usedAction = gameFunctions.UseAction(gameObject, action);
                     _continueAt = DateTime.Now.AddSeconds(0.5);
                     return true;
@@ -105,4 +117,4 @@ internal static class Action
 
         public override string ToString() => $"Action({action})";
     }
-}
+}
\ No newline at end of file
diff --git a/Questionable/Functions/GameFunctions.cs b/Questionable/Functions/GameFunctions.cs
index 07fb8c37..2cc2e122 100644
--- a/Questionable/Functions/GameFunctions.cs
+++ b/Questionable/Functions/GameFunctions.cs
@@ -308,6 +308,11 @@ internal sealed unsafe class GameFunctions
         StatusManager* statusManager = battleChara->GetStatusManager();
         return statusManager->HasStatus(statusId);
     }
+    
+    public static bool RemoveStatus(uint statusId)
+    {
+        return StatusManager.ExecuteStatusOff(statusId);
+    }
 
     public bool Mount()
     {