Faction Test 100.10.0.0

Barotrauma/BarotraumaClient/ClientSource/GameMain.cs

@@ -1061,11 +1061,9 @@ namespace Barotrauma
                 }
 
                 // Update store stock when saving and quitting in an outpost (normally updated when CampaignMode.End() is called)
-                if (GameSession?.Campaign is SinglePlayerCampaign spCampaign && Level.IsLoadedFriendlyOutpost && spCampaign.Map?.CurrentLocation != null && spCampaign.CargoManager != null)
+                if (GameSession?.Campaign is SinglePlayerCampaign spCampaign && Level.IsLoadedFriendlyOutpost)
                 {
-                    spCampaign.Map.CurrentLocation.AddStock(spCampaign.CargoManager.SoldItems);
+                    spCampaign.UpdateStoreStock();
-                    spCampaign.CargoManager.ClearSoldItemsProjSpecific();
-                    spCampaign.Map.CurrentLocation.RemoveStock(spCampaign.CargoManager.PurchasedItems);
                 }
 
                 SaveUtil.SaveGame(GameSession.SavePath);

Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -652,8 +652,18 @@ namespace Barotrauma
 
                 if (ShouldApply(NetFlags.SubList, id, requireUpToDateSave: false))
                 {
-                    foreach (int ownedSubIndex in ownedSubIndices)
+                    foreach (ushort ownedSubIndex in ownedSubIndices)
                     {
+                        if (ownedSubIndex >= GameMain.Client.ServerSubmarines.Count)
+                        {
+                            string errorMsg = $"Error in {nameof(MultiPlayerCampaign.ClientRead)}. Owned submarine index was out of bounds. Index: {ownedSubIndex}, submarines: {string.Join(", ", GameMain.Client.ServerSubmarines.Select(s => s.Name))}";
+                            DebugConsole.ThrowError(errorMsg);
+                            GameAnalyticsManager.AddErrorEventOnce(
+                                "MultiPlayerCampaign.ClientRead.OwnerSubIndexOutOfBounds" + ownedSubIndex,
+                                GameAnalyticsManager.ErrorSeverity.Error, errorMsg);
+                            continue;
+                        }
+
                         SubmarineInfo sub = GameMain.Client.ServerSubmarines[ownedSubIndex];
                         if (GameMain.NetLobbyScreen.CheckIfCampaignSubMatches(sub, NetLobbyScreen.SubmarineDeliveryData.Owned))
                         {

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Reactor.cs

@@ -474,6 +474,7 @@ namespace Barotrauma.Items.Components
                         item.WorldPosition,
                         sound.Volume,
                         sound.Range,
+                        freqMult: sound.GetRandomFrequencyMultiplier(),
                         hullGuess: item.CurrentHull);
                 }
             }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Sonar.cs

@@ -62,7 +62,6 @@ namespace Barotrauma.Items.Components
         private float displayBorderSize;
 
         private List<SonarBlip> sonarBlips;
-        private readonly HashSet<SonarBlip> prevBlips = new HashSet<SonarBlip>();
 
         private float prevPassivePingRadius;
 
