(420c429b4) Fix issues in reporting.

Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs

@@ -108,6 +108,61 @@ namespace Barotrauma
                         }
                     }
                     
+                    //unconscious/dead characters can't correct their position using AnimController movement
+                    // -> we need to correct it manually
+                    if (!character.AllowInput)
+                    {
+                        float mainLimbDistSqrd = Vector2.DistanceSquared(MainLimb.PullJointWorldAnchorA, Collider.SimPosition);
+                        float mainLimbErrorTolerance = 0.1f;
+                        //if the main limb is roughly at the correct position and the collider isn't moving (much at least),
+                        //don't attempt to correct the position.
+                        if (mainLimbDistSqrd > mainLimbErrorTolerance || Collider.LinearVelocity.LengthSquared() > 0.05f)
+                        {
+                            MainLimb.PullJointWorldAnchorB = Collider.SimPosition;
+                            MainLimb.PullJointEnabled = true;
+                        }
+                        character.SelectedConstruction = character.MemState[0].SelectedItem;
+                    }
+
+                    if (character.MemState[0].Animation == AnimController.Animation.CPR)
+                    {
+                        character.AnimController.Anim = AnimController.Animation.CPR;
+                    }
+                    else if (character.AnimController.Anim == AnimController.Animation.CPR)
+                    {
+                        character.AnimController.Anim = AnimController.Animation.None;
+                    }
+
+                    Vector2 newVelocity = Collider.LinearVelocity;
+                    Vector2 newPosition = Collider.SimPosition;
+                    float newRotation = Collider.Rotation;
+                    float newAngularVelocity = Collider.AngularVelocity;
+                    Collider.CorrectPosition(character.MemState, out newPosition, out newVelocity, out newRotation, out newAngularVelocity);
+
+                    newVelocity = newVelocity.ClampLength(100.0f);
+                    if (!MathUtils.IsValid(newVelocity)) { newVelocity = Vector2.Zero; }
+                    overrideTargetMovement = newVelocity.LengthSquared() > 0.01f ? newVelocity : Vector2.Zero;
+
+                    Collider.LinearVelocity = newVelocity;
+                    Collider.AngularVelocity = newAngularVelocity;
+
+                    float distSqrd = Vector2.DistanceSquared(newPosition, Collider.SimPosition);
+                    float errorTolerance = character.AllowInput ? 0.01f : 0.2f;
+                    if (distSqrd > errorTolerance)
+                    {
+                        if (distSqrd > 10.0f || !character.AllowInput)
+                        {
+                            Collider.TargetRotation = newRotation;
+                            SetPosition(newPosition, lerp: distSqrd < 5.0f, ignorePlatforms: false);
+                        }
+                        else
+                        {
+                            Collider.TargetRotation = newRotation;
+                            Collider.TargetPosition = newPosition;
+                            Collider.MoveToTargetPosition(true);
+                        }
+                    }
+                    
                     //unconscious/dead characters can't correct their position using AnimController movement
                     // -> we need to correct it manually
                     if (!character.AllowInput)
@@ -151,32 +206,34 @@ namespace Barotrauma
                     }
 
                 }
-
+                character.MemLocalState.Clear();
-                if (character.MemLocalState.Count > 120) character.MemLocalState.RemoveRange(0, character.MemLocalState.Count - 120);
-                character.MemState.Clear();
             }
-        }
+            else
-        
-        partial void ImpactProjSpecific(float impact, Body body)
-        {
-            float volume = MathHelper.Clamp(impact - 3.0f, 0.5f, 1.0f);
-
-            if (body.UserData is Limb limb && character.Stun <= 0f)
             {
-                if (impact > 3.0f) { PlayImpactSound(limb); }
+                //remove states with a timestamp (there may still timestamp-based states 
-            }
+                //in the list if the controlled character switches from timestamp-based interpolation to ID-based)
-            else if (body.UserData is Limb || body == Collider.FarseerBody)
+                character.MemState.RemoveAll(m => m.Timestamp > 0.0f);
-            {
+                
-                if (!character.IsRemotePlayer && impact > ImpactTolerance)
+                for (int i = 0; i < character.MemLocalState.Count; i++)
                 {
-                    SoundPlayer.PlayDamageSound("LimbBlunt", strongestImpact, Collider);
+                    if (character.Submarine == null)
+                    {
+                        //transform in-sub coordinates to outside coordinates
+                        if (character.MemLocalState[i].Position.Y > lowestSubPos)
+                        {                            
+                            character.MemLocalState[i].TransformInToOutside();
+                        }
+                    }
+                    else if (currentHull?.Submarine != null)
+                    {
+                        //transform outside coordinates to in-sub coordinates
+                        if (character.MemLocalState[i].Position.Y < lowestSubPos)
+                        {
+                            character.MemLocalState[i].TransformOutToInside(currentHull.Submarine);
+                        }
+                    }
+
                 }
-            }
-            if (Character.Controlled == character)
-            {
-                GameMain.GameScreen.Cam.Shake = Math.Min(Math.Max(strongestImpact, GameMain.GameScreen.Cam.Shake), 3.0f);
-            }
-        }
 
                 if (character.MemState.Count < 1) return;
 

Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs

