(3a5d98b) v0.9.6.0

2019-12-17 14:38:24 +01:00
parent 5c95c53118
commit a3569b8bf0
95 changed files with 1579 additions and 728 deletions
@@ -24,6 +24,8 @@ namespace Barotrauma
        public Entity OperateTarget => operateTarget;
        public ItemComponent Component => component;

+        public ItemComponent GetTarget() => useController ? controller : component;
+
        public Func<bool> completionCondition;

        public override float GetPriority()
@@ -35,6 +37,7 @@ namespace Barotrauma
            }
            if (component.Item.CurrentHull == null) { return 0; }
            if (component.Item.CurrentHull.FireSources.Count > 0) { return 0; }
+            if (IsOperatedByAnother(GetTarget())) { return 0; }
            if (Character.CharacterList.Any(c => c.CurrentHull == component.Item.CurrentHull && !HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c))) { return 0; }
            float devotion = MathHelper.Min(10, Priority);
            float value = devotion + AIObjectiveManager.OrderPriority * PriorityModifier;
@@ -58,6 +61,45 @@ namespace Barotrauma
            }
        }

+        private bool IsOperatedByAnother(ItemComponent target)
+        {
+            foreach (var c in Character.CharacterList)
+            {
+                if (c == character) { continue; }
+                if (!HumanAIController.IsFriendly(c)) { continue; }
+                if (c.SelectedConstruction != target.Item) { continue; }
+                // If the other character is player, don't try to operate
+                if (c.IsRemotePlayer || Character.Controlled == c) { return true; }
+                if (c.AIController is HumanAIController humanAi)
+                {
+                    // If the other character is ordered to operate the item, let him do it
+                    if (humanAi.ObjectiveManager.IsCurrentOrder<AIObjectiveOperateItem>())
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        if (target is Steering)
+                        {
+                            // Steering is hard-coded -> cannot use the required skills collection defined in the xml
+                            return character.GetSkillLevel("helm") <= c.GetSkillLevel("helm");
+                        }
+                        else
+                        {
+                            return target.DegreeOfSuccess(character) <= target.DegreeOfSuccess(c);
+                        }
+                    }
+                }
+                else
+                {
+                    // Shouldn't go here, unless we allow non-humans to operate items
+                    return false;
+                }
+
+            }
+            return false;
+        }
+
        protected override void Act(float deltaTime)
        {
            if (character.LockHands)
@@ -65,24 +107,24 @@ namespace Barotrauma
                Abandon = true;
                return;
            }
-            ItemComponent target = useController ? controller : component;
+            ItemComponent target = GetTarget();
            if (useController && controller == null)
            {
                character.Speak(TextManager.GetWithVariable("DialogCantFindController", "[item]", component.Item.Name, true), null, 2.0f, "cantfindcontroller", 30.0f);
                Abandon = true;
                return;
            }
+            // Don't allow to operate an item that someone with a better skills already operates, unless this is an order
+            if (objectiveManager.CurrentOrder != this && IsOperatedByAnother(target))
+            {
+                // Don't abandon
+                return;
+            }
            if (target.CanBeSelected)
            {
                if (character.CanInteractWith(target.Item, out _, checkLinked: false))
                {
                    HumanAIController.FaceTarget(target.Item);
-                    // Don't allow to operate an item that someone already operates, unless this objective is an order
-                    if (objectiveManager.CurrentOrder != this && Character.CharacterList.Any(c => c.SelectedConstruction == target.Item && c != character && HumanAIController.IsFriendly(c) && HumanAIController.IsActive(c)))
-                    {
-                        // Don't abandon
-                        return;
-                    }
                    if (character.SelectedConstruction != target.Item)
                    {
                        target.Item.TryInteract(character, false, true);