@@ -820,27 +819,9 @@ namespace Barotrauma.Items.Components
                     float dist = (float)Math.Sqrt(distSqr);
                     if (dist > prevPassivePingRadius * Range && dist <= passivePingRadius * Range && Rand.Int(sonarBlips.Count) < 500)
                     {
-                        prevBlips.Clear();
-                        foreach (var blip in sonarBlips)
-                        {
-                            prevBlips.Add(blip);
-                        }
-
                         Ping(t.WorldPosition, transducerCenter,
                             t.SoundRange * displayScale, 0, displayScale, range,
-                            passive: true, pingStrength: 0.5f);
+                            passive: true, pingStrength: 0.5f, needsToBeInSector: t);
-                        //remove blips that weren't in the AITarget's sector
-                        if (t.HasSector())
-                        {
-                            for (int i = sonarBlips.Count - 1; i >= 0; i--)
-                            {
-                                if (prevBlips.Contains(sonarBlips[i])) { continue; }
-                                if (!t.IsWithinSector(sonarBlips[i].Position))
-                                {
-                                    sonarBlips.RemoveAt(i);
-                                }
-                            }
-                        }
                         if (t.IsWithinSector(transducerCenter))
                         {
                             sonarBlips.Add(new SonarBlip(t.WorldPosition, fadeTimer: 1.0f, scale: MathHelper.Clamp(t.SoundRange / 2000, 1.0f, 5.0f)));
@@ -1405,7 +1386,7 @@ namespace Barotrauma.Items.Components
         }
 
         private void Ping(Vector2 pingSource, Vector2 transducerPos, float pingRadius, float prevPingRadius, float displayScale, float range, bool passive,
-            float pingStrength = 1.0f)
+            float pingStrength = 1.0f, AITarget needsToBeInSector = null)
         {
             float prevPingRadiusSqr = prevPingRadius * prevPingRadius;
             float pingRadiusSqr = pingRadius * pingRadius;
@@ -1417,25 +1398,25 @@ namespace Barotrauma.Items.Components
                     new Vector2(item.CurrentHull.WorldRect.X, item.CurrentHull.WorldRect.Y), 
                     new Vector2(item.CurrentHull.WorldRect.Right, item.CurrentHull.WorldRect.Y), 
                     pingSource, transducerPos,
-                    pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive);
+                    pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive, needsToBeInSector: needsToBeInSector);
 
                 CreateBlipsForLine(
                     new Vector2(item.CurrentHull.WorldRect.X, item.CurrentHull.WorldRect.Y - item.CurrentHull.Rect.Height),
                     new Vector2(item.CurrentHull.WorldRect.Right, item.CurrentHull.WorldRect.Y - item.CurrentHull.Rect.Height),
                     pingSource, transducerPos,
-                    pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive);
+                    pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive, needsToBeInSector: needsToBeInSector);
 
                 CreateBlipsForLine(
                     new Vector2(item.CurrentHull.WorldRect.X, item.CurrentHull.WorldRect.Y),
                     new Vector2(item.CurrentHull.WorldRect.X, item.CurrentHull.WorldRect.Y - item.CurrentHull.Rect.Height),
                     pingSource, transducerPos,
-                    pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive);
+                    pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive, needsToBeInSector: needsToBeInSector);
 
                 CreateBlipsForLine(
                     new Vector2(item.CurrentHull.WorldRect.Right, item.CurrentHull.WorldRect.Y),
                     new Vector2(item.CurrentHull.WorldRect.Right, item.CurrentHull.WorldRect.Y - item.CurrentHull.Rect.Height),
                     pingSource, transducerPos,
-                    pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive);
+                    pingRadius, prevPingRadius, 50.0f, 5.0f, range, 2.0f, passive, needsToBeInSector: needsToBeInSector);
 
                 return;
             }
@@ -1472,7 +1453,8 @@ namespace Barotrauma.Items.Components
                         end + submarine.WorldPosition,
                         pingSource, transducerPos,
                         pingRadius, prevPingRadius,
-                        200.0f, 2.0f, range, 1.0f, passive);
+                        200.0f, 2.0f, range, 1.0f, passive, 
+                        needsToBeInSector: needsToBeInSector);
                 }
             }
 
@@ -1485,7 +1467,8 @@ namespace Barotrauma.Items.Components
                         new Vector2(pingSource.X + range, Level.Loaded.Size.Y),
                         pingSource, transducerPos,
                         pingRadius, prevPingRadius,
-                        250.0f, 150.0f, range, pingStrength, passive);
+                        250.0f, 150.0f, range, pingStrength, passive, 
+                        needsToBeInSector: needsToBeInSector);
                 }
                 if (pingSource.Y - Level.Loaded.BottomPos < range)
                 {
@@ -1494,7 +1477,8 @@ namespace Barotrauma.Items.Components
                         new Vector2(pingSource.X + range, Level.Loaded.BottomPos),
                         pingSource, transducerPos,
                         pingRadius, prevPingRadius,
-                        250.0f, 150.0f, range, pingStrength, passive);
+                        250.0f, 150.0f, range, pingStrength, passive, 
+                        needsToBeInSector: needsToBeInSector);
                 }
 
                 List<Voronoi2.VoronoiCell> cells = Level.Loaded.GetCells(pingSource, 7);
