AutoHook 2.2.2.3 [PUSH]

fixing #22
InitialDet · Aug 15, 2022 · 4383096 · 4383096
1 parent e9bae6f
commit 4383096
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 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.2.2.2</Version>
+		<Version>2.2.2.3</Version>
 		<Description>Auto hooks for you</Description>
 		<PackageProjectUrl>https://github.com/InitialDet/AutoHook</PackageProjectUrl>
 		<Configurations>Release;Debug</Configurations>

diff --git a/AutoHook/AutoHook.json b/AutoHook/AutoHook.json
@@ -9,5 +9,5 @@
   "Tags": ["Gathering","Fishing"],
   "DalamudApiLevel": 6,
   "IconUrl": "https://raw.githubusercontent.com/InitialDet/AutoHook/main/AutoHook/images/icon.png",
-  "Changelog": "- Trying to add support for CN server"
+  "Changelog": "- Trying to add support for CN server \n- Fixing problems with collectable fish"
 }
diff --git a/AutoHook/Parser/FishingParser.cs b/AutoHook/Parser/FishingParser.cs
@@ -104,6 +104,12 @@ private void OnCatchUpdate(IntPtr module, uint fishId, bool large, ushort size,
     {
         _catchHook!.Original(module, fishId, large, size, amount, level, unk7, unk8, unk9, unk10, unk11, unk12);
 
+        // Check against collectibles.
+        if (fishId > 500000)
+        {
+            fishId -= 500000;
+        }
+
         string fishName = MultiString.ParseSeStringLumina(Service.DataManager.GetExcelSheet<Item>()!.GetRow(fishId)?.Name);
         CaughtFish?.Invoke(fishName, fishId);
     }