(5a377a8ee) Unstable v0.9.1000.0

Barotrauma/BarotraumaShared/SharedSource/GameSession/AutoItemPlacer.cs

@@ -160,7 +160,7 @@ namespace Barotrauma
             bool success = false;
             if (Rand.Value() > validContainer.Value.SpawnProbability) { return false; }
             // Don't add dangerously reactive materials in thalamus wrecks 
-            if (validContainer.Key.Item.Submarine.ThalamusAI != null && itemPrefab.Tags.Contains("explodesinwater"))
+            if (validContainer.Key.Item.Submarine.WreckAI != null && itemPrefab.Tags.Contains("explodesinwater"))
             {
                 return false;
             }
@@ -174,6 +174,10 @@ namespace Barotrauma
                 }
 
                 var item = new Item(itemPrefab, validContainer.Key.Item.Position, validContainer.Key.Item.Submarine);
+                foreach (WifiComponent wifiComponent in item.GetComponents<WifiComponent>())
+                {
+                    wifiComponent.TeamID = validContainer.Key.Item.Submarine.TeamID;
+                }
                 spawnedItems.Add(item);
 #if SERVER
                 Entity.Spawner.CreateNetworkEvent(item, remove: false);

Barotrauma/BarotraumaShared/SharedSource/GameSession/CargoManager.cs

@@ -1,4 +1,5 @@
 using Barotrauma.Items.Components;
+using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -20,8 +21,9 @@ namespace Barotrauma
 
     class CargoManager
     {
-        private readonly List<PurchasedItem> purchasedItems;
+        public const int MaxQuantity = 100;
 
+        private readonly List<PurchasedItem> purchasedItems;
         private readonly CampaignMode campaign;
 
         public Action OnItemsChanged;
@@ -115,9 +117,25 @@ namespace Barotrauma
             ItemPrefab containerPrefab = null;
             foreach (PurchasedItem pi in itemsToSpawn)
             {
+                float floorPos = cargoRoom.Rect.Y - cargoRoom.Rect.Height;
+
                 Vector2 position = new Vector2(
                     Rand.Range(cargoRoom.Rect.X + 20, cargoRoom.Rect.Right - 20),
-                    cargoRoom.Rect.Y - cargoRoom.Rect.Height + pi.ItemPrefab.Size.Y / 2);
+                    floorPos);
+
+                //check where the actual floor structure is in case the bottom of the hull extends below it
+                if (Submarine.PickBody(
+                    ConvertUnits.ToSimUnits(new Vector2(position.X, cargoRoom.Rect.Y - cargoRoom.Rect.Height / 2)),
+                    ConvertUnits.ToSimUnits(position),
+                    collisionCategory: Physics.CollisionWall) != null)
+                {
+                    float floorStructurePos = ConvertUnits.ToDisplayUnits(Submarine.LastPickedPosition.Y);
+                    if (floorStructurePos > floorPos)
+                    {
+                        floorPos = floorStructurePos;
+                    }
+                }
+                position.Y = floorPos +  pi.ItemPrefab.Size.Y / 2;
 
                 ItemContainer itemContainer = null;
                 if (!string.IsNullOrEmpty(pi.ItemPrefab.CargoContainerIdentifier))

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -4,7 +4,7 @@ using System;
 using System.Linq;
 using System.Xml.Linq;
 using System.Collections.Generic;
-using System.IO;
+using Barotrauma.IO;
 
 namespace Barotrauma
 {
@@ -113,6 +113,7 @@ namespace Barotrauma
             {
                 if (c.Character?.Info != null && !c.Character.IsDead)
                 {
+                    c.Character.ResetCurrentOrder();
                     c.CharacterInfo = c.Character.Info;
                     characterData.Add(new CharacterCampaignData(c));
                 }

Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs

@@ -1,4 +1,5 @@
-using Barotrauma.Items.Components;
+using Barotrauma.IO;
+using Barotrauma.Items.Components;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -9,7 +10,7 @@ namespace Barotrauma
 {
     partial class GameSession
     {
-        public enum InfoFrameTab { Crew, Mission, MyCharacter, ManagePlayers };
+        public enum InfoFrameTab { Crew, Mission, MyCharacter, Traitor };
 
         public readonly EventManager EventManager;
 
@@ -231,7 +232,7 @@ namespace Barotrauma
                         if (port.Item.WorldPosition.Y < Submarine.WorldPosition.Y) { continue; }
 
                         float dist = Vector2.DistanceSquared(port.Item.WorldPosition, level.StartOutpost.WorldPosition);
-                        if (myPort == null || dist < closestDistance || (port.MainDockingPort && !myPort.MainDockingPort))
+                        if ((myPort == null || dist < closestDistance || port.MainDockingPort) && !(myPort?.MainDockingPort ?? false))
                         {
                             myPort = port;
                             closestDistance = dist;
@@ -351,6 +352,8 @@ namespace Barotrauma
                     OnClicked = (GUIButton button, object obj) => { GUIMessageBox.MessageBoxes.Remove(summaryFrame); return true; }
                 };
             }
+
+            TabMenu.OnRoundEnded();
 #endif
 
             EventManager?.EndRound();
@@ -461,7 +464,7 @@ namespace Barotrauma
 
             try
             {
-                doc.Save(filePath);
+                doc.SaveSafe(filePath);
             }
             catch (Exception e)
             {