AutoHook 3.0.0.7 [PUSH]

Okay now i promise cordials work
InitialDet · Oct 18, 2023 · e8e9e55 · e8e9e55
1 parent f6a39fb
commit e8e9e55
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 31 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.6</Version>
+        <Version>3.0.0.7</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,10 +9,30 @@ 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;
 
     public bool InvertCordialPriority;
+
+    private readonly List<(uint, uint)> _cordialList = new()
+    {
+        (IDs.Item.HiCordial,        CordialHiRecovery),
+        (IDs.Item.HQCordial,        CordialHqRecovery),
+        (IDs.Item.Cordial,          CordialRecovery),
+        (IDs.Item.HQWateredCordial, CordialHqWateredRecovery), 
+        (IDs.Item.WateredCordial,   CordialWateredRecovery)
+    };
+
+    private readonly List<(uint, uint)> _invertedList = new()
+    {
+        (IDs.Item.HQWateredCordial, CordialHqWateredRecovery), 
+        (IDs.Item.WateredCordial,   CordialWateredRecovery),
+        (IDs.Item.HQCordial,        CordialHqRecovery),
+        (IDs.Item.Cordial,          CordialRecovery),
+        (IDs.Item.HiCordial,        CordialHiRecovery)
+    };
 
     public AutoCordial() : base(UIStrings.Cordial, IDs.Item.Cordial, ActionType.Item)
     {
@@ -24,30 +44,19 @@ public override string GetName()
 
     public override bool CastCondition()
     {
-        var cordialList = new List<(uint, uint)>
-        {
-            (IDs.Item.HiCordial, CordialHiRecovery),
-            (IDs.Item.Cordial, CordialRecovery),
-            (IDs.Item.WateredCordial, CordialWateredRecovery)
-        };
+        var cordialList = _cordialList;
 
-
         if (InvertCordialPriority)
-            cordialList.Reverse();
+            cordialList = _invertedList;
 
         foreach (var (id, recovery) in cordialList)
         {
-            if (!PlayerResources.HaveCordialInInventory(id, out bool isHq))
+            if (!PlayerResources.HaveCordialInInventory(id))
                 continue;
 
-            var cordialRecovery = recovery;
-
-            if (isHq)
-                cordialRecovery += 50; // yep hardcoded (thumbsup emoji)
-
             Id = id;
 
-            var notOvercaped = PlayerResources.GetCurrentGp() + cordialRecovery < PlayerResources.GetMaxGp();
+            var notOvercaped = PlayerResources.GetCurrentGp() + recovery < PlayerResources.GetMaxGp();
             return notOvercaped;
         }
 

diff --git a/AutoHook/PluginUI.cs b/AutoHook/PluginUI.cs
@@ -135,9 +135,9 @@ private static unsafe 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));
-            Service.PrintChat("Quant. Available: " + InventoryManager.Instance()->GetInventoryItemCount(IDs.Item.HiCordial));
+            Service.PrintChat("Watered Available: " + InventoryManager.Instance()->GetInventoryItemCount(IDs.Item.WateredCordial));
+            Service.PrintChat("HQ Watered Available: " + InventoryManager.Instance()->GetInventoryItemCount(IDs.Item.HQWateredCordial));
+
 
         }
     }

diff --git a/AutoHook/Utils/PlayerResources.cs b/AutoHook/Utils/PlayerResources.cs
@@ -153,8 +153,7 @@ public static unsafe int GetRecastGroups(uint id, ActionType actionType = Action
 
     public static unsafe void UseItems(uint id)
     {
-        if (InventoryManager.Instance()->GetInventoryItemCount(id) > 0)
-            AgentInventoryContext.Instance()->UseItem(id);
+        AgentInventoryContext.Instance()->UseItem(id);
     }
 
     // RecastGroup 68 = Cordial pots
@@ -187,17 +186,9 @@ public static unsafe float GetCooldown(uint id, ActionType actionType)
     public static unsafe bool HaveItemInInventory(uint id, bool isHQ = false)
         => InventoryManager.Instance()->GetInventoryItemCount(id, isHQ) > 0;
 
-    public static unsafe bool HaveCordialInInventory(uint id, out bool isHq)
+    public static unsafe bool HaveCordialInInventory(uint id)
     {
-        isHq = false;
-
-        if (InventoryManager.Instance()->GetInventoryItemCount(id, true) > 0)
-        {
-            isHq = true;
-            return true;
-        }
-
-        return InventoryManager.Instance()->GetInventoryItemCount(id, false) > 0;
+        return InventoryManager.Instance()->GetInventoryItemCount(id) > 0;
     }