@@ -1516,7 +1500,8 @@ namespace Barotrauma.Items.Components
                             pingSource, transducerPos,
                             pingRadius, prevPingRadius,
                             350.0f, 3.0f * (Math.Abs(facingDot) + 1.0f), range, pingStrength, passive,
-                            blipType : cell.IsDestructible ? BlipType.Destructible : BlipType.Default);
+                            blipType : cell.IsDestructible ? BlipType.Destructible : BlipType.Default,
+                            needsToBeInSector: needsToBeInSector);
                     }
                 }
             }
@@ -1526,14 +1511,13 @@ namespace Barotrauma.Items.Components
                 if (item.CurrentHull == null && item.Prefab.SonarSize > 0.0f)
                 {
                     float pointDist = ((item.WorldPosition - pingSource) * displayScale).LengthSquared();
-
                     if (pointDist > prevPingRadiusSqr && pointDist < pingRadiusSqr)
                     {
                         var blip = new SonarBlip(
                             item.WorldPosition + Rand.Vector(item.Prefab.SonarSize),
                             MathHelper.Clamp(item.Prefab.SonarSize, 0.1f, pingStrength),
                             MathHelper.Clamp(item.Prefab.SonarSize * 0.1f, 0.1f, 10.0f));
-                        if (!passive && !CheckBlipVisibility(blip, transducerPos)) continue;
+                        if (!IsVisible(blip)) { continue; }
                         sonarBlips.Add(blip);
                     }
                 }
@@ -1556,7 +1540,7 @@ namespace Barotrauma.Items.Components
                             c.WorldPosition,
                             MathHelper.Clamp(c.Mass, 0.1f, pingStrength),
                             MathHelper.Clamp(c.Mass * 0.03f, 0.1f, 2.0f));
-                        if (!passive && !CheckBlipVisibility(blip, transducerPos)) { continue; }
+                        if (!IsVisible(blip)) { continue; }
                         sonarBlips.Add(blip);
                         HintManager.OnSonarSpottedCharacter(Item, c);
                     }
@@ -1573,19 +1557,29 @@ namespace Barotrauma.Items.Components
                     if (pointDist > prevPingRadiusSqr && pointDist < pingRadiusSqr)
                     {
                         var blip = new SonarBlip(
-                            limb.WorldPosition + Rand.Vector(limb.Mass / 10.0f), 
+                            limb.WorldPosition + Rand.Vector(limb.Mass / 10.0f),
-                            MathHelper.Clamp(limb.Mass, 0.1f, pingStrength), 
+                            MathHelper.Clamp(limb.Mass, 0.1f, pingStrength),
                             MathHelper.Clamp(limb.Mass * 0.1f, 0.1f, 2.0f));
-                        if (!passive && !CheckBlipVisibility(blip, transducerPos)) { continue; }
+                        if (!IsVisible(blip)) { continue; }
                         sonarBlips.Add(blip);
                         HintManager.OnSonarSpottedCharacter(Item, c);
                     }
                 }
             }
+
+            bool IsVisible(SonarBlip blip)
+            {
+                if (!passive && !CheckBlipVisibility(blip, transducerPos)) { return false; }
+                if (needsToBeInSector != null)
+                {
+                    if (!needsToBeInSector.IsWithinSector(blip.Position)) { return false; }
+                }
+                return true;
+            }
         }
