Syncing for map room modules.

Author: Sunrunner37

NitroxClient/GameLogic/Bases/Spawning/BaseBioReactorSpawnProcessor.cs

@@ -26,19 +26,9 @@ public override void SpawnPostProcess(Base latestBase, Int3 latestCell, GameObje
             BaseBioReactorGeometry bioReactor = finishedPiece.RequireComponent<BaseBioReactorGeometry>();
             GameObject bioReactorModule = ((BaseBioReactor)bioReactor.ReflectionCall("GetModule")).gameObject;
 
-            NitroxId moduleId = generateDeterministicReactorModuleId(reactorId);
+            NitroxId moduleId = reactorId.Increment();
             NitroxEntity.SetNewId(bioReactorModule, moduleId);
         }
 
-        private NitroxId generateDeterministicReactorModuleId(NitroxId parentId)
-        {
-            string guid = parentId.ToString();
-            char newLastChar = (guid.Last() == '0') ? '1' : '0';
-
-            string moduleGuid = guid.Substring(0, guid.Length - 1) + newLastChar;
-
-            return new NitroxId(moduleGuid);
-        }
-
     }
 }

NitroxClient/GameLogic/Bases/Spawning/MapRoomSpawnProcessor.cs

@@ -0,0 +1,50 @@
+using System;
+using NitroxClient.MonoBehaviours;
+using NitroxModel.DataStructures;
+using UnityEngine;
+
+namespace NitroxClient.GameLogic.Bases.Spawning
+{
+    /*
+     * When a map room is created, two objects are added to the base: a BaseMapRoom piece that is
+     * entirely geometry and a MapRoomFunctionality game object in the base root.  This class sets
+     * deterministic ids on non-geometry pieces, such as the map module upgrade storage area, so 
+     * they can stay in sync during player interactions.
+     */
+    public class MapRoomSpawnProcessor : BasePieceSpawnProcessor
+    {
+        public override TechType[] ApplicableTechTypes { get; } =
+        {
+            TechType.BaseMapRoom
+        };
+
+        public override void SpawnPostProcess(Base latestBase, Int3 latestCell, GameObject finishedPiece)
+        {
+            NitroxId mapRoomGeometryPieceId = NitroxEntity.GetId(finishedPiece);
+            GameObject mapRoomFunctionality = FindUntaggedMapRoomFunctionality(latestBase);
+
+            NitroxId mapRoomFunctionalityId = mapRoomGeometryPieceId.Increment();
+            NitroxEntity.SetNewId(mapRoomFunctionality, mapRoomFunctionalityId);
+
+            GameObject mapRoomModules = mapRoomFunctionality.FindChild("MapRoomUpgrades");
+            NitroxId mapRoomModulesId = mapRoomFunctionalityId.Increment();
+            NitroxEntity.SetNewId(mapRoomModules, mapRoomModulesId);
+        }
+
+        private GameObject FindUntaggedMapRoomFunctionality(Base latestBase)
+        {
+            foreach (Transform child in latestBase.transform)
+            {
+                NitroxEntity nitroxEntity = child.GetComponent<NitroxEntity>();
+                MapRoomFunctionality mapRoomFunctionality = child.GetComponent<MapRoomFunctionality>();
+
+                if (mapRoomFunctionality && !nitroxEntity)
+                {
+                    return child.gameObject;
+                }
+            }
+
+            throw new Exception("Unable to locate recently built map room");
+        }
+    }
+}

NitroxClient/NitroxClient.csproj

@@ -61,6 +61,7 @@
     <Compile Include="Communication\Packets\Processors\RocketStageUpdateProcessor.cs" />
     <Compile Include="Communication\Packets\Processors\VehicleSpawnedProcessor.cs" />
     <Compile Include="Debuggers\EntityDebugger.cs" />
+    <Compile Include="GameLogic\Bases\Spawning\MapRoomSpawnProcessor.cs" />
     <Compile Include="GameLogic\Bases\Spawning\BaseBioReactorSpawnProcessor.cs" />
     <Compile Include="GameLogic\Bases\Spawning\BasePieceSpawnProcessor.cs" />
     <Compile Include="GameLogic\Bases\Spawning\BaseLadderSpawnProcessor.cs" />

NitroxModel/DataStructures/NitroxId.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.Serialization;
 using System.Security.Permissions;
 using ProtoBufNet;
@@ -30,6 +31,11 @@ public NitroxId(string str)
             guid = new Guid(str);
         }
 
+        public NitroxId(Guid guid)
+        {
+            this.guid = guid;
+        }
+
         public NitroxId(byte[] bytes)
         {
             guid = new Guid(bytes);
@@ -82,5 +88,16 @@ public override string ToString()
         {
             return guid.ToString();
         }
+
+        static int[] byteOrder = { 15, 14, 13, 12, 11, 10, 9, 8, 6, 7, 4, 5, 0, 1, 2, 3 };
+
+        public NitroxId Increment()
+        {
+            byte[] bytes = guid.ToByteArray();
+            bool canIncrement = byteOrder.Any(i => ++bytes[i] != 0);
+            Guid nextGuid = new Guid(canIncrement ? bytes : new byte[16]);
+
+            return new NitroxId(nextGuid);
+        }
     }
 }