Improve vehicle destruction sync

NitroxClient/GameLogic/Spawning/Metadata/Extractor/CyclopsMetadataExtractor.cs

@@ -28,7 +28,10 @@ public override CyclopsMetadata Extract(CyclopsGameObject cyclops)
         LiveMixin liveMixin = gameObject.RequireComponentInChildren<LiveMixin>();
         float health = liveMixin.health;
 
-        return new(silentRunning.active, shieldOn, sonarOn, engineOn, (int)motorMode, health);
+        SubRoot subRoot = gameObject.RequireComponentInChildren<SubRoot>();
+        bool isDestroyed = subRoot.subDestroyed || health <= 0f;
+
+        return new(silentRunning.active, shieldOn, sonarOn, engineOn, (int)motorMode, health, isDestroyed);
     }
 
     public struct CyclopsGameObject

NitroxClient/GameLogic/Spawning/Metadata/Processor/CyclopsMetadataProcessor.cs

@@ -29,6 +29,7 @@ public override void ProcessMetadata(GameObject cyclops, CyclopsMetadata metadat
             ChangeSonarMode(cyclops, metadata.SonarOn);
             SetEngineState(cyclops, metadata.EngineOn);
             SetHealth(cyclops, metadata.Health);
+            SetDestroyed(cyclops, metadata.IsDestroyed);
         }
     }
 
@@ -149,4 +150,25 @@ private void SetHealth(GameObject gameObject, float health)
         LiveMixin liveMixin = gameObject.RequireComponentInChildren<LiveMixin>(true);
         liveMixinManager.SyncRemoteHealth(liveMixin, health);
     }
+
+    private void SetDestroyed(GameObject gameObject, bool isDestroyed)
+    {
+        CyclopsDestructionEvent destructionEvent = gameObject.RequireComponentInChildren<CyclopsDestructionEvent>(true);
+
+        // Don't play VFX and SFX if the Cyclops is already destroyed or was spawned in as destroyed
+        if (destructionEvent.subRoot.subDestroyed == isDestroyed) return;
+
+        if (isDestroyed)
+        {
+            // Use packet suppressor as sentinel so the patch callback knows not to spawn loot
+            using (PacketSuppressor<EntitySpawnedByClient>.Suppress())
+            {
+                destructionEvent.DestroyCyclops();
+            }
+        }
+        else
+        {
+            destructionEvent.RestoreCyclops();
+        }
+    }
 }

NitroxClient/GameLogic/Spawning/WorldEntities/VehicleWorldEntitySpawner.cs

@@ -3,6 +3,7 @@
 using NitroxClient.MonoBehaviours.CinematicController;
 using NitroxClient.Unity.Helper;
 using NitroxModel.DataStructures.GameLogic.Entities;
+using NitroxModel.DataStructures.GameLogic.Entities.Metadata;
 using NitroxModel.DataStructures.Util;
 using NitroxModel.Helper;
 using NitroxModel_Subnautica.DataStructures;
