Convert movement packets

source/Missions/Missions.csproj

@@ -42,8 +42,23 @@
     <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="Polly, Version=7.0.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Polly.7.2.3\lib\net472\Polly.dll</HintPath>
     </Reference>
     <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <HintPath>..\packages\protobuf-net.3.1.22\lib\net462\protobuf-net.dll</HintPath>
@@ -76,25 +91,29 @@
     <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">
       <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
     <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" />
@@ -138,6 +157,11 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Services\Agents\Messages\ActionDataChanged.cs" />
+    <Compile Include="Services\Agents\Messages\LookDirectionChanged.cs" />
+    <Compile Include="Services\Agents\Messages\MountDataChanged.cs" />
+    <Compile Include="Services\Agents\Messages\Movement.cs" />
+    <Compile Include="Services\Agents\Messages\MovementInputVectorChanged.cs" />
     <Compile Include="Services\Arena\ArenaTestGameManager.cs" />
     <Compile Include="Services\BoardGames\Messages\BoardGameMoveMessage.cs" />
     <Compile Include="Services\BoardGames\Messages\OnSetPawnCapturedMessage.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,33 @@
+using Missions.Services.Agents.Packets;
+using System;
+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 sealed class ActionDataChanged : Movement
+    {
+        /// <summary>
+        /// The changed <see cref="AgentActionData"/> propagated by this <see cref="IEvent"/>.
+        /// </summary>
+        public AgentActionData AgentActionData { get; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="agent"></param>
+        /// <param name="agentActionData"></param>
+        public ActionDataChanged(Agent agent, AgentActionData agentActionData, Guid guid) : base(agent, guid)
+        {
+            AgentActionData = agentActionData;
+        }
+
+        /// <inheritdoc />
+        public override MovementPacket ToMovementPacket()
+        {
+            return new MovementPacket(Guid, new AgentData(Agent, AgentActionData));
+        }
+    }
+}

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

