Merge pull request #653 from starfi5h/pr-drone

Rework drone syncing for 0.10.29.21950

NebulaModel/Packets/Factory/PrebuildItemRequiredUpdate.cs

@@ -0,0 +1,17 @@
+namespace NebulaModel.Packets.Factory;
+
+public class PrebuildItemRequiredUpdate
+{
+    public PrebuildItemRequiredUpdate() { }
+
+    public PrebuildItemRequiredUpdate(int planetId, int prebuildId, int itemCount)
+    {
+        PlanetId = planetId;
+        PrebuildId = prebuildId;
+        ItemCount = itemCount;
+    }
+
+    public int PlanetId { get; set; }
+    public int PrebuildId { get; set; }
+    public int ItemCount { get; set; }
+}

NebulaModel/Packets/Players/PlayerEjectMechaDronePacket.cs

@@ -0,0 +1,26 @@
+namespace NebulaModel.Packets.Players;
+
+public class PlayerEjectMechaDronePacket
+{
+    public PlayerEjectMechaDronePacket() { }
+
+    public PlayerEjectMechaDronePacket(ushort playerId, int planetId, int targetObjectId,
+        int next1ObjectId, int next2ObjectId, int next3ObjectId, int dronePriority)
+    {
+        PlayerId = playerId;
+        PlanetId = planetId;
+        TargetObjectId = targetObjectId;
+        Next1ObjectId = next1ObjectId;
+        Next2ObjectId = next2ObjectId;
+        Next3ObjectId = next3ObjectId;
+        DronePriority = dronePriority;
+    }
+
+    public ushort PlayerId { get; set; }
+    public int PlanetId { get; set; }
+    public int TargetObjectId { get; set; }
+    public int Next1ObjectId { get; set; }
+    public int Next2ObjectId { get; set; }
+    public int Next3ObjectId { get; set; }
+    public int DronePriority { get; set; }
+}

NebulaModel/Packets/Players/PlayerGiveItemPacket.cs

@@ -0,0 +1,17 @@
+namespace NebulaModel.Packets.Players;
+
+public class PlayerGiveItemPacket
+{
+    public PlayerGiveItemPacket() { }
+
+    public PlayerGiveItemPacket(int itemId, int itemCount, int itemInc)
+    {
+        ItemId = itemId;
+        ItemCount = itemCount;
+        ItemInc = itemInc;
+    }
+
+    public int ItemId { get; set; }
+    public int ItemCount { get; set; }
+    public int ItemInc { get; set; }
+}

NebulaNetwork/PacketProcessors/Factory/Entity/BuildEntityRequestProcessor.cs

@@ -22,8 +22,7 @@ protected override void ProcessPacket(BuildEntityRequest packet, NebulaConnectio
     {
         if (IsHost && !Multiplayer.Session.Factories.ContainsPrebuildRequest(packet.PlanetId, packet.PrebuildId))
         {
-            Log.Warn(
-                $"BuildEntityRequest received does not have a corresponding PrebuildRequest with the id {packet.PrebuildId} for the planet {packet.PlanetId}");
+            // Prebuild has already been removed, so skip it.
             return;
         }
 

NebulaNetwork/PacketProcessors/Factory/Entity/PrebuildItemRequiredUpdateProcessor.cs

@@ -0,0 +1,51 @@
+#region
+
+using NebulaAPI.Packets;
+using NebulaModel.Networking;
+using NebulaModel.Packets;
+using NebulaModel.Packets.Factory;
+using NebulaModel.Packets.Players;
+using NebulaWorld;
+
+#endregion
+
+namespace NebulaNetwork.PacketProcessors.Factory.Entity;
+
+[RegisterPacketProcessor]
+public class PrebuildItemRequiredUpdateProcessor : PacketProcessor<PrebuildItemRequiredUpdate>
+{
+    protected override void ProcessPacket(PrebuildItemRequiredUpdate packet, NebulaConnection conn)
+    {
+        var planet = GameMain.galaxy.PlanetById(packet.PlanetId);
+        if (planet.factory == null || packet.PrebuildId >= planet.factory.prebuildCursor)
+        {
+            return;
+        }
+        var factory = planet.factory;
+
+        ref var ptr = ref factory.prebuildPool[packet.PrebuildId];
+        if (ptr.id != packet.PrebuildId || ptr.itemRequired == 0)
+        {
+            //Prebuild not exist or the prebuild has satisfied the item requirement (green)
+            if (IsHost)
+            {
+                //Refund the item back to the player
+                var itemId = ptr.protoId;
+                conn.SendPacket(new PlayerGiveItemPacket(itemId, packet.ItemCount, 0));
+            }
+            return;
+        }
+
+        using (Multiplayer.Session.Factories.IsIncomingRequest.On())
+        {
+            //From ConstructionModuleComponent.PlaceItems
+            ptr.itemRequired = 0;
+            factory.NotifyPrebuildChange(ptr.id, 3);
+            if (factory.planet.factoryLoaded || factory.planet.factingCompletedStage >= 3)
+            {
+                factory.AlterPrebuildModelState(ptr.id, false);
+            }
+            factory.constructionSystem.AddBuildTargetToModules(ptr.id, ref ptr.pos);
+        }
+    }
+}

NebulaNetwork/PacketProcessors/Players/PlayerEjectMechaDroneProcessor.cs

@@ -0,0 +1,23 @@
+#region
+
+using NebulaAPI.Packets;
+using NebulaModel.Networking;
+using NebulaModel.Packets;
+using NebulaModel.Packets.Players;
+using NebulaWorld;
+
+#endregion
+
+namespace NebulaNetwork.PacketProcessors.Players;
+
+[RegisterPacketProcessor]
+public class PlayerEjectMechaDroneProcessor : PacketProcessor<PlayerEjectMechaDronePacket>
+{
+    protected override void ProcessPacket(PlayerEjectMechaDronePacket packet, NebulaConnection conn)
+    {
+        var factory = GameMain.galaxy.PlanetById(packet.PlanetId)?.factory;
+        if (factory == null) return;
+
+        Multiplayer.Session.Drones.EjectMechaDroneFromOtherPlayer(packet);
+    }
+}