Unstable 0.1300.0.9

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

@@ -141,7 +141,8 @@ namespace Barotrauma
                     {
                         DialogueIdentifier = "dialogcannotreachtarget",
                         TargetName = container.Item.Name,
-                        abortCondition = obj => !ItemToContain.IsOwnedBy(character)
+                        abortCondition = obj => !ItemToContain.IsOwnedBy(character),
+                        SpeakIfFails = !objectiveManager.IsCurrentOrder<AIObjectiveCleanupItems>()
                     },
                     onAbandon: () => Abandon = true,
                     onCompleted: () => RemoveSubObjective(ref goToObjective));

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

@@ -87,6 +87,7 @@ namespace Barotrauma
                     },
                     onAbandon: () =>
                     {
+                        getOxygen = null;
                         int remainingTanks = ReportOxygenTankCount();
                         // Try to seek any oxygen sources.
                         TryAddSubObjective(ref getOxygen, () =>

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

@@ -354,6 +354,7 @@ namespace Barotrauma
 #if DEBUG
                         DebugConsole.NewMessage($"{character.Name}: Cannot find an item with the following identifier(s) or tag(s): {string.Join(", ", identifiersOrTags)}", Color.Yellow);
 #endif
+                        SpeakCannotFind();
                         Abandon = true;
                     }
                 }
@@ -415,6 +416,24 @@ namespace Barotrauma
 #if DEBUG
             DebugConsole.NewMessage($"{character.Name}: Get item failed to reach {moveToTarget}", Color.Yellow);
 #endif
