Unstable v0.15.17.0 (Hex is out of town edition)

2021-12-03 13:31:10 -03:00
parent cd5c8f3e13
commit 617d9ede88
245 changed files with 8088 additions and 5842 deletions
@@ -52,9 +52,11 @@ namespace Barotrauma
                }
                else
                {
-                    Priority = (objectiveManager.IsCurrentOrder<AIObjectiveGoTo>() ||
-                        objectiveManager.IsCurrentOrder<AIObjectiveReturn>() ||
-                        objectiveManager.Objectives.Any(o => o.Priority > 0 && o is AIObjectiveCombat))
+                    Priority = (
+                        objectiveManager.HasOrder<AIObjectiveGoTo>(o => o.Priority > 0) ||
+                        objectiveManager.HasOrder<AIObjectiveReturn>(o => o.Priority > 0) ||
+                        objectiveManager.HasActiveObjective<AIObjectiveRescue>() ||
+                        objectiveManager.Objectives.Any(o => o is AIObjectiveCombat && o.Priority > 0))
                        && HumanAIController.HasDivingSuit(character) ? 0 : 100;
                }
            }