Autopilot waypoint skipping, AI finds and equips diving gear when the sub is flooding, progress on AI welding, equipping items in AIObjectiveGetItem, wire node coordinate bugfixes, EntityGrid.RemoveEntity fix

2015-12-23 00:10:02 +02:00
parent 63f5a501e8
commit c7e7b3909f
35 changed files with 402 additions and 257 deletions
@@ -1,4 +1,6 @@
-using Microsoft.Xna.Framework;
+using Barotrauma.Items.Components;
+using FarseerPhysics;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,17 +10,26 @@ namespace Barotrauma
 {
    class AIObjectiveFixLeak : AIObjective
    {
-        Gap leak;
+        private Gap leak;
+
+        public Gap Leak
+        {
+            get { return leak; }
+        }

        public AIObjectiveFixLeak(Gap leak, Character character)
-            :base (character, "")
+            : base (character, "")
        {
            this.leak = leak;
        }

        public override float GetPriority(Character character)
        {
-            return leak.isHorizontal ? leak.Rect.Height * leak.Open : leak.Rect.Width * leak.Open;
+            float leakSize = (leak.isHorizontal ? leak.Rect.Height : leak.Rect.Width) * leak.Open;
+
+            float dist = Vector2.DistanceSquared(character.SimPosition, leak.SimPosition);
+            dist = Math.Max(dist/1000.0f, 1.0f);
+            return Math.Min(leakSize/dist, 40.0f);
        }

        public override bool IsDuplicate(AIObjective otherObjective)
@@ -34,15 +45,51 @@ namespace Barotrauma

            if (weldingTool == null)
            {
-                subObjectives.Add(new AIObjectiveGetItem(character, "Welding Tool"));
+                subObjectives.Add(new AIObjectiveGetItem(character, "Welding Tool", true));
+                return;
            }
            else
            {
-                if (Vector2.Distance(character.Position, leak.Position)>10.0f)
+                var containedItems = weldingTool.ContainedItems;
+                if (containedItems == null) return;
+                
+                var fuelTank = Array.Find(containedItems, i => i.Name == "Welding Fuel Tank" && i.Condition > 0.0f);
+
+                if (fuelTank == null)
                {
-                    subObjectives.Add(new AIObjectiveGoTo(leak.Position,character));
+                    AddSubObjective(new AIObjectiveContainItem(character, "Welding Fuel Tank", weldingTool.GetComponent<ItemContainer>()));
                }
            }
+
+            if (Vector2.Distance(character.Position, leak.Position) > 300.0f)
+            {
+                AddSubObjective(new AIObjectiveGoTo(ConvertUnits.ToSimUnits(GetStandPosition()), character));
+            }
+            else
+            {
+                var repairTool = weldingTool.GetComponent<RepairTool>();
+                if (repairTool == null) return;
+                AddSubObjective(new AIObjectiveOperateItem(repairTool, character, ""));
+            }            
+        }
+
+        private Vector2 GetStandPosition()
+        {
+            Vector2 standPos = leak.Position;
+            var hull = leak.linkedTo[0];
+
+            if (hull == null) return standPos;
+            
+            if (leak.isHorizontal)
+            {
+                standPos += Vector2.UnitX * Math.Sign(hull.Position.X - leak.Position.X) * leak.Rect.Width;
+            }
+            else
+            {
+                standPos += Vector2.UnitY * Math.Sign(hull.Position.Y - leak.Position.Y) * leak.Rect.Height;
+            }
+
+            return standPos;            
        }
    }
 }