+        }
+
+        private void SpeakCannotFind()
+        {
+            // TODO: Use the item name as the variable here.
+            if (character.IsOnPlayerTeam && objectiveManager.CurrentOrder == objectiveManager.CurrentObjective)
+            {
+                string msg = TextManager.Get("dialogcannotreachtarget", true);
+                if (msg != null)
+                {
+                    character.Speak(msg, identifier: "dialogcannotfinditem", minDurationBetweenSimilar: 20.0f);
+                }
+            }
+        }
+
+        // TODO: remove?
+        private void SpeakCannotReach()
+        {
             if (character.IsOnPlayerTeam && objectiveManager.CurrentOrder == objectiveManager.CurrentObjective)
             {
                 string TargetName = (moveToTarget as MapEntity)?.Name ?? (moveToTarget as Character)?.Name ?? moveToTarget.ToString();

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

@@ -166,7 +166,11 @@ namespace Barotrauma
             coroutine = CoroutineManager.InvokeAfter(() =>
             {
                 //round ended before the coroutine finished
+#if CLIENT
+                if (GameMain.GameSession == null || Level.Loaded == null && !(GameMain.GameSession.GameMode is TestGameMode)) { return; }
+#else
                 if (GameMain.GameSession == null || Level.Loaded == null) { return; }
+#endif
                 DelayedObjectives.Remove(objective);
                 AddObjective(objective);
                 callback?.Invoke();

Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs

@@ -612,10 +612,11 @@ namespace Barotrauma
             set
             {
 #if CLIENT
-                HintManager.OnSetSelectedConstruction(this, _selectedConstruction, value);
+                var prevSelectedConstruction = _selectedConstruction;
 #endif
                 _selectedConstruction = value;
 #if CLIENT
+                HintManager.OnSetSelectedConstruction(this, prevSelectedConstruction, _selectedConstruction);
                 if (Controlled == this)
                 {
                     if (_selectedConstruction == null)
@@ -3815,6 +3816,10 @@ namespace Barotrauma
                         }
                     }
                 }
+                else
+                {
+                    canBePutInOriginalInventory = inventory.CanBePut(newItem, slotIndices[0]);
+                }
 
                 if (canBePutInOriginalInventory)
                 {

Barotrauma/BarotraumaShared/SharedSource/Characters/Limb.cs

@@ -898,11 +898,11 @@ namespace Barotrauma
                     case HitDetection.Distance:
                         if (dist < attack.DamageRange)
                         {
-                            structureBody = Submarine.PickBody(simPos, attackSimPos, collisionCategory: Physics.CollisionWall | Physics.CollisionLevel, allowInsideFixture: true);    
-                            if (structureBody?.UserData as string == "ruinroom")
+                            structureBody = Submarine.PickBody(simPos, attackSimPos, collisionCategory: Physics.CollisionWall | Physics.CollisionLevel, allowInsideFixture: true, customPredicate:                             
+                            (Fixture f) =>
                             {
-                                structureBody = null;
-                            }
+                                return f?.Body?.UserData as string != "ruinroom";
+                            });
                             if (damageTarget is Item i && i.GetComponent<Items.Components.Door>() != null)
                             {
                                 // If the attack is aimed to an item and hits an item, it's successful.

Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/UnlockPathAction.cs

@@ -31,10 +31,10 @@ namespace Barotrauma
                 foreach (LocationConnection connection in GameMain.GameSession?.Map?.CurrentLocation?.Connections)
                 {
                     if (!connection.Locked) { continue; }
+                    connection.Locked = false;
 #if SERVER
                     NotifyUnlock(connection);
 #else
-                    connection.Locked = false;
                     new GUIMessageBox(string.Empty, TextManager.Get("pathunlockedgeneric"),
                         new string[0], type: GUIMessageBox.Type.InGame, iconStyle: "UnlockPathIcon", relativeSize: new Vector2(0.3f, 0.15f), minSize: new Point(512, 128));
 #endif

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

@@ -115,7 +115,11 @@ namespace Barotrauma
             {
                 if (Map.CurrentLocation?.SelectedMission != null)
                 {
-                    yield return Map.CurrentLocation.SelectedMission;
+                    if (Map.CurrentLocation.SelectedMission.Locations[0] == Map.CurrentLocation.SelectedMission.Locations[1] ||
+                        Map.CurrentLocation.SelectedMission.Locations.Contains(Map.SelectedLocation))
+                    {
+                        yield return Map.CurrentLocation.SelectedMission;
+                    }
                 }
                 foreach (Mission mission in extraMissions)
                 {
@@ -279,7 +283,7 @@ namespace Barotrauma
                     {
                         Random rand = new MTRandom(ToolBox.StringToInt(levelData.Seed));
                         var huntingGroundsMissionPrefab = huntingGroundsMissionPrefabs.GetRandom(rand);
-                        if (!Missions.Any(m => m.Prefab.Type == huntingGroundsMissionPrefab.Type))
+                        if (!Missions.Any(m => m.Prefab.Tags.Any(t => t.Equals("huntinggrounds", StringComparison.OrdinalIgnoreCase))))
                         {
                             extraMissions.Add(huntingGroundsMissionPrefab.Instantiate(Map.SelectedConnection.Locations));
                         }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Reactor.cs

@@ -590,8 +590,7 @@ namespace Barotrauma.Items.Components
                         var container = item.GetComponent<ItemContainer>();
                         if (objective.SubObjectives.None())
                         {
-                            int itemCount = item.ContainedItems.Count(i => i != null && container.ContainableItems.Any(ri => ri.MatchesItem(i))) + 1;
-                            var containObjective = AIContainItems<Reactor>(container, character, objective, itemCount, equip: false, removeEmpty: true, spawnItemIfNotFound: character.TeamID == CharacterTeamType.FriendlyNPC, dropItemOnDeselected: true);
+                            var containObjective = AIContainItems<Reactor>(container, character, objective, itemCount: 1, equip: true, removeEmpty: true, spawnItemIfNotFound: character.TeamID == CharacterTeamType.FriendlyNPC, dropItemOnDeselected: true);
                             containObjective.Completed += ReportFuelRodCount;
                             containObjective.Abandoned += ReportFuelRodCount;
                             character.Speak(TextManager.Get("DialogReactorFuel"), null, 0.0f, "reactorfuel", 30.0f);
@@ -613,19 +612,15 @@ namespace Barotrauma.Items.Components
                         }
                         return outOfFuel;
                     }
-                    else if (TooMuchFuel())
+                    else
                     {
-                        if (item.OwnInventory?.AllItems != null)
+                        if (TooMuchFuel())
                         {
-                            var container = item.GetComponent<ItemContainer>();
-                            foreach (Item item in item.OwnInventory.AllItemsMod)
-                            {
-                                if (container.ContainableItems.Any(ri => ri.MatchesItem(item)))
-                                {
-                                    item.Drop(character);
-                                    break;
-                                }
-                            }
+                            DropFuel(minCondition: 0.1f, maxCondition: 100);
+                        }
+                        else
+                        {
+                            DropFuel(minCondition: 0, maxCondition: 0);
                         }
                     }
                 }
@@ -692,6 +687,23 @@ namespace Barotrauma.Items.Components
                 aiUpdateTimer = AIUpdateInterval;
                 return false;
             }
+
+
+            void DropFuel(float minCondition, float maxCondition)
+            {
+                if (item.OwnInventory?.AllItems != null)
+                {
+                    var container = item.GetComponent<ItemContainer>();
+                    foreach (Item item in item.OwnInventory.AllItemsMod)
+                    {
+                        if (item.ConditionPercentage <= maxCondition && item.ConditionPercentage >= minCondition)
+                        {
+                            item.Drop(character);
+                            break;
+                        }
+                    }
+                }
+            }
         }
 
         public override void OnMapLoaded()
@@ -735,6 +747,5 @@ namespace Barotrauma.Items.Components
                     break;
             }
         }
-
     }
 }

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

@@ -3598,10 +3598,13 @@ namespace Barotrauma
                 if (!(GameMain.NetworkMember?.IsClient ?? false))
                 {
                     //empty the reactor
-                    foreach (Item item in reactorContainer.Inventory.AllItems)
+                    if (reactorContainer != null)
                     {
-                        if (item.NonInteractable) { continue; }
-                        Spawner.AddToRemoveQueue(item);
+                        foreach (Item item in reactorContainer.Inventory.AllItems)
+                        {
+                            if (item.NonInteractable) { continue; }
+                            Spawner.AddToRemoveQueue(item);
+                        }
                     }
 
                     //remove wires

Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs

@@ -1082,6 +1082,7 @@ namespace Barotrauma
             int currentLocationConnection = element.GetAttributeInt("currentlocationconnection", -1);
             if (currentLocationConnection >= 0)
             {
+                Connections[currentLocationConnection].Locked = false;
                 SelectLocation(Connections[currentLocationConnection].OtherLocation(CurrentLocation));
             }
             else

Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs

@@ -165,10 +165,7 @@ namespace Barotrauma
                         if (structure.Submarine != this || !structure.HasBody || structure.Indestructible) { continue; }
                         realWorldCrushDepth = Math.Min(structure.CrushDepth, realWorldCrushDepth.Value);
                     }
-                    if (Info.SubmarineClass == SubmarineClass.DeepDiver)
-                    {
-                        realWorldCrushDepth *= 1.2f;
-                    }
+                    realWorldCrushDepth *= Info.GetRealWorldCrushDepthMultiplier();
                 }
                 return realWorldCrushDepth.Value;
             }
