CN 7.2+7.3 Merge

.github/workflows/build-artifact.yml

@@ -37,7 +37,7 @@ jobs:
 
       - name: Check dependencies cache
         id: cache-dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ./Thirdparty

.github/workflows/lint-check.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 'main'
+      - 'master'
     paths:
       - '**/*.cs'
       - '.editorconfig'

.github/workflows/release.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - master
     paths:
       - 'Directory.Build.props'
 
@@ -43,14 +44,14 @@ jobs:
     needs: [validate_tag]
     runs-on: windows-latest
     if: |
-      github.repository == 'OverlayPlugin/OverlayPlugin' &&
+      github.repository == 'sandtechnology/OverlayPlugin' &&
       needs.validate_tag.outputs.do_release == 'true'
     steps:
       - uses: actions/checkout@v2
 
       - name: Check dependencies cache
         id: cache-dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ./Thirdparty

Directory.Build.props

@@ -5,8 +5,8 @@
         <Copyright>Copyright © RainbowMage 2015, Kuriyama hibiya 2016, ngld 2019, OverlayPlugin Team 2022</Copyright>
         <RunCodeAnalysis>false</RunCodeAnalysis>
         <EnableNETAnalyzers>true</EnableNETAnalyzers>
-        <AssemblyVersion>25.2.18.0</AssemblyVersion>
-        <FileVersion>25.2.18.0</FileVersion>
+        <AssemblyVersion>26.5.9.0</AssemblyVersion>
+        <FileVersion>26.5.9.0</FileVersion>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
         <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
@@ -24,4 +24,4 @@
     <ItemGroup>
         <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
     </ItemGroup>
-</Project>
+</Project>

OverlayPlugin.Core/EventSources/CactbotEventSource.cs

@@ -191,7 +191,8 @@
             Config.SaveConfig(config);
         }
 
