(ad567dea) v0.9.7.1

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

@@ -45,17 +45,20 @@ namespace Barotrauma
         private float randomUpdateInterval = 5;
         public float Random { get; private set; }
 
-        public void CalculatePriority()
+        public void SetRandom()
         {
             Random = Rand.Range(0.5f, 1.5f);
             randomTimer = randomUpdateInterval;
+        }
+
+        public override float GetPriority()
+        {
             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 float GetPriority() => Priority;
-
         public override void Update(float deltaTime)
         {
             if (objectiveManager.CurrentObjective == this)
@@ -66,7 +69,7 @@ namespace Barotrauma
                 }
                 else
                 {
-                    CalculatePriority();
+                    SetRandom();
                 }
             }
         }
@@ -179,7 +182,7 @@ namespace Barotrauma
             if (!character.IsClimbing)
             {
                 if (SteeringManager != PathSteering || (PathSteering.CurrentPath != null &&
-                    (PathSteering.CurrentPath.Finished || PathSteering.CurrentPath.Unreachable || PathSteering.CurrentPath.HasOutdoorsNodes)))
+                    (PathSteering.CurrentPath.NextNode == null || PathSteering.CurrentPath.Unreachable || PathSteering.CurrentPath.HasOutdoorsNodes)))
                 {
                     Wander(deltaTime);
                     return;
@@ -261,9 +264,9 @@ namespace Barotrauma
         public static bool IsForbidden(Hull hull)
         {
             if (hull == null) { return true; }
-            string hullName = hull.RoomName;
+            string hullName = hull.RoomName?.ToLowerInvariant();
             if (hullName == null) { return false; }
-            return hullName.Contains("ballast", StringComparison.OrdinalIgnoreCase) || hullName.Contains("airlock", StringComparison.OrdinalIgnoreCase);
+            return hullName.Contains("ballast") || hullName.Contains("airlock");
         }
     }
 }