@@ -99,6 +100,14 @@ private IEnumerator SpawnInWorld(VehicleWorldEntity vehicleEntity, TaskResult<Op
 
         NitroxEntity.SetNewId(gameObject, vehicleEntity.Id);
 
+        if (vehicleEntity.Metadata is CyclopsMetadata cyclopsMetadata && cyclopsMetadata.IsDestroyed)
+        {
+            // Swap to destroyed look without triggering animations / effects
+            gameObject.BroadcastMessage("SwapToDamagedModels");
+            gameObject.BroadcastMessage("OnKill");
+            gameObject.BroadcastMessage("CyclopsDeathEvent", SendMessageOptions.DontRequireReceiver);
+        }
+
         if (parent.HasValue)
         {
             DockVehicle(gameObject, parent.Value);

NitroxClient/GameLogic/Vehicles.cs

@@ -3,10 +3,14 @@
 using NitroxClient.Communication;
 using NitroxClient.Communication.Abstract;
 using NitroxClient.GameLogic.Helper;
+using NitroxClient.GameLogic.Spawning.Metadata;
+using NitroxClient.GameLogic.Spawning.Metadata.Extractor;
 using NitroxClient.MonoBehaviours;
 using NitroxClient.Unity.Helper;
 using NitroxModel.DataStructures;
 using NitroxModel.DataStructures.GameLogic.Entities;
+using NitroxModel.DataStructures.GameLogic.Entities.Metadata;
+using NitroxModel.DataStructures.Util;
 using NitroxModel.Packets;
 using NitroxModel_Subnautica.DataStructures;
 using UnityEngine;
@@ -18,14 +22,18 @@ public class Vehicles
     private readonly IPacketSender packetSender;
     private readonly IMultiplayerSession multiplayerSession;
     private readonly PlayerManager playerManager;
+    private readonly EntityMetadataManager entityMetadataManager;
+    private readonly Entities entities;
 
     private readonly Dictionary<TechType, string> pilotingChairByTechType = [];
 
-    public Vehicles(IPacketSender packetSender, IMultiplayerSession multiplayerSession, PlayerManager playerManager)
+    public Vehicles(IPacketSender packetSender, IMultiplayerSession multiplayerSession, PlayerManager playerManager, EntityMetadataManager entityMetadataManager, Entities entities)
     {
         this.packetSender = packetSender;
         this.multiplayerSession = multiplayerSession;
         this.playerManager = playerManager;
+        this.entityMetadataManager = entityMetadataManager;
+        this.entities = entities;
     }
 
     private PilotingChair FindPilotingChairWithCache(GameObject parent, TechType techType)
@@ -54,8 +62,20 @@ public void BroadcastDestroyedVehicle(NitroxId id)
     {
         using (PacketSuppressor<VehicleOnPilotModeChanged>.Suppress())
         {
-            VehicleDestroyed vehicleDestroyed = new(id);
-            packetSender.Send(vehicleDestroyed);
+            EntityDestroyed entityDestroyed = new(id);
+            packetSender.Send(entityDestroyed);
+        }
+    }
+
+    public void BroadcastDestroyedCyclops(GameObject cyclops, NitroxId id)
+    {
+        CyclopsMetadataExtractor.CyclopsGameObject cyclopsGameObject = new() { GameObject = cyclops };
+        Optional<EntityMetadata> metadata = entityMetadataManager.Extract(cyclopsGameObject);
+
+        if (metadata.HasValue && metadata.Value is CyclopsMetadata cyclopsMetadata)
+        {
+            cyclopsMetadata.IsDestroyed = true;
+            entities.BroadcastMetadataUpdate(id, cyclopsMetadata);
         }
     }
 

NitroxModel/DataStructures/GameLogic/Entities/Metadata/CyclopsMetadata.cs

@@ -26,24 +26,28 @@ public class CyclopsMetadata : EntityMetadata
     [DataMember(Order = 6)]
     public float Health { get; set; }
 
+    [DataMember(Order = 7)]
+    public bool IsDestroyed { get; set; }
+
     [IgnoreConstructor]
     protected CyclopsMetadata()
     {
         // Constructor for serialization. Has to be "protected" for json serialization.
     }
 
-    public CyclopsMetadata(bool silentRunningOn, bool shieldOn, bool sonarOn, bool engineOn, int engineMode, float health)
+    public CyclopsMetadata(bool silentRunningOn, bool shieldOn, bool sonarOn, bool engineOn, int engineMode, float health, bool isDestroyed)
     {
         SilentRunningOn = silentRunningOn;
         ShieldOn = shieldOn;
         SonarOn = sonarOn;
         EngineOn = engineOn;
         EngineMode = engineMode;
         Health = health;
+        IsDestroyed = isDestroyed;
     }
 
     public override string ToString()
     {
-        return $"[CyclopsMetadata SilentRunningOn: {SilentRunningOn}, ShieldOn: {ShieldOn}, SonarOn: {SonarOn}, EngineOn: {EngineOn}, EngineMode: {EngineMode}, Health: {Health}]";
+        return $"[CyclopsMetadata SilentRunningOn: {SilentRunningOn}, ShieldOn: {ShieldOn}, SonarOn: {SonarOn}, EngineOn: {EngineOn}, EngineMode: {EngineMode}, Health: {Health}, IsDestroyed: {IsDestroyed}]";
     }
 }

NitroxPatcher/Patches/Dynamic/CyclopsDestructionEvent_DestroyCyclops_Patch.cs

@@ -8,7 +8,7 @@
 namespace NitroxPatcher.Patches.Dynamic;
 
 /// <summary>
-/// Broadcasts the cyclops destruction by calling <see cref="LiveMixin.Kill"/>, and safely remove every player from it.
+/// Broadcasts the cyclops destruction, and safely removes every player from it.
 /// </summary>
 public sealed partial class CyclopsDestructionEvent_DestroyCyclops_Patch : NitroxPatch, IDynamicPatch
 {
@@ -38,4 +38,12 @@ public static void Prefix(CyclopsDestructionEvent __instance)
 
         __instance.subLiveMixin.Kill();
     }
+
+    public static void Postfix(CyclopsDestructionEvent __instance)
+    {
+        if (__instance.TryGetNitroxId(out NitroxId nitroxId))
+        {
+            Resolve<Vehicles>().BroadcastDestroyedCyclops(__instance.gameObject, nitroxId);
+        }
+    }
 }

