(4ff749939) Added new environment assets for implementation

2019-05-16 05:51:28 +03:00
parent 049d3ba795
commit 57302f7bb8
24 changed files with 339 additions and 331 deletions
@@ -127,7 +127,7 @@ namespace Barotrauma
            }
            if (abandon) { return; }
            Arm(deltaTime);
-            Move();
+            Move(deltaTime);
        }

        private void Arm(float deltaTime)
@@ -150,7 +150,7 @@ namespace Barotrauma
                    }
                    if (Equip())
                    {
-                        if (Reload())
+                        if (Reload(deltaTime))
                        {
                            Attack(deltaTime);
                        }
@@ -163,16 +163,16 @@ namespace Barotrauma
            }
        }

-        private void Move()
+        private void Move(float deltaTime)
        {
            switch (Mode)
            {
                case CombatMode.Offensive:
-                    Engage();
+                    Engage(deltaTime);
                    break;
                case CombatMode.Defensive:
                case CombatMode.Retreat:
-                    Retreat();
+                    Retreat(deltaTime);
                    break;
                default:
                    throw new NotImplementedException();
@@ -273,7 +273,7 @@ namespace Barotrauma
            return true;
        }

-        private void Retreat()
+        private void Retreat(float deltaTime)
        {
            if (followTargetObjective != null)
            {
@@ -294,7 +294,7 @@ namespace Barotrauma
            TryAddSubObjective(ref retreatObjective, () => new AIObjectiveGoTo(retreatTarget, character, objectiveManager, false, true));
        }

-        private void Engage()
+        private void Engage(float deltaTime)
        {
            retreatTarget = null;
            if (retreatObjective != null)
@@ -323,7 +323,7 @@ namespace Barotrauma
                });
        }

-        private bool Reload()
+        private bool Reload(float deltaTime)
        {
            if (WeaponComponent != null && WeaponComponent.requiredItems.ContainsKey(RelatedItem.RelationType.Contained))
            {
@@ -125,6 +125,31 @@ 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;
+            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 });
+            }
+            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,21 +73,6 @@ 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;

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