armoury thing and onemote

Author: Jaksuhn

SomethingNeedDoing/Core/Enums.cs

@@ -71,6 +71,7 @@ public enum TriggerEvent
     OnDutyStarted,
     OnDutyWiped,
     OnDutyCompleted,
+    OnEmote,
 }
 
 /// <summary>

SomethingNeedDoing/LuaMacro/Modules/InventoryModule.cs

@@ -181,6 +181,25 @@ public InventoryItemWrapper(uint itemId)
         [LuaDocs] public InventoryType Container => Item->Container;
         [LuaDocs] public int Slot => Item->Slot;
 
+        [LuaDocs]
+        [Changelog("13.55")]
+        public InventoryType ArmouryContainer => GetRow<Sheets.Item>(ItemId)?.EquipSlotCategory.Value switch
+        {
+            { MainHand: 1 } => InventoryType.ArmoryMainHand,
+            { OffHand: 1 } => InventoryType.ArmoryOffHand,
+            { Head: 1 } => InventoryType.ArmoryHead,
+            { Body: 1 } => InventoryType.ArmoryBody,
+            { Gloves: 1 } => InventoryType.ArmoryHands,
+            { Legs: 1 } => InventoryType.ArmoryLegs,
+            { Feet: 1 } => InventoryType.ArmoryFeets,
+            { Ears: 1 } => InventoryType.ArmoryEar,
+            { Neck: 1 } => InventoryType.ArmoryNeck,
+            { Wrists: 1 } => InventoryType.ArmoryWrist,
+            { FingerL: 1 } => InventoryType.ArmoryRings,
+            { FingerR: 1 } => InventoryType.ArmoryRings,
+            _ => InventoryType.Invalid
+        };
+
         [LuaDocs] public void Use() => Game.UseItem(ItemId, IsHighQuality);
 
         [LuaDocs]

SomethingNeedDoing/Managers/MacroScheduler.cs

@@ -3,7 +3,11 @@
 using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
+using Dalamud.Hooking;
 using Dalamud.Plugin.Services;
+using Dalamud.Utility.Signatures;
+using ECommons;
+using FFXIVClientStructs.FFXIV.Client.Game.Object;
 using NLua;
 using SomethingNeedDoing.Core.Events;
 using SomethingNeedDoing.Core.Interfaces;
@@ -43,8 +47,15 @@ public class MacroScheduler : IMacroScheduler, IDisposable
     /// </summary>
     public event EventHandler<MacroErrorEventArgs>? MacroError;
 
+    private unsafe delegate long OnEmoteFuncDelegate(IntPtr a1, GameObject* source, ushort emoteId, GameObjectId targetId, long a5);
+    [Signature("48 89 5C 24 ?? 48 89 6C 24 ?? 48 89 74 24 ?? 48 89 7C 24 ?? 41 56 48 83 EC 30 4C 8B 74 24 ?? 48 8B D9", DetourName = nameof(OnEmoteFuncDetour))]
+    private readonly Hook<OnEmoteFuncDelegate> OnEmoteFuncHook = null!;
+
     public MacroScheduler(NativeMacroEngine nativeEngine, NLuaMacroEngine luaEngine, TriggerEventManager triggerEventManager, MacroHierarchyManager hierarchyManager, IEnumerable<IDisableable> disableablePlugins)
     {
+        Svc.Hook.InitializeFromAttributes(this);
+        OnEmoteFuncHook?.Enable();
+
         _nativeEngine = nativeEngine;
         _luaEngine = luaEngine;
         _triggerEventManager = triggerEventManager;
@@ -797,6 +808,14 @@ private void OnDutyCompleted(object? sender, ushort e)
         _ = _triggerEventManager.RaiseTriggerEvent(TriggerEvent.OnDutyCompleted);
     }
 
+    private unsafe long OnEmoteFuncDetour(IntPtr a1, GameObject* source, ushort emoteId, GameObjectId targetId, long a5)
+    {
+        FrameworkLogger.Verbose($"Emote performed: Source={source->NameString}, EmoteId={emoteId}, TargetId={targetId.Id}, a5={a5}");
+        var eventData = new Dictionary<string, object> { { "SourceId", source->EntityId }, { "SourceName", source->NameString }, { "EmoteId", emoteId }, { "TargetId", targetId } };
+        _ = _triggerEventManager.RaiseTriggerEvent(TriggerEvent.OnEmote, eventData);
+        return OnEmoteFuncHook!.Original(a1, source, emoteId, targetId, a5);
+    }
+
     private void CheckCharacterPostProcess(IMacro macro)
     {
         if (C.ARCharacterPostProcessExcludedCharacters.Any(x => x == Svc.ClientState.LocalContentId))
@@ -933,6 +952,7 @@ public void Dispose()
         _addonEvents.Clear();
 
         _triggerEventManager.Dispose();
+        OnEmoteFuncHook?.Dispose();
     }
 
     /// <inheritdoc/>

SomethingNeedDoing/SomethingNeedDoing.csproj

@@ -3,6 +3,7 @@
 	<PropertyGroup>
 		<Version>0.0.0.0</Version>
 		<LangVersion>preview</LangVersion>
+		<Platforms>x64;ARM32</Platforms>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">

SomethingNeedDoing/SomethingNeedDoing.sln

@@ -6,14 +6,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SomethingNeedDoing", "Somet
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{70FB72AD-8823-5E66-89E8-BBC2BCFDCAC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70FB72AD-8823-5E66-89E8-BBC2BCFDCAC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70FB72AD-8823-5E66-89E8-BBC2BCFDCAC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70FB72AD-8823-5E66-89E8-BBC2BCFDCAC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70FB72AD-8823-5E66-89E8-BBC2BCFDCAC9}.Debug|x64.ActiveCfg = Debug|x64
+		{70FB72AD-8823-5E66-89E8-BBC2BCFDCAC9}.Debug|x64.Build.0 = Debug|x64
+		{70FB72AD-8823-5E66-89E8-BBC2BCFDCAC9}.Release|x64.ActiveCfg = Release|x64
+		{70FB72AD-8823-5E66-89E8-BBC2BCFDCAC9}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE