Merge pull request #157 from Jaksuhn/refresh-patience

option to refresh patience early
InitialDet · Feb 7, 2024 · 3bf057b · 3bf057b
2 parents be5536d + b018859
commit 3bf057b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 deletions.
diff --git a/AutoHook/Classes/AutoCasts/AutoChum.cs b/AutoHook/Classes/AutoCasts/AutoChum.cs
@@ -25,7 +25,7 @@ public override bool CastCondition()
         if (!hasIntuition && _onlyUseWithIntuition)
             return false;
 
-        if (hasIntuition && _onlyUseWithIntuition && PlayerResources.GetIntuitionTimeRemaining() <= _useWhenIntuitionExceeds)
+        if (hasIntuition && _onlyUseWithIntuition && PlayerResources.GetStatusTime(IDs.Status.FishersIntuition) <= _useWhenIntuitionExceeds)
             return false;
 
         return true;

diff --git a/AutoHook/Classes/AutoCasts/AutoFood.cs b/AutoHook/Classes/AutoCasts/AutoFood.cs
@@ -1,4 +1,5 @@
-using AutoHook.Resources.Localization;
+using AutoHook.Data;
+using AutoHook.Resources.Localization;
 using AutoHook.Utils;
 using FFXIVClientStructs.FFXIV.Client.Game;
 
@@ -17,7 +18,7 @@ public override string GetName()
 
     public override bool CastCondition()
     {
-        if (PlayerResources.GetStatusTime() > SecondsRemaining)
+        if (PlayerResources.GetStatusTime(IDs.Status.FoodBuff) > SecondsRemaining)
         {
             return false;
         }

diff --git a/AutoHook/Classes/AutoCasts/AutoPatience.cs b/AutoHook/Classes/AutoCasts/AutoPatience.cs
@@ -3,12 +3,14 @@
 using AutoHook.Utils;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using ImGuiNET;
+using System;
 
 namespace AutoHook.Classes.AutoCasts;
 
 public class AutoPatience : BaseActionCast
 {
     public bool EnableMakeshiftPatience;
+    public int RefreshEarlyTime = 0;
 
     public AutoPatience() : base(UIStrings.AutoPatience_Patience, Data.IDs.Actions.Patience2, ActionType.Action)
     {
@@ -21,7 +23,7 @@ public override string GetName()
 
     public override bool CastCondition()
     {
-        if (PlayerResources.HasStatus(IDs.Status.AnglersFortune))
+        if (PlayerResources.HasStatus(IDs.Status.AnglersFortune) && PlayerResources.GetStatusTime(IDs.Status.AnglersFortune) > RefreshEarlyTime)
             return false;
 
         if (PlayerResources.HasStatus(IDs.Status.PrizeCatch))
@@ -51,5 +53,12 @@ public override bool CastCondition()
             Id = IDs.Actions.Patience2;
             Service.Save();
         }
+
+        var time = RefreshEarlyTime;
+        if (DrawUtil.EditNumberField(UIStrings.RefreshWhenTimeIsLessThanOrEqual, ref time))
+        {
+            RefreshEarlyTime = Math.Max(0, Math.Min(time, 999));
+            Service.Save();
+        }
     };
 }
diff --git a/AutoHook/Resources/Localization/UIStrings.Designer.cs b/AutoHook/Resources/Localization/UIStrings.Designer.cs
diff --git a/AutoHook/Resources/Localization/UIStrings.resx b/AutoHook/Resources/Localization/UIStrings.resx
@@ -892,4 +892,7 @@ Check the Guide Tab for Guides.</value>
   <data name="OnlyUseWhenNOTActiveSurfaceSlap" xml:space="preserve">
     <value>Only use when Surface Slap is not active</value>
   </data>
+  <data name="RefreshWhenTimeIsLessThanOrEqual" xml:space="preserve">
+    <value>Refresh when buff timer is less than or equal to</value>
+  </data>
 </root>
diff --git a/AutoHook/Utils/PlayerResources.cs b/AutoHook/Utils/PlayerResources.cs
@@ -98,28 +98,14 @@ public static bool HasAnglersArtStacks(int amount)
         return false;
     }
 
-    public static float GetStatusTime()
+    public static float GetStatusTime(uint statusId)
     {
         if (Service.ClientState.LocalPlayer?.StatusList == null)
             return 0;
 
         foreach (var buff in Service.ClientState.LocalPlayer.StatusList)
         {
-            if (buff.StatusId == IDs.Status.FoodBuff)
-                return buff.RemainingTime;
-        }
-
-        return 0;
-    }
-
-    public static float GetIntuitionTimeRemaining()
-    {
-        if (Service.ClientState.LocalPlayer?.StatusList == null)
-            return 0;
-
-        foreach (var buff in Service.ClientState.LocalPlayer.StatusList)
-        {
-            if (buff.StatusId == IDs.Status.FishersIntuition)
+            if (buff.StatusId == statusId)
                 return buff.RemainingTime;
         }