-        
+
         private void CreateBlipsForLine(Vector2 point1, Vector2 point2, Vector2 pingSource, Vector2 transducerPos, float pingRadius, float prevPingRadius,
-            float lineStep, float zStep, float range, float pingStrength, bool passive, BlipType blipType = BlipType.Default)
+            float lineStep, float zStep, float range, float pingStrength, bool passive, BlipType blipType = BlipType.Default, AITarget needsToBeInSector = null)
         {
             lineStep /= zoom;
             zStep /= zoom;
@@ -1631,12 +1625,17 @@ namespace Barotrauma.Items.Components
                     Vector2 pos = point + Rand.Vector(150.0f / zoom) + pingDirection * z / displayScale;
                     float fadeTimer = alpha * (1.0f - displayPointDist / range);
 
-                    int minDist = (int)(200 / zoom);
+                    if (needsToBeInSector != null)
-                    sonarBlips.RemoveAll(b => b.FadeTimer < fadeTimer && Math.Abs(pos.X - b.Position.X) < minDist && Math.Abs(pos.Y - b.Position.Y) < minDist);
+                    {
+                        if (!needsToBeInSector.IsWithinSector(pos)) { continue; }
+                    }
 
                     var blip = new SonarBlip(pos, fadeTimer, 1.0f + ((displayPointDist + z) / DisplayRadius), blipType);
                     if (!passive && !CheckBlipVisibility(blip, transducerPos)) { continue; }
 
+                    int minDist = (int)(200 / zoom);
+                    sonarBlips.RemoveAll(b => b.FadeTimer < fadeTimer && Math.Abs(pos.X - b.Position.X) < minDist && Math.Abs(pos.Y - b.Position.Y) < minDist);
+
                     sonarBlips.Add(blip);
                     zStep += 0.5f / zoom;
 

Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen.cs

@@ -966,11 +966,15 @@ namespace Barotrauma
                 modUpdateTask = BulkDownloader.GetItemsThatNeedUpdating();
                 modUpdateTimer = ModUpdateInterval;
             }
-            
+
+#if DEBUG
+            hostServerButton.Enabled = true;
+#else
             if (GameSettings.CurrentConfig.UseSteamMatchmaking)
             {
-                hostServerButton.Enabled = Steam.SteamManager.IsInitialized;
+                hostServerButton.Enabled = SteamManager.IsInitialized;
             }
+#endif
 
             if (modUpdateTask is { IsCompletedSuccessfully: true })
             {

Barotrauma/BarotraumaClient/LinuxClient.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>100.9.0.1</Version>
+    <Version>100.10.0.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaClient/MacClient.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>100.9.0.1</Version>
+    <Version>100.10.0.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaClient/WindowsClient.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>100.9.0.1</Version>
+    <Version>100.10.0.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaServer/LinuxServer.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>100.9.0.1</Version>
+    <Version>100.10.0.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaServer/MacServer.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>100.9.0.1</Version>
+    <Version>100.10.0.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs

@@ -1399,7 +1399,8 @@ namespace Barotrauma.Networking
                                 if (mpCampaign != null && Level.IsLoadedFriendlyOutpost && save)
                                 {
                                     mpCampaign.SavePlayers();
-                                    GameMain.GameSession.SubmarineInfo = new SubmarineInfo(GameMain.GameSession.Submarine);                              
+                                    GameMain.GameSession.SubmarineInfo = new SubmarineInfo(GameMain.GameSession.Submarine);
+                                    mpCampaign.UpdateStoreStock();
                                     SaveUtil.SaveGame(GameMain.GameSession.SavePath);                                
                                 }
                                 else

Barotrauma/BarotraumaServer/WindowsServer.csproj

@@ -6,7 +6,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>100.9.0.1</Version>
+    <Version>100.10.0.0</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs

@@ -692,7 +692,7 @@ namespace Barotrauma
                             //if the attacker has the same targeting tag as the character we're protecting, we can't change the TargetState
                             //otherwise e.g. a pet that's set to follow humans would start attacking all humans (and other pets, since they're considered part of the same group) when a hostile human attacks it
                             //TODO: a way for pets to differentiate hostile and friendly humans?
-                            if (attacker?.AiTarget != null && targetCharacter.SpeciesName != GetTargetingTag(attacker.AiTarget))
+                            if (attacker?.AiTarget != null && targetCharacter.SpeciesName != GetTargetingTag(attacker.AiTarget) && !attacker.IsFriendly(targetCharacter))
                             {
                                 // Attack the character that attacked the target we are protecting
                                 ChangeTargetState(attacker, AIState.Attack, selectedTargetingParams.Priority * 2);
@@ -3729,7 +3729,7 @@ namespace Barotrauma
                 // When the monsters attack the player sub, they wall hack so that they can be more aggressive.
                 // Pets should always check the visibility, unless the pet and the target are both outside the submarine -> shouldn't target when they can't perceive (= no wall hack)
                 checkVisibility = 
-                    Character.IsPet && (Character.Submarine == null) != (target.Entity.Submarine == null) || 
+                    Character.IsPet && (Character.Submarine != null || target.Entity.Submarine != null) || 
                     target.Entity.Submarine != null && target.Entity.Submarine == Character.Submarine && target.Entity.Submarine.TeamID == CharacterTeamType.None;
             }
             if (dist > 0)

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveContainItem.cs

@@ -238,6 +238,15 @@ namespace Barotrauma
             }
         }
 