@@ -0,0 +1,33 @@
+using Missions.Services.Agents.Packets;
+using System;
+using TaleWorlds.Library;
+using TaleWorlds.MountAndBlade;
+
+namespace Missions.Services.Agents.Messages
+{
+    /// <summary>
+    /// An <see cref="IEvent"/> propagating the <see cref="Agent"/>'s change in look direction.
+    /// </summary>
+    public sealed class LookDirectionChanged : Movement
+    {
+        /// <summary>
+        /// The changed vector representing the look direction.
+        /// </summary>
+        public Vec3 LookDirection { get; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="agent"></param>
+        public LookDirectionChanged(Agent agent, Guid guid) : base(agent, guid)
+        {
+            LookDirection = agent.LookDirection;
+        }
+
+        /// <inheritdoc />
+        public override MovementPacket ToMovementPacket()
+        {
+            return new MovementPacket(Guid, new AgentData(Agent, LookDirection));
+        }
+    }
+}

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

@@ -0,0 +1,33 @@
+using Missions.Services.Agents.Packets;
+using System;
+using TaleWorlds.MountAndBlade;
+
+namespace Missions.Services.Agents.Messages
+{
+    /// <summary>
+    /// An <see cref="IEvent"/> used to propagate movement related changes of <see cref="AgentMountData"/> of an <see cref="Agent"/>.
+    /// </summary>
+    public sealed class MountDataChanged : Movement
+    {
+        /// <summary>
+        /// The changed <see cref="AgentMountData"/> propagated by this <see cref="IEvent"/>.
+        /// </summary>
+        public AgentMountData AgentMountData { get; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="agent"></param>
+        /// <param name="agentMountData"></param>
+        public MountDataChanged(Agent agent, AgentMountData agentMountData, Guid guid) : base(agent, guid)
+        {
+            AgentMountData = agentMountData;
+        }
+
+        /// <inheritdoc />
+        public override MovementPacket ToMovementPacket()
+        {
+            return new MovementPacket(Guid, new AgentData(Agent, AgentMountData));
+        }
+    }
+}

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

@@ -0,0 +1,39 @@
+using Common.Messaging;
+using Missions.Services.Agents.Packets;
+using System;
+using TaleWorlds.MountAndBlade;
+
+namespace Missions.Services.Agents.Messages
+{
+    /// <summary>
+    /// An <see cref="IEvent"/> used to propagate movement related changes of an <see cref="Agent"/>.
+    /// </summary>
+    public abstract class Movement : IEvent
+    {
+        /// <summary>
+        /// The <see cref="Agent"/> this <see cref="IEvent"/> is for.
+        /// </summary>
+        public Agent Agent { get; }
+
+        /// <summary>
+        /// The <paramref name="Agent"/>'s <see cref="Guid"/>.
+        /// </summary>
+        public Guid Guid { get; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="agent"></param>
+        public Movement(Agent agent, Guid guid)
+        {
+            Agent = agent;
+            Guid = guid;
+        }
+
+        /// <summary>
+        /// Converts the <see cref="IEvent"/> to a <see cref="MovementPacket"/>.
+        /// </summary>
+        /// <returns></returns>
+        public abstract MovementPacket ToMovementPacket();
+    }
+}

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

@@ -0,0 +1,33 @@
+using Missions.Services.Agents.Packets;
+using System;
+using TaleWorlds.Library;
+using TaleWorlds.MountAndBlade;
+
+namespace Missions.Services.Agents.Messages
+{
+    /// <summary>
+    /// An <see cref="IEvent"/> propagating that the <see cref="Agent"/>'s input vector has changed.
+    /// </summary>
+    public sealed class MovementInputVectorChanged : Movement
+    {
+        /// <summary>
+        /// The changed input vector.
+        /// </summary>
+        public Vec2 InputVector { get; }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="agent"></param>
+        public MovementInputVectorChanged(Agent agent, Guid guid) : base(agent, guid)
+        {
+            InputVector = agent.MovementInputVector;
+        }
+
+        /// <inheritdoc />
+        public override MovementPacket ToMovementPacket()
+        {
+            return new MovementPacket(Guid, new AgentData(Agent, InputVector));
+        }
+    }
+}

source/Missions/Services/Agents/Packets/AgentData.cs

@@ -35,6 +35,40 @@ public AgentData(Agent agent)
             }
         }
 
+        public AgentData(
+            Vec3 position,
+            Vec2 movementDirection,
+            Vec3 lookDirection,
+            Vec2 inputVector,
+            AgentEquipmentData agentEquipment,
+            AgentActionData agentActionData,
+            AgentMountData agentMountData)
+        {
+            Position = position;
+            MovementDirection = movementDirection;
+            LookDirection = lookDirection;
+            InputVector = inputVector;
+            AgentEquipment = agentEquipment;
+            ActionData = agentActionData;
+            MountData = agentMountData;
+        }
+
+        public AgentData(Agent agent, Vec2 movementDirection) : 
+            this(Vec3.Invalid, movementDirection, Vec3.Invalid, Vec2.Invalid, new AgentEquipmentData(agent), null, null)
+        { }
+
+        public AgentData(Agent agent, Vec3 lookDirection) :
+            this(Vec3.Invalid, Vec2.Invalid, lookDirection, Vec2.Invalid, new AgentEquipmentData(agent), null, null)
+        { }
+
+        public AgentData(Agent agent, AgentActionData actionData) :
+            this(Vec3.Invalid, Vec2.Invalid, Vec3.Invalid, Vec2.Invalid, new AgentEquipmentData(agent), actionData, null)
+        { }
+
+        public AgentData(Agent agent, AgentMountData mountData) :
+            this(Vec3.Invalid, Vec2.Invalid, Vec3.Invalid, Vec2.Invalid, new AgentEquipmentData(agent), null, mountData)
+        { }
+
         public void Apply(Agent agent)
         {
             // if the player is dead, dont sync anything
@@ -83,7 +117,7 @@ public void Apply(Agent agent)
         [ProtoMember(5)]
         public AgentEquipmentData AgentEquipment { get; }
         [ProtoMember(6)]
-        public AgentActionData ActionData { get; }
+        public AgentActionData ActionData { get;}
         [ProtoMember(7)]
         public AgentMountData MountData { get; }
     }