AutoHook 2.4.4.0 [PUSH]

It's now possible to enable both Double and Triple hook
InitialDet · Mar 7, 2023 · 3d5ea60 · 3d5ea60
1 parent 79f2e06
commit 3d5ea60
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 29 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>2.4.3.1</Version>
+		<Version>2.4.4.0</Version>
 		<Description>Auto hooks for you</Description>
 		<PackageProjectUrl>https://github.com/InitialDet/AutoHook</PackageProjectUrl>
 		<Configurations>Release;Debug</Configurations>

diff --git a/AutoHook/Configurations/BaitConfig.cs b/AutoHook/Configurations/BaitConfig.cs
@@ -135,31 +135,25 @@ public bool CheckHookDHTHEnabled(BiteType bite) =>
 
     private HookType? GetDoubleTripleHook(BiteType bite)
     {
-        HookType hook = HookType.None;
+        if (UseTripleHook || UseDoubleHook)
+        {
+            if (UseDHTHOnlySurfaceSlap && !PlayerResources.HasStatus(IDs.Status.IdenticalCast))
+                return HookType.None;
 
-        if (PlayerResources.HasStatus(IDs.Status.AnglersFortune) && !UseDHTHPatience)
-            return hook;
+            if (PlayerResources.HasStatus(IDs.Status.AnglersFortune) && !UseDHTHPatience)
+                return HookType.None;
 
-        if (UseDHTHOnlySurfaceSlap && !PlayerResources.HasStatus(IDs.Status.IdenticalCast))
-            return hook;
+            if (UseTripleHook && PlayerResources.GetCurrentGP() >= 700 && CheckHookDHTHEnabled(bite))
+                return HookType.Triple;
+
+            if (UseDoubleHook && PlayerResources.GetCurrentGP() >= 400 && CheckHookDHTHEnabled(bite))
+                return HookType.Double;
 
-
-        if (UseDoubleHook)
-        {
-            if (PlayerResources.GetCurrentGP() >= 400 && CheckHookDHTHEnabled(bite))
-                hook = HookType.Double;
             if (LetFishEscape)
                 return null;
         }
-        else if (UseTripleHook)
-        {
-            if (PlayerResources.GetCurrentGP() >= 700 && CheckHookDHTHEnabled(bite))
-                hook = HookType.Triple;
-            else if (LetFishEscape)
-                return null;
-        }
-
-        return hook;
+
+        return HookType.None;
     }
 
     public override bool Equals(object? obj)

diff --git a/AutoHook/Ui/TabBaseConfig.cs b/AutoHook/Ui/TabBaseConfig.cs
@@ -215,14 +215,17 @@ public void DrawCheckBoxDoubleTripleHook(BaitConfig cfg)
 
             if (ImGui.Checkbox("Use Double Hook (If gp > 400)", ref cfg.UseDoubleHook))
             {
-                if (cfg.UseDoubleHook) cfg.UseTripleHook = false;
+                if (cfg.UseDoubleHook && !ImGui.GetIO().KeyShift) cfg.UseTripleHook = false;
                 Service.Configuration.Save();
             }
+            ImGuiComponents.HelpMarker("Hold SHIFT to select both Double and Triple Hook (not recommended)");
+
             if (ImGui.Checkbox("Use Triple Hook (If gp > 700)", ref cfg.UseTripleHook))
             {
-                if (cfg.UseTripleHook) cfg.UseDoubleHook = false;
+                if (cfg.UseTripleHook && !ImGui.GetIO().KeyShift) cfg.UseDoubleHook = false;
                 Service.Configuration.Save();
             }
+            ImGuiComponents.HelpMarker("Hold SHIFT to select both Double and Triple Hook (not recommended)");
 
             if (cfg.UseTripleHook || cfg.UseDoubleHook)
             {

diff --git a/AutoHook/Ui/TabGeneral.cs b/AutoHook/Ui/TabGeneral.cs
@@ -132,22 +132,31 @@ private void DrawChangelog()
             if (ImGui.Begin("Changelog", ref openChangelog, ImGuiWindowFlags.AlwaysAutoResize))
             {
                 ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudYellow);
-                ImGui.TextWrapped("2.4.3.0");
+                ImGui.TextWrapped("2.4.4.0");
                 ImGui.PopStyleColor();
                 ImGui.Separator();
-                ImGui.TextWrapped("- Added Watered Cortials for AutoCasts");
+                //Current Version
+                ImGui.TextWrapped("- It's now possible to enable both Double and Triple hook (hold shift when selecting the options)");
 
                 ImGui.Spacing();
 
-                if (ImGui.TreeNode("2.4.3.x"))
+                /*if (ImGui.TreeNode("2.4.4.x"))
                 {
-                    ImGui.TextWrapped("- Fixed duplicated GP Configs");
-
                     ImGui.TreePop();
-                }
+                }*/
 
                 if (ImGui.BeginChild("old_versions", new Vector2(0, 150), true))
                 {
+                    if (ImGui.TreeNode("2.4.3.0"))
+                    {
+                        ImGui.TextWrapped("- Added Watered Cortials for AutoCasts");
+                        ImGui.Spacing();
+                        ImGui.TextWrapped("2.4.3.x");
+                        ImGui.TextWrapped("- Fixed duplicated GP Configs");
+
+                        ImGui.TreePop();
+                    }
+
                     if (ImGui.TreeNode("2.4.2.0"))
                     {
                         ImGui.TextWrapped("- Added customizable hitbox for autogig");
@@ -162,7 +171,7 @@ private void DrawChangelog()
                         ImGui.Separator();
                         ImGui.Spacing();
 
-                        ImGui.TextWrapped("2.4.2.X");
+                        ImGui.TextWrapped("2.4.2.x");
                         ImGui.TextWrapped("- Gig hitbox is now enabled by default");
                         ImGui.TextWrapped("- Fixed the order of the Chum Timer Min/Max fields");
                         ImGui.TextWrapped("- Fixed some options not saving correctly");