@@ -1060,6 +1057,7 @@ namespace Barotrauma
                 }
 
                 steering.MaintainPos = true;
+                steering.PosToMaintain = WorldPosition;
                 steering.AutoPilot = true;
 #if SERVER
                 steering.UnsentChanges = true;

Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineInfo.cs

@@ -464,6 +464,49 @@ namespace Barotrauma
             }
         }
 
+        /// <summary>
+        /// Calculated from <see cref="SubmarineElement"/>. Can be used when the sub hasn't been loaded and we can't access <see cref="Submarine.RealWorldCrushDepth"/>.
+        /// </summary>
+        public float GetRealWorldCrushDepth()
+        {
+            if (SubmarineElement == null) { return Level.DefaultRealWorldCrushDepth; }
+            bool structureCrushDepthsDefined = false;
+            float realWorldCrushDepth = float.PositiveInfinity;
+            foreach (var structureElement in SubmarineElement.GetChildElements("structure"))
+            {
+                string name = structureElement.Attribute("name")?.Value ?? "";
+                string identifier = structureElement.GetAttributeString("identifier", "");
+                var structurePrefab = Structure.FindPrefab(name, identifier);
+                if (structurePrefab == null || !structurePrefab.Body) { continue; }
+                if (!structureCrushDepthsDefined && structureElement.Attribute("crushdepth") != null)
+                {
+                    structureCrushDepthsDefined = true;
+                }
+                float structureCrushDepth = structureElement.GetAttributeFloat("crushdepth", float.PositiveInfinity);
+                realWorldCrushDepth = Math.Min(structureCrushDepth, realWorldCrushDepth);
+            }
+            if (!structureCrushDepthsDefined)
+            {
+                realWorldCrushDepth = Level.DefaultRealWorldCrushDepth;
+            }
+            realWorldCrushDepth *= GetRealWorldCrushDepthMultiplier();
+            return realWorldCrushDepth;
+        }
+
+        /// <summary>
+        /// Based on <see cref="SubmarineClass"/>
+        /// </summary>
+        public float GetRealWorldCrushDepthMultiplier()
+        {
+            if (SubmarineClass == SubmarineClass.DeepDiver)
+            {
+                return 1.2f;
+            }
+            else
+            {
+                return 1.0f;
+            }
+        }
 
         //saving/loading ----------------------------------------------------
         public bool SaveAs(string filePath, System.IO.MemoryStream previewImage = null)

Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs

