AutoHook 3.0.0.5 [PUSH]

Possible fix for #124 JA Localization updated
InitialDet · Oct 18, 2023 · 1e92857 · 1e92857
1 parent d929dd5
commit 1e92857
Show file tree

Hide file tree

Showing 14 changed files with 248 additions and 64 deletions.
diff --git a/AutoHook/AutoHook.csproj b/AutoHook/AutoHook.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Authors>Det</Authors>
-        <Version>3.0.0.4</Version>
+        <Version>3.0.0.5</Version>
         <Description>Auto hooks for you</Description>
         <PackageProjectUrl>https://github.com/InitialDet/AutoHook</PackageProjectUrl>
         <Configurations>Release;Debug</Configurations>

diff --git a/AutoHook/Classes/AutoCasts/AutoCordial.cs b/AutoHook/Classes/AutoCasts/AutoCordial.cs
@@ -9,12 +9,10 @@ namespace AutoHook.Classes.AutoCasts;
 public class AutoCordial : BaseActionCast
 {
     private const uint CordialHiRecovery = 400;
-    private const uint CordialHqRecovery = 350;
     private const uint CordialRecovery = 300;
-    private const uint CordialHqWateredRecovery = 200;
     private const uint CordialWateredRecovery = 150;
 
-    private bool _invertCordialPriority;
+    public bool InvertCordialPriority;
 
     public AutoCordial() : base(UIStrings.Cordial, IDs.Item.Cordial, ActionType.Item)
     {
@@ -26,26 +24,31 @@ public override string GetName()
 
     public override bool CastCondition()
     {
-        var cordialList = new List<(uint, bool, uint)>
+        var cordialList = new List<(uint, uint)>
         {
-            (IDs.Item.HiCordial, false, CordialHiRecovery),
-            (IDs.Item.Cordial, true, CordialHqRecovery), //Hq
-            (IDs.Item.Cordial, false, CordialRecovery),
-            (IDs.Item.WateredCordial, true, CordialHqWateredRecovery), // Hq
-            (IDs.Item.WateredCordial, false, CordialWateredRecovery)
+            (IDs.Item.HiCordial, CordialHiRecovery),
+            (IDs.Item.Cordial, CordialRecovery),
+            (IDs.Item.WateredCordial, CordialWateredRecovery)
         };
+
 
-        if (_invertCordialPriority)
+        if (InvertCordialPriority)
             cordialList.Reverse();
-
-        foreach (var (id, hq, recovery) in cordialList)
+        
+        foreach (var (id, recovery) in cordialList)
         {
-            if (!PlayerResources.HaveItemInInventory(id, hq))
+
+            if (!PlayerResources.HaveCordialInInventory(id, out bool isHq))
                 continue;
+
+            var cordialRecovery = recovery;
 
+            if (isHq)
+                cordialRecovery += 50; // yep hardcoded (thumbsup emoji)
+
             Id = id;
 
-            var notOvercaped = PlayerResources.GetCurrentGp() + recovery < PlayerResources.GetMaxGp();
+            var notOvercaped = PlayerResources.GetCurrentGp() + cordialRecovery < PlayerResources.GetMaxGp();
             return notOvercaped && PlayerResources.IsPotOffCooldown();
         }
 
@@ -62,7 +65,7 @@ public override void SetThreshold(int newCost)
 
     protected override DrawOptionsDelegate DrawOptions => () =>
     {
-        if (DrawUtil.Checkbox(UIStrings.AutoCastCordialPriority, ref _invertCordialPriority))
+        if (DrawUtil.Checkbox(UIStrings.AutoCastCordialPriority, ref InvertCordialPriority))
         {
             Service.Save();
         }

diff --git a/AutoHook/Classes/AutoCasts/AutoFood.cs b/AutoHook/Classes/AutoCasts/AutoFood.cs
@@ -4,9 +4,9 @@
 
 namespace AutoHook.Classes.AutoCasts;
 
-public class AutoFood : BaseActionCast
+public class AutoFood : BaseActionCast //todo
 {
-    private float _secondsRemaining = 0;
+    public float SecondsRemaining = 0;
 
     public AutoFood() : base(UIStrings.Food_Buff, 0, ActionType.Item)
     {
@@ -17,7 +17,7 @@ public override string GetName()
 
     public override bool CastCondition()
     {
-        if (PlayerResources.CheckFoodBuff() > _secondsRemaining)
+        if (PlayerResources.GetStatusTime() > SecondsRemaining)
         {
             return false;
         }

diff --git a/AutoHook/Classes/AutoCasts/AutoMakeShiftBait.cs b/AutoHook/Classes/AutoCasts/AutoMakeShiftBait.cs
@@ -33,7 +33,7 @@ public override bool CastCondition()
             return false;
 
 
-        bool available = PlayerResources.ActionAvailable(IDs.Actions.MakeshiftBait);
+        bool available = PlayerResources.ActionTypeAvailable(IDs.Actions.MakeshiftBait);
         bool hasStacks = PlayerResources.HasAnglersArtStacks(MakeshiftBaitStacks);
 
         return hasStacks && available;

diff --git a/AutoHook/Classes/AutoCasts/AutoMooch.cs b/AutoHook/Classes/AutoCasts/AutoMooch.cs
@@ -31,7 +31,7 @@ public override bool CastCondition()
             return true;
         }
 
-        if (PlayerResources.ActionAvailable(IDs.Actions.Mooch))
+        if (PlayerResources.ActionTypeAvailable(IDs.Actions.Mooch))
         {
             Service.PrintDebug(@$"Mooch Available, casting normal mooch");
             Id = IDs.Actions.Mooch;

diff --git a/AutoHook/Classes/AutoCasts/AutoPrizeCatch.cs b/AutoHook/Classes/AutoCasts/AutoPrizeCatch.cs
@@ -25,7 +25,7 @@ public override bool CastCondition()
         if (!Enabled)
             return false;
 
-        if (UseWhenMoochIIOnCD && PlayerResources.ActionAvailable(IDs.Actions.Mooch2))
+        if (UseWhenMoochIIOnCD && PlayerResources.ActionTypeAvailable(IDs.Actions.Mooch2))
             return false;
 
         if (UseOnlyWithIdenticalCast && !PlayerResources.HasStatus(IDs.Status.IdenticalCast))
@@ -40,7 +40,7 @@ public override bool CastCondition()
         if (PlayerResources.HasStatus(IDs.Status.AnglersFortune))
             return false;
 
-        return PlayerResources.ActionAvailable(IDs.Actions.PrizeCatch);
+        return PlayerResources.ActionTypeAvailable(IDs.Actions.PrizeCatch);
     }
 
     protected override DrawOptionsDelegate DrawOptions => () =>

diff --git a/AutoHook/Classes/BaseActionCast.cs b/AutoHook/Classes/BaseActionCast.cs
@@ -69,7 +69,7 @@ public bool IsAvailableToCast()
         else
             hasGp = currentGp <= GpThreshold;
 
-        var actionAvailable = PlayerResources.ActionAvailable(Id, ActionType);
+        var actionAvailable = PlayerResources.ActionTypeAvailable(Id, ActionType);
 
         return hasGp && actionAvailable && condition;
     }

diff --git a/AutoHook/Configurations/Configuration.cs b/AutoHook/Configurations/Configuration.cs
@@ -44,7 +44,6 @@ public class Configuration : IPluginConfiguration
     public int DelayBetweenCastsMax = 1000;
 
     public bool ShowStatusHeader = true;
-
 
     // old config
     public List<BaitPresetConfig> BaitPresetList = new List<BaitPresetConfig>()!;

diff --git a/AutoHook/HookManager.cs b/AutoHook/HookManager.cs
@@ -415,7 +415,7 @@ private void HookFish(BiteType bite)
         if (hook is null or HookType.None)
             return;
 
-        if (PlayerResources.ActionAvailable((uint)hook)) // Check if Powerful/Precision is available
+        if (PlayerResources.ActionTypeAvailable((uint)hook)) // Check if Powerful/Precision is available
         {
             Service.PrintDebug(@$"[HookManager] Using {hook.ToString()} hook.");
             PlayerResources.CastActionDelayed((uint)hook, ActionType.Action, @$"{hook.ToString()}");
@@ -501,7 +501,7 @@ private delegate bool UseActionDelegate(IntPtr manager, ActionType actionType, u
     private bool OnUseAction(IntPtr manager, ActionType actionType, uint actionId, GameObjectID targetId, uint a4,
         uint a5, uint a6, IntPtr a7)
     {
-        if (actionType == ActionType.Action && PlayerResources.ActionAvailable(actionId))
+        if (actionType == ActionType.Action && PlayerResources.ActionTypeAvailable(actionId))
             switch (actionId)
             {
                 case IDs.Actions.Cast:

diff --git a/AutoHook/PluginUI.cs b/AutoHook/PluginUI.cs
@@ -9,8 +9,10 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
+using AutoHook.Data;
 using AutoHook.Resources.Localization;
 using AutoHook.Utils;
+using FFXIVClientStructs.FFXIV.Client.Game;
 
 namespace AutoHook;
 
@@ -54,25 +56,21 @@ public override void Draw()
         ImGui.Spacing();
         DrawUtil.Checkbox(UIStrings.Enable_AutoHook, ref Service.Configuration.PluginEnabled,
             UIStrings.PluginUi_Draw_Enables_Disables);
+
+
         ShowKofi();
-        ImGui.SameLine();
         ShowPaypal();
-
+        
         ImGui.Indent();
 
         if (Service.Configuration.PluginEnabled)
-        {
             ImGui.TextColored(ImGuiColors.HealerGreen, UIStrings.Plugin_Enabled);
-        }
         else
-        {
             ImGui.TextColored(ImGuiColors.DalamudRed, UIStrings.Plugin_Disabled);
-        }
 
         ImGui.Unindent();
         ImGui.Spacing();
-
-
+
         DrawChangelog();
         ImGui.SameLine();
         DrawLanguageSelector();
@@ -86,9 +84,10 @@ public override void Draw()
             }
 
             ImGui.SameLine();
-
-            //TestButtons();
-
+#if DEBUG
+            TestButtons();
+#endif
+
             Debug();
 
             ImGui.Spacing();
@@ -134,7 +133,11 @@ private void Debug()
     private static void TestButtons()
     {
         if (ImGui.Button(@"Check"))
-        {
+        {  
+            Service.PrintChat("-----------------");
+            Service.PrintChat("Cordial Available: " + PlayerResources.ActionTypeAvailable(IDs.Item.HiCordial, ActionType.Item));
+            Service.PrintChat("Cast Available: " + PlayerResources.ActionTypeAvailable(IDs.Actions.Cast));
+
         }
     }
 
@@ -170,10 +173,11 @@ public override void OnClose()
         Service.Save();
     }
 
-    private static void ShowKofi()
+    public static void ShowKofi()
     {
-        string buttonText = UIStrings.Support_me_on_Ko_fi;
+
         ImGui.SameLine();
+        string buttonText = UIStrings.Support_me_on_Ko_fi;
         ImGui.PushStyleColor(ImGuiCol.Button, 0xFF000000 | 0x005E5BFF);
         ImGui.PushStyleColor(ImGuiCol.ButtonActive, 0xDD000000 | 0x005E5BFF);
         ImGui.PushStyleColor(ImGuiCol.ButtonHovered, 0xAA000000 | 0x005E5BFF);
@@ -186,8 +190,10 @@ private static void ShowKofi()
         ImGui.PopStyleColor(3);
     }
 
-    private static void ShowPaypal()
+    public static void ShowPaypal()
     {
+
+        ImGui.SameLine();
         string buttonText = @"PayPal";
         ImGui.SameLine();
         ImGui.PushStyleColor(ImGuiCol.Button, 0xFFA06020);
@@ -243,7 +249,7 @@ private void DrawChangelog()
             return;
 
         ImGui.SetNextWindowSize(new Vector2(400, 0));
-        if (ImGui.Begin($"{UIStrings.Changelog}", ref _openChangelog, ImGuiWindowFlags.AlwaysAutoResize))
+        if (ImGui.Begin($"{UIStrings.Changelog}", ref _openChangelog))
         {
             var changes = PluginChangeLog.Versions;