(de26bb46c) AutoScale CustomInterface texts to prevent overflows

2019-05-16 06:43:54 +03:00
parent 3153771cc7
commit 49b0ee7c50
30 changed files with 333 additions and 349 deletions
@@ -169,15 +169,7 @@ namespace Barotrauma
                bool highPressure = Character.CurrentHull == null || Character.CurrentHull.LethalPressure > 0 && Character.PressureProtection <= 0;
                bool shouldKeepTheGearOn = !ObjectiveManager.IsCurrentObjective<AIObjectiveIdle>();

-                // 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);
-
+                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,9 +53,13 @@ namespace Barotrauma
            (currentPath.NextNode != null && currentPath.NextNode.Ladders != null));

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

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