@@ -74,17 +74,12 @@ namespace Barotrauma
         public CrewManager(XElement element, bool isSinglePlayer)
             : this(isSinglePlayer)
         {
-            if (GameMain.Client != null)
+            if (!isSinglePlayer)
             {
-                //let the server create random conversations in MP
+                DebugConsole.ThrowError("Cannot add messages to single player chat box in multiplayer mode!\n" + Environment.StackTrace);
                 return;
             }
-            List<Character> availableSpeakers = Character.CharacterList.FindAll(c =>
+            if (string.IsNullOrEmpty(text)) { return; }
-                c.AIController is HumanAIController &&
-                !c.IsDead &&
-                c.SpeechImpediment <= 100.0f);
-            pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
-        }
 
                 var characterInfo = new CharacterInfo(subElement);
                 characterInfos.Add(characterInfo);
@@ -95,6 +90,7 @@ namespace Barotrauma
                     break;
                 }
             }
+            ChatBox.AddMessage(ChatMessage.Create(senderName, text, messageType, sender));
         }
 
         partial void InitProjectSpecific()
@@ -243,24 +239,27 @@ namespace Barotrauma
 
         public IEnumerable<Character> GetCharacters()
         {
-            if (characterInfos.Contains(characterInfo))
+            if (character?.Inventory == null) return null;
-            {
-                DebugConsole.ThrowError("Tried to add the same character info to CrewManager twice.\n" + Environment.StackTrace);
-                return;
-            }
 
-            characterInfos.Add(characterInfo);
+            var radioItem = character.Inventory.Items.FirstOrDefault(it => it != null && it.GetComponent<WifiComponent>() != null);
+            if (radioItem == null) return null;
+            if (requireEquipped && !character.HasEquippedItem(radioItem)) return null;
+
+            return radioItem.GetComponent<WifiComponent>();
         }
 
         public IEnumerable<CharacterInfo> GetCharacterInfos()
         {
-            if (character == null)
+            if (GameMain.Client != null)
             {
-                DebugConsole.ThrowError("Tried to remove a null character from CrewManager.\n" + Environment.StackTrace);
+                //let the server create random conversations in MP
                 return;
             }
-            characters.Remove(character);
+            List<Character> availableSpeakers = Character.CharacterList.FindAll(c =>
-            if (removeInfo) characterInfos.Remove(character.Info);
+                c.AIController is HumanAIController &&
+                !c.IsDead &&
+                c.SpeechImpediment <= 100.0f);
+            pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
         }
 
         public void AddCharacter(Character character)
@@ -634,183 +633,9 @@ namespace Barotrauma
             {
                 characterListBox.BarScroll = roundedPos;
             }
