(1fe9abf75) Fix the GetAdjacentHulls method.

2019-05-16 06:45:36 +03:00
parent 3318fd8e14
commit 496ee1492c
31 changed files with 367 additions and 394 deletions
@@ -169,7 +169,15 @@ namespace Barotrauma
                bool highPressure = Character.CurrentHull == null || Character.CurrentHull.LethalPressure > 0 && Character.PressureProtection <= 0;
                bool shouldKeepTheGearOn = !ObjectiveManager.IsCurrentObjective<AIObjectiveIdle>();

-                bool removeDivingSuit = (oxygenLow && !highPressure) || (!shouldKeepTheGearOn && Character.CurrentHull.WaterPercentage < 1 && !Character.IsClimbing && steeringManager == insideSteering && !PathSteering.InStairs);
+                // Don't allow to drop the diving suit in water or while climbing or if the current path has stairs
+                bool removeDivingSuit = 
+                    (oxygenLow && !highPressure) || 
+                        (!shouldKeepTheGearOn && 
+                        Character.CurrentHull.WaterPercentage < 1 && 
+                        !Character.IsClimbing && 
+                        steeringManager == insideSteering && 
+                        !PathSteering.InStairs);
+
                if (removeDivingSuit)
                {
                    var divingSuit = Character.Inventory.FindItemByIdentifier("divingsuit") ?? Character.Inventory.FindItemByTag("divingsuit");