NitroxPatcher/Patches/Dynamic/CyclopsDestructionEvent_OnConsoleCommand_Patch.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Reflection;
 using HarmonyLib;
-using NitroxClient.GameLogic;
-using NitroxModel.DataStructures;
 using NitroxModel.Helper;
 using static NitroxModel.Helper.Reflect;
 
@@ -15,6 +13,7 @@ public sealed class CyclopsDestructionEvent_OnConsoleCommand_Patch : NitroxPatch
 
     public static bool PrefixRestore()
     {
+        // TODO: add support for "restorecyclops" command
         Log.InGame(Language.main.Get("Nitrox_CommandNotAvailable"));
         return false;
     }
@@ -26,24 +25,11 @@ public static bool PrefixDestroy(CyclopsDestructionEvent __instance, out bool __
         return __state;
     }
 
-    /// <remarks>
-    /// This must happen at postfix so that the SubRootChanged packet are sent before the destroyed vehicle one,
-    /// thus saving player entities from deletion.
-    /// </remarks>
-    public static void PostfixDestroy(CyclopsDestructionEvent __instance, bool __state)
-    {
-        if (__state && __instance.TryGetIdOrWarn(out NitroxId id))
-        {
-            Resolve<Vehicles>().BroadcastDestroyedVehicle(id);
-        }
-    }
-
     public override void Patch(Harmony harmony)
     {
         MethodInfo destroyPrefixInfo = Method(() => PrefixDestroy(default, out Ref<bool>.Field));
 
         PatchPrefix(harmony, TARGET_METHOD_RESTORE, ((Func<bool>)PrefixRestore).Method);
         PatchPrefix(harmony, TARGET_METHOD_DESTROY, destroyPrefixInfo);
-        PatchPostfix(harmony, TARGET_METHOD_DESTROY, ((Action<CyclopsDestructionEvent, bool>)PostfixDestroy).Method);
     }
 }

NitroxPatcher/Patches/Dynamic/CyclopsDestructionEvent_SpawnLootAsync_Patch.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Reflection.Emit;
+using HarmonyLib;
+using NitroxClient.Communication;
+using NitroxClient.GameLogic;
+using NitroxClient.MonoBehaviours;
+using NitroxModel.DataStructures;
+using NitroxModel.DataStructures.GameLogic.Entities;
+using NitroxModel.Helper;
+using NitroxModel.Packets;
+using NitroxModel_Subnautica.DataStructures;
+using NitroxPatcher.PatternMatching;
+using UnityEngine;
+
+namespace NitroxPatcher.Patches.Dynamic;
+
+public sealed partial class CyclopsDestructionEvent_SpawnLootAsync_Patch : NitroxPatch, IDynamicPatch
+{
+    public static readonly MethodInfo TARGET_METHOD = AccessTools.EnumeratorMoveNext(Reflect.Method((CyclopsDestructionEvent t) => t.SpawnLootAsync()));
+
+    // Matches twice, once for scrap metal and once for computer chips
+    public static readonly InstructionsPattern PATTERN = new(expectedMatches: 2)
+    {
+        { Reflect.Method(() => UnityEngine.Object.Instantiate(default(GameObject), default(Vector3), default(Quaternion))), "SpawnObject" }
+    };
+
+    public static IEnumerable<CodeInstruction> Transpiler(MethodBase original, IEnumerable<CodeInstruction> instructions)
+    {
+        return new CodeMatcher(instructions)
+               .MatchStartForward(new CodeMatch(OpCodes.Switch))
+               .InsertAndAdvance(new CodeInstruction(OpCodes.Call, Reflect.Method(() => PrefixCallback(default))))
+               .InstructionEnumeration()
+               .InsertAfterMarker(PATTERN, "SpawnObject", [
+                    new(OpCodes.Dup),
+                    new(OpCodes.Ldloc_1),
+                    new(OpCodes.Call, ((Action<GameObject, CyclopsDestructionEvent>)SpawnObjectCallback).Method)
+                ]);
+    }
+
+    public static void SpawnObjectCallback(GameObject gameObject, CyclopsDestructionEvent __instance)
+    {
+        NitroxId lootId = NitroxEntity.GenerateNewId(gameObject);
+
+        LargeWorldEntity largeWorldEntity = gameObject.GetComponent<LargeWorldEntity>();
+        PrefabIdentifier prefabIdentifier = gameObject.GetComponent<PrefabIdentifier>();
+        Pickupable pickupable = gameObject.GetComponent<Pickupable>();
+
+        WorldEntity lootEntity = new(gameObject.transform.ToWorldDto(), (int)largeWorldEntity.cellLevel, prefabIdentifier.classId, false, lootId, pickupable.GetTechType().ToDto(), null, null, []);
+        Resolve<Entities>().BroadcastEntitySpawnedByClient(lootEntity);
+    }
+
+    public static int PrefixCallback(int originalIndex)
+    {
+        // Immediately return from iterator block if called from within CyclopsMetadataProcessor
+        return PacketSuppressor<EntitySpawnedByClient>.IsSuppressed ? int.MaxValue : originalIndex;
+    }
+}