+        public bool IsInTargetSlot(Item item)
+        {
+            if (container?.Inventory is ItemInventory inventory && TargetSlot is not null)
+            {
+                return inventory.IsInSlot(item, (int)TargetSlot);
+            }
+            return false;
+        }
+
         public override void Reset()
         {
             base.Reset();

Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindDivingGear.cs

@@ -115,6 +115,8 @@ namespace Barotrauma
                         {
                             objective.TargetSlot = container.FindSuitableSubContainerIndex(OXYGEN_SOURCE);
                         }
+                        // Only remove the oxygen source being replaced
+                        objective.RemoveExistingPredicate = i => objective.IsInTargetSlot(i);
                         return objective;
                     },
                     onAbandon: () =>

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

@@ -324,9 +324,18 @@ namespace Barotrauma
 
         public override void AddExtraMissions(LevelData levelData)
         {
+            if (levelData == null)
+            {
+                throw new ArgumentException("Current location was null.");
+            }
+
             extraMissions.Clear();
 
             var currentLocation = Map.CurrentLocation;
+            if (currentLocation == null)
+            {
+                throw new InvalidOperationException("Current location was null.");
+            }
             if (levelData.Type == LevelData.LevelType.Outpost)
             {
                 //if there's an available mission that takes place in the outpost, select it
@@ -765,9 +774,10 @@ namespace Barotrauma
             if (map != null && CargoManager != null)
             {
                 map.CurrentLocation.RegisterTakenItems(takenItems);
-                map.CurrentLocation.AddStock(CargoManager.SoldItems);
+                if (transitionType != TransitionType.None)
-                CargoManager.ClearSoldItemsProjSpecific();
+                {
-                map.CurrentLocation.RemoveStock(CargoManager.PurchasedItems);
+                    UpdateStoreStock();
+                }
             }
             if (GameMain.NetworkMember == null)
             {
@@ -830,6 +840,16 @@ namespace Barotrauma
             }
         }
 
+        /// <summary>
+        /// Updates store stock before saving the game
+        /// </summary>
+        public void UpdateStoreStock()
+        {
+            Map?.CurrentLocation?.AddStock(CargoManager.SoldItems);
+            CargoManager?.ClearSoldItemsProjSpecific();
+            Map?.CurrentLocation?.RemoveStock(CargoManager.PurchasedItems);
+        }
+
         public void EndCampaign()
         {
             foreach (Character c in Character.CharacterList)

Barotrauma/BarotraumaShared/SharedSource/GameSession/UpgradeManager.cs

@@ -574,6 +574,7 @@ namespace Barotrauma
             }
         }
 
+        private readonly static HashSet<Submarine> upgradedSubs = new HashSet<Submarine>();
         /// <summary>
         /// Applies an upgrade on the submarine, should be called by <see cref="ApplyUpgrades"/> when the round starts.
         /// </summary>
