Unstable 0.16.3.0

2022-02-10 02:52:08 +09:00
parent 6814a11520
commit 2190fe08ef
115 changed files with 993 additions and 453 deletions
@@ -76,6 +76,10 @@ namespace Barotrauma
                    // -> ignore find safety unless we need to find a diving gear
                    Priority = 0;
                }
+                else if (objectiveManager.Objectives.Any(o => o is AIObjectiveCombat && o.Priority > 0))
+                {
+                    Priority = 0;
+                }
                Priority = MathHelper.Clamp(Priority, 0, 100);
                if (divingGearObjective != null && !divingGearObjective.IsCompleted && divingGearObjective.CanBeCompleted)
                {