(5f20d1b76) Remove custom steering logic for stairs, because most of the waypoints going over the stairs don't have stairs assigned to them. Bots shouldn't drop the diving suit if any of the nodes in the path has stairs. Doesn't work well, but it's a minor issue. Don't want to do raycasts here.

2019-05-16 06:40:39 +03:00
parent 113e17a409
commit 2b95c55070
18 changed files with 387 additions and 183 deletions
@@ -169,7 +169,15 @@ namespace Barotrauma
                bool highPressure = Character.CurrentHull == null || Character.CurrentHull.LethalPressure > 0 && Character.PressureProtection <= 0;
                bool shouldKeepTheGearOn = !ObjectiveManager.IsCurrentObjective<AIObjectiveIdle>();

-                bool removeDivingSuit = (oxygenLow && !highPressure) || (!shouldKeepTheGearOn && Character.CurrentHull.WaterPercentage < 1 && !Character.IsClimbing && steeringManager == insideSteering && !PathSteering.InStairs);
+                // Don't allow to drop the diving suit in water or while climbing or if the current path has stairs
+                bool removeDivingSuit = 
+                    (oxygenLow && !highPressure) || 
+                        (!shouldKeepTheGearOn && 
+                        Character.CurrentHull.WaterPercentage < 1 && 
+                        !Character.IsClimbing && 
+                        steeringManager == insideSteering && 
+                        !PathSteering.InStairs);
+
                if (removeDivingSuit)
                {
                    var divingSuit = Character.Inventory.FindItemByIdentifier("divingsuit") ?? Character.Inventory.FindItemByTag("divingsuit");
@@ -53,13 +53,9 @@ namespace Barotrauma
            (currentPath.NextNode != null && currentPath.NextNode.Ladders != null));

        /// <summary>
-        /// Returns true if the previous, current or the next node is in stairs.
+        /// Returns true if any node in the path is in stairs
        /// </summary>
-        public bool InStairs =>
-            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 InStairs => currentPath != null && currentPath.Nodes.Any(n => n.Stairs != null);

        public bool IsNextNodeLadder
        {
@@ -304,7 +300,9 @@ 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 (currentPath.CurrentNode != null && currentPath.CurrentNode.Stairs != null)
+                float margin = MathHelper.Lerp(1, 10, MathHelper.Clamp(Math.Abs(velocity.X) / 10, 0, 1));
+                float targetDistance = collider.radius * margin;
+                if (horizontalDistance < targetDistance && isAboveFeet && isNotTooHigh)
                {
                    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));
@@ -387,6 +387,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;
@@ -88,6 +88,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;

@@ -657,6 +657,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {
@@ -563,6 +563,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);
@@ -144,17 +144,6 @@ namespace Barotrauma.Items.Components
            }
        }

-        public Vector2 SteeringInput
-        {
-            get { return steeringInput; }
-            set
-            {
-                if (!MathUtils.IsValid(value)) return;
-                steeringInput.X = MathHelper.Clamp(value.X, -100.0f, 100.0f);
-                steeringInput.Y = MathHelper.Clamp(value.Y, -100.0f, 100.0f);
-            }
-        }
-
        public SteeringPath SteeringPath
        {
            if (!CanBeSelected) return false;
@@ -175,6 +164,12 @@ namespace Barotrauma.Items.Components
            set { posToMaintain = value; }
        }

+        public Vector2? PosToMaintain
+        {
+            get { return posToMaintain; }
+            set { posToMaintain = value; }
+        }
+
        struct ObstacleDebugInfo
        {
            public Vector2 Point1;
@@ -1204,6 +1204,38 @@ namespace Barotrauma
            }
        }
                
+        public void UpdateTransform()
+        {
+            Submarine prevSub = Submarine;
+
+            FindHull();
+
+            if (Submarine == null && prevSub != null)
+            {
+                body.SetTransform(body.SimPosition + prevSub.SimPosition, body.Rotation);
+            }
+            else if (Submarine != null && prevSub == null)
+            {
+                body.SetTransform(body.SimPosition - Submarine.SimPosition, body.Rotation);
+            }
+            else if (Submarine != null && prevSub != null && Submarine != prevSub)
+            {
+                body.SetTransform(body.SimPosition + prevSub.SimPosition - Submarine.SimPosition, body.Rotation);
+            }
+
+            Vector2 displayPos = ConvertUnits.ToDisplayUnits(body.SimPosition);
+            rect.X = (int)(displayPos.X - rect.Width / 2.0f);
+            rect.Y = (int)(displayPos.Y + rect.Height / 2.0f);
+
+            if (Math.Abs(body.LinearVelocity.X) > NetConfig.MaxPhysicsBodyVelocity || 
+                Math.Abs(body.LinearVelocity.Y) > NetConfig.MaxPhysicsBodyVelocity)
+            {
+                body.LinearVelocity = new Vector2(
+                    MathHelper.Clamp(body.LinearVelocity.X, -NetConfig.MaxPhysicsBodyVelocity, NetConfig.MaxPhysicsBodyVelocity),
+                    MathHelper.Clamp(body.LinearVelocity.Y, -NetConfig.MaxPhysicsBodyVelocity, NetConfig.MaxPhysicsBodyVelocity));
+            }
+        }
+                
        public void UpdateTransform()
        {
            Submarine prevSub = Submarine;
@@ -2004,7 +2036,6 @@ namespace Barotrauma
            return Load(element, submarine, createNetworkEvent: false);
        }

-
        /// <summary>
        /// Instantiate a new item and load its data from the XML element.
        /// </summary>
@@ -2017,10 +2048,30 @@ namespace Barotrauma
            string name = element.Attribute("name").Value;            
            string identifier = element.GetAttributeString("identifier", "");

-            ItemPrefab prefab = ItemPrefab.Find(name, 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;
+                }
+            }

            if (prefab == null)
            {
+                DebugConsole.ThrowError("Error loading item - item prefab \"" + name + "\" (identifier \"" + identifier + "\") not found.");
                return null;
            }

@@ -441,7 +441,6 @@ 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
@@ -449,22 +448,20 @@ namespace Barotrauma

            if (string.IsNullOrEmpty(nameIdentifier))
            {
-                name = TextManager.Get("EntityName." + identifier, true) ?? nonTranslatedName;
+                name = TextManager.Get("EntityName." + identifier, true) ?? element.GetAttributeString("name", "");
            }
            else
            {
-                name = TextManager.Get("EntityName." + nameIdentifier, true) ?? nonTranslatedName;
+                name = TextManager.Get("EntityName." + nameIdentifier, true) ?? element.GetAttributeString("name", "");
            }

            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)).ToHashSet();
-            Aliases.Add(nonTranslatedName.ToLowerInvariant());
-
+            Aliases = 
+                element.GetAttributeStringArray("aliases", null, convertToLowerInvariant: true) ??
+                element.GetAttributeStringArray("Aliases", new string[0], convertToLowerInvariant: true);

            if (!Enum.TryParse(element.GetAttributeString("category", "Misc"), true, out MapEntityCategory category))
            {
@@ -722,42 +719,7 @@ 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;
@@ -778,6 +778,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
@@ -115,7 +115,6 @@ namespace Barotrauma
                Linkable = true
            };
            ep.AllowedLinks.Add("hull");
-            ep.Aliases = new HashSet<string> { "hull" };
            List.Add(ep);

            ep = new MapEntityPrefab
@@ -225,6 +225,12 @@ 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)
            {