(900eddc26) Take the priority modifier in account when calculating the priority, not the max value.

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

@@ -1104,6 +1104,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/AIObjectiveFixLeak.cs

@@ -39,10 +39,9 @@ namespace Barotrauma
         public override float GetPriority(AIObjectiveManager objectiveManager)
         {
             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 - 1) * maxMultiplier, 90);
-            return MathHelper.Clamp(Priority + priority, 0, max);
+            float severity = AIObjectiveFixLeaks.GetLeakSeverity(leak);
+            float max = MathHelper.Min((AIObjectiveManager.OrderPriority - 1), 90);
+            return MathHelper.Clamp(Priority + severity * PriorityModifier, 0, max);
         }
 
         public override bool IsDuplicate(AIObjective otherObjective)

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

@@ -91,17 +91,16 @@ namespace Barotrauma
         {
             if (character.Submarine == null) { return 0; }
             if (targets.None()) { return 0; }
-            //if (objectiveManager.CurrentOrder == this)
-            //{
-            //    return AIObjectiveManager.OrderPriority;
-            //}
             float targetValue = MathHelper.Clamp(TargetEvaluation(), 0, 100);
             // If the target value is less than 1% of the max value, let's just treat it as zero.
             if (targetValue < 1) { return 0; }
-            float maxMultiplier = MathHelper.Min(PriorityModifier, 1);
-            float max = MathHelper.Min((AIObjectiveManager.OrderPriority - 1) * maxMultiplier, 90);
+            if (objectiveManager.CurrentOrder == this)
+            {
+                return AIObjectiveManager.OrderPriority;
+            }
+            float max = MathHelper.Min(AIObjectiveManager.OrderPriority - 1, 90);
             float devotion = MathHelper.Min(10, Priority);
-            float value = MathHelper.Min((devotion + targetValue) / 100, 1);
+            float value = MathHelper.Min((devotion + targetValue * PriorityModifier) / 100, 1);
             return MathHelper.Lerp(0, max, value);
         }
 

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

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

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

@@ -36,10 +36,9 @@ namespace Barotrauma
             float damagePriority = MathHelper.Lerp(1, 0, Item.Condition / Item.MaxCondition);
             float successFactor = MathHelper.Lerp(0, 1, Item.Repairables.Average(r => r.DegreeOfSuccess(character)));
             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 - 1) * maxMultiplier, 90);
-            return MathHelper.Clamp(baseLevel * damagePriority * distanceFactor * successFactor, 0, max);
+            float devotion = Math.Max(Priority + isSelected, 1);
+            float max = MathHelper.Min(AIObjectiveManager.OrderPriority - 1, 90);
+            return MathHelper.Clamp(devotion * damagePriority * distanceFactor * successFactor * PriorityModifier, 0, max);
         }
 
         public override bool CanBeCompleted => !abandon;

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -2706,6 +2706,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

@@ -536,6 +536,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

@@ -1188,6 +1188,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

@@ -603,6 +603,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();