-    public override void Start() {
+        public override void Start()
+        {
             // Our own timer with a higher frequency than OverlayPlugin since we want to see
             // the effect of log messages quickly.
             fast_update_timer_ = new System.Timers.Timer();
@@ -217,7 +218,7 @@
             pc_locale_ = System.Globalization.CultureInfo.CurrentUICulture.Name;
             var repository = container.Resolve<FFXIVRepository>();
 
-            cactbot_version_ = new Version(0,33,7,0);
+            cactbot_version_ = new Version(0, 37, 1, 0);
             overlay_plugin_version_ = typeof(IOverlay).Assembly.GetName().Version;
             ffxiv_plugin_version_ = repository.GetPluginVersion();
             act_version_ = typeof(ActGlobals).Assembly.GetName().Version;
@@ -725,7 +726,7 @@
             if (config_dir != null)
                 Config.UserConfigFile = config_dir;
         }
-          
+
 
         private JObject FetchUserFiles(JObject msg)
         {
@@ -744,7 +745,7 @@
             result["language"] = language_;
 
             //It's unknown for ffcafe, but leave stub here should be better incase some overlays using that
-            result["cactbotVersion"] = "0.33.7.0";
+            result["cactbotVersion"] = "0.37.1.0";
             result["overlayPluginVersion"] = overlay_plugin_version_.ToString();
             result["ffxivPluginVersion"] = ffxiv_plugin_version_.ToString();
             result["actVersion"] = act_version_.ToString();
@@ -833,7 +834,7 @@
             var name = nameOverride != null ? nameOverride : dirName;
             var filename = fileOverride != null ? fileOverride : dirName;
 
             Registry.RegisterOverlayPreset(new OverlayPreset
             {
                 Name = $"Cactbot {name}",
                 Url = Path.Combine(pluginMain.OfflineCactbotDirectory, "ui", lc, $"{filename}.html"), // Path.Combine("https://quisquous.github.io/cactbot", "ui", lc, $"{filename}.html"),

OverlayPlugin.Core/GameRepoInfo.cs

@@ -8,16 +8,19 @@ namespace RainbowMage.OverlayPlugin
 {
     public class GameRepoInfo
     {
-        //CN 7.1
-        public static readonly Version version = new Version(7, 0);
-        public static readonly int ActorMoveOpcode = 0x123;
-        public static readonly int ActorSetPosOpcode = 0x2BC;
-        public static readonly int BattleTalk2Opcode = 0x1C4;
-        public static readonly int CountdownOpcode = 0x233;
-        public static readonly int CountdownCancelOpcode = 0x33C;
-        public static readonly int CEDirectorOpcode = 0x36A;
-        public static readonly int MapEffectOpcode = 0x175;
-        public static readonly int RSVDataOpcode = 0x3D6;
-        public static readonly int NpcYellOpcode = 0x3CD;
+        //CN 7.50a
+        public static readonly Version version = new Version(7, 5);
+        public static readonly int ActorMoveOpcode = 0x0095;
+        public static readonly int ActorSetPosOpcode = 0x01C0;
+        public static readonly int BattleTalk2Opcode = 0x028C;
+        public static readonly int CEDirectorOpcode = 0x016C;
+        public static readonly int CountdownOpcode = 0x033F;
+        public static readonly int CountdownCancelOpcode = 0x0300;
+        public static readonly int MapEffectOpcode = 0x0338;
+        public static readonly int NpcYellOpcode = 0x02A7;
+        public static readonly int RSVDataOpcode = 0x01BB;
+        public static readonly int MapEffect4Opcode = 0x03A6;
+        public static readonly int MapEffect8Opcode = 0x0360;
+        public static readonly int MapEffect12Opcode = 0x02D8;
     }
 }

OverlayPlugin.Core/Integration/FFXIVRepository.cs

@@ -68,7 +68,8 @@ public enum GameRegion
     {
         Global = 1,
         Chinese = 2,
-        Korean = 3
+        Korean = 3,
+        TraditionalChinese = 4
     }
 
     public class FFXIVRepository
@@ -386,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/Integration/OverlayPluginLogLines.cs

@@ -57,6 +57,9 @@ public OverlayPluginLogLineConfig(TinyIoCContainer container)
             opcodes.Add("CountdownCancel", new OpcodeConfigEntry { opcode = (uint)GameRepoInfo.CountdownCancelOpcode, size = 40 });
             opcodes.Add("ActorMove", new OpcodeConfigEntry { opcode = (uint)GameRepoInfo.ActorMoveOpcode, size = 16 });
             opcodes.Add("ActorSetPos", new OpcodeConfigEntry { opcode = (uint)GameRepoInfo.ActorSetPosOpcode, size = 24 });
+            opcodes.Add("MapEffect4", new OpcodeConfigEntry { opcode = (uint)GameRepoInfo.MapEffect4Opcode, size = 0 });
+            opcodes.Add("MapEffect8", new OpcodeConfigEntry { opcode = (uint)GameRepoInfo.MapEffect8Opcode, size = 0 });
+            opcodes.Add("MapEffect12", new OpcodeConfigEntry { opcode = (uint)GameRepoInfo.MapEffect12Opcode, size = 0 });
         }
         public IOpcodeConfigEntry this[string name]
         {

OverlayPlugin.Core/Integration/TriggIntegration.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using Advanced_Combat_Tracker;
@@ -35,20 +36,27 @@ public TriggIntegration(TinyIoCContainer container)
                     return;
 
                 var triggType = trigg.pluginObj.GetType();
-                var deleType = triggType.GetNestedType("CustomCallbackDelegate");
-                if (deleType == null)
-                    return;
+                var deleType = triggType.GetNestedType("CustomCallbackDelegate")
+                    ?? throw new MissingMemberException(triggType.FullName, "CustomCallbackDelegate");
+
+                var registerType = triggType.GetMethod(
+                    "RegisterNamedCallback",
+                    BindingFlags.Instance | BindingFlags.Public,
+                    null,
+                    new[] { typeof(string), deleType, typeof(object), typeof(string) },
+                    null)
+                    ?? throw new MissingMethodException(triggType.FullName, "RegisterNamedCallback(string, CustomCallbackDelegate, object, string)");
 
-                var registerType = triggType.GetMethod("RegisterNamedCallback");
+                var registrant = "OverlayPlugin";
 
                 var sendDele = Delegate.CreateDelegate(deleType, this, typeof(TriggIntegration).GetMethod("SendOverlayMessage"));
-                registerType?.Invoke(trigg.pluginObj, new object[] { "OverlayPluginMessage", sendDele, null });
+                registerType.Invoke(trigg.pluginObj, new object[] { "OverlayPluginMessage", sendDele, null, registrant });
 
                 var hideDele = Delegate.CreateDelegate(deleType, this, typeof(TriggIntegration).GetMethod("HideOverlay"));
-                registerType?.Invoke(trigg.pluginObj, new object[] { "HideOverlay", hideDele, null });
+                registerType.Invoke(trigg.pluginObj, new object[] { "HideOverlay", hideDele, null, registrant });
 
                 var showDele = Delegate.CreateDelegate(deleType, this, typeof(TriggIntegration).GetMethod("ShowOverlay"));
-                registerType?.Invoke(trigg.pluginObj, new object[] { "ShowOverlay", showDele, null });
+                registerType.Invoke(trigg.pluginObj, new object[] { "ShowOverlay", showDele, null, registrant });
             }
             catch (Exception ex)
             {