-            var characterArea = new GUIButton(new RectTransform(new Point(characterInfoWidth, frame.Rect.Height), frame.RectTransform, Anchor.CenterLeft), style: "GUITextBox")
+            soundIcon.Visible = !muted && !mutedLocally;
-            {
+            soundIconDisabled.Visible = muted || mutedLocally;
-                UserData = character,
+            soundIconDisabled.ToolTip = TextManager.Get(mutedLocally ? "MutedLocally" : "MutedGlobally");
-                Color = frame.Color,
-                SelectedColor = frame.SelectedColor,
-                HoverColor = frame.HoverColor,
-                ToolTip = characterToolTip
-            };
-
-            var soundIcon = new GUIImage(new RectTransform(new Point((int)(characterArea.Rect.Height * 0.5f)), characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(5, 0) },
-                "GUISoundIcon")
-            {
-                UserData = "soundicon",
-                CanBeFocused = false,
-                Visible = true
-            };
-            soundIcon.Color = new Color(soundIcon.Color, 0.0f);
-            new GUIImage(new RectTransform(new Point((int)(characterArea.Rect.Height * 0.5f)), characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(5, 0) },
-                "GUISoundIconDisabled")
-            {
-                UserData = "soundicondisabled",
-                CanBeFocused = true,
-                Visible = false
-            };
-
-            if (isSinglePlayer)
-            {
-                characterArea.OnClicked = CharacterClicked;
-            }
-            else
-            {
-                characterArea.CanBeFocused = false;
-                characterArea.CanBeSelected = false;
-            }
-
-            var characterImage = new GUICustomComponent(new RectTransform(new Point(characterArea.Rect.Height), characterArea.RectTransform, Anchor.CenterLeft),
-                onDraw: (sb, component) => character.Info.DrawIcon(sb, component.Rect.Center.ToVector2(), targetAreaSize: component.Rect.Size.ToVector2()))
-            {
-                CanBeFocused = false,
-                HoverColor = Color.White,
-                SelectedColor = Color.White,
-                ToolTip = characterToolTip
-            };
-
-            var characterName = new GUITextBlock(new RectTransform(new Point(characterArea.Rect.Width - characterImage.Rect.Width - soundIcon.Rect.Width - 10, characterArea.Rect.Height),
-                characterArea.RectTransform, Anchor.CenterRight) { AbsoluteOffset = new Point(soundIcon.Rect.Width + 10, 0) },
-                character.Name, textColor: frame.Color, font: GUI.SmallFont, wrap: true)
-            {
-                Color = frame.Color,
-                HoverColor = Color.Transparent,
-                SelectedColor = Color.Transparent,
-                CanBeFocused = false,
-                ToolTip = characterToolTip,
-                AutoScale = true
-            };
-
-            //---------------- order buttons ----------------
-
-            var orderButtonFrame = new GUILayoutGroup(new RectTransform(new Point(100, frame.Rect.Height), frame.RectTransform)
-            { AbsoluteOffset = new Point(characterInfoWidth + spacing, 0) },
-                isHorizontal: true, childAnchor: Anchor.CenterLeft)
-            {
-                AbsoluteSpacing = (int)(10 * GUI.Scale),
-                UserData = "orderbuttons",
-                CanBeFocused = false
-            };
-
-            //listbox for holding the orders inappropriate for this character
-            //(so we can easily toggle their visibility)
-            var wrongOrderList = new GUIListBox(new RectTransform(new Point(50, orderButtonFrame.Rect.Height), orderButtonFrame.RectTransform), isHorizontal: true, style: null)
-            {
-                ScrollBarEnabled = false,
-                ScrollBarVisible = false,
-                Enabled = false,
-                Spacing = spacing,
-                ClampMouseRectToParent = false
-            };
-            wrongOrderList.Content.ClampMouseRectToParent = false;
-
-            for (int i = 0; i < orders.Count; i++)
-            {
-                var order = orders[i];
-                if (order.TargetAllCharacters) continue;
-
-                RectTransform btnParent = (i >= correctOrderCount + neutralOrderCount) ?
-                    wrongOrderList.Content.RectTransform :
-                    orderButtonFrame.RectTransform;
-
-                var btn = new GUIButton(new RectTransform(new Point(iconSize, iconSize), btnParent, Anchor.CenterLeft),
-                    style: null)
-                {
-                    UserData = order
-                };
-
-                new GUIFrame(new RectTransform(new Vector2(1.5f), btn.RectTransform, Anchor.Center), "OuterGlow")
-                {
-                    Color = Color.Lerp(order.Color, frame.Color, 0.5f) * 0.8f,
-                    HoverColor = Color.Lerp(order.Color, frame.Color, 0.5f) * 1.0f,
-                    PressedColor = Color.Lerp(order.Color, frame.Color, 0.5f) * 0.6f,
-                    UserData = "selected",
-                    CanBeFocused = false,
-                    Visible = false
-                };
-
-                var img = new GUIImage(new RectTransform(Vector2.One, btn.RectTransform), order.Prefab.SymbolSprite);
-                img.Scale = iconSize / (float)img.SourceRect.Width;
-                img.Color = Color.Lerp(order.Color, frame.Color, 0.5f);
-                img.ToolTip = order.Name;
-                img.HoverColor = Color.Lerp(img.Color, Color.White, 0.5f);
-
-                btn.OnClicked += (GUIButton button, object userData) =>
-                {
-                    if (Character.Controlled == null || Character.Controlled.SpeechImpediment >= 100.0f) return false;
-
-                    if (btn.GetChildByUserData("selected").Visible)
-                    {
-                        SetCharacterOrder(character, Order.PrefabList.Find(o => o.AITag == "dismissed"), null, Character.Controlled);
-                    }
-                    else
-                    {
-                        if (order.ItemComponentType != null || order.ItemIdentifiers.Length > 0 || order.Options.Length > 1)
-                        {
-                            CreateOrderTargetFrame(button, character, order);
-                        }
-                        else
-                        {
-                            SetCharacterOrder(character, order, null, Character.Controlled);
-                        }
-                    }
-                    return true;
-                };
-                btn.UserData = order;
-                btn.ToolTip = order.Name;
-
-                //divider between different groups of orders
-                if (i == correctOrderCount - 1 || i == correctOrderCount + neutralOrderCount - 1)
-                {
-                    //TODO: divider sprite
-                    new GUIFrame(new RectTransform(new Point(8, iconSize), orderButtonFrame.RectTransform), style: "GUIButton");
-                }
-            }
-
-            var toggleWrongOrderBtn = new GUIButton(new RectTransform(new Point((int)(30 * GUI.Scale), wrongOrderList.Rect.Height), wrongOrderList.Content.RectTransform),
-                "", style: "UIToggleButton")
-            {
-                UserData = "togglewrongorder",
-                CanBeFocused = false
-            };
-
-            wrongOrderList.RectTransform.NonScaledSize = new Point(
-                wrongOrderList.Content.Children.Sum(c => c.Rect.Width + wrongOrderList.Spacing),
-                wrongOrderList.RectTransform.NonScaledSize.Y);
-            wrongOrderList.RectTransform.SetAsLastChild();
-
-            new GUIFrame(new RectTransform(new Point(
-                wrongOrderList.Rect.Width - toggleWrongOrderBtn.Rect.Width - wrongOrderList.Spacing * 2,
-                wrongOrderList.Rect.Height), wrongOrderList.Content.RectTransform),
-                style: null)
-            {
-                CanBeFocused = false
-            };
-
-            //scale to fit the content
-            orderButtonFrame.RectTransform.NonScaledSize = new Point(
-                orderButtonFrame.Children.Sum(c => c.Rect.Width + orderButtonFrame.AbsoluteSpacing),
-                orderButtonFrame.RectTransform.NonScaledSize.Y);
-
-            frame.RectTransform.NonScaledSize = new Point(
-                characterInfoWidth + spacing + (orderButtonFrame.Rect.Width - wrongOrderList.Rect.Width),
-                frame.RectTransform.NonScaledSize.Y);
-
-            characterListBox.RectTransform.NonScaledSize = new Point(
-                characterListBox.Content.Children.Max(c => c.Rect.Width) + wrongOrderList.Rect.Width,
-                characterListBox.RectTransform.NonScaledSize.Y);
-            characterListBox.Content.RectTransform.NonScaledSize = characterListBox.RectTransform.NonScaledSize;
-            characterListBox.UpdateScrollBarSize();
-            return frame;
         }
 
         private IEnumerable<object> KillCharacterAnim(GUIComponent component)
