(779fe50ee) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs

@@ -53,12 +53,13 @@ namespace Barotrauma
             (currentPath.NextNode != null && currentPath.NextNode.Ladders != null));
 
         /// <summary>
-        /// Returns true if the current or the next node is in stairs.
+        /// Returns true if the previous, current or the next node is in stairs.
         /// </summary>
         public bool InStairs =>
-            currentPath != null &&
-            currentPath.CurrentNode != null && (currentPath.CurrentNode.Stairs != null ||
-            (currentPath.NextNode != null && currentPath.NextNode.Stairs != null));
+            currentPath != null && (
+            currentPath.PrevNode != null && currentPath.PrevNode.Stairs != null ||
+            currentPath.CurrentNode != null && currentPath.CurrentNode.Stairs != null ||
+            currentPath.NextNode != null && currentPath.NextNode.Stairs != null);
 
         public bool IsNextNodeLadder
         {
@@ -303,11 +304,11 @@ namespace Barotrauma
                 float horizontalDistance = Math.Abs(collider.SimPosition.X - currentPath.CurrentNode.SimPosition.X);
                 bool isAboveFeet = currentPath.CurrentNode.SimPosition.Y > colliderBottom.Y;
                 bool isNotTooHigh = currentPath.CurrentNode.SimPosition.Y < colliderBottom.Y + characterHeight;
-                if (InStairs)
+                if (currentPath.CurrentNode != null && currentPath.CurrentNode.Stairs != null)
                 {
                     float multiplierX = MathHelper.Lerp(1, 10, MathHelper.Clamp(Math.Abs(velocity.X) / 10, 0, 1));
                     float multiplierY = MathHelper.Lerp(1, 10, MathHelper.Clamp(Math.Abs(velocity.Y) / 10, 0, 1));
-                    float verticalDistance = Math.Abs(collider.SimPosition.Y - currentPath.CurrentNode.SimPosition.Y);
+                    float verticalDistance = Math.Abs(colliderBottom.Y - currentPath.CurrentNode.SimPosition.Y);
                     float targetDistX = collider.radius * multiplierX;
                     float targetDistY = collider.radius * multiplierY;
                     if (horizontalDistance < targetDistX && verticalDistance < targetDistY && isAboveFeet && isNotTooHigh)

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs

@@ -517,6 +517,32 @@ namespace Barotrauma
             {
 #if DEBUG
                 DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
+#endif
+                abandon = true;
+                return;
+            }
+            Vector2 gapDiff = Leak.WorldPosition - character.WorldPosition;
+            // TODO: use the collider size/reach?
+            if (!character.AnimController.InWater && Math.Abs(gapDiff.X) < 100 && gapDiff.Y < 0.0f && gapDiff.Y > -150)
+            {
+                HumanAIController.AnimController.Crouching = true;
+            }
+            float reach = ConvertUnits.ToSimUnits(repairTool.Range);
+            bool canOperate = ConvertUnits.ToSimUnits(gapDiff.Length()) < reach * 1.5f;
+            if (canOperate)
+            {
+                TryAddSubObjective(ref operateObjective, () => new AIObjectiveOperateItem(repairTool, character, objectiveManager, option: "", requireEquip: true, operateTarget: Leak));
+            }
+            else
+            {
+                TryAddSubObjective(ref gotoObjective, () => new AIObjectiveGoTo(ConvertUnits.ToSimUnits(GetStandPosition()), character, objectiveManager) { CloseEnough = reach * 0.75f });
+            }
+            if (subObjectives.Any()) { return; }
+            var repairTool = weldingTool.GetComponent<RepairTool>();
+            if (repairTool == null)
+            {
+#if DEBUG
+                DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
 #endif
                 abandon = true;
                 return;

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs

@@ -73,6 +73,21 @@ namespace Barotrauma
             }
         }
 
+        public override void Update(float deltaTime)
+        {
+            if (objectiveManager.CurrentObjective == this)
+            {
+                if (randomTimer > 0)
+                {
+                    randomTimer -= deltaTime;
+                }
+                else
+                {
+                    SetRandom();
+                }
+            }
+        }
+
         public override bool IsCompleted() => false;
         public override bool CanBeCompleted => true;
 

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs

@@ -677,6 +677,10 @@ namespace Barotrauma
                     {
                         isCompleted = true;
                     }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                 }
                 else
                 {

Barotrauma/BarotraumaShared/Source/Characters/Animation/Params/Animation/AnimationParams.cs

@@ -97,11 +97,12 @@ namespace Barotrauma
 
         public static string GetDefaultFileName(string speciesName, AnimationType animType) => $"{speciesName.CapitaliseFirstInvariant()}{animType.ToString()}";
         public static string GetDefaultFolder(string speciesName) => $"Content/Characters/{speciesName.CapitaliseFirstInvariant()}/Animations/";
-        public static string GetDefaultFile(string speciesName, AnimationType animType) => $"{GetFolder(speciesName)}{GetDefaultFileName(speciesName, animType)}.xml";
+        public static string GetDefaultFile(string speciesName, AnimationType animType, ContentPackage contentPackage = null) => 
+            $"{GetFolder(speciesName, contentPackage)}{GetDefaultFileName(speciesName, animType)}.xml";
 
-        public static string GetFolder(string speciesName)
+        public static string GetFolder(string speciesName, ContentPackage contentPackage = null)
         {
-            var folder = XMLExtensions.TryLoadXml(Character.GetConfigFile(speciesName))?.Root?.Element("animations")?.GetAttributeString("folder", string.Empty);
+            var folder = XMLExtensions.TryLoadXml(Character.GetConfigFile(speciesName, contentPackage))?.Root?.Element("animations")?.GetAttributeString("folder", string.Empty);
             if (string.IsNullOrEmpty(folder) || folder.ToLowerInvariant() == "default")
             {
                 folder = GetDefaultFolder(speciesName);

Barotrauma/BarotraumaShared/Source/Characters/Animation/Params/Ragdoll/RagdollParams.cs

@@ -64,7 +64,7 @@ namespace Barotrauma
 
         public static string GetDefaultFileName(string speciesName) => $"{speciesName.CapitaliseFirstInvariant()}DefaultRagdoll";
         public static string GetDefaultFolder(string speciesName) => $"Content/Characters/{speciesName.CapitaliseFirstInvariant()}/Ragdolls/";
-        public static string GetDefaultFile(string speciesName) => $"{GetFolder(speciesName)}{GetDefaultFileName(speciesName)}.xml";
+        public static string GetDefaultFile(string speciesName, ContentPackage contentPackage = null) => $"{GetFolder(speciesName, contentPackage)}{GetDefaultFileName(speciesName)}.xml";
 
         private static readonly object[] dummyParams = new object[]
         {
@@ -79,9 +79,9 @@ namespace Barotrauma
                     new XAttribute("sourcerect", $"0, 0, 1, 1")))
         };
 
-        public static string GetFolder(string speciesName)
+        public static string GetFolder(string speciesName, ContentPackage contentPackage = null)
         {
-            var folder = XMLExtensions.TryLoadXml(Character.GetConfigFile(speciesName))?.Root?.Element("ragdolls")?.GetAttributeString("folder", string.Empty);
+            var folder = XMLExtensions.TryLoadXml(Character.GetConfigFile(speciesName, contentPackage))?.Root?.Element("ragdolls")?.GetAttributeString("folder", string.Empty);
             if (string.IsNullOrEmpty(folder) || folder.ToLowerInvariant() == "default")
             {
                 //DebugConsole.NewMessage("[RagollParams] Using the default folder.");

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -853,15 +853,26 @@ namespace Barotrauma
             {
                 if (characterConfigFiles == null)
                 {
-                    characterConfigFiles = GameMain.Instance.GetFilesOfType(ContentType.Character, searchAllContentPackages: true);
+                    characterConfigFiles = GameMain.Instance.GetFilesOfType(ContentType.Character);
                 }
                 return characterConfigFiles;
             }
         }
 
-        public static string GetConfigFile(string speciesName)
+        public static string GetConfigFile(string speciesName, ContentPackage contentPackage = null)
         {
-            string configFile = CharacterConfigFiles.FirstOrDefault(c => Path.GetFileName(c).ToLowerInvariant() == $"{speciesName.ToLowerInvariant()}.xml");
+            string configFile = null;
+            if (contentPackage == null)
+            {
+                configFile = GameMain.Instance.GetFilesOfType(ContentType.Character, searchAllContentPackages: true)
+                    .FirstOrDefault(c => Path.GetFileName(c).ToLowerInvariant() == $"{speciesName.ToLowerInvariant()}.xml");
+            }
+            else
+            {
+                configFile = contentPackage.GetFilesOfType(ContentType.Character)?
+                    .FirstOrDefault(c => Path.GetFileName(c).ToLowerInvariant() == $"{speciesName.ToLowerInvariant()}.xml");
+            }
+
             if (configFile == null)
             {
                 DebugConsole.ThrowError($"Couldn't find a config file for {speciesName} from the selected content packages!");
@@ -1136,7 +1147,7 @@ namespace Barotrauma
             
             if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
             {
-                Vector2 targetMovement = GetTargetMovement();
+                if (speedMultipliers.Count == 0) return 1f;
 
                 AnimController.TargetMovement = targetMovement;
                 AnimController.IgnorePlatforms = AnimController.TargetMovement.Y < -0.1f;

Barotrauma/BarotraumaShared/Source/ContentPackage.cs

@@ -362,10 +362,11 @@ namespace Barotrauma
                 case ContentType.Character:
                     XDocument doc = XMLExtensions.TryLoadXml(file.Path);
                     string speciesName = doc.Root.GetAttributeString("name", "");
-                    filePaths.Add(RagdollParams.GetDefaultFile(speciesName));
+                    //TODO: check non-default paths if defined
+                    filePaths.Add(RagdollParams.GetDefaultFile(speciesName, this));
                     foreach (AnimationType animationType in Enum.GetValues(typeof(AnimationType)))
                     {
-                        filePaths.Add(AnimationParams.GetDefaultFile(speciesName, animationType));
+                        filePaths.Add(AnimationParams.GetDefaultFile(speciesName, animationType, this));
                     }
                     break;
             }

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Deconstructor.cs

@@ -658,6 +658,25 @@ namespace Barotrauma.Items.Components
                     }
                 }
                 
+                if (targetItem.Prefab.DeconstructItems.Any())
+                {
+                    inputContainer.Inventory.RemoveItem(targetItem);
+                    Entity.Spawner.AddToRemoveQueue(targetItem);
+                    MoveInputQueue();
+                    PutItemsToLinkedContainer();
+                }
+                else
+                {
+                    if (outputContainer.Inventory.Items.All(i => i != null))
+                    {
+                        targetItem.Drop(dropper: null);
+                    }
+                    else
+                    {
+                        outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true);
+                    }
+                }
+                
                 if (targetItem.Prefab.DeconstructItems.Any())
                 {
                     inputContainer.Inventory.RemoveItem(targetItem);

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -158,18 +158,6 @@ namespace Barotrauma.Items.Components
             set { posToMaintain = value; }
         }
 
-        public Vector2? PosToMaintain
-        {
-            get { return posToMaintain; }
-            set { posToMaintain = value; }
-        }
-
-        public Vector2? PosToMaintain
-        {
-            get { return posToMaintain; }
-            set { posToMaintain = value; }
-        }
-
         struct ObstacleDebugInfo
         {
             public Vector2 Point1;
@@ -564,6 +552,7 @@ namespace Barotrauma.Items.Components
         public void ServerRead(ClientNetObject type, Lidgren.Network.NetBuffer msg, Barotrauma.Networking.Client c)
         {
             bool autoPilot              = msg.ReadBoolean();
+            bool dockingButtonClicked   = msg.ReadBoolean();
             Vector2 newSteeringInput    = targetVelocity;
             bool maintainPos            = false;
             Vector2? newPosToMaintain   = null;
@@ -590,8 +579,6 @@ namespace Barotrauma.Items.Components
 
             if (!item.CanClientAccess(c)) return;
 
-            user = c.Character;
-
             user = c.Character;
             AutoPilot = autoPilot;
 

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -2036,6 +2036,7 @@ namespace Barotrauma
             return Load(element, submarine, createNetworkEvent: false);
         }
 
+
         /// <summary>
         /// Instantiate a new item and load its data from the XML element.
         /// </summary>
@@ -2048,30 +2049,10 @@ namespace Barotrauma
             string name = element.Attribute("name").Value;            
             string identifier = element.GetAttributeString("identifier", "");
 
-            ItemPrefab prefab;
-            if (string.IsNullOrEmpty(identifier))
-            {
-                //legacy support: 
-                //1. attempt to find a prefab with an empty identifier and a matching name
-                prefab = MapEntityPrefab.Find(name, "", showErrorMessages: false) as ItemPrefab;
-                //2. not found, attempt to find a prefab with a matching name
-                if (prefab == null) prefab = MapEntityPrefab.Find(name) as ItemPrefab;
-            }
-            else
-            {
-                prefab = MapEntityPrefab.Find(null, identifier, showErrorMessages: false) as ItemPrefab;
-
-                //not found, see if we can find a prefab with a matching alias
-                if (prefab == null)
-                {
-                    string lowerCaseName = name.ToLowerInvariant();
-                    prefab = MapEntityPrefab.List.Find(me => me.Aliases != null && me.Aliases.Contains(lowerCaseName)) as ItemPrefab;
-                }
-            }
+            ItemPrefab prefab = ItemPrefab.Find(name, identifier);
 
             if (prefab == null)
             {
-                DebugConsole.ThrowError("Error loading item - item prefab \"" + name + "\" (identifier \"" + identifier + "\") not found.");
                 return null;
             }
 

Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs

@@ -441,6 +441,7 @@ namespace Barotrauma
             configFile = filePath;
             ConfigElement = element;
 
+            string nonTranslatedName = element.GetAttributeString("name", "");
             identifier = element.GetAttributeString("identifier", "");
 
             //nameidentifier can be used to make multiple items use the same names and descriptions
@@ -448,20 +449,22 @@ namespace Barotrauma
 
             if (string.IsNullOrEmpty(nameIdentifier))
             {
-                name = TextManager.Get("EntityName." + identifier, true) ?? element.GetAttributeString("name", "");
+                name = TextManager.Get("EntityName." + identifier, true) ?? nonTranslatedName;
             }
             else
             {
-                name = TextManager.Get("EntityName." + nameIdentifier, true) ?? element.GetAttributeString("name", "");
+                name = TextManager.Get("EntityName." + nameIdentifier, true) ?? nonTranslatedName;
             }
 
             if (name == "") { DebugConsole.ThrowError("Unnamed item in " + filePath + "!"); }
 
             DebugConsole.Log("    " + name);
 
-            Aliases = 
-                element.GetAttributeStringArray("aliases", null, convertToLowerInvariant: true) ??
-                element.GetAttributeStringArray("Aliases", new string[0], convertToLowerInvariant: true);
+            Aliases =
+                (element.GetAttributeStringArray("aliases", null, convertToLowerInvariant: true) ??
+                element.GetAttributeStringArray("Aliases", new string[0], convertToLowerInvariant: true)).ToHashSet();
+            Aliases.Add(nonTranslatedName.ToLowerInvariant());
+
 
             if (!Enum.TryParse(element.GetAttributeString("category", "Misc"), true, out MapEntityCategory category))
             {
@@ -719,7 +722,42 @@ namespace Barotrauma
             return prices[location.Type.Identifier.ToLowerInvariant()];
         }
 
+        public static ItemPrefab Find(string name, string identifier)
+        {
+            ItemPrefab prefab;
+            if (string.IsNullOrEmpty(identifier))
+            {
+                //legacy support: 
+                //1. attempt to find a prefab with an empty identifier and a matching name
+                prefab = Find(name, "", showErrorMessages: false) as ItemPrefab;
+                //2. not found, attempt to find a prefab with a matching name
+                if (prefab == null) prefab = Find(name) as ItemPrefab;
+                //not found, see if we can find a prefab with a matching alias
+                if (prefab == null)
+                {
+                    string lowerCaseName = name.ToLowerInvariant();
+                    prefab = List.Find(me => me.Aliases != null && me.Aliases.Contains(lowerCaseName)) as ItemPrefab;
+                }
 
+            }
+            else
+            {
+                prefab = Find(null, identifier, showErrorMessages: false) as ItemPrefab;
+
+                //not found, see if we can find a prefab with a matching alias
+                if (prefab == null)
+                {
+                    string lowerCaseName = name.ToLowerInvariant();
+                    prefab = List.Find(me => me.Aliases != null && me.Aliases.Contains(lowerCaseName)) as ItemPrefab;
+                }
+            }
+
+            if (prefab == null)
+            {
+                DebugConsole.ThrowError("Error loading item - item prefab \"" + name + "\" (identifier \"" + identifier + "\") not found.");
+            }
+            return prefab;
+        }
         public IEnumerable<PriceInfo> GetPrices()
         {
             return prices?.Values;

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -246,6 +246,25 @@ namespace Barotrauma
             }
         }
 
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
         public override Rectangle Rect
         {
             get

Barotrauma/BarotraumaShared/Source/Map/MapEntityPrefab.cs

@@ -115,6 +115,7 @@ namespace Barotrauma
                 Linkable = true
             };
             ep.AllowedLinks.Add("hull");
+            ep.Aliases = new HashSet<string> { "hull" };
             List.Add(ep);
 
             ep = new MapEntityPrefab

Barotrauma/BarotraumaShared/Source/Map/StructurePrefab.cs

@@ -225,12 +225,6 @@ namespace Barotrauma
             string nonTranslatedName = element.GetAttributeString("name", null) ?? element.Name.ToString();
             sp.Aliases.Add(nonTranslatedName.ToLowerInvariant());
 
-            SerializableProperty.DeserializeProperties(sp, element);
-            if (sp.Body)
-            {
-                sp.Tags.Add("wall");
-            }
-
             SerializableProperty.DeserializeProperties(sp, element);
             if (sp.Body)
             {

Barotrauma/BarotraumaShared/Source/Networking/ChatMessage.cs

@@ -131,7 +131,12 @@ namespace Barotrauma.Networking
             float dist = Vector2.Distance(listener.WorldPosition, sender.WorldPosition);
             if (dist > range) { return 1.0f; }
 
-            if (Submarine.CheckVisibility(listener.SimPosition, sender.SimPosition) != null) dist = (dist + 100f) * obstructionmult;
+            Hull listenerHull = listener == null ? null : Hull.FindHull(listener.WorldPosition);
+            Hull sourceHull = sender == null ? null : Hull.FindHull(sender.WorldPosition);
+            if (sourceHull != listenerHull)
+            {
+                if (Submarine.CheckVisibility(listener.SimPosition, sender.SimPosition) != null) dist = (dist + 100f) * obstructionmult;
+            }
             if (dist > range) { return 1.0f; }
 
             return dist / range;