Convert movement packets

source/ClientDebug/ClientDebug.csproj.user

@@ -11,4 +11,4 @@
     <StartProgram>..\mb2\bin\Win64_Shipping_Client\Bannerlord.exe</StartProgram>
     <StartWorkingDirectory>..\..\..\..\mb2\bin\Win64_Shipping_Client\</StartWorkingDirectory>
   </PropertyGroup>
-</Project>
+</Project>

source/MissionTestMod/MissionTestMod.csproj

@@ -186,7 +186,7 @@
       <Name>Common</Name>
     </ProjectReference>
     <ProjectReference Include="..\Missions\Missions.csproj">
-      <Project>{E12F967C-1CC9-4E4D-8D8F-5029E0BA96EE}</Project>
+      <Project>{e12f967c-1cc9-4e4d-8d8f-5029e0ba96ee}</Project>
       <Name>Missions</Name>
     </ProjectReference>
   </ItemGroup>

source/MissionTestMod/app.config

@@ -14,6 +14,14 @@
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

source/MissionTests/AgentMovementDeltaSerializationTest.cs

@@ -0,0 +1,39 @@
+using Common.Serialization;
+using Missions.Services.Agents.Messages;
+using Missions.Services.Agents.Packets;
+using Missions.Services.Network.Surrogates;
+using ProtoBuf.Meta;
+using System;
+using TaleWorlds.Library;
+using Xunit;
+
+namespace IntroductionServerTests
+{
+    public class AgentMovementDeltaSerializationTest
+    {
+        [Fact]
+        public void Serialize_Test()
+        {
+            try
+            {
+                RuntimeTypeModel.Default.SetSurrogate<Vec3, Vec3Surrogate>();
+                RuntimeTypeModel.Default.SetSurrogate<Vec2, Vec2Surrogate>();
+            }
+            catch
+            {
+                // nop
+            }
+
+            var delta = new AgentMovement(Guid.NewGuid());
+
+            var bytes = ProtoBufSerializer.Serialize(delta);
+
+            Assert.NotNull(bytes);
+            Assert.NotEmpty(bytes);
+
+            var desDelta = (AgentMovement)ProtoBufSerializer.Deserialize(bytes);
+
+            Assert.Equal(delta, desDelta);
+        }
+    }
+}

source/MissionTests/MissionTests.csproj

@@ -113,6 +113,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AgentMovementDeltaSerializationTest.cs" />
     <Compile Include="AutoFacTests.cs" />
     <Compile Include="NetworkAgentRegistryTests.cs" />
     <Compile Include="ClientInfoTests.cs" />
@@ -137,7 +138,7 @@
       <Name>IntroServer</Name>
     </ProjectReference>
     <ProjectReference Include="..\Missions\Missions.csproj">
-      <Project>{E12F967C-1CC9-4E4D-8D8F-5029E0BA96EE}</Project>
+      <Project>{e12f967c-1cc9-4e4d-8d8f-5029e0ba96ee}</Project>
       <Name>Missions</Name>
     </ProjectReference>
   </ItemGroup>

source/MissionTests/NetworkAgentRegistryTests.cs

@@ -1,10 +1,6 @@
-using Common.Messaging;
-using Missions.Services.Network;
+using Missions.Services.Network;
 using System;
-using System.Collections.Generic;
 using System.Runtime.Serialization;
-using System.Text;
-using TaleWorlds.CampaignSystem;
 using TaleWorlds.MountAndBlade;
 using Xunit;
 
