v0.14.6.0

2021-06-17 17:54:52 +03:00
parent 3f324b14e8
commit c27e2ea5ab
348 changed files with 13156 additions and 4266 deletions
@@ -9,7 +9,7 @@ namespace Barotrauma
    {
        public override void DebugDraw(SpriteBatch spriteBatch)
        {
-            if (Character.IsDead) return;
+            if (Character.IsUnconscious || !Character.Enabled || !Enabled) { return; }

            Vector2 pos = Character.WorldPosition;
            pos.Y = -pos.Y;
@@ -38,7 +38,7 @@ namespace Barotrauma
                }
                targetPos.Y = -targetPos.Y;
                GUI.DrawLine(spriteBatch, pos, targetPos, GUI.Style.Red * 0.5f, 0, 4);
-                if (wallTarget != null && (State == AIState.Attack || State == AIState.Aggressive || State == AIState.PassiveAggressive))
+                if (wallTarget != null)
                {
                    Vector2 wallTargetPos = wallTarget.Position;
                    if (wallTarget.Structure.Submarine != null) { wallTargetPos += wallTarget.Structure.Submarine.Position; }
@@ -0,0 +1,32 @@
+namespace Barotrauma
+{
+    abstract partial class AIObjective
+    {
+        public static Sprite GetSprite(string identifier, string option, Entity targetEntity)
+        {
+            if (string.IsNullOrEmpty(identifier))
+            {
+                return null;
+            }
+            identifier = identifier.RemoveWhitespace();
+            if (Order.Prefabs.TryGetValue(identifier, out Order orderPrefab))
+            {
+                if (!string.IsNullOrEmpty(option) && orderPrefab.OptionSprites.TryGetValue(option, out var optionSprite))
+                {
+                    return optionSprite;
+                }
+                if (targetEntity is Item targetItem && targetItem.Prefab.MinimapIcon != null)
+                {
+                    return targetItem.Prefab.MinimapIcon;
+                }
+                return orderPrefab.SymbolSprite;
+            }
+            return GUI.Style.GetComponentStyle($"{identifier}objectiveicon")?.GetDefaultSprite();
+        }
+
+        public Sprite GetSprite()
+        {
+            return GetSprite(Identifier, Option, (this as AIObjectiveOperateItem)?.OperateTarget);
+        }
+    }
+}
@@ -39,10 +39,7 @@ namespace Barotrauma

        partial void DamageParticles(float deltaTime, Vector2 worldPosition)
        {
-            if (particleEmitter != null)
-            {
-                particleEmitter.Emit(deltaTime, worldPosition);
-            }
+            particleEmitter?.Emit(deltaTime, worldPosition);

            if (sound != null)
            {
@@ -102,11 +102,13 @@ namespace Barotrauma
            set { chromaticAberrationStrength = MathHelper.Clamp(value, 0.0f, 100.0f); }
        }
        
+        public Color GrainColor { get; set; }
+        
        private float grainStrength;
        public float GrainStrength
        {
            get => grainStrength;
-            set => grainStrength = MathHelper.Clamp(value, 0.0f, 1.0f);
+            set => grainStrength = Math.Max(0, value);
        }

        private readonly List<ParticleEmitter> bloodEmitters = new List<ParticleEmitter>();
@@ -199,7 +201,7 @@ namespace Barotrauma
        /// </summary>
        public void ControlLocalPlayer(float deltaTime, Camera cam, bool moveCam = true)
        {
-            if (DisableControls || GUI.PauseMenuOpen || GUI.SettingsMenuOpen)
+            if (DisableControls || GUI.InputBlockingMenuOpen)
            {
                foreach (Key key in keys)
                {
@@ -321,7 +323,7 @@ namespace Barotrauma
                DoInteractionUpdate(deltaTime, mouseSimPos);
            }

-            if (!GUI.PauseMenuOpen && !GUI.SettingsMenuOpen)
+            if (!GUI.InputBlockingMenuOpen)
            {
                if (SelectedConstruction != null &&
                    (SelectedConstruction.ActiveHUDs.Any(ic => ic.GuiFrame != null && HUD.CloseHUD(ic.GuiFrame.Rect)) ||
@@ -505,14 +507,16 @@ namespace Barotrauma
                {
                    continue;
                }
-                if (item.body != null && !item.body.Enabled) continue;
-                if (item.ParentInventory != null) continue;
-                if (ignoredItems != null && ignoredItems.Contains(item)) continue;
+                if (item.body != null && !item.body.Enabled) { continue; }
+                if (item.ParentInventory != null) { continue; }
+                if (ignoredItems != null && ignoredItems.Contains(item)) { continue; }
+                if (item.Prefab.RequireCampaignInteract && item.CampaignInteractionType == CampaignMode.InteractionType.None) { continue; }
                if (Screen.Selected is SubEditorScreen editor && editor.WiringMode && item.GetComponent<ConnectionPanel>() == null) { continue; }

                if (draggingItemToWorld)
                {
                    if (item.OwnInventory == null || 
+                        !item.OwnInventory.Container.AllowDragAndDrop ||
                        !item.OwnInventory.CanBePut(CharacterInventory.DraggingItems.First()) ||
                        !CanAccessInventory(item.OwnInventory))
                    {
@@ -677,7 +681,7 @@ namespace Barotrauma
                    else
                    {
                        //Ideally it shouldn't send the character entirely if we can't see them but /shrug, this isn't the most hacker-proof game atm
-                        hudInfoVisible = controlled.CanSeeCharacter(this, controlled.ViewTarget == null ? controlled.WorldPosition : controlled.ViewTarget.WorldPosition);
+                        hudInfoVisible = controlled.CanSeeTarget(this, controlled.ViewTarget);
                    }
                    hudInfoTimer = Rand.Range(0.5f, 1.0f);
                }
@@ -859,7 +863,14 @@ namespace Barotrauma
                    Color nameColor = Color.White;
                    if (Controlled != null && TeamID != Controlled.TeamID)
                    {
-                        nameColor = TeamID == CharacterTeamType.FriendlyNPC ? Color.SkyBlue : GUI.Style.Red;
+                        if (TeamID == CharacterTeamType.FriendlyNPC)
+                        {
+                            nameColor = UniqueNameColor ?? Color.SkyBlue;
+                        }
+                        else
+                        {
+                            nameColor = GUI.Style.Red;
+                        }
                    }
                    if (CampaignInteractionType != CampaignMode.InteractionType.None && AllowCustomInteract)
                    {
@@ -296,7 +296,7 @@ namespace Barotrauma
                float alpha = GetDistanceBasedIconAlpha(brokenItem);
                if (alpha <= 0.0f) continue;
                GUI.DrawIndicator(spriteBatch, brokenItem.DrawPosition, cam, 100.0f, GUI.BrokenIcon, 
-                    Color.Lerp(GUI.Style.Red, GUI.Style.Orange * 0.5f, brokenItem.Condition / brokenItem.MaxCondition) * alpha);                
+                    Color.Lerp(GUI.Style.Red, GUI.Style.Orange * 0.5f, brokenItem.Condition / brokenItem.MaxCondition) * alpha);
            }

            float GetDistanceBasedIconAlpha(ISpatialEntity target, float maxDistance = 1000.0f)
@@ -341,7 +341,7 @@ namespace Barotrauma

                    if (!GUI.DisableItemHighlights && !Inventory.DraggingItemToWorld)
                    {
-                        bool shiftDown = PlayerInput.KeyDown(Keys.LeftShift) || PlayerInput.KeyDown(Keys.RightShift);
+                        bool shiftDown = PlayerInput.IsShiftDown();
                        if (shouldRecreateHudTexts || heldDownShiftWhenGotHudTexts != shiftDown)
                        {
                            shouldRecreateHudTexts = true;
@@ -391,7 +391,16 @@ namespace Barotrauma
                    if (npc.CampaignInteractionType == CampaignMode.InteractionType.None || npc.Submarine != character.Submarine || npc.IsDead || npc.IsIncapacitated) { continue; }

                    var iconStyle = GUI.Style.GetComponentStyle("CampaignInteractionIcon." + npc.CampaignInteractionType);
-                    GUI.DrawIndicator(spriteBatch, npc.WorldPosition, cam, 500.0f, iconStyle.GetDefaultSprite(), iconStyle.Color);
+                    GUI.DrawIndicator(spriteBatch, npc.WorldPosition, cam, npc.CurrentHull == Character.Controlled.CurrentHull ? 500.0f : 100.0f, iconStyle.GetDefaultSprite(), iconStyle.Color);
+                }
+
+                foreach (Item item in Item.ItemList)
+                {
+                    if (item.IconStyle is null || item.Submarine != character.Submarine) { continue; }
+                    if (Vector2.DistanceSquared(character.Position, item.Position) > 500f*500f) { continue; }
+                    var body = Submarine.CheckVisibility(character.SimPosition, item.SimPosition, ignoreLevel: true);
+                    if (body != null && body.UserData as Item != item) { continue; }
+                    GUI.DrawIndicator(spriteBatch, item.WorldPosition + new Vector2(0f, item.RectHeight * 0.65f), cam, new Vector2(-100f, 500.0f), item.IconStyle.GetDefaultSprite(), item.IconStyle.Color, createOffset: false);
                }
            }

@@ -291,8 +291,7 @@ namespace Barotrauma

                    break;
                case ServerNetObject.ENTITY_EVENT:
-
-                    int eventType = msg.ReadRangedInteger(0, 6);
+                    int eventType = msg.ReadRangedInteger(0, 9);
                    switch (eventType)
                    {
                        case 0: //NetEntityEvent.Type.InventoryState
@@ -303,9 +302,9 @@ namespace Barotrauma
                                GameAnalyticsManager.AddErrorEventOnce("CharacterNetworking.ClientRead:NoInventory" + ID, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);

                                //read anyway to prevent messing up reading the rest of the message
-                                UInt16 lastEventID = msg.ReadUInt16();
-                                byte itemCount = msg.ReadByte();
-                                for (int i = 0; i < itemCount; i++)
+                                _ = msg.ReadUInt16();
+                                byte inventoryItemCount = msg.ReadByte();
+                                for (int i = 0; i < inventoryItemCount; i++)
                                {
                                    msg.ReadUInt16();
                                }
@@ -354,56 +353,102 @@ namespace Barotrauma
                                info?.SetSkillLevel(skillIdentifier, skillLevel, Position + Vector2.UnitY * 150.0f);
                            }
                            break;
-                        case 4: //NetEntityEvent.Type.ExecuteAttack
+                        case 4: // NetEntityEvent.Type.SetAttackTarget
+                        case 5: //NetEntityEvent.Type.ExecuteAttack
                            int attackLimbIndex = msg.ReadByte();
                            UInt16 targetEntityID = msg.ReadUInt16();
                            int targetLimbIndex = msg.ReadByte();
-
+                            Vector2 targetSimPos = new Vector2(msg.ReadSingle(), msg.ReadSingle());
                            //255 = entity already removed, no need to do anything
                            if (attackLimbIndex == 255 || Removed) { break; }
-
                            if (attackLimbIndex >= AnimController.Limbs.Length)
                            {
-                                DebugConsole.ThrowError($"Received invalid ExecuteAttack message. Limb index out of bounds (character: {Name}, limb index: {attackLimbIndex}, limb count: {AnimController.Limbs.Length})");
+                                DebugConsole.ThrowError($"Received invalid SetAttack/ExecuteAttack message. Limb index out of bounds (character: {Name}, limb index: {attackLimbIndex}, limb count: {AnimController.Limbs.Length})");
                                break;
                            }
                            Limb attackLimb = AnimController.Limbs[attackLimbIndex];
                            Limb targetLimb = null;
                            if (!(FindEntityByID(targetEntityID) is IDamageable targetEntity))
                            {
-                                DebugConsole.ThrowError($"Received invalid ExecuteAttack message. Target entity not found (ID {targetEntityID})");
+                                DebugConsole.ThrowError($"Received invalid SetAttack/ExecuteAttack message. Target entity not found (ID {targetEntityID})");
                                break;
                            }
                            if (targetEntity is Character targetCharacter)
                            {
                                if (targetLimbIndex >= targetCharacter.AnimController.Limbs.Length)
                                {
-                                    DebugConsole.ThrowError($"Received invalid ExecuteAttack message. Target limb index out of bounds (target character: {targetCharacter.Name}, limb index: {targetLimbIndex}, limb count: {targetCharacter.AnimController.Limbs.Length})");
+                                    DebugConsole.ThrowError($"Received invalid SetAttack/ExecuteAttack message. Target limb index out of bounds (target character: {targetCharacter.Name}, limb index: {targetLimbIndex}, limb count: {targetCharacter.AnimController.Limbs.Length})");
                                    break;
                                }
                                targetLimb = targetCharacter.AnimController.Limbs[targetLimbIndex];
                            }
                            if (attackLimb?.attack != null)
                            {
-                                attackLimb.ExecuteAttack(targetEntity, targetLimb, out _);
+                                if (eventType == 4)
+                                {
+                                    SetAttackTarget(attackLimb, targetEntity, targetSimPos);
+                                }
+                                else
+                                {
+                                    attackLimb.ExecuteAttack(targetEntity, targetLimb, out _);
+                                }
                            }
                            break;
-                        case 5: //NetEntityEvent.Type.AssignCampaignInteraction
+                        case 6: //NetEntityEvent.Type.AssignCampaignInteraction
                            byte campaignInteractionType = msg.ReadByte();
+                            bool requireConsciousness = msg.ReadBoolean();
                            (GameMain.GameSession?.GameMode as CampaignMode)?.AssignNPCMenuInteraction(this, (CampaignMode.InteractionType)campaignInteractionType);
+                            RequireConsciousnessForCustomInteract = requireConsciousness;
                            break;
-                        case 6: //NetEntityEvent.Type.ObjectiveManagerOrderState
-                            bool properData = msg.ReadBoolean();
-                            if (!properData) { break; }
-                            int orderIndex = msg.ReadRangedInteger(0, Order.PrefabList.Count);
-                            var orderPrefab = Order.PrefabList[orderIndex];
-                            string option = null;
-                            if (orderPrefab.HasOptions)
+                        case 7: //NetEntityEvent.Type.ObjectiveManagerState
+                            // 1 = order, 2 = objective
+                            int msgType = msg.ReadRangedInteger(0, 2);
+                            if (msgType == 0) { break; }
+                            bool validData = msg.ReadBoolean();
+                            if (!validData) { break; }
+                            if (msgType == 1)
                            {
-                                int optionIndex = msg.ReadRangedInteger(0, orderPrefab.Options.Length);
-                                option = orderPrefab.Options[optionIndex];
+                                int orderIndex = msg.ReadRangedInteger(0, Order.PrefabList.Count);
+                                var orderPrefab = Order.PrefabList[orderIndex];
+                                string option = null;
+                                if (orderPrefab.HasOptions)
+                                {
+                                    int optionIndex = msg.ReadRangedInteger(-1, orderPrefab.AllOptions.Length);
+                                    if (optionIndex > -1)
+                                    {
+                                        option = orderPrefab.AllOptions[optionIndex];
+                                    }
+                                }
+                                GameMain.GameSession?.CrewManager?.SetOrderHighlight(this, orderPrefab.Identifier, option);
+                            }
+                            else if (msgType == 2)
+                            {
+                                string identifier = msg.ReadString();
+                                string option = msg.ReadString();
+                                ushort objectiveTargetEntityId = msg.ReadUInt16();
+                                var objectiveTargetEntity = FindEntityByID(objectiveTargetEntityId);
+                                GameMain.GameSession?.CrewManager?.CreateObjectiveIcon(this, identifier, option, objectiveTargetEntity);
+                            }
+                            break;
+                        case 8: //NetEntityEvent.Type.TeamChange
+                            byte newTeamId = msg.ReadByte();
+                            ChangeTeam((CharacterTeamType)newTeamId);
+                            break;
+                        case 9: //NetEntityEvent.Type.AddToCrew
+                            GameMain.GameSession.CrewManager.AddCharacter(this);
+                            CharacterTeamType teamID = (CharacterTeamType)msg.ReadByte();
+                            ushort itemCount = msg.ReadUInt16();
+                            for (int i = 0; i < itemCount; i++)
+                            {
+                                ushort itemID = msg.ReadUInt16();
+                                if (!(Entity.FindEntityByID(itemID) is Item item)) { continue; }
+                                item.AllowStealing = true;
+                                var wifiComponent = item.GetComponent<Items.Components.WifiComponent>();
+                                if (wifiComponent != null)
+                                {
+                                    wifiComponent.TeamID = teamID;
+                                }
                            }
-                            GameMain.GameSession.CrewManager.SetHighlightedOrderIcon(this, orderPrefab.Identifier, option);
                            break;
                    }
                    msg.ReadPadBits();
@@ -415,7 +460,7 @@ namespace Barotrauma
        {
            DebugConsole.Log("Reading character spawn data");

-            if (GameMain.Client == null) return null;
+            if (GameMain.Client == null) { return null; }

            bool noInfo = inc.ReadBoolean();
            ushort id = inc.ReadUInt16();
@@ -431,7 +476,15 @@ namespace Barotrauma
            Character character = null;
            if (noInfo)
            {
-                character = Create(speciesName, position, seed, characterInfo: null, id: id, isRemotePlayer: false);
+                try
+                {
+                    character = Create(speciesName, position, seed, characterInfo: null, id: id, isRemotePlayer: false);
+                }
+                catch (Exception e)
+                {
+                    DebugConsole.ThrowError($"Failed to spawn character {speciesName}", e);
+                    throw;
+                }
                bool containsStatusData = inc.ReadBoolean();
                if (containsStatusData)
                {
@@ -447,8 +500,15 @@ namespace Barotrauma
                string infoSpeciesName = inc.ReadString();

                CharacterInfo info = CharacterInfo.ClientRead(infoSpeciesName, inc);
-
-                character = Create(speciesName, position, seed, characterInfo: info, id: id, isRemotePlayer: ownerId > 0 && GameMain.Client.ID != ownerId, hasAi: hasAi);
+                try
+                {
+                    character = Create(speciesName, position, seed, characterInfo: info, id: id, isRemotePlayer: ownerId > 0 && GameMain.Client.ID != ownerId, hasAi: hasAi);
+                }
+                catch (Exception e)
+                {
+                    DebugConsole.ThrowError($"Failed to spawn character {speciesName}", e);
+                    throw;
+                }
                character.TeamID = (CharacterTeamType)teamID;
                character.CampaignInteractionType = (CampaignMode.InteractionType)inc.ReadByte();
                if (character.CampaignInteractionType != CampaignMode.InteractionType.None)
@@ -471,7 +531,7 @@ namespace Barotrauma
                        var x = inc.ReadSingle();
                        var y = inc.ReadSingle();
                        var hull = FindEntityByID(inc.ReadUInt16()) as Hull;
-                        targetPosition = new OrderTarget(new Vector2(x, y), hull, true);
+                        targetPosition = new OrderTarget(new Vector2(x, y), hull, creatingFromExistingData: true);
                    }

                    if (orderPrefabIndex >= 0 && orderPrefabIndex < Order.PrefabList.Count)
@@ -485,7 +545,7 @@ namespace Barotrauma
                                new Order(orderPrefab, targetPosition, orderGiver: orderGiver);
                            character.SetOrder(order,
                                orderOptionIndex >= 0 && orderOptionIndex < orderPrefab.Options.Length ? orderPrefab.Options[orderOptionIndex] : null,
-                                orderPriority, orderGiver, speak: false);
+                                orderPriority, orderGiver, speak: false, force: true);
                        }
                        else
                        {
@@ -63,6 +63,8 @@ namespace Barotrauma

        private GUIListBox afflictionTooltip;

+        private static readonly Color oxygenLowGrainColor = new Color(0.1f, 0.1f, 0.1f, 1f);
+
        private struct HeartratePosition
        {
            public float Time;
@@ -671,17 +673,19 @@ namespace Barotrauma
            bloodParticleTimer -= deltaTime * (affliction.Strength / 10.0f);
            if (bloodParticleTimer <= 0.0f)
            {
-                var emitter = Character.BloodEmitters.FirstOrDefault();
-                float particleMinScale = emitter != null ? emitter.Prefab.ScaleMin : 0.5f;
-                float particleMaxScale = emitter != null ? emitter.Prefab.ScaleMax : 1;
+                bool inWater = Character.AnimController.InWater;
+                var drawTarget = inWater ? Particles.ParticlePrefab.DrawTargetType.Water : Particles.ParticlePrefab.DrawTargetType.Air;
+                var emitter = Character.BloodEmitters.FirstOrDefault(e => e.Prefab.ParticlePrefab.DrawTarget == drawTarget || e.Prefab.ParticlePrefab.DrawTarget == Particles.ParticlePrefab.DrawTargetType.Both);
+                float particleMinScale = emitter?.Prefab.Properties.ScaleMin ?? 0.5f;
+                float particleMaxScale = emitter?.Prefab.Properties.ScaleMax ?? 1;
                float severity = Math.Min(affliction.Strength / affliction.Prefab.MaxStrength * Character.Params.BleedParticleMultiplier, 1);
                float bloodParticleSize = MathHelper.Lerp(particleMinScale, particleMaxScale, severity);
-                bool inWater = Character.AnimController.InWater;
                if (!inWater)
                {
                    bloodParticleSize *= 2.0f;
                }

+                // TODO: use the blood emitter?
                var blood = GameMain.ParticleManager.CreateParticle(
                    inWater ? Character.Params.BleedParticleWater : Character.Params.BleedParticleAir,
                    targetLimb.WorldPosition, Rand.Vector(affliction.Strength), 0.0f, Character.AnimController.CurrentHull);
@@ -694,6 +698,12 @@ namespace Barotrauma
            }
        }

+        public static bool IsMouseOnHealthBar()
+        {
+            if (Character.Controlled?.CharacterHealth == null) { return false; }
+            return Character.Controlled.CharacterHealth.healthBar.State == GUIComponent.ComponentState.Hover;
+        }
+
        public void UpdateHUD(float deltaTime)
        {
            if (GUI.DisableHUD) return;
@@ -742,7 +752,9 @@ namespace Barotrauma
            float radialDistortStrength = 0.0f;
            float chromaticAberrationStrength = 0.0f;
            float grainStrength = 0.0f;
+            Color grainColor = Color.Transparent;

+            float oxygenLowStrength = 0.0f;
            if (Character.IsUnconscious)
            {
                blurStrength = 1.0f;
@@ -750,10 +762,14 @@ namespace Barotrauma
            }
            else if (OxygenAmount < 100.0f)
            {
-                blurStrength = MathHelper.Lerp(0.5f, 1.0f, 1.0f - Vitality / MaxVitality);
-                distortStrength = blurStrength;
-                distortSpeed = (blurStrength + 1.0f);
+                oxygenLowStrength = Math.Min(1.0f - (OxygenAmount - LowOxygenThreshold) / LowOxygenThreshold, 1.0f);
+                blurStrength = MathHelper.Lerp(0.5f, 1.0f, 1.0f - Vitality / MaxVitality) * oxygenLowStrength;
+                distortStrength = blurStrength * oxygenLowStrength;
+                distortSpeed = blurStrength + 1.0f;
                distortSpeed *= distortSpeed * distortSpeed * distortSpeed;
+
+                grainStrength = MathHelper.Lerp(0.5f, 10.0f, oxygenLowStrength);
+                grainColor = oxygenLowGrainColor;
            }

            foreach (Affliction affliction in afflictions)
@@ -762,7 +778,12 @@ namespace Barotrauma
                blurStrength = Math.Max(blurStrength, affliction.GetScreenBlurStrength());
                radialDistortStrength = Math.Max(radialDistortStrength, affliction.GetRadialDistortStrength());
                chromaticAberrationStrength = Math.Max(chromaticAberrationStrength, affliction.GetChromaticAberrationStrength());
-                grainStrength = Math.Max(grainStrength, affliction.GetScreenGrainStrength());
+                float afflictionGrainStrength = affliction.GetScreenGrainStrength();
+                if (afflictionGrainStrength > 0.0f)
+                {
+                    grainStrength = Math.Max(grainStrength, affliction.GetScreenGrainStrength());
+                    grainColor = Color.Lerp(grainColor, Color.White, (float)Math.Pow(1.0f - oxygenLowStrength, 2));
+                }
            }
            foreach (LimbHealth limbHealth in limbHealths)
            {
@@ -778,6 +799,7 @@ namespace Barotrauma
            Character.RadialDistortStrength = radialDistortStrength;
            Character.ChromaticAberrationStrength = chromaticAberrationStrength;
            Character.GrainStrength = grainStrength;
+            Character.GrainColor = grainColor;
            if (blurStrength > 0.0f)
            {
                distortTimer = (distortTimer + deltaTime * distortSpeed) % MathHelper.TwoPi;
@@ -955,11 +977,9 @@ namespace Barotrauma
                highlightedLimbIndex = -1;
            }

-            Rectangle hoverArea = Rectangle.Union(HUDLayoutSettings.AfflictionAreaLeft, HUDLayoutSettings.HealthBarArea);
-
            healthBarHolder.CanBeFocused = healthBar.CanBeFocused = healthBarShadow.CanBeFocused = !Character.ShouldLockHud();
            if (Character.AllowInput && UseHealthWindow && healthBar.Enabled && healthBar.CanBeFocused &&
-                hoverArea.Contains(PlayerInput.MousePosition) && Inventory.SelectedSlot == null)
+                (GUI.IsMouseOn(healthBar) || highlightedAfflictionIcon != null) && Inventory.SelectedSlot == null)
            {
                healthBar.State = GUIComponent.ComponentState.Hover;
                if (PlayerInput.PrimaryMouseButtonClicked())
@@ -1076,8 +1096,11 @@ namespace Barotrauma
            DrawStatusHUD(spriteBatch);
        }

+
+        private Pair<Affliction, string> highlightedAfflictionIcon = null;
        public void DrawStatusHUD(SpriteBatch spriteBatch)
        {
+            highlightedAfflictionIcon = null;
            //Rectangle interactArea = healthBar.Rect;
            if (Character.Controlled?.SelectedCharacter == null && openHealthWindow == null)
            {
@@ -1092,7 +1115,6 @@ namespace Barotrauma
                    statusIcons.Add(new Pair<Affliction, string>(affliction, affliction.Prefab.Name));
                }

-                Pair<Affliction, string> highlightedIcon = null;
                Vector2 highlightedIconPos = Vector2.Zero;
                Rectangle afflictionArea = HUDLayoutSettings.AfflictionAreaLeft;

@@ -1113,9 +1135,9 @@ namespace Barotrauma
                    AfflictionPrefab afflictionPrefab = affliction.Prefab;

                    Rectangle afflictionIconRect = new Rectangle(pos, new Point(iconSize));
-                    if (afflictionIconRect.Contains(PlayerInput.MousePosition) && !Character.ShouldLockHud())
+                    if (afflictionIconRect.Contains(PlayerInput.MousePosition) && !Character.ShouldLockHud() && GUI.MouseOn == null)
                    {
-                        highlightedIcon = statusIcon;
+                        highlightedAfflictionIcon = statusIcon;
                        highlightedIconPos = afflictionIconRect.Location.ToVector2();
                    }

@@ -1135,7 +1157,7 @@ namespace Barotrauma
                        highlightedIcon == statusIcon ? slot.HoverColor : slot.Color);*/


-                    float alphaMultiplier = highlightedIcon == statusIcon ? 1f : 0.8f;
+                    float alphaMultiplier = highlightedAfflictionIcon == statusIcon ? 1f : 0.8f;

                    afflictionPrefab.Icon?.Draw(spriteBatch,
                        pos.ToVector2(),
@@ -1150,9 +1172,9 @@ namespace Barotrauma
                        pos.Y += iconSize + (int)(5 * GUI.Scale);
                }

-                if (highlightedIcon != null)
+                if (highlightedAfflictionIcon != null)
                {
-                    string nameTooltip = highlightedIcon.Second;
+                    string nameTooltip = highlightedAfflictionIcon.Second;
                    Vector2 offset = GUI.Font.MeasureString(nameTooltip);

                    GUI.DrawString(spriteBatch,
@@ -1315,7 +1337,7 @@ namespace Barotrauma
                child.Recalculate();
            }

-            if (buttonToSelect != null) { buttonToSelect.OnClicked(buttonToSelect, "selectaffliction"); }
+            buttonToSelect?.OnClicked(buttonToSelect, "selectaffliction");

            afflictionIconContainer.RecalculateChildren();

@@ -2004,7 +2026,7 @@ namespace Barotrauma
                        existingAffliction.PeriodicEffectTimers[periodicEffect.First] = periodicEffect.Second;
                        foreach (StatusEffect effect in periodicEffect.First.StatusEffects)
                        {
-                            existingAffliction.ApplyStatusEffect(effect, deltaTime: 1.0f, this, targetLimb: null);
+                            existingAffliction.ApplyStatusEffect(ActionType.OnActive, effect, deltaTime: 1.0f, this, targetLimb: null);
                        }
                    }
                }
@@ -2071,7 +2093,7 @@ namespace Barotrauma
                            foreach (StatusEffect effect in periodicEffect.First.StatusEffects)
                            {
                                Limb targetLimb = Character.AnimController.Limbs.FirstOrDefault(l => l.HealthIndex == limbHealths.IndexOf(newAffliction.First));
-                                existingAffliction.ApplyStatusEffect(effect, deltaTime: 1.0f, this, targetLimb: targetLimb);
+                                existingAffliction.ApplyStatusEffect(ActionType.OnActive, effect, deltaTime: 1.0f, this, targetLimb: targetLimb);
                            }
                        }
                    }
@@ -997,7 +997,7 @@ namespace Barotrauma
                }
                wearableColor = wearableItemComponent.Item.GetSpriteColor();
            }
-            float textureScale = wearable.InheritTextureScale ? TextureScale : 1;
+            float textureScale = wearable.InheritTextureScale ? TextureScale : wearable.Scale;

            wearable.Sprite.Draw(spriteBatch,
                new Vector2(body.DrawPosition.X, -body.DrawPosition.Y),