Crew commands

Subsurface/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs

@@ -14,10 +14,13 @@ namespace Barotrauma
 
         Vector2 targetPos;
 
+        bool repeat;
+
         public override bool CanBeCompleted
         {
             get
             {
+                if (repeat) return true;
                 var pathSteering = character.AIController.SteeringManager as IndoorsSteeringManager;
                 return (pathSteering.CurrentPath == null || !pathSteering.CurrentPath.Unreachable);
             }
@@ -28,10 +31,11 @@ namespace Barotrauma
             get { return target; }
         }
 
-        public AIObjectiveGoTo(AITarget target, Character character)
+        public AIObjectiveGoTo(AITarget target, Character character, bool repeat = false)
             : base (character)
         {
             this.target = target;
+            this.repeat = false;
         }
 
 
@@ -51,6 +55,7 @@ namespace Barotrauma
 
         public override bool IsCompleted()
         {
+            if (repeat) return false;
             return Vector2.Distance(target != null ? target.SimPosition : ConvertUnits.ToDisplayUnits(targetPos), character.SimPosition) < 0.5f;
         }
     }

Subsurface/Source/Characters/AI/Objectives/AIObjectiveManager.cs

@@ -1,4 +1,5 @@
-using System;
+using Barotrauma.Items.Components;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -7,14 +8,19 @@ namespace Barotrauma
 {
     class AIObjectiveManager
     {
+        const float OrderPriority = 50.0f;
+
         private List<AIObjective> objectives;
 
         private Character character;
+
+        private AIObjective currentOrder;
         
         public AIObjective CurrentObjective
         {
             get
             {
+                if (currentOrder != null) return currentOrder;
                 return objectives.Any() ? objectives[0] : null;
             }
         }
@@ -33,9 +39,15 @@ namespace Barotrauma
             objectives.Add(objective);
         }
 
+        public float GetCurrentPriority(Character character)
+        {
+            if (currentOrder != null) return OrderPriority;
+            return (CurrentObjective == null) ? 0.0f : CurrentObjective.GetPriority(character);
+        }
+
         public void UpdateObjectives()
         {
-            if (!objectives.Any()) return;
+            if (currentOrder != null || !objectives.Any()) return;
 
             //remove completed objectives
             objectives = objectives.FindAll(o => !o.IsCompleted());
@@ -57,8 +69,33 @@ namespace Barotrauma
 
         public void DoCurrentObjective(float deltaTime)
         {
+            if (currentOrder != null)
+            {
+                currentOrder.TryComplete(deltaTime);
+                return;
+            }
+
             if (!objectives.Any()) return;
             objectives[0].TryComplete(deltaTime);
         }
+
+        public void SetOrder(Order order, string option)
+        {
+            switch (order.Name.ToLower())
+            {
+                case "follow":
+                    currentOrder = new AIObjectiveGoTo(Character.Controlled.AiTarget, character, true);
+                    break;
+                case "operate reactor":
+                    var reactorItem = Item.ItemList.Find(i => i.GetComponent<Reactor>() != null);
+                    if (reactorItem == null) return;
+
+                    currentOrder = new AIObjectiveOperateItem(reactorItem.GetComponent<Reactor>(), character);
+                    break;
+                default:
+                    currentOrder = null;
+                    break;
+            }
+        }
     }
 }

Subsurface/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs

@@ -1,4 +1,6 @@
-using System;
+using Barotrauma.Items.Components;
+using Microsoft.Xna.Framework;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -7,9 +9,9 @@ namespace Barotrauma
 {
     class AIObjectiveOperateItem : AIObjective
     {
-        private Item targetItem;
+        private ItemComponent targetItem;
 
-        public AIObjectiveOperateItem(Item item, Character character)
+        public AIObjectiveOperateItem(ItemComponent item, Character character)
             :base (character)
         {
             targetItem = item;
@@ -17,7 +19,13 @@ namespace Barotrauma
 
         protected override void Act(float deltaTime)
         {
-            //item.AIOperate(float deltaTime, Character character) or something
+            if (Vector2.Distance(character.SimPosition, targetItem.Item.SimPosition) < targetItem.Item.PickDistance)
+            {
+                //targetItem.Pick(character, false, true);
+                return;
+            }
+
+            subObjectives.Add(new AIObjectiveGoTo(targetItem.Item.SimPosition, character));
         }
 
         public override bool IsDuplicate(AIObjective otherObjective)