From 4383096375a8d38e59a83a92c3c60d5653defd74 Mon Sep 17 00:00:00 2001 From: Det Date: Mon, 15 Aug 2022 00:54:56 -0300 Subject: [PATCH] AutoHook 2.2.2.3 [PUSH] fixing #22 --- AutoHook/AutoHook.csproj | 2 +- AutoHook/AutoHook.json | 2 +- AutoHook/Parser/FishingParser.cs | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/AutoHook/AutoHook.csproj b/AutoHook/AutoHook.csproj index 936a5fb..b53f8b6 100644 --- a/AutoHook/AutoHook.csproj +++ b/AutoHook/AutoHook.csproj @@ -2,7 +2,7 @@ Det - 2.2.2.2 + 2.2.2.3 Auto hooks for you https://github.com/InitialDet/AutoHook Release;Debug diff --git a/AutoHook/AutoHook.json b/AutoHook/AutoHook.json index 58ce928..c832658 100644 --- 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" } \ No newline at end of file diff --git a/AutoHook/Parser/FishingParser.cs b/AutoHook/Parser/FishingParser.cs index d0afc23..a8deb5e 100644 --- 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()!.GetRow(fishId)?.Name); CaughtFish?.Invoke(fishName, fishId); }