@@ -14,7 +10,6 @@ public class NetworkAgentRegistryTests
     {
         NetworkAgentRegistry networkAgentRegistry = new NetworkAgentRegistry();
 
-
         [Fact]
         public void FullTestLocal()
         {

source/MissionTests/NetworkMessageSerializationTest.cs

@@ -16,8 +16,15 @@ public class NetworkMessageSerializationTest
         [Fact]
         public void Serialize_Test()
         {
-            RuntimeTypeModel.Default.SetSurrogate<Vec3, Vec3Surrogate>();
-            RuntimeTypeModel.Default.SetSurrogate<Vec2, Vec2Surrogate>();
+            try
+            {
+                RuntimeTypeModel.Default.SetSurrogate<Vec3, Vec3Surrogate>();
+                RuntimeTypeModel.Default.SetSurrogate<Vec2, Vec2Surrogate>();
+            }
+            catch
+            {
+                // nop
+            }
 
             var character = (CharacterObject)FormatterServices.GetUninitializedObject(typeof(CharacterObject));
             NetworkMissionJoinInfo missionJoinInfo = new NetworkMissionJoinInfo(character, default(bool), default(Guid), default(Vec3), default(Guid[]), default(Vec3[]), Array.Empty<string>());

source/MissionTests/app.config

@@ -14,6 +14,14 @@
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

source/Missions/Missions.csproj

@@ -42,8 +42,20 @@
     <Reference Include="LiteNetLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\LiteNetLib.0.9.5.2\lib\net35\LiteNetLib.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.7.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Options, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Options.7.0.0\lib\net462\Microsoft.Extensions.Options.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Extensions.Primitives.7.0.0\lib\net462\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <HintPath>..\packages\protobuf-net.3.1.26\lib\net462\protobuf-net.dll</HintPath>
@@ -76,6 +88,7 @@
     <Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
     </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -89,12 +102,15 @@
     <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -152,6 +168,13 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Services\Agents\Messages\ActionDataChanged.cs" />
+    <Compile Include="Services\Agents\Messages\AgentPublisher.cs" />
+    <Compile Include="Services\Agents\Messages\LookDirectionChanged.cs" />
+    <Compile Include="Services\Agents\Messages\MountDataChanged.cs" />
+    <Compile Include="Services\Agents\Messages\IMovementEvent.cs" />
+    <Compile Include="Services\Agents\Messages\MovementInputVectorChanged.cs" />
+    <Compile Include="Services\Agents\Messages\AgentMovement.cs" />
     <Compile Include="MissionModule.cs" />
     <Compile Include="Services\Agents\Messages\AgentShoot.cs" />
     <Compile Include="Services\Agents\Messages\AgentDamaged.cs" />
@@ -201,7 +224,6 @@
     <Compile Include="Services\Network\NetworkSiegeEngine.cs" />
     <Compile Include="Services\Network\Player.cs" />
     <Compile Include="Services\Agents\Packets\AgentActionData.cs" />
-    <Compile Include="Services\Agents\Packets\AgentData.cs" />
     <Compile Include="Services\Agents\Packets\AgentEquipmentData.cs" />
     <Compile Include="Services\Agents\Packets\AgentGroupController.cs" />
     <Compile Include="Services\Agents\Packets\AgentMountData.cs" />

source/Missions/Services/Agents/Extensions/AgentExtensions.cs

@@ -1,5 +1,5 @@
-using TaleWorlds.MountAndBlade;
-using Missions.Services.Network;
+using Missions.Services.Network;
+using TaleWorlds.MountAndBlade;
 
 namespace Missions.Services.Agents.Extensions
 {

source/Missions/Services/Agents/Messages/ActionDataChanged.cs

@@ -0,0 +1,31 @@
+using Missions.Services.Agents.Packets;
+using TaleWorlds.MountAndBlade;
+
+namespace Missions.Services.Agents.Messages
+{
+    /// <summary>
+    /// An <see cref="IEvent"/> used to propagate movement related changes of <see cref="AgentActionData"/> of an <see cref="Agent"/>.
+    /// </summary>
+    public readonly struct ActionDataChanged : IMovementEvent
+    {
+        /// <summary>
+        /// The changed <see cref="AgentActionData"/> propagated by this <see cref="IEvent"/>.
+        /// </summary>
+        public AgentActionData AgentActionData { get; }
+
+        /// <inheritdoc />
+        public Agent Agent { get; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="agent"></param>
+        /// <param name="actionData">optional</param>
+        public ActionDataChanged(Agent agent, AgentActionData actionData = null)
+        {
+            Agent = agent;
+            AgentActionData = actionData ?? new AgentActionData(agent);
+        }
+
+    }
+}