JonKazama-Hellion/HellionChat
1
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 28 Activity

Merge pull request #35

Browse Source 
* Handle event items by checking item kind
This commit is contained in:
nebel
2024-05-02 00:05:53 +09:00
committed by GitHub
parent 93ed2874d8
commit 31221ac8f6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChatTwo/GameFunctions/GameFunctions.cs
+3 -2
View File
@@ -1,4 +1,5 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dalamud.Game.Text.SeStringHandling.Payloads;
using Dalamud.Hooking; using Dalamud.Hooking;
using Dalamud.Memory; using Dalamud.Memory;
using Dalamud.Utility.Signatures; using Dalamud.Utility.Signatures;
@@ -151,7 +152,7 @@ internal unsafe class GameFunctions : IDisposable
return (*flags & (1 << 22)) == 0; return (*flags & (1 << 22)) == 0;
} }
internal static void OpenItemTooltip(uint id) internal static void OpenItemTooltip(uint id, ItemPayload.ItemKind itemKind)
{ {
var atkStage = AtkStage.GetSingleton(); var atkStage = AtkStage.GetSingleton();
var agent = Framework.Instance()->GetUiModule()->GetAgentModule()->GetAgentByInternalId(AgentId.ItemDetail); var agent = Framework.Instance()->GetUiModule()->GetAgentModule()->GetAgentByInternalId(AgentId.ItemDetail);
@@ -169,7 +170,7 @@ internal unsafe class GameFunctions : IDisposable
// A54B19: sets some shit // A54B19: sets some shit
*(uint*) (agentPtr + 0x20) = 22; *(uint*) (agentPtr + 0x20) = 22;
// A55218: switch goes down to default, which is what we want // A55218: switch goes down to default, which is what we want
*(byte*) (agentPtr + 0x118) = 1; *(byte*) (agentPtr + 0x118) = itemKind == ItemPayload.ItemKind.EventItem ? (byte)8 : (byte)1;
// A54BE0: item id when hovering over item in chat // A54BE0: item id when hovering over item in chat
*(uint*) (agentPtr + 0x11C) = id; *(uint*) (agentPtr + 0x11C) = id;
// A54BCC: always 0 when hovering over item in chat // A54BCC: always 0 when hovering over item in chat
ChatTwo/PayloadHandler.cs
+2 -3
View File
@@ -230,11 +230,10 @@ public sealed class PayloadHandler {
DoHover(() => HoverStatus(status), hoverSize); DoHover(() => HoverStatus(status), hoverSize);
break; break;
case ItemPayload item: case ItemPayload item:
// Event Item do weird things with the client, so we stop vanilla tooltips for now if (LogWindow.Plugin.Config.NativeItemTooltips)
if (LogWindow.Plugin.Config.NativeItemTooltips && item.Kind != ItemPayload.ItemKind.EventItem)
{ {
if (!_handleTooltips) if (!_handleTooltips)
GameFunctions.GameFunctions.OpenItemTooltip(item.RawItemId); GameFunctions.GameFunctions.OpenItemTooltip(item.RawItemId, item.Kind);
_handleTooltips = true; _handleTooltips = true;
if (_hoveredItem != item.RawItemId) if (_hoveredItem != item.RawItemId)