@@ -954,12 +779,6 @@ namespace Barotrauma
                 }
                 return;
             }
-            List<Character> availableSpeakers = Character.CharacterList.FindAll(c =>
-                c.AIController is HumanAIController &&
-                !c.IsDead &&
-                c.SpeechImpediment <= 100.0f);
-            pendingConversationLines.AddRange(NPCConversation.CreateRandom(availableSpeakers));
-        }
 
             character.SetOrder(order, option, orderGiver, speak: orderGiver != character);
             if (IsSinglePlayer)
@@ -1017,23 +836,19 @@ namespace Barotrauma
                     }
                 }
             }
-
+            //only one target (or an order with no particular targets), just show options
-            character.SetOrder(order, option, orderGiver, speak: orderGiver != character);
+            else
-            if (IsSinglePlayer)
             {
-                orderGiver?.Speak(
+                orderTargetFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.2f + order.Options.Length * 0.1f, 0.18f), GUI.Canvas)
-                    order.GetChatMessage(character.Name, orderGiver.CurrentHull?.DisplayName, givingOrderToSelf: character == orderGiver, orderOption: option), null);
+                    { AbsoluteOffset = new Point(orderButton.Rect.Center.X, orderButton.Rect.Bottom) },
-            }
+                    isHorizontal: true, childAnchor: Anchor.BottomLeft)
-            else if (orderGiver != null)
-            {
-                OrderChatMessage msg = new OrderChatMessage(order, option, order.TargetItemComponent?.Item, character, orderGiver);
-                if (GameMain.Client != null)
                 {
-                    GameMain.Client.SendChatMessage(msg);
+                    UserData = character,
-                }
+                    Stretch = true
-            }
+                };
-            DisplayCharacterOrder(character, order);
+                //line connecting the order button to the option buttons
-        }
+                //TODO: sprite
+                new GUIFrame(new RectTransform(new Vector2(0.5f, 1.0f), orderTargetFrame.RectTransform), style: null);
 
         /// <summary>
         /// Create the UI panel that's used to select the target and options for a given order

Barotrauma/BarotraumaClient/Source/Screens/CampaignSetupUI.cs

@@ -206,6 +206,8 @@ namespace Barotrauma
 
         private GUILayoutGroup subPreviewContainer;
 
+        private GUILayoutGroup subPreviewContainer;
+
         private GUIButton loadGameButton;
         
         public Action<Submarine, string, string> StartNewGame;

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

@@ -90,6 +90,7 @@ namespace Barotrauma
 
             if (Character.SpeechImpediment < 100.0f)
             {
+                // TODO: add a timer -> once per second is enough?
                 ReportProblems();
                 UpdateSpeaking();
             }
