(6e187d247) Fixed contained items' status effects being added twice to the list of an ItemContainer's active status effects when swapping items. For example, when swapping a fuel rod with another one, the status effect that increases AvailableFuel would be applied twice, causing the reactor to act as if there were 2 rods in it. Closes #1643 + merge fix

Barotrauma/BarotraumaShared/Source/Map/Entity.cs

@@ -9,6 +9,7 @@ namespace Barotrauma
     class Entity : ISpatialEntity
     {
         public const ushort NullEntityID = 0;
+        public const ushort EntitySpawnerID = ushort.MaxValue;
 
         private static Dictionary<ushort, Entity> dictionary = new Dictionary<ushort, Entity>();
         public static List<Entity> GetEntityList()
@@ -43,12 +44,19 @@ namespace Barotrauma
             }
             set
             {
+                if (this is EntitySpawner) { return; }
                 if (value == NullEntityID)
                 {
                     DebugConsole.ThrowError("Cannot set the ID of an entity to " + NullEntityID +
                         "! The value is reserved for entity events referring to a non-existent (e.g. removed) entity.\n" + Environment.StackTrace);
                     return;
                 }
+                if (value == EntitySpawnerID)
+                {
+                    DebugConsole.ThrowError("Cannot set the ID of an entity to " + EntitySpawnerID +
+                        "! The value is reserved for EntitySpawner.\n" + Environment.StackTrace);
+                    return;
+                }
 
                 if (dictionary.TryGetValue(id, out Entity thisEntity) && thisEntity == this)
                 {
@@ -107,15 +115,17 @@ namespace Barotrauma
             this.Submarine = submarine;
 
             //give a unique ID
-            id = FindFreeID(submarine == null ? (ushort)1 : submarine.IdOffset);
-
+            id = this is EntitySpawner ?
+                EntitySpawnerID :
+                FindFreeID(submarine == null ? (ushort)1 : submarine.IdOffset);
+            
             dictionary.Add(id, this);
         }
 
         public static ushort FindFreeID(ushort idOffset = 0)
         {
-            //ushort.MaxValue - 1 because 0 is a reserved value
-            if (dictionary.Count >= ushort.MaxValue - 1)
+            //ushort.MaxValue - 2 because 0 and ushort.MaxValue are reserved values
+            if (dictionary.Count >= ushort.MaxValue - 2)
             {
                 throw new Exception("Maximum amount of entities (" + (ushort.MaxValue - 1) + ") reached!");
             }

Barotrauma/BarotraumaShared/Source/Map/ItemAssemblyPrefab.cs

@@ -107,7 +107,7 @@ namespace Barotrauma
             if (Screen.Selected == GameMain.SubEditorScreen)
             {
                 MapEntity.SelectedList.Clear();
-                MapEntity.SelectedList.AddRange(entities);
+                entities.ForEach(e => MapEntity.AddSelection(e));
             }
 #endif   
             return entities;

Barotrauma/BarotraumaShared/Source/Map/Levels/Level.cs

@@ -1274,6 +1274,8 @@ namespace Barotrauma
                 }
             }
 
+            DebugConsole.Log("Generating level resources...");
+
             for (int i = 0; i < generationParams.ItemCount; i++)
             {
                 var selectedPrefab = ToolBox.SelectWeightedRandom(
@@ -1286,6 +1288,7 @@ namespace Barotrauma
                 var selectedEdge = selectedCell.Edges.GetRandom(e => e.IsSolid && !e.OutsideLevel, Rand.RandSync.Server);
                 if (selectedEdge == null) continue;
 
+
                 float edgePos = Rand.Range(0.0f, 1.0f, Rand.RandSync.Server);
                 Vector2 selectedPos = Vector2.Lerp(selectedEdge.Point1, selectedEdge.Point2, edgePos);
                 Vector2 edgeNormal = selectedEdge.GetNormal(selectedCell);
@@ -1306,6 +1309,8 @@ namespace Barotrauma
 #endif
                 }
             }
+
+            DebugConsole.Log("Level resources generated");
         }
 
         public Vector2 GetRandomItemPos(PositionType spawnPosType, float randomSpread, float minDistFromSubs, float offsetFromWall = 10.0f)

Barotrauma/BarotraumaShared/Source/Map/Levels/Ruins/RuinGenerator.cs

@@ -1022,12 +1022,12 @@ namespace Barotrauma.RuinGeneration
                     {
                         targetEntity = ruinEntities.GetRandom(e =>
                             e.Room == targetRoom &&
-                            e.Entity.prefab?.Identifier == connection.TargetEntityIdentifier)?.Entity;
+                            e.Entity.prefab?.Identifier == connection.TargetEntityIdentifier, Rand.RandSync.Server)?.Entity;
                     }
                 }
                 else
                 {
-                    targetEntity = ruinEntities.GetRandom(e => e.Entity.prefab?.Identifier == connection.TargetEntityIdentifier)?.Entity;
+                    targetEntity = ruinEntities.GetRandom(e => e.Entity.prefab?.Identifier == connection.TargetEntityIdentifier, Rand.RandSync.Server)?.Entity;
                 }
 
                 if (targetEntity == null) continue;

Barotrauma/BarotraumaShared/Source/Map/Structure.cs

@@ -388,20 +388,6 @@ namespace Barotrauma
             return Name;
         }
 
-        partial void InitProjSpecific();
-
-        public override string ToString()
-        {
-            return Name;
-        }
-
-        partial void InitProjSpecific();
-
-        public override string ToString()
-        {
-            return Name;
-        }
-
         public override MapEntity Clone()
         {
             var clone = new Structure(rect, Prefab, Submarine)

Barotrauma/BarotraumaShared/Source/Map/Submarine.cs

@@ -1404,7 +1404,6 @@ namespace Barotrauma
             }
 
 
-
             ID = (ushort)(ushort.MaxValue - 1 - Submarine.loaded.IndexOf(this));
         }