Rocket improvements (SubnauticaNitrox#1280)

* Fix for rocket's buildbots

* Fix for rocket's stage persistance

* Sync for preflights check

* Bug fixes

Author: dartasen

NitroxClient/Communication/Packets/Processors/RocketPreflightCompleteProcessor.cs

@@ -0,0 +1,63 @@
+using NitroxClient.Communication.Packets.Processors.Abstract;
+using NitroxClient.MonoBehaviours;
+using NitroxModel_Subnautica.Packets;
+using UnityEngine;
+
+namespace NitroxClient.Communication.Packets.Processors
+{
+    public class RocketPreflightCompleteProcessor : ClientPacketProcessor<RocketPreflightComplete>
+    {
+        public override void Process(RocketPreflightComplete packet)
+        {
+            GameObject gameObjectRocket = NitroxEntity.RequireObjectFrom(packet.Id);
+
+            switch (packet.FlightCheck)
+            {
+                //Preflights inside the cockpit, we do want to ignore TimeCapsule for now
+                case PreflightCheck.LifeSupport:
+                case PreflightCheck.PrimaryComputer:
+
+                    CockpitSwitch[] cockpitSwitches = gameObjectRocket.GetComponentsInChildren<CockpitSwitch>(true);
+
+                    foreach (CockpitSwitch cockpitSwitch in cockpitSwitches)
+                    {
+                        if (!cockpitSwitch.completed && cockpitSwitch.preflightCheck == packet.FlightCheck)
+                        {
+                            cockpitSwitch.animator.SetBool("Completed", true);
+                            cockpitSwitch.completed = true;
+
+                            cockpitSwitch.preflightCheckSwitch?.CompletePreflightCheck();
+
+                            if (cockpitSwitch.collision)
+                            {
+                                cockpitSwitch.collision.SetActive(false);
+                            }
+                        }
+                    }
+
+                    break;
+
+                //CommunicationsArray, Hydraulics, AuxiliaryPowerUnit
+                default:
+
+                    ThrowSwitch[] throwSwitches = gameObjectRocket.GetComponentsInChildren<ThrowSwitch>(true);
+
+                    foreach (ThrowSwitch throwSwitch in throwSwitches)
+                    {
+                        if (!throwSwitch.completed && throwSwitch.preflightCheck == packet.FlightCheck)
+                        {
+                            throwSwitch.animator?.SetTrigger("Throw");
+                            throwSwitch.completed = true;
+                            throwSwitch.preflightCheckSwitch?.CompletePreflightCheck();
+                            throwSwitch.cinematicTrigger.showIconOnHandHover = false;
+                            throwSwitch.triggerCollider.enabled = false;
+                            throwSwitch.lamp.GetComponent<SkinnedMeshRenderer>().material = throwSwitch.completeMat;
+                        }
+                    }
+
+                    break;
+            }
+
+        }
+    }
+}

NitroxClient/Communication/Packets/Processors/RocketStageUpdateProcessor.cs

@@ -1,9 +1,7 @@
 using NitroxClient.Communication.Packets.Processors.Abstract;
-using NitroxClient.GameLogic.Helper;
 using NitroxClient.MonoBehaviours;
 using NitroxClient.Unity.Helper;
 using NitroxModel.Helper;
-using NitroxModel.Logger;
 using NitroxModel_Subnautica.Packets;
 using Story;
 using UnityEngine;
@@ -14,24 +12,15 @@ public class RocketStageUpdateProcessor : ClientPacketProcessor<RocketStageUpdat
     {
         public override void Process(RocketStageUpdate packet)
         {
-            GameObject gameObjectConstructor = NitroxEntity.RequireObjectFrom(packet.ConstructorId);
             GameObject gameObjectRocket = NitroxEntity.RequireObjectFrom(packet.Id);
 
             Rocket rocket = gameObjectRocket.RequireComponent<Rocket>();
-            rocket.StartRocketConstruction();
+            GameObject build = rocket.StartRocketConstruction();
 
             ItemGoalTracker.OnConstruct(packet.CurrentStageTech);
 
-            RocketConstructor rocketConstructor = gameObjectConstructor.GetComponentInChildren<RocketConstructor>(true);
-            if (rocketConstructor)
-            {
-                GameObject gameObjectTobuild = SerializationHelper.GetGameObject(packet.SerializedGameObject);
-                rocketConstructor.ReflectionCall("SendBuildBots", false, false, gameObjectTobuild);
-            }
-            else
-            {
-                Log.Error($"{nameof(RocketStageUpdateProcessor)}: Can't find attached rocketconstructor with id {packet.ConstructorId} for rocket with id {packet.Id}");
-            }
+            RocketConstructor rocketConstructor = gameObjectRocket.RequireComponentInChildren<RocketConstructor>(true);
+            rocketConstructor.ReflectionCall("SendBuildBots", false, false, build);
         }
     }
 }