@@ -246,7 +247,7 @@ namespace Barotrauma
             Order newOrder = null;
             if (Character.CurrentHull != null)
             {
-                if (AIObjectiveExtinguishFires.IsValidTarget(Character.CurrentHull))
+                if (AIObjectiveExtinguishFires.IsValidTarget(Character.CurrentHull, Character))
                 {
                     var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportfire");
                     newOrder = new Order(orderPrefab, Character.CurrentHull, null);
@@ -255,7 +256,7 @@ namespace Barotrauma
 
                 foreach (var gap in Character.CurrentHull.ConnectedGaps)
                 {
-                    if (AIObjectiveFixLeaks.IsValidTarget(gap))
+                    if (AIObjectiveFixLeaks.IsValidTarget(gap, Character))
                     {
                         var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportbreach");
                         newOrder = new Order(orderPrefab, Character.CurrentHull, null);
@@ -266,7 +267,7 @@ namespace Barotrauma
                 foreach (Item item in Item.ItemList)
                 {
                     if (item.CurrentHull != Character.CurrentHull) { continue; }
-                    if (AIObjectiveRepairItems.IsValidTarget(item))
+                    if (AIObjectiveRepairItems.IsValidTarget(item, Character))
                     {
                         var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportbrokendevices");
                         newOrder = new Order(orderPrefab, Character.CurrentHull, item.Repairables?.FirstOrDefault());
@@ -277,7 +278,7 @@ namespace Barotrauma
                 foreach (Character c in Character.CharacterList)
                 {
                     if (c.CurrentHull != Character.CurrentHull) { continue; }
-                    if (AIObjectiveFightIntruders.IsValidTarget(c))
+                    if (AIObjectiveFightIntruders.IsValidTarget(c, Character))
                     {
                         var orderPrefab = Order.PrefabList.Find(o => o.AITag == "reportintruders");
                         newOrder = new Order(orderPrefab, Character.CurrentHull, null);
@@ -483,7 +484,7 @@ namespace Barotrauma
                 case "reportbreach":
                     foreach (var gap in hull.ConnectedGaps)
                     {
-                        if (AIObjectiveFixLeaks.IsValidTarget(gap))
+                        if (AIObjectiveFixLeaks.IsValidTarget(gap, character))
                         {
                             AddTargets<AIObjectiveFixLeaks, Gap>(character, gap);
                         }
@@ -493,7 +494,7 @@ namespace Barotrauma
                     foreach (var item in Item.ItemList)
                     {
                         if (item.CurrentHull != hull) { continue; }
-                        if (AIObjectiveRepairItems.IsValidTarget(item))
+                        if (AIObjectiveRepairItems.IsValidTarget(item, character))
                         {
                             AddTargets<AIObjectiveRepairItems, Item>(character, item);
                         }
@@ -503,7 +504,7 @@ namespace Barotrauma
                     foreach (var enemy in Character.CharacterList)
                     {
                         if (enemy.CurrentHull != hull) { continue; }
-                        if (AIObjectiveFightIntruders.IsValidTarget(enemy))
+                        if (AIObjectiveFightIntruders.IsValidTarget(enemy, character))
                         {
                             AddTargets<AIObjectiveFightIntruders, Character>(character, enemy);
                         }
@@ -513,7 +514,7 @@ namespace Barotrauma
                     foreach (var c in Character.CharacterList)
                     {
                         if (c.CurrentHull != hull) { continue; }
-                        if (AIObjectiveRescueAll.IsValidTarget(c))
+                        if (AIObjectiveRescueAll.IsValidTarget(c, character))
                         {
                             AddTargets<AIObjectiveRescueAll, Character>(character, c);
                         }

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

@@ -248,7 +248,7 @@ namespace Barotrauma
             {
                 if (retreatObjective == null || retreatObjective.Target != retreatTarget)
                 {
-                    retreatObjective = new AIObjectiveGoTo(retreatTarget, character, objectiveManager, false, true, priorityModifier: PriorityModifier);
+                    retreatObjective = new AIObjectiveGoTo(retreatTarget, character, objectiveManager, false, true);
                 }
                 retreatObjective.TryComplete(deltaTime);
             }
@@ -260,7 +260,7 @@ namespace Barotrauma
             retreatObjective = null;
             if (followTargetObjective == null)
             {
-                followTargetObjective = new AIObjectiveGoTo(Enemy, character, objectiveManager, repeat: true, getDivingGearIfNeeded: true, priorityModifier: PriorityModifier)
+                followTargetObjective = new AIObjectiveGoTo(Enemy, character, objectiveManager, repeat: true, getDivingGearIfNeeded: true)
                 {
                     AllowGoingOutside = true,
                     IgnoreIfTargetDead = true,

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

@@ -20,16 +20,7 @@ namespace Barotrauma
             }
         }
 
-        protected override bool Filter(Hull target)
+        protected override bool Filter(Hull hull) => IsValidTarget(hull, character);
-        {
-            if (target == null) { return false; }
-            if (target.FireSources.None()) { return false; }
-            if (target.Submarine == null) { return false; }
-            if (target.Submarine.TeamID != character.TeamID) { return false; }
-            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(target, true)) { return false; }
-            //if (Character.CharacterList.Any(c => c.CurrentHull == target && !HumanAIController.IsFriendly(c))) { return false; }
-            return true;
-        }
 
         protected override float TargetEvaluation() => objectiveManager.CurrentObjective == this ? 100 : targets.Sum(t => GetFireSeverity(t));
 
@@ -39,5 +30,15 @@ namespace Barotrauma
         protected override IEnumerable<Hull> GetList() => Hull.hullList;
 
         protected override AIObjective ObjectiveConstructor(Hull target) => new AIObjectiveExtinguishFire(character, target, objectiveManager, PriorityModifier);
+
+        public static bool IsValidTarget(Hull hull, Character character)
+        {
+            if (hull == null) { return false; }
+            if (hull.FireSources.None()) { return false; }
+            if (hull.Submarine == null) { return false; }
+            if (hull.Submarine.TeamID != character.TeamID) { return false; }
+            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(hull, true)) { return false; }
+            return true;
+        }
     }
 }

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

@@ -14,11 +14,10 @@ namespace Barotrauma
         public AIObjectiveFightIntruders(Character character, AIObjectiveManager objectiveManager, float priorityModifier = 1) 
             : base(character, objectiveManager, priorityModifier) { }
 
-        public override bool IsDuplicate(AIObjective otherObjective) => otherObjective is AIObjectiveFightIntruders && otherObjective.Option == Option;
+        public override bool IsDuplicate(AIObjective otherObjective) => otherObjective is AIObjectiveFightIntruders;
 
         protected override void FindTargets()
         {
-            if (Option == null) { return; }
             base.FindTargets();
             if (targets.None() && objectiveManager.CurrentOrder == this)
             {
@@ -26,21 +25,28 @@ namespace Barotrauma
             }
         }
 
-        protected override bool Filter(Character target)
+        protected override bool Filter(Character target) => IsValidTarget(target, character);
-        {
+
-            if (target == null || target.IsDead || target.Removed) { return false; }
-            if (HumanAIController == null || HumanAIController.IsFriendly(target)) { return false; }
-            if (target.Submarine != character.Submarine) { return false; }
-            if (target.CurrentHull == null && character.Submarine != null) { return false; }
-            return true;
-        }
         protected override IEnumerable<Character> GetList() => Character.CharacterList;
 
         protected override AIObjective ObjectiveConstructor(Character target) => new AIObjectiveCombat(character, target, AIObjectiveCombat.CombatMode.Offensive, objectiveManager, PriorityModifier) { useCoolDown = false };
+
         protected override float TargetEvaluation()
         {
             // TODO: sorting criteria
-            return 90;
+            return 100;
+        }
+
+        public static bool IsValidTarget(Character target, Character character)
+        {
+            if (target == null || target.IsDead || target.Removed) { return false; }
+            if (target == character) { return false; }
+            if (HumanAIController.IsFriendly(character, target)) { return false; }
+            if (target.Submarine == null) { return false; }
+            if (target.Submarine.TeamID != character.TeamID) { return false; }
+            if (target.CurrentHull == null) { return false; }
+            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(target.CurrentHull, true)) { return false; }
+            return true;
         }
     }
 }

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

@@ -150,6 +150,31 @@ namespace Barotrauma
             {
 #if DEBUG
                 DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
+#endif
+                abandon = true;
+                return;
+            }
+            Vector2 gapDiff = Leak.WorldPosition - character.WorldPosition;
+            // TODO: use the collider size/reach?
+            if (!character.AnimController.InWater && Math.Abs(gapDiff.X) < 100 && gapDiff.Y < 0.0f && gapDiff.Y > -150)
+            {
+                HumanAIController.AnimController.Crouching = true;
+            }
+            float reach = ConvertUnits.ToSimUnits(repairTool.Range);
+            bool canOperate = ConvertUnits.ToSimUnits(gapDiff.Length()) < reach;
+            if (canOperate)
+            {
+                TryAddSubObjective(ref operateObjective, () => new AIObjectiveOperateItem(repairTool, character, objectiveManager, option: "", requireEquip: true, operateTarget: Leak));
+            }
+            else
+            {
+                TryAddSubObjective(ref gotoObjective, () => new AIObjectiveGoTo(ConvertUnits.ToSimUnits(GetStandPosition()), character, objectiveManager) { CloseEnough = reach * 0.75f });
+            }
+            var repairTool = weldingTool.GetComponent<RepairTool>();
+            if (repairTool == null)
+            {
+#if DEBUG
+                DebugConsole.ThrowError("AIObjectiveFixLeak failed - the item \"" + weldingTool + "\" has no RepairTool component but is tagged as a welding tool");
 #endif
                 abandon = true;
                 return;

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

@@ -22,15 +22,7 @@ namespace Barotrauma
             }
         }
 
-        protected override bool Filter(Gap gap)
+        protected override bool Filter(Gap gap) => IsValidTarget(gap, character);
-        {
-            if (gap == null) { return false; }
-            if (gap.ConnectedWall == null || gap.ConnectedDoor != null || gap.Open <= 0 || gap.linkedTo.All(l => l == null)) { return false; }
-            if (gap.Submarine == null) { return false; }
-            if (gap.Submarine.TeamID != character.TeamID) { return false; }
-            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(gap, true)) { return false; }
-            return true;
-        }
 
         public static float GetLeakSeverity(Gap leak)
         {
@@ -45,5 +37,15 @@ namespace Barotrauma
         protected override float TargetEvaluation() => targets.Max(t => GetLeakSeverity(t));
         protected override IEnumerable<Gap> GetList() => Gap.GapList;
         protected override AIObjective ObjectiveConstructor(Gap gap) => new AIObjectiveFixLeak(gap, character, objectiveManager, PriorityModifier);
+
+        public static bool IsValidTarget(Gap gap, Character character)
+        {
+            if (gap == null) { return false; }
+            if (gap.ConnectedWall == null || gap.ConnectedDoor != null || gap.Open <= 0 || gap.linkedTo.All(l => l == null)) { return false; }
+            if (gap.Submarine == null) { return false; }
+            if (gap.Submarine.TeamID != character.TeamID) { return false; }
+            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(gap, true)) { return false; }
+            return true;
+        }
     }
 }

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

@@ -74,6 +74,21 @@ namespace Barotrauma
             }
         }
 
