(3241b8fe7) Adjust the priorities. The orders should now always have higher priority than other objectives (except find safety and combat).

Barotrauma/BarotraumaShared/Source/Characters/AI/EnemyAIController.cs

@@ -1080,6 +1080,8 @@ namespace Barotrauma
 
         private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
 
+        private bool IsProperlyLatchedOnSub => LatchOntoAI != null && LatchOntoAI.IsAttachedToSub && SelectedAiTarget?.Entity == wallTarget?.Structure;
+
         //goes through all the AItargets, evaluates how preferable it is to attack the target,
         //whether the Character can see/hear the target and chooses the most preferable target within
         //sight/hearing range

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveExtinguishFires.cs

@@ -26,7 +26,7 @@ namespace Barotrauma
             }
             float basePriority = MathHelper.Clamp(Priority, 0, 10);
             float maxMultiplier = MathHelper.Min(PriorityModifier, 1);
-            float max = MathHelper.Min((AIObjectiveManager.OrderPriority + 20) * maxMultiplier, 90);
+            float max = MathHelper.Min((AIObjectiveManager.OrderPriority - 1) * maxMultiplier, 90);
             return MathHelper.Clamp(basePriority + fireCount * 20, 0, max);
         }
 

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFindSafety.cs

@@ -277,7 +277,7 @@ namespace Barotrauma
             Priority = MathHelper.Clamp(Priority, 0, 100);
             if (divingGearObjective != null && !divingGearObjective.IsCompleted() && divingGearObjective.CanBeCompleted)
             {
-                Priority = Math.Max(Priority, AIObjectiveManager.OrderPriority + 10);
+                Priority = Math.Max(Priority, Math.Min(AIObjectiveManager.OrderPriority + 10, 100));
             }
         }
     }

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveFixLeak.cs

@@ -41,7 +41,7 @@ namespace Barotrauma
             if (leak.Open == 0.0f) { return 0.0f; }
             float priority = AIObjectiveFixLeaks.GetLeakSeverity(leak);
             float maxMultiplier = MathHelper.Min(PriorityModifier, 1);
-            float max = MathHelper.Min((AIObjectiveManager.OrderPriority + 20) * maxMultiplier, 90);
+            float max = MathHelper.Min((AIObjectiveManager.OrderPriority - 1) * maxMultiplier, 90);
             return MathHelper.Clamp(Priority + priority, 0, max);
         }
 

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveLoop.cs

@@ -97,7 +97,7 @@ namespace Barotrauma
             // If the avg is less than 1% of the max value, let's just treat it as zero.
             if (avg < 1) { return 0; }
             float maxMultiplier = MathHelper.Min(PriorityModifier, 1);
-            float max = MathHelper.Min((AIObjectiveManager.OrderPriority + 20) * maxMultiplier, 90);
+            float max = MathHelper.Min((AIObjectiveManager.OrderPriority - 1) * maxMultiplier, 90);
             float value = MathHelper.Min((Priority + avg) / 100 * PriorityModifier, 1);
             return MathHelper.Lerp(0, max, value);
         }

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveOperateItem.cs

@@ -51,7 +51,7 @@ namespace Barotrauma
             }
             float value = (Priority + (AIObjectiveManager.OrderPriority / 2)) * PriorityModifier;
             float maxMultiplier = MathHelper.Min(PriorityModifier, 1);
-            float max = MathHelper.Min(AIObjectiveManager.OrderPriority * maxMultiplier, 90);
+            float max = MathHelper.Min((AIObjectiveManager.OrderPriority - 1) * maxMultiplier, 90);
             return MathHelper.Clamp(value, 0, max);
         }
 

Barotrauma/BarotraumaShared/Source/Characters/AI/Objectives/AIObjectiveRepairItem.cs

@@ -38,7 +38,7 @@ namespace Barotrauma
             float isSelected = character.SelectedConstruction == Item ? 50 : 0;
             float baseLevel = Math.Max(Priority + isSelected, 1);
             float maxMultiplier = MathHelper.Min(PriorityModifier, 1);
-            float max = MathHelper.Min((AIObjectiveManager.OrderPriority + 20) * maxMultiplier, 90);
+            float max = MathHelper.Min((AIObjectiveManager.OrderPriority - 1) * maxMultiplier, 90);
             return MathHelper.Clamp(baseLevel * damagePriority * distanceFactor * successFactor, 0, max);
         }
 

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -2658,6 +2658,10 @@ namespace Barotrauma
             GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif
 
+#if CLIENT
+            GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
+#endif
+
 #if CLIENT
             GameMain.GameSession?.CrewManager?.RemoveCharacter(this);
 #endif

Barotrauma/BarotraumaShared/Source/Items/Components/Machines/Steering.cs

@@ -380,6 +380,19 @@ namespace Barotrauma.Items.Components
             return true;
         }
 
+        public override void OnItemLoaded()
+        {
+            sonar = item.GetComponent<Sonar>();
+        }
+
+        public override bool Select(Character character)
+        {
+            if (!CanBeSelected) return false;
+
+            user = character;
+            return true;
+        }
+
         public override void Update(float deltaTime, Camera cam)
         {
             networkUpdateTimer -= deltaTime;

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1140,6 +1140,10 @@ namespace Barotrauma
             {
                 ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
             }
+            if (!broken)
+            {
+                ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
+            }
             ApplyStatusEffects(!waterProof && inWater ? ActionType.InWater : ActionType.NotInWater, deltaTime);
 
             if (body == null || !body.Enabled || !inWater || ParentInventory != null || Removed) { return; }

Barotrauma/BarotraumaShared/Source/Map/FireSource.cs

@@ -24,8 +24,6 @@ namespace Barotrauma
 
         private bool removed;
 
-        private bool removed;
-
 #if CLIENT
         private List<Decal> burnDecals = new List<Decal>();
 #endif

Barotrauma/BarotraumaShared/Source/Map/Hull.cs

@@ -375,6 +375,25 @@ namespace Barotrauma
             }
         }
 
+        public string DisplayName
+        {
+            get;
+            private set;
+        }
+
+        private string roomName;
+        [Editable, Serialize("", true, translationTextTag: "RoomName.")]
+        public string RoomName
+        {
+            get { return roomName; }
+            set
+            {
+                if (roomName == value) { return; }
+                roomName = value;
+                DisplayName = TextManager.Get(roomName, returnNull: true) ?? roomName;
+            }
+        }
+
         public override Rectangle Rect
         {
             get

Barotrauma/BarotraumaShared/Source/PlayerInput.cs

@@ -162,6 +162,21 @@ namespace Barotrauma
             get { return binding; }
         }
 
+        public void SetState()
+        {
+            hit = binding.IsHit();
+            if (hit) hitQueue = true;
+
+            held = binding.IsDown();
+            if (held) heldQueue = true;
+        }
+#endif
+
+        public KeyOrMouse State
+        {
+            get { return binding; }
+        }
+
         public void SetState()
         {
             hit = binding.IsHit();