NitroxClient/GameLogic/Rockets.cs

@@ -1,11 +1,9 @@
 using NitroxClient.Communication.Abstract;
-using NitroxClient.GameLogic.Helper;
 using NitroxModel.DataStructures;
 using NitroxModel.DataStructures.Util;
 using NitroxModel.Logger;
 using NitroxModel_Subnautica.DataStructures.GameLogic;
 using NitroxModel_Subnautica.Packets;
-using UnityEngine;
 
 namespace NitroxClient.GameLogic
 {
@@ -20,18 +18,48 @@ public Rockets(IPacketSender packetSender, Vehicles vehicles)
             this.vehicles = vehicles;
         }
 
-        public void BroadcastRocketStateUpdate(NitroxId id, NitroxId constructorId, TechType currentStageTech, GameObject builtGameObject)
+        /** Rocket states :
+         * 0 : Launch Platform
+         * 1 : Gantry
+         * 2 : Boosters
+         * 3 : Fuel Reserve
+         * 4 : Cockpit
+         * 5 : Final rocket
+         **/
+        public void BroadcastRocketStateUpdate(NitroxId id, TechType currentStageTech)
         {
             Optional<NeptuneRocketModel> model = vehicles.TryGetVehicle<NeptuneRocketModel>(id);
 
             if (model.HasValue)
             {
                 model.Value.CurrentStage += 1;
-                packetSender.Send(new RocketStageUpdate(id, constructorId, model.Value.CurrentStage, currentStageTech, SerializationHelper.GetBytes(builtGameObject)));
+
+                //State 5 cannot be reached for the server based on players events, so we do it by hand
+                if (model.Value.CurrentStage > 3)
+                {
+                    model.Value.CurrentStage = 5;
+                }
+
+                packetSender.Send(new RocketStageUpdate(id, model.Value.CurrentStage, currentStageTech));
+            }
+            else
+            {
+                Log.Error($"{nameof(Rockets.BroadcastRocketStateUpdate)}: Can't find model for rocket with id {id} and currentStageTech {currentStageTech}");
+            }
+        }
+
+        public void CompletePreflightCheck(NitroxId id, PreflightCheck preflightCheck)
+        {
+            Optional<NeptuneRocketModel> model = vehicles.TryGetVehicle<NeptuneRocketModel>(id);
+
+            if (model.HasValue)
+            {
+                model.Value.PreflightChecks?.Add(preflightCheck);
+                packetSender.Send(new RocketPreflightComplete(id, preflightCheck));
             }
             else
             {
-                Log.Error($"{nameof(Rockets)}: Can't find model for rocket with id {id} with constructor {constructorId} and currentStageTech {currentStageTech}");
+                Log.Error($"{nameof(Rockets.CompletePreflightCheck)}: Can't find model for rocket with id {id}");
             }
         }
 
@@ -46,7 +74,7 @@ public void CallElevator(NitroxId id, RocketElevatorPanel panel, bool up)
             }
             else
             {
-                Log.Error($"{nameof(Rockets)}: Can't find model for rocket with id {id}");
+                Log.Error($"{nameof(Rockets.CallElevator)}: Can't find model for rocket with id {id}");
             }
         }
     }

NitroxClient/NitroxClient.csproj

@@ -57,6 +57,7 @@
     <Compile Include="Communication\Packets\Processors\RadioPlayPendingMessageProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\ExosuitArmActionProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\RocketElevatorCallProcessor.cs" />