+        public override void Update(float deltaTime)
+        {
+            if (objectiveManager.CurrentObjective == this)
+            {
+                if (randomTimer > 0)
+                {
+                    randomTimer -= deltaTime;
+                }
+                else
+                {
+                    SetRandom();
+                }
+            }
+        }
+
         public override bool IsCompleted() => false;
         public override bool CanBeCompleted => true;
 

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

@@ -13,8 +13,6 @@ namespace Barotrauma
         private float ignoreListTimer;
         private float targetUpdateTimer;
 
-        private static AIObjectiveLoop<T> instance;
-
         // By default, doesn't clear the list automatically
         protected virtual float IgnoreListClearInterval => 0;
         protected virtual float TargetUpdateInterval => 2;
@@ -23,6 +21,10 @@ namespace Barotrauma
 
         public bool AddTarget(T target)
         {
+            if (ReportedTargets.Contains(target))
+            {
+                return false;
+            }
             if (Filter(target))
             {
                 ReportedTargets.Add(target);
@@ -34,7 +36,6 @@ namespace Barotrauma
         public AIObjectiveLoop(Character character, AIObjectiveManager objectiveManager, float priorityModifier, string option = null) 
             : base(character, objectiveManager, priorityModifier, option)
         {
-            instance = this;
             Reset();
         }
 
@@ -171,7 +172,5 @@ namespace Barotrauma
 
         protected abstract AIObjective ObjectiveConstructor(T target);
         protected abstract bool Filter(T target);
-
-        public static bool IsValidTarget(T target) => instance == null ? false : instance.Filter(target);
     }
 }

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

