(914b4d519) Set Reactor window max size to be slightly larger, fixed ItemInventory text wrapping to work better on different resolutions

Barotrauma/BarotraumaShared/Source/Characters/AI/IndoorsSteeringManager.cs

@@ -415,6 +415,18 @@ namespace Barotrauma
                             return;
                         }
 
+                        closestButton.Item.TryInteract(character, false, true, false);
+                        buttonPressCooldown = ButtonPressInterval;
+                        break;
+                    }
+                    else
+                    {
+                        if (!door.HasRequiredItems(character, false) && shouldBeOpen)
+                        {
+                            currentPath.Unreachable = true;
+                            return;
+                        }
+
                         door.Item.TryInteract(character, false, true, true);
                         buttonPressCooldown = ButtonPressInterval;
                         break;

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjective.cs

@@ -28,6 +28,10 @@ namespace Barotrauma
         protected IndoorsSteeringManager PathSteering => HumanAIController.PathSteering;
         protected SteeringManager SteeringManager => HumanAIController.SteeringManager;
 
+        protected HumanAIController HumanAIController => character.AIController as HumanAIController;
+        protected IndoorsSteeringManager PathSteering => HumanAIController.PathSteering;
+        protected SteeringManager SteeringManager => HumanAIController.SteeringManager;
+
         /// <summary>
         /// Run the main objective with all subobjectives concurrently?
         /// If false, the main objective will continue only when all the subobjectives have been removed (done).

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs

@@ -32,7 +32,7 @@ namespace Barotrauma
         public override bool IsCompleted() => false;
         public override bool CanBeCompleted => true;
 
-        public override void Update(float deltaTime)
+        protected override void Act(float deltaTime)
         {
             var currentHull = character.AnimController.CurrentHull;           
             if (HumanAIController.NeedsDivingGear(currentHull) && divingGearObjective == null)

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeaks.cs

@@ -48,6 +48,10 @@ namespace Barotrauma
         protected override IEnumerable<Gap> GetList() => Gap.GapList;
         protected override AIObjective ObjectiveConstructor(Gap gap) => new AIObjectiveFixLeak(gap, character, objectiveManager, PriorityModifier);
 
+            return gapPriority;
+
+        }
+
         public override bool IsDuplicate(AIObjective otherObjective) => otherObjective is AIObjectiveFixLeaks;
         protected override float Average(Gap gap) => gap.Open;
         protected override IEnumerable<Gap> GetList() => Gap.GapList;

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGetItem.cs

@@ -224,6 +224,8 @@ namespace Barotrauma
                 targetItem = item;
                 moveToTarget = rootContainer ?? item;
 
+            }
+
             }
             //if searched through all the items and a target wasn't found, can't be completed
             if (currSearchIndex >= Item.ItemList.Count - 1 && targetItem == null)

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveGoTo.cs

@@ -11,6 +11,8 @@ namespace Barotrauma
 
         private AIObjectiveFindDivingGear findDivingGear;
 
+        private AIObjectiveFindDivingGear findDivingGear;
+
         private AIObjectiveFindDivingGear findDivingGear;
         private Vector2 targetPos;
         private bool repeat;
@@ -224,5 +226,11 @@ namespace Barotrauma
             float interactionDistance = Target is Item i ? ConvertUnits.ToSimUnits(i.InteractDistance) : 0;
             CloseEnough = Math.Max(interactionDistance, CloseEnough);
         }
+
+        private void CalculateCloseEnough()
+        {
+            float interactionDistance = Target is Item i ? ConvertUnits.ToSimUnits(i.InteractDistance) : 0;
+            CloseEnough = Math.Max(interactionDistance, CloseEnough);
+        }
     }
 }

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveIdle.cs

@@ -38,15 +38,6 @@ namespace Barotrauma
         public override bool IsCompleted() => false;
         public override bool CanBeCompleted => true;
 
-        public override float GetPriority()
-        {
-            return 1;
-            float max = Math.Min(Math.Min(AIObjectiveManager.RunPriority, AIObjectiveManager.OrderPriority) - 1, 100);
-            float initiative = character.GetSkillLevel("initiative");
-            Priority = MathHelper.Lerp(1, max, MathUtils.InverseLerp(100, 0, initiative * Random));
-            return Priority;
-        }
-
         public override void Update(float deltaTime)
         {
             if (objectiveManager.CurrentObjective == this)
@@ -101,6 +92,9 @@ namespace Barotrauma
             bool currentTargetIsInvalid = currentTarget == null || IsForbidden(currentTarget) || 
                 (PathSteering.CurrentPath != null && PathSteering.CurrentPath.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull)));
 
+            bool currentTargetIsInvalid = currentTarget == null || IsForbidden(currentTarget) || 
+                (PathSteering.CurrentPath != null && PathSteering.CurrentPath.Nodes.Any(n => HumanAIController.UnsafeHulls.Contains(n.CurrentHull)));
+
             if (currentTargetIsInvalid || (currentTarget == null && currentHullForbidden))
             {
                 newTargetTimer = 0;

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs

@@ -24,6 +24,10 @@ namespace Barotrauma
 
         private AIObjectiveGoTo gotoObjective;
 
+        private bool useController;
+
+        private AIObjectiveGoTo gotoObjective;
+
         public override bool CanBeCompleted
         {
             get
@@ -41,6 +45,8 @@ namespace Barotrauma
 
         public ItemComponent Component => component;
 
+        public ItemComponent Component => component;
+
         public override float GetPriority(AIObjectiveManager objectiveManager)
         {
             if (gotoObjective != null && !gotoObjective.CanBeCompleted) { return 0; }
@@ -110,6 +116,12 @@ namespace Barotrauma
                     return;
                 }
                 else if (!character.Inventory.Items.Contains(component.Item))
+                {
+                    //controller/target can't be selected and the item cannot be picked -> objective can't be completed
+                    canBeCompleted = false;
+                    return;
+                }
+                else if (!character.Inventory.Items.Contains(component.Item))
                 {
                     //controller/target can't be selected and the item cannot be picked -> objective can't be completed
                     abandon = true;