+    <Compile Include="Communication\Packets\Processors\RocketPreflightCompleteProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\RocketStageUpdateProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\VehicleSpawnedProcessor.cs" />
     <Compile Include="Debuggers\EntityDebugger.cs" />

NitroxModel-Subnautica/DataStructures/GameLogic/NeptuneRocketModel.cs

@@ -12,13 +12,13 @@ namespace NitroxModel_Subnautica.DataStructures.GameLogic
     public class NeptuneRocketModel : VehicleModel
     {
         [ProtoMember(1)]
-        public NitroxId ConstructorId { get; set; }
+        public int CurrentStage { get; set; }
 
         [ProtoMember(2)]
-        public int CurrentStage { get; set; }
+        public bool ElevatorUp { get; set; }
 
         [ProtoMember(3)]
-        public bool ElevatorUp { get; set; }
+        public ThreadSafeCollection<PreflightCheck> PreflightChecks { get; set; }
 
         protected NeptuneRocketModel()
         {
@@ -30,12 +30,12 @@ public NeptuneRocketModel(NitroxTechType techType, NitroxId id, NitroxVector3 po
         {
             CurrentStage = 0;
             ElevatorUp = false;
-            ConstructorId = new NitroxId(); //The ID will be set forever and will be fetched once a rocket base platform starts (see Rocket_Start_Patch)
+            PreflightChecks = new ThreadSafeCollection<PreflightCheck>();
         }
 
         public override string ToString()
         {
-            return $"[NeptuneRocketModel - {base.ToString()}, ConstructorId: {ConstructorId}, CurrentStage: {CurrentStage}, ElevatorUp: {ElevatorUp}]";
+            return $"[NeptuneRocketModel - {base.ToString()}, CurrentStage: {CurrentStage}, ElevatorUp: {ElevatorUp}, Preflights: {PreflightChecks?.Count}]";
         }
     }
 }

NitroxModel-Subnautica/NitroxModel-Subnautica.csproj

@@ -89,6 +89,7 @@
     <Compile Include="Packets\CyclopsToggleInternalLighting.cs" />
     <Compile Include="Packets\ExosuitArmActionPacket.cs" />
     <Compile Include="Packets\RocketElevatorCall.cs" />
+    <Compile Include="Packets\RocketPreflightComplete.cs" />
     <Compile Include="Packets\RocketStageUpdate.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

NitroxModel-Subnautica/Packets/RocketPreflightComplete.cs

@@ -0,0 +1,24 @@
+using System;
+using NitroxModel.Packets;
+using NitroxModel.DataStructures;
+
+namespace NitroxModel_Subnautica.Packets
+{
+    [Serializable]
+    public class RocketPreflightComplete : Packet
+    {
+        public NitroxId Id { get; }
+        public PreflightCheck FlightCheck { get; }
+
+        public RocketPreflightComplete(NitroxId id, PreflightCheck flightCheck)
+        {
+            Id = id;
+            FlightCheck = flightCheck;
+        }
+
+        public override string ToString()
+        {
+            return $"[RocketPreflightComplete - Id: {Id}, FlightCheck: {FlightCheck}]";
+        }
+    }
+}

NitroxModel-Subnautica/Packets/RocketStageUpdate.cs

@@ -9,22 +9,18 @@ public class RocketStageUpdate : Packet
     {
         public NitroxId Id { get; }
         public int NewStage { get; }
-        public NitroxId ConstructorId { get; }
         public TechType CurrentStageTech { get; }
-        public byte[] SerializedGameObject { get; }
 
-        public RocketStageUpdate(NitroxId id, NitroxId constructorId, int newStage, TechType currentStageTech, byte[] serializedGameObject)
+        public RocketStageUpdate(NitroxId id, int newStage, TechType currentStageTech)
         {
             Id = id;
-            ConstructorId = constructorId;
             NewStage = newStage;
             CurrentStageTech = currentStageTech;
-            SerializedGameObject = serializedGameObject;
         }
 
         public override string ToString()
         {
-            return $"[RocketStageUpdate - Id: {Id}, ConstructorId: {ConstructorId}, NewRocketStage: {NewStage}, CurrentStageTech: {CurrentStageTech}]";
+            return $"[RocketStageUpdate - Id: {Id}, NewRocketStage: {NewStage}, CurrentStageTech: {CurrentStageTech}]";
         }
     }
 }