@@ -91,6 +91,10 @@ namespace Barotrauma
                     {
                         isCompleted = true;
                     }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                 }
                 else
                 {

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

@@ -34,9 +34,10 @@ namespace Barotrauma
             if (pump.Item.Submarine == null) { return false; }
             if (pump.Item.CurrentHull == null) { return false; }
             if (pump.Item.Submarine.TeamID != character.TeamID) { return false; }
-            if (pump.Item.CurrentHull.FireSources.Count > 0 || Character.CharacterList.Any(c => c.CurrentHull == pump.Item.CurrentHull && !HumanAIController.IsFriendly(c))) { return false; }
             if (pump.Item.ConditionPercentage <= 0) { return false; }
+            if (pump.Item.CurrentHull.FireSources.Count > 0) { return false; }
             if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(pump.Item, true)) { return false; }
+            if (Character.CharacterList.Any(c => c.CurrentHull == pump.Item.CurrentHull && !HumanAIController.IsFriendly(c))) { return false; }
             if (Option == "stoppumping")
             {
                 if (!pump.IsActive || MathUtils.NearlyEqual(pump.FlowPercentage, 0)) { return false; }

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

@@ -46,13 +46,7 @@ namespace Barotrauma
 
         protected override bool Filter(Item item)
         {
-            if (item == null) { return false; }
+            if (!IsValidTarget(item, character)) { return false; }
-            if (item.IsFullCondition) { return false; }
-            if (item.CurrentHull == null) { return false; }
-            if (item.Submarine == null) { return false; }
-            if (item.Submarine.TeamID != character.TeamID) { return false; }
-            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(item, true)) { return false; }
-            if (item.Repairables.None()) { return false; }
             if (item.CurrentHull.FireSources.Count > 0) { return false; }
             // Don't repair items in rooms that have enemies inside.
             if (Character.CharacterList.Any(c => c.CurrentHull == item.CurrentHull && !HumanAIController.IsFriendly(c))) { return false; }
@@ -73,5 +67,17 @@ namespace Barotrauma
         protected override float TargetEvaluation() => targets.Max(t => 100 - t.ConditionPercentage);
         protected override IEnumerable<Item> GetList() => Item.ItemList;
         protected override AIObjective ObjectiveConstructor(Item item) => new AIObjectiveRepairItem(character, item, objectiveManager, PriorityModifier);
+
+        public static bool IsValidTarget(Item item, Character character)
+        {
+            if (item == null) { return false; }
+            if (item.IsFullCondition) { return false; }
+            if (item.CurrentHull == null) { return false; }
+            if (item.Submarine == null) { return false; }
+            if (item.Submarine.TeamID != character.TeamID) { return false; }
+            if (item.Repairables.None()) { return false; }
+            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(item, true)) { return false; }
+            return true;
+        }
     }
 }

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

