Merge remote-tracking branch 'cactbot/main' 252cc49

Author: sandtechnology

OverlayPlugin.Core/Integration/FFXIVRepository.cs

@@ -69,7 +69,7 @@ public enum GameRegion
         Global = 1,
         Chinese = 2,
         Korean = 3,
-        Tc = 4
+        TraditionalChinese = 4
     }
 
     public class FFXIVRepository
@@ -387,39 +387,28 @@ public DateTime EpochToDateTime(long epoch)
         /**
          * Convert a coordinate expressed as a uint16 to a float.
          *
-         * See https://github.com/ravahn/FFXIV_ACT_Plugin/issues/298
+         * See https://github.com/ravahn/FFXIV_ACT_Plugin/issues/298, though this has been
+         * updated to be more accurate.
          */
         public static float ConvertUInt16Coordinate(ushort value)
         {
-            return (value - 0x7FFF) / 32.767f;
+            // This is the exact same formula the game client uses
+            return (float)(value * 3.0518043 * 0.0099999998 - 1000.0);
         }
 
         /**
-         * Convert a packet heading to an in-game headiung.
+         * Convert a packet heading to an in-game heading.
          * 
          * When a heading is sent in certain packets, the heading is expressed as a uint16, where
          * 0=north and each increment is 1/65536 of a turn in the CCW direction.
          * 
-         * See https://github.com/ravahn/FFXIV_ACT_Plugin/issues/298
+         * See https://github.com/ravahn/FFXIV_ACT_Plugin/issues/298, though this has been
+         * updated to be more accurate.
          */
         public static double ConvertHeading(ushort heading)
         {
-            return heading
-               // Normalize to turns
-               / 65536.0
-               // Normalize to radians
-               * 2 * Math.PI
-               // Flip from 0=north to 0=south like the game uses
-               - Math.PI;
-        }
-
-        /**
-         * Reinterpret a float as a UInt16. Some fields in Machina, such as Server_ActorCast.Rotation, are
-         * marked as floats when they really should be UInt16.
-         */
-        public static ushort InterpretFloatAsUInt16(float value)
-        {
-            return BitConverter.ToUInt16(BitConverter.GetBytes(value), 0);
+            // This is the exact same formula the game client uses
+            return heading * 0.009587526 * 0.0099999998 - Math.PI;
         }
 
         internal object GetFFXIVACTPluginIOCService(string parentAssemblyName, string type)

OverlayPlugin.Core/MemoryProcessors/Combatant/LineCombatant.cs

@@ -5,10 +5,12 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using RainbowMage.OverlayPlugin.MemoryProcessors.InCombat;
 using RainbowMage.OverlayPlugin.NetworkProcessors;
+using RainbowMage.OverlayPlugin.NetworkProcessors.PacketHelper;
 
 namespace RainbowMage.OverlayPlugin.MemoryProcessors.Combatant
 {
@@ -21,9 +23,6 @@ public class LineCombatant : IDisposable
         private bool inCombat = false;
         private ConcurrentDictionary<uint, CombatantStateInfo> combatantStateMap = new ConcurrentDictionary<uint, CombatantStateInfo>();
 
-        int offsetHeaderActorID;
-        int offsetHeaderLoginUserID;
-
         // Only emit a log line when this information changes every X milliseconds
         private class CombatantChangeCriteria
         {
@@ -194,13 +193,8 @@ public LineCombatant(TinyIoCContainer container)
                 Version = 1,
             });
 
-            var netHelper = container.Resolve<NetworkParser>();
             try
             {
-                var mach = Assembly.Load("Machina.FFXIV");
-                var msgHeaderType = mach.GetType("Machina.FFXIV.Headers.Server_MessageHeader");
-                offsetHeaderActorID = netHelper.GetOffset(msgHeaderType, "ActorID");
-                offsetHeaderLoginUserID = netHelper.GetOffset(msgHeaderType, "LoginUserID");
                 ffxiv.RegisterNetworkParser(MessageReceived);
             }
             catch (System.IO.FileNotFoundException)
@@ -450,18 +444,17 @@ private unsafe void MessageReceived(string id, long epoch, byte[] message)
         {
             fixed (byte* buffer = message)
             {
-                uint actorID = *(uint*)&buffer[offsetHeaderActorID];
-                uint loginID = *(uint*)&buffer[offsetHeaderLoginUserID];
+                var header = Marshal.PtrToStructure<Server_MessageHeader>(new IntPtr(buffer));
                 // Only check if we're not looking at a packet that's for just us
-                if (actorID != loginID)
+                if (header.ActorID != header.LoginUserID)
                 {
                     DateTime serverTime = ffxiv.EpochToDateTime(epoch);
                     var delayDefault = CombatantChangeCriteria.Criteria(inCombat).DelayDefault;
                     // Also only check if we're beyond the default delay for this ID, or if this ID doesn't exist yet
                     // This check is in place to avoid reading memory every packet, excessively
-                    if (!combatantStateMap.ContainsKey(actorID) || (serverTime - combatantStateMap[actorID].lastUpdated).TotalMilliseconds > delayDefault)
+                    if (!combatantStateMap.ContainsKey(header.ActorID) || (serverTime - combatantStateMap[header.ActorID].lastUpdated).TotalMilliseconds > delayDefault)
                     {
-                        CheckCombatants(serverTime, actorID);
+                        CheckCombatants(serverTime, header.ActorID);
                     }
                 }
             }

OverlayPlugin.Core/MemoryProcessors/FFXIVClientStructs/ManagedType.cs

@@ -430,9 +430,6 @@ private unsafe object DynamicCast(Type elementType, byte* v)
             }
         }
 
-        /// <summary>
-        /// Same as <see cref="NetworkProcessors.NetworkParser.GetOffset(Type, string)"/>
-        /// </summary>
         public static int GetOffset(Type type, string property)
         {
             int offset = 0;