@@ -224,7 +224,7 @@ namespace Barotrauma
             if (Character.Controlled != null && 
                 Lights.LightManager.ViewTarget != null)
             {
-                Vector2 targetPos = Lights.LightManager.ViewTarget.DrawPosition;
+                Vector2 targetPos = Lights.LightManager.ViewTarget.WorldPosition;
                 if (Lights.LightManager.ViewTarget == Character.Controlled &&
                     (CharacterHealth.OpenHealthWindow != null || CrewManager.IsCommandInterfaceOpen || ConversationAction.IsDialogOpen))
                 {

Barotrauma/BarotraumaShared/SharedSource/TextManager.cs

@@ -4,6 +4,7 @@ using Barotrauma.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using Barotrauma.Extensions;
 
 namespace Barotrauma
 {
@@ -202,6 +203,8 @@ namespace Barotrauma
             return false;
         }
 
+        private static readonly List<string> availableTexts = new List<string>();
+
         public static string Get(string textTag, bool returnNull = false, string fallBackTag = null, bool useEnglishAsFallBack = true)
         {
             lock (mutex)
@@ -228,11 +231,19 @@ namespace Barotrauma
                     return textTag;
                 }
 #endif
-
+                availableTexts.Clear();
                 foreach (TextPack textPack in textPacks[Language])
                 {
-                    string text = textPack.Get(textTag);
-                    if (text != null) { return text; }
+                    var texts = textPack.GetAll(textTag);
+                    if (texts != null)
+                    {
+                        availableTexts.AddRange(texts);
+                    }
+                }
+
+                if (availableTexts.Any())
+                {
+                    return availableTexts.GetRandom().Replace(@"\n", "\n");
                 }
 
                 if (!string.IsNullOrEmpty(fallBackTag))

Barotrauma/BarotraumaShared/SharedSource/Utils/MTRandom.cs

@@ -84,6 +84,22 @@ namespace Barotrauma
             return retval;
         }
 
+        public override int Next(int minValue, int maxValue)
+        {
+            int range = maxValue - minValue;
+            return minValue + Next(range);
+        }
+
+        public override void NextBytes(byte[] buffer)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void NextBytes(Span<byte> buffer)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <summary>
         /// Returns a random value is greater or equal than 0 and less than maxValue
         /// </summary>