@@ -25,25 +25,26 @@ namespace Barotrauma
             }
         }
 
-        protected override bool Filter(Character target)
+        protected override bool Filter(Character target) => IsValidTarget(target, character);
-        {
-            if (target == null || target.IsDead || target.Removed) { return false; }
-            if (target == character) { return false; }
-            if (target.Submarine != character.Submarine) { return false; }
-            if (target.CurrentHull == null && character.Submarine != null) { return false; }
-            if (target.Vitality / target.MaxVitality > VitalityThreshold) { return false; }
-            if (HumanAIController == null || !HumanAIController.IsFriendly(target)) { return false; }
-            return true;
-        }
 
         protected override IEnumerable<Character> GetList() => Character.CharacterList;
 
         protected override AIObjective ObjectiveConstructor(Character target) => new AIObjectiveRescue(character, target, objectiveManager, PriorityModifier);
 
-        protected override float TargetEvaluation()
+        protected override float TargetEvaluation() => GetVitalityFactor(character) * 100;
+
+        public static float GetVitalityFactor(Character character) => (character.MaxVitality - character.Vitality) / character.MaxVitality;
+
+        public static bool IsValidTarget(Character target, Character character)
         {
-            // TODO: sorting criteria
+            if (target == null || target.IsDead || target.Removed) { return false; }
-            return 100;
+            if (!HumanAIController.IsFriendly(character, target)) { return false; }
+            if (target.Vitality / target.MaxVitality > VitalityThreshold) { return false; }
+            if (target.Submarine == null) { return false; }
+            if (target.Submarine.TeamID != character.Submarine.TeamID) { return false; }
+            if (target.CurrentHull == null) { return false; }
+            if (character.Submarine != null && !character.Submarine.IsEntityFoundOnThisSub(target.CurrentHull, true)) { return false; }
+            return true;
         }
     }
 }

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

@@ -810,6 +810,25 @@ namespace Barotrauma.Items.Components
                     }
                 }
                 
+                if (targetItem.Prefab.DeconstructItems.Any())
+                {
+                    inputContainer.Inventory.RemoveItem(targetItem);
+                    Entity.Spawner.AddToRemoveQueue(targetItem);
+                    MoveInputQueue();
+                    PutItemsToLinkedContainer();
+                }
+                else
+                {
+                    if (outputContainer.Inventory.Items.All(i => i != null))
+                    {
+                        targetItem.Drop(dropper: null);
+                    }
+                    else
+                    {
+                        outputContainer.Inventory.TryPutItem(targetItem, user: null, createNetworkEvent: true);
+                    }
+                }
+                
                 if (targetItem.Prefab.DeconstructItems.Any())
                 {
                     inputContainer.Inventory.RemoveItem(targetItem);

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

@@ -212,6 +212,33 @@ namespace Barotrauma.Items.Components
             }
         }
 
+        public Vector2? PosToMaintain
+        {
+            get { return posToMaintain; }
+            set { posToMaintain = value; }
+        }
+
+        struct ObstacleDebugInfo
+        {
+            public Vector2 Point1;
+            public Vector2 Point2;
+
+            public Vector2? Intersection;
+
+            public float Dot;
+
+            public Vector2 AvoidStrength;
+
+            public ObstacleDebugInfo(GraphEdge edge, Vector2? intersection, float dot, Vector2 avoidStrength)
+            {
+                Point1 = edge.Point1;
+                Point2 = edge.Point2;
+                Intersection = intersection;
+                Dot = dot;
+                AvoidStrength = avoidStrength;
+            }
+        }
+
         //edge point 1, edge point 2, avoid strength
         private List<ObstacleDebugInfo> debugDrawObstacles = new List<ObstacleDebugInfo>();
 

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1572,6 +1572,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/Hull.cs

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