NitroxPatcher/NitroxPatcher.csproj

@@ -49,6 +49,7 @@
     <Compile Include="Patches\Dynamic\PrecursorKeyTerminal_OnHandClick_Patch.cs" />
     <Compile Include="Patches\Dynamic\PrecursorTeleporterActivationTerminal_OnProxyHandClick_Patch.cs" />
     <Compile Include="Patches\Dynamic\PrecursorTeleporter_OnActivateTeleporter_Patch.cs" />
+    <Compile Include="Patches\Dynamic\RocketPreflightCheckManager_CompletePreflightCheck_Patch.cs" />
     <Compile Include="Patches\Dynamic\StarshipDoor_LockDoor_Patch.cs" />
     <Compile Include="Patches\Dynamic\StarshipDoor_OnDoorToggle_Patch.cs" />
     <Compile Include="Patches\Dynamic\StarshipDoor_UnlockDoor_Patch.cs" />

NitroxPatcher/Patches/Dynamic/RocketConstructor_StartRocketConstruction_Patch.cs

@@ -6,7 +6,6 @@
 using NitroxClient.MonoBehaviours;
 using NitroxModel.Core;
 using NitroxModel.DataStructures;
-using UnityEngine;
 
 namespace NitroxPatcher.Patches.Dynamic
 {
@@ -24,29 +23,26 @@ public static IEnumerable<CodeInstruction> Transpiler(MethodBase original, IEnum
 
                 /* if (this.crafterLogic.Craft(currentStageTech, craftTime)) {
 			     *      GameObject toBuild = this.rocket.StartRocketConstruction();
-                 *  ->  RocketConstructor_StartRocketConstruction_Patch.Callback(this.rocket, currentStageTech, this, toBuild); 
+                 *  ->  RocketConstructor_StartRocketConstruction_Patch.Callback(this.rocket, currentStageTech); 
 			     *      ItemGoalTracker.OnConstruct(currentStageTech);
 			     *      this.SendBuildBots(toBuild);
 		         * }
                  */
                 if (instruction.opcode == INJECTION_CODE)
                 {
-                    yield return new CodeInstruction(OpCodes.Ldarg_0);
-                    yield return new CodeInstruction(OpCodes.Ldfld, typeof(RocketConstructor).GetField("rocket", BindingFlags.Public | BindingFlags.Instance)); //this.rocket
                     yield return new CodeInstruction(OpCodes.Ldarg_0); //this
+                    yield return new CodeInstruction(OpCodes.Ldfld, typeof(RocketConstructor).GetField("rocket", BindingFlags.Public | BindingFlags.Instance)); //this.rocket
                     yield return new CodeInstruction(OpCodes.Ldloc_0); //techtype
-                    yield return new CodeInstruction(OpCodes.Ldloc_2); //toBuild GO
-                    yield return new CodeInstruction(OpCodes.Call, typeof(RocketConstructor_StartRocketConstruction_Patch).GetMethod("Callback", BindingFlags.Static | BindingFlags.Public));
+                    yield return new CodeInstruction(OpCodes.Call, typeof(RocketConstructor_StartRocketConstruction_Patch).GetMethod("Callback", BindingFlags.Static | BindingFlags.NonPublic));
                 }
 
             }
         }
 
-        public static void Callback(Rocket rocketInstanceAttachedToConstructor, RocketConstructor rocketConstructor, TechType currentStageTech, GameObject gameObjectToBuild)
+        private static void Callback(Rocket rocketInstanceAttachedToConstructor, TechType currentStageTech)
         {
             NitroxId rocketId = NitroxEntity.GetId(rocketInstanceAttachedToConstructor.gameObject);
-            NitroxId constructorId = NitroxEntity.GetId(rocketConstructor.gameObject);
-            NitroxServiceLocator.LocateService<Rockets>().BroadcastRocketStateUpdate(rocketId, constructorId, currentStageTech, gameObjectToBuild);
+            NitroxServiceLocator.LocateService<Rockets>().BroadcastRocketStateUpdate(rocketId, currentStageTech);
         }
 
         public override void Patch(HarmonyInstance harmony)