@@ -584,6 +585,12 @@ namespace Barotrauma
         /// <returns>New level that was applied, -1 if no upgrades were applied.</returns>
         private static int BuyUpgrade(UpgradePrefab prefab, UpgradeCategory category, Submarine submarine, int level = 1, Submarine? parentSub = null)
         {
+            if (parentSub == null)
+            {
+                upgradedSubs.Clear();
+            }
+            upgradedSubs.Add(submarine);
+
             int? newLevel = null;
             if (category.IsWallUpgrade)
             {
@@ -619,9 +626,12 @@ namespace Barotrauma
                 }
             }
 
-            foreach (Submarine loadedSub in Submarine.Loaded.Where(sub => sub != submarine))
+            foreach (Submarine loadedSub in Submarine.Loaded)
             {
-                if (loadedSub == parentSub) { continue; }
+                if (loadedSub == parentSub || loadedSub == submarine) { continue; }
+                if (loadedSub.Info?.Type != SubmarineType.Player) { continue; }
+                if (upgradedSubs.Contains(loadedSub)) { continue; }
+
                 XElement? root = loadedSub.Info?.SubmarineElement;
                 if (root == null) { continue; }
 
@@ -630,8 +640,8 @@ namespace Barotrauma
                     if (root.Attribute("location") == null) { continue; }
 
                     // Check if this is our linked submarine
-                    ushort dockingPortID = (ushort) root.GetAttributeInt("originallinkedto", 0);
+                    ushort dockingPortID = (ushort)root.GetAttributeInt("originallinkedto", 0);
-                    if (dockingPortID > 0 && submarine.GetItems(true).Any(item => item.ID == dockingPortID))
+                    if (dockingPortID > 0 && submarine.GetItems(alsoFromConnectedSubs: true).Any(item => item.ID == dockingPortID))
                     {
                         BuyUpgrade(prefab, category, loadedSub, level, submarine);
                     }

Barotrauma/BarotraumaShared/SharedSource/Items/Inventory.cs

@@ -953,6 +953,12 @@ namespace Barotrauma
             slots[index].RemoveItem(item);
         }
 
+        public bool IsInSlot(Item item, int index)
+        {
+            if (index < 0 || index >= slots.Length) { return false; }
+            return slots[index].Contains(item);
+        }
+
         public void SharedRead(IReadMessage msg, out List<ushort>[] newItemIds)
         {
             byte slotCount = msg.ReadByte();

Barotrauma/BarotraumaShared/changelog.txt

@@ -1,3 +1,9 @@
+---------------------------------------------------------------------------------------------------------
+v100.10.0.0
+---------------------------------------------------------------------------------------------------------
+
+- Fixes included in v0.20.11.0.
+
 ---------------------------------------------------------------------------------------------------------
 v100.9.0.1
 ---------------------------------------------------------------------------------------------------------
@@ -108,6 +114,25 @@ Test version of the faction overhaul:
 - There's now always two paths from biome to another, one controlled by the Coalition and one by Separatists.
 - Improvements to the campaign map.
 
+---------------------------------------------------------------------------------------------------------
+v0.20.11.0
+---------------------------------------------------------------------------------------------------------
+
+Unstable only:
+- Yet another passive sonar fix: fixed blips "flickering" when there's multiple sound sources, some of which directional, visible on the sonar.
+- Fixed bots walking against the admin module's door in the campaign tutorial outpost.
+- Fixed Sulphuric Acid and Europabrew not being categorized as "Medical" in the sub editor.
+- Fixed arc emitter being in the "Machine" category.
+- Fixed water-reactant items flashing on and off constantly.
+- Fixed Defensebot attacking players.
+- Fixed Defensebot still wall hacking.
+
+Bugfixes:
+- Fixed bots being unable to fix Typhon 2's top docking hatch or the wall right next to it.
+- Fixed crashing when applying upgrades to linked subs, and there's more than one linked sub.
+- Fixed Research Station being in the "Outpost" subcategory in the sub editor.
+- Fixed bots dropping medicine from PUCS when changing its oxygen tank.
+
 ---------------------------------------------------------------------------------------------------------
 v0.20.10.1
 ---------------------------------------------------------------------------------------------------------