NitroxPatcher/Patches/Dynamic/SubRoot_OnTakeDamage_Patch.cs

@@ -30,15 +30,4 @@ public static bool Prefix(SubRoot __instance, DamageInfo damageInfo)
 
         return Resolve<SimulationOwnership>().HasAnyLockType(id);
     }
-
-    public static void Postfix(bool __runOriginal, SubRoot __instance, DamageInfo damageInfo)
-    {
-        // If we have lock on it, we'll notify the server that this cyclops must be destroyed
-        if (__runOriginal && __instance.live.health <= 0f &&
-            damageInfo.type != EntityDestroyedProcessor.DAMAGE_TYPE_RUN_ORIGINAL &&
-            __instance.TryGetIdOrWarn(out NitroxId id))
-        {
-            Resolve<Vehicles>().BroadcastDestroyedVehicle(id);
-        }
-    }
 }

NitroxPatcher/Patches/Dynamic/SubRoot_SetCyclopsUpgrades_Patch.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using NitroxModel.Helper;
+
+namespace NitroxPatcher.Patches.Dynamic;
+
+/// <summary>
+/// The way Subnautica handles modules in Cyclops wrecks is pretty weird. if any module is added/removed (and when spawning
+/// the entity during joining), they are all instantly disabled, which deletes creature decoys in any slot except
+/// the first one. We want to keep the creature decoys around if the module is inserted, so we allow use of that
+/// module even when the Cyclops has been destroyed.
+/// </summary>
+public sealed partial class SubRoot_SetCyclopsUpgrades_Patch : NitroxPatch, IDynamicPatch
+{
+    private static readonly MethodInfo TARGET_METHOD = Reflect.Method((SubRoot t) => t.SetCyclopsUpgrades());
+
+    public static void Postfix(SubRoot __instance)
+    {
+        if (__instance.upgradeConsole == null)
+        {
+            return;
+        }
+
+        __instance.decoyTubeSizeIncreaseUpgrade = false;
+
+        Equipment modules = __instance.upgradeConsole.modules;
+        foreach (string slot in SubRoot.slotNames)
+        {
+            TechType techTypeInSlot = modules.GetTechTypeInSlot(slot);
+            if (techTypeInSlot == TechType.CyclopsDecoyModule)
+            {
+                __instance.decoyTubeSizeIncreaseUpgrade = true;
+                break;
+            }
+        }
+    }
+}

NitroxServer/Communication/Packets/Processors/EntityDestroyedPacketProcessor.cs

@@ -1,4 +1,5 @@
 using NitroxModel.DataStructures.GameLogic;
+using NitroxModel.DataStructures.GameLogic.Entities;
 using NitroxModel.DataStructures.Util;
 using NitroxModel.Packets;
 using NitroxServer.Communication.Packets.Processors.Abstract;
@@ -26,6 +27,11 @@ public override void Process(EntityDestroyed packet, Player destroyingPlayer)
 
         if (worldEntityManager.TryDestroyEntity(packet.Id, out Entity entity))
         {
+            if (entity is VehicleWorldEntity vehicleWorldEntity)
+            {
+                worldEntityManager.MovePlayerChildrenToRoot(vehicleWorldEntity);
+            }
+
             foreach (Player player in playerManager.GetConnectedPlayers())
             {
                 bool isOtherPlayer = player != destroyingPlayer;