409d4d9...aeafa16 (merge human-ai)

2019-03-18 22:52:17 +02:00
parent 80ab27df22
commit 3301bed442
88 changed files with 2334 additions and 1657 deletions
@@ -9,6 +9,10 @@ namespace Barotrauma
 {
    class AIObjectiveRescue : AIObjective
    {
+        public override string DebugTag => "rescue";
+        public override bool ForceRun => true;
+        public override bool KeepDivingGearOn => true;
+
        const float TreatmentDelay = 0.5f;

        private readonly Character targetCharacter;
@@ -102,7 +106,7 @@ namespace Barotrauma
                }

                return !character.AnimController.InWater && !targetCharacter.AnimController.InWater &&
-                    AIObjectiveFindSafety.GetHullSafety(character.CurrentHull, character) > 50.0f;
+                    HumanAIController.GetHullSafety(character.CurrentHull, character) > HumanAIController.HULL_SAFETY_THRESHOLD;
            }

            return false;