Fix fate and cn 6.41

Author: sandtechnology

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>26.1.7.1</AssemblyVersion>
-        <FileVersion>26.1.7.1</FileVersion>
+        <AssemblyVersion>26.1.31.0</AssemblyVersion>
+        <FileVersion>26.1.31.0</FileVersion>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
         <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>

OverlayPlugin.Core/GameRepoInfo.cs

@@ -8,19 +8,19 @@ namespace RainbowMage.OverlayPlugin
 {
     public class GameRepoInfo
     {
-        //CN 7.40b
+        //CN 7.41
         public static readonly Version version = new Version(7, 4);
-        public static readonly int ActorMoveOpcode = 0x02D4;
-        public static readonly int ActorSetPosOpcode = 0x01CC;
-        public static readonly int BattleTalk2Opcode = 0x00E6;
-        public static readonly int CountdownOpcode = 0x03AF;
-        public static readonly int CountdownCancelOpcode = 0x00DD;
-        public static readonly int CEDirectorOpcode = 0x0305;
-        public static readonly int MapEffectOpcode = 0x0223;
-        public static readonly int MapEffect4Opcode = 0x03E1;
-        public static readonly int MapEffect8Opcode = 0x0144;
-        public static readonly int MapEffect12Opcode = 0x00B1;
-        public static readonly int RSVDataOpcode = 0x03AB;
-        public static readonly int NpcYellOpcode = 0x01DC;
+        public static readonly int ActorMoveOpcode = 0x013b;
+        public static readonly int ActorSetPosOpcode = 0x0202;
+        public static readonly int BattleTalk2Opcode = 0x012d;
+        public static readonly int CountdownOpcode = 0x0098;
+        public static readonly int CountdownCancelOpcode = 0x0371;
+        public static readonly int CEDirectorOpcode = 0x00f5;
+        public static readonly int MapEffectOpcode = 0x00b6;
+        public static readonly int MapEffect4Opcode = 0x03d0;
+        public static readonly int MapEffect8Opcode = 0x0398;
+        public static readonly int MapEffect12Opcode = 0x0196;
+        public static readonly int RSVDataOpcode = 0x0374;
+        public static readonly int NpcYellOpcode = 0x02ea;
     }
 }

OverlayPlugin.Core/NetworkProcessors/FateWatcher.cs

@@ -45,10 +45,10 @@ private struct ActorControlSelfFateUpdateOpcodes
             public readonly int remove;
             public readonly int update;
         };
-        private static readonly ActorControlSelfFateUpdateOpcodes acFateUpdate_v5_2 = new ActorControlSelfFateUpdateOpcodes(
+        private static readonly ActorControlSelfFateUpdateOpcodes acFateUpdate_v6_2 = new ActorControlSelfFateUpdateOpcodes(
+          0x942,
           0x935,
-          0x936,
-          0x93E
+          0x93C
         );
 
         [Serializable]
@@ -75,10 +75,10 @@ public struct CEDirectorData
         private static SemaphoreSlim ceSemaphore;
         private Dictionary<GameRegion, ActorControlSelfFateUpdateOpcodes> fateControlOpcodes
             = new Dictionary<GameRegion, ActorControlSelfFateUpdateOpcodes>() {
-                { GameRegion.Korean, acFateUpdate_v5_2 },
-                { GameRegion.Chinese, acFateUpdate_v5_2 },
-                { GameRegion.TraditionalChinese, acFateUpdate_v5_2 },
-                { GameRegion.Global, acFateUpdate_v5_2 },
+                { GameRegion.Korean, acFateUpdate_v6_2 },
+                { GameRegion.Chinese, acFateUpdate_v6_2 },
+                { GameRegion.TraditionalChinese, acFateUpdate_v6_2 },
+                { GameRegion.Global, acFateUpdate_v6_2 },
         };
 
         // fates<fateID, progress>
@@ -88,12 +88,6 @@ private Dictionary<GameRegion, ActorControlSelfFateUpdateOpcodes> fateControlOpc
         public event EventHandler<FateChangedArgs> OnFateChanged;
         public event EventHandler<CEChangedArgs> OnCEChanged;
 
-        public int GetOffset(Type type, string property)
-        {
-            var netHelper = container_.Resolve<NetworkParser>();
-            return netHelper.GetOffset(type, property);
-        }
-
         public FateWatcher(TinyIoCContainer container)
         {
             container_ = container;