cacahuetes
/
Questionable
forked from liza/Questionable
1
0
Fork 0
Code Pull Requests 1 Activity

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.
pull/3/head
kaiser 2024-09-15 10:23:43 +10:00
parent 2a2e3cafb9
commit b1572f5832
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Questionable/Controller/Steps/Interactions/Action.cs
View File

@ -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})";
}
}
}

5
Questionable/Functions/GameFunctions.cs
View File

@ -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()
{