(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00
parent bd07acf26d
commit 6262b3ea54
96 changed files with 1972 additions and 825 deletions
@@ -19,7 +19,7 @@ namespace Barotrauma
            Right,
            Center
        }
-
+        
        private enum QuickUseAction
        {
            None,
@@ -34,6 +34,8 @@ namespace Barotrauma
        }

        private static Dictionary<InvSlotType, Sprite> limbSlotIcons;
+        
+        const InvSlotType PersonalSlots = InvSlotType.Card | InvSlotType.Headset | InvSlotType.InnerClothes | InvSlotType.OuterClothes | InvSlotType.Head;

        private Point screenResolution;

@@ -51,11 +53,42 @@ namespace Barotrauma
            }
        }
        public bool Hidden { get; set; }
+        
+        private bool hidePersonalSlots;
+        private float hidePersonalSlotsState;
+        private GUIButton hideButton;
+        private Rectangle personalSlotArea;

+        public bool HidePersonalSlots
+        {
+            get { return hidePersonalSlots; }
+        }
+
+        public Rectangle PersonalSlotArea
+        {
+            get { return personalSlotArea; }
+        }
+        
        partial void InitProjSpecific(XElement element)
        {
            Hidden = true;

+            hideButton = new GUIButton(new RectTransform(new Point((int)(30 * GUI.Scale), (int)(60 * GUI.Scale)), GUI.Canvas)
+            { AbsoluteOffset = HUDLayoutSettings.CrewArea.Location },
+                "", style: "UIToggleButton");
+            hideButton.Children.ForEach(c => c.SpriteEffects = SpriteEffects.FlipHorizontally);
+            hideButton.OnClicked += (GUIButton btn, object userdata) =>
+            {
+                hidePersonalSlots = !hidePersonalSlots;
+                foreach (GUIComponent child in btn.Children)
+                {
+                    child.SpriteEffects = hidePersonalSlots ? SpriteEffects.None : SpriteEffects.FlipHorizontally;
+                }
+                return true;
+            };
+
+            hidePersonalSlots = false;
+
            if (limbSlotIcons == null)
            {
                limbSlotIcons = new Dictionary<InvSlotType, Sprite>();
@@ -68,12 +101,11 @@ namespace Barotrauma
                limbSlotIcons.Add(InvSlotType.LeftHand, new Sprite("Content/UI/IconAtlas.png", new Rectangle(640 + margin, 383 + margin, 128 - margin * 2, 128 - margin * 2)));
                limbSlotIcons.Add(InvSlotType.RightHand, new Sprite("Content/UI/IconAtlas.png", new Rectangle(768 + margin, 383 + margin, 128 - margin * 2, 128 - margin * 2)));
            }
-
            SlotPositions = new Vector2[SlotTypes.Length];
            CurrentLayout = Layout.Default;
            SetSlotPositions(layout);
        }
-        
+
        protected override void PutItem(Item item, int i, Character user, bool removeItem = true, bool createNetworkEvent = true)
        {
            base.PutItem(item, i, user, removeItem, createNetworkEvent);
@@ -159,6 +191,11 @@ namespace Barotrauma
        {
            if (slots[i].Disabled || (hideEmptySlot[i] && Items[i] == null)) return true;

+            if (layout == Layout.Default)
+            {
+                if (PersonalSlots.HasFlag(SlotTypes[i]) && !personalSlotArea.Contains(slots[i].Rect.Center + slots[i].DrawOffset.ToPoint())) return true;
+            }
+
            //no need to draw the right hand slot if the item is in both hands
            if (Items[i] != null && SlotTypes[i] == InvSlotType.RightHand && IsInLimbSlot(Items[i], InvSlotType.LeftHand))
            {
@@ -176,7 +213,6 @@ namespace Barotrauma

            return false;
        }
-
        private void SetSlotPositions(Layout layout)
        {
            int spacing = (int)(10 * UIScale);
@@ -185,27 +221,32 @@ namespace Barotrauma

            if (slots == null) CreateSlots();

-            var upperSlots = InvSlotType.Card | InvSlotType.Headset | InvSlotType.InnerClothes | InvSlotType.Head;
+            hideButton.Visible = false;

            switch (layout)
            {
                case Layout.Default:
                    {
-                        int personalSlotCount = SlotTypes.Count(s => upperSlots.HasFlag(s));
-                        int normalSlotCount = SlotTypes.Count(s => !upperSlots.HasFlag(s));
+                        int personalSlotCount = SlotTypes.Count(s => PersonalSlots.HasFlag(s));
+                        int normalSlotCount = SlotTypes.Count(s => !PersonalSlots.HasFlag(s));

                        int x = GameMain.GraphicsWidth / 2 - normalSlotCount * (slotSize.X + spacing) / 2;
-                        int upperX = HUDLayoutSettings.PortraitArea.X - slotSize.X;
+                        int upperX = HUDLayoutSettings.PortraitArea.X - slotSize.X * 2;

                        //make sure the rightmost normal slot doesn't overlap with the personal slots
                        x -= Math.Max((x + normalSlotCount * (slotSize.X + spacing)) - (upperX - personalSlotCount * (slotSize.X + spacing)), 0);

+                        int hideButtonSlotIndex = -1;
                        for (int i = 0; i < SlotPositions.Length; i++)
                        {
-                            if (upperSlots.HasFlag(SlotTypes[i]))
+                            if (PersonalSlots.HasFlag(SlotTypes[i]))
                            {
                                SlotPositions[i] = new Vector2(upperX, GameMain.GraphicsHeight - bottomOffset);
                                upperX -= slotSize.X + spacing;
+                                personalSlotArea = (hideButtonSlotIndex == -1) ? 
+                                    new Rectangle(SlotPositions[i].ToPoint(), slotSize) :
+                                    Rectangle.Union(personalSlotArea, new Rectangle(SlotPositions[i].ToPoint(), slotSize));
+                                hideButtonSlotIndex = i;
                            }
                            else
                            {
@@ -213,19 +254,29 @@ namespace Barotrauma
                                x += slotSize.X + spacing;
                            }
                        }
+
+                        if (hideButtonSlotIndex > -1)
+                        {
+                            hideButton.RectTransform.SetPosition(Anchor.TopLeft, Pivot.TopLeft);
+                            hideButton.RectTransform.NonScaledSize = new Point(slotSize.X / 2, slotSize.Y + slots[hideButtonSlotIndex].EquipButtonRect.Height);
+                            hideButton.RectTransform.AbsoluteOffset = new Point(
+                                personalSlotArea.Right + spacing, 
+                                personalSlotArea.Y - slots[hideButtonSlotIndex].EquipButtonRect.Height);
+                            hideButton.Visible = true;
+                        }
                    }
                    break;
                case Layout.Right:
                    {
                        int extraOffset = 0;
                        int x = HUDLayoutSettings.InventoryAreaLower.Right;
-                        int upperX = HUDLayoutSettings.InventoryAreaLower.Right;
+                        int personalSlotX = HUDLayoutSettings.InventoryAreaLower.Right - slotSize.X - spacing;
                        for (int i = 0; i < slots.Length; i++)
                        {
                            if (HideSlot(i)) continue;
-                            if (upperSlots.HasFlag(SlotTypes[i]))
+                            if (PersonalSlots.HasFlag(SlotTypes[i]))
                            {
-                                upperX -= slotSize.X + spacing;
+                                //upperX -= slotSize.X + spacing;
                            }
                            else
                            {
@@ -237,10 +288,10 @@ namespace Barotrauma
                        for (int i = 0; i < SlotPositions.Length; i++)
                        {
                            if (HideSlot(i)) continue;
-                            if (upperSlots.HasFlag(SlotTypes[i]))
+                            if (PersonalSlots.HasFlag(SlotTypes[i]))
                            {
-                                SlotPositions[i] = new Vector2(upperX, GameMain.GraphicsHeight - bottomOffset * 2 - extraOffset - spacing * 2);
-                                upperX += slots[i].Rect.Width + spacing;
+                                SlotPositions[i] = new Vector2(personalSlotX, GameMain.GraphicsHeight - bottomOffset * 2 - extraOffset - spacing * 2);
+                                personalSlotX -= slots[i].Rect.Width + spacing;
                            }
                            else
                            {
@@ -261,14 +312,14 @@ namespace Barotrauma
                case Layout.Left:
                    {
                        int x = HUDLayoutSettings.InventoryAreaLower.X;
-                        int upperX = x;
+                        int personalSlotX = x;
                        for (int i = 0; i < SlotPositions.Length; i++)
                        {
                            if (HideSlot(i)) continue;
-                            if (upperSlots.HasFlag(SlotTypes[i]))
+                            if (PersonalSlots.HasFlag(SlotTypes[i]))
                            {
-                                SlotPositions[i] = new Vector2(upperX, GameMain.GraphicsHeight - bottomOffset * 2 - spacing * 2);
-                                upperX += slots[i].Rect.Width + spacing;
+                                SlotPositions[i] = new Vector2(personalSlotX, GameMain.GraphicsHeight - bottomOffset * 2 - spacing * 2);
+                                personalSlotX += slots[i].Rect.Width + spacing;
                            }
                            else
                            {
@@ -354,6 +405,27 @@ namespace Barotrauma
                ((selectedSlot != null && selectedSlot.IsSubSlot) || (draggingItem != null && (draggingSlot == null || !draggingSlot.MouseOn())));
            if (CharacterHealth.OpenHealthWindow != null) hoverOnInventory = true;
            
+            if (layout == Layout.Default && hideButton.Visible)
+            {
+                hideButton.AddToGUIUpdateList();
+                hideButton.UpdateManually(deltaTime, alsoChildren: true);
+
+                hidePersonalSlotsState = hidePersonalSlots ? 
+                    Math.Min(hidePersonalSlotsState + deltaTime * 5.0f, 1.0f) : 
+                    Math.Max(hidePersonalSlotsState -  deltaTime * 5.0f, 0.0f);
+                
+                for (int i = 0; i < slots.Length; i++)
+                {
+                    if (!PersonalSlots.HasFlag(SlotTypes[i])) { continue; }
+                    if (HidePersonalSlots)
+                    {
+                        if (selectedSlot?.Slot == slots[i]) { selectedSlot = null; }
+                        highlightedSubInventorySlots.RemoveWhere(s => s.Slot == slots[i]);
+                    }
+                    slots[i].DrawOffset = Vector2.Lerp(Vector2.Zero, new Vector2(personalSlotArea.Width, 0.0f), hidePersonalSlotsState);
+                }
+            }
+            
            if (hoverOnInventory) HideTimer = 0.5f;
            if (HideTimer > 0.0f) HideTimer -= deltaTime;

@@ -366,6 +438,32 @@ namespace Barotrauma
                    QuickUseItem(Items[i], true, false, true);
                }
            }
+        }
+
+            //force personal slots open if an item is running out of battery/fuel/oxygen/etc
+            if (hidePersonalSlots)
+            {
+                for (int i = 0; i < slots.Length; i++)
+                {
+                    if (Items[i]?.OwnInventory != null && Items[i].OwnInventory.Capacity == 1 && PersonalSlots.HasFlag(SlotTypes[i]))
+                    {
+                        if (Items[i].OwnInventory.Items[0].Condition > 0.0f &&
+                            Items[i].OwnInventory.Items[0].Condition / Items[i].OwnInventory.Items[0].MaxCondition < 0.15f)
+                        {
+                            hidePersonalSlots = false;
+                        }
+                    }
+                }
+            }
+
+            List<SlotReference> hideSubInventories = new List<SlotReference>();
+            foreach (var highlightedSubInventorySlot in highlightedSubInventorySlots)
+            {
+                if (highlightedSubInventorySlot.ParentInventory == this)
+                {
+                    UpdateSubInventory(deltaTime, highlightedSubInventorySlot.SlotIndex, cam);
+                }
+            }
            
            List<SlotReference> hideSubInventories = new List<SlotReference>();
            foreach (var highlightedSubInventorySlot in highlightedSubInventorySlots)
@@ -704,7 +802,12 @@ namespace Barotrauma
            }

            base.Draw(spriteBatch);
-
+            
+            if (hideButton != null && hideButton.Visible)
+            {
+                hideButton.DrawManually(spriteBatch, alsoChildren: true);
+            }
+            
            InventorySlot highlightedQuickUseSlot = null;
            for (int i = 0; i < capacity; i++)
            {
@@ -718,7 +821,7 @@ namespace Barotrauma
                    if (limbSlotIcons.ContainsKey(SlotTypes[i]))
                    {
                        var icon = limbSlotIcons[SlotTypes[i]];
-                        icon.Draw(spriteBatch, slots[i].Rect.Center.ToVector2(), Color.White * 0.3f, origin: icon.size / 2, scale: slots[i].Rect.Width / icon.size.X);
+                        icon.Draw(spriteBatch, slots[i].Rect.Center.ToVector2() + slots[i].DrawOffset, Color.White * 0.3f, origin: icon.size / 2, scale: slots[i].Rect.Width / icon.size.X);
                    }
                    continue;
                }
@@ -728,12 +831,12 @@ namespace Barotrauma
                if (IsInLimbSlot(Items[i], InvSlotType.LeftHand))
                {
                    var icon = limbSlotIcons[InvSlotType.LeftHand];
-                    icon.Draw(spriteBatch, new Vector2(slots[i].Rect.X, slots[i].Rect.Bottom), Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.35f, icon.size.Y * 0.75f), scale: slots[i].Rect.Width / icon.size.X * 0.7f);
+                    icon.Draw(spriteBatch, new Vector2(slots[i].Rect.X, slots[i].Rect.Bottom) + slots[i].DrawOffset, Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.35f, icon.size.Y * 0.75f), scale: slots[i].Rect.Width / icon.size.X * 0.7f);
                }
                if (IsInLimbSlot(Items[i], InvSlotType.RightHand))
                {
                    var icon = limbSlotIcons[InvSlotType.RightHand];
-                    icon.Draw(spriteBatch, new Vector2(slots[i].Rect.Right, slots[i].Rect.Bottom), Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.65f, icon.size.Y * 0.75f), scale: slots[i].Rect.Width / icon.size.X * 0.7f);
+                    icon.Draw(spriteBatch, new Vector2(slots[i].Rect.Right, slots[i].Rect.Bottom) + slots[i].DrawOffset, Color.White * 0.6f, origin: new Vector2(icon.size.X * 0.65f, icon.size.Y * 0.75f), scale: slots[i].Rect.Width / icon.size.X * 0.7f);
                }

                Color color = slots[i].EquipButtonState == GUIComponent.ComponentState.Pressed ? Color.Gray : Color.White * 0.8f;
@@ -377,9 +377,13 @@ namespace Barotrauma.Items.Components

        public virtual void UpdateHUD(Character character, float deltaTime, Camera cam) { }

-        public ItemComponent GetLinkUIToComponent()
+        public virtual void CreateEditingHUD(SerializableEntityEditor editor)
        {
-            if (string.IsNullOrEmpty(LinkUIToComponent))
+        }
+
+        private bool LoadElemProjSpecific(XElement subElement)
+        {
+            switch (subElement.Name.ToString().ToLowerInvariant())
            {
                case "guiframe":
                    if (subElement.Attribute("rect") != null)
@@ -28,7 +28,7 @@ namespace Barotrauma.Items.Components
        }

        private string text;
-        [Serialize("", true), Editable(100)]
+        [Serialize("", true, translationTextTag: "Label."), Editable(100)]
        public string Text
        {
            get { return text; }
@@ -40,9 +40,10 @@ namespace Barotrauma.Items.Components
                {
                    textBlock = null;
                }
-
+                
                text = value;
-                TextBlock.Text = value;
+                DisplayText = TextManager.Get(text, returnNull: true) ?? value;
+                TextBlock.Text = DisplayText;
                SetScrollingText();
            }
        }
@@ -121,7 +122,7 @@ namespace Barotrauma.Items.Components
        {
            if (!scrollable) return;

-            float totalWidth = textBlock.Font.MeasureString(text).X;
+            float totalWidth = textBlock.Font.MeasureString(DisplayText).X;
            float textAreaWidth = Math.Max(textBlock.Rect.Width - textBlock.Padding.X - textBlock.Padding.Z, 0);
            if (totalWidth >= textAreaWidth)
            {
@@ -129,13 +130,13 @@ namespace Barotrauma.Items.Components
                //(so the text can scroll entirely out of view before we reset it back to start)
                needsScrolling = true;
                float spaceWidth = textBlock.Font.MeasureChar(' ').X;
-                scrollingText = new string(' ', (int)Math.Ceiling(textAreaWidth / spaceWidth)) + text;
+                scrollingText = new string(' ', (int)Math.Ceiling(textAreaWidth / spaceWidth)) + DisplayText;
            }
            else
            {
                //whole text can fit in the textblock, no need to scroll
                needsScrolling = false;
-                scrollingText = text;
+                scrollingText = DisplayText;
                scrollAmount = 0.0f;
                scrollIndex = 0;
                return;
@@ -151,7 +152,7 @@ namespace Barotrauma.Items.Components
                charWidths[i] = charWidth;
            }

-            scrollIndex = MathHelper.Clamp(scrollIndex, 0, text.Length);
+            scrollIndex = MathHelper.Clamp(scrollIndex, 0, DisplayText.Length);
        }

        public override void Update(float deltaTime, Camera cam)
@@ -221,7 +221,7 @@ namespace Barotrauma.Items.Components
                {                    
                    hullInfoFrame.RectTransform.ScreenSpaceOffset = hullFrame.Rect.Center;
                    hullInfoFrame.Visible = true;
-                    hullNameText.Text = hull.RoomName;
+                    hullNameText.Text = hull.DisplayName;

                    foreach (Hull linkedHull in hullData.LinkedHulls)
                    {
@@ -785,15 +785,32 @@ namespace Barotrauma.Items.Components

            foreach (Character c in Character.CharacterList)
            {
-                if (c.AnimController.CurrentHull != null || !c.Enabled) continue;
-                if (DetectSubmarineWalls && c.AnimController.CurrentHull == null && item.CurrentHull != null) continue;
+                if (c.AnimController.CurrentHull != null || !c.Enabled) { continue; }
+                if (DetectSubmarineWalls && c.AnimController.CurrentHull == null && item.CurrentHull != null) { continue; }
+
+                if (c.AnimController.SimplePhysicsEnabled)
+                {
+                    float pointDist = ((c.WorldPosition - pingSource) * displayScale).LengthSquared();
+                    if (pointDist > DisplayRadius * DisplayRadius) { continue; }
+
+                    if (pointDist > prevPingRadiusSqr && pointDist < pingRadiusSqr)
+                    {
+                        var blip = new SonarBlip(
+                            c.WorldPosition,
+                            MathHelper.Clamp(c.Mass, 0.1f, pingStrength),
+                            MathHelper.Clamp(c.Mass * 0.03f, 0.1f, 2.0f));
+                        if (!passive && !CheckBlipVisibility(blip, transducerPos)) { continue; }
+                        sonarBlips.Add(blip);
+                    }
+                    continue;
+                }

                foreach (Limb limb in c.AnimController.Limbs)
                {
                    if (!limb.body.Enabled) { continue; }

                    float pointDist = ((limb.WorldPosition - pingSource) * displayScale).LengthSquared();
-                    if (limb.SimPosition == Vector2.Zero || pointDist > DisplayRadius * DisplayRadius) continue;
+                    if (limb.SimPosition == Vector2.Zero || pointDist > DisplayRadius * DisplayRadius) { continue; }

                    if (pointDist > prevPingRadiusSqr && pointDist < pingRadiusSqr)
                    {
@@ -801,13 +818,13 @@ namespace Barotrauma.Items.Components
                            limb.WorldPosition + Rand.Vector(limb.Mass / 10.0f), 
                            MathHelper.Clamp(limb.Mass, 0.1f, pingStrength), 
                            MathHelper.Clamp(limb.Mass * 0.1f, 0.1f, 2.0f));
-                        if (!passive && !CheckBlipVisibility(blip, transducerPos)) continue;
+                        if (!passive && !CheckBlipVisibility(blip, transducerPos)) { continue; }
                        sonarBlips.Add(blip);
                    }
                }
            }
        }
-
+        
        private void CreateBlipsForLine(Vector2 point1, Vector2 point2, Vector2 pingSource, Vector2 transducerPos, float pingRadius, float prevPingRadius,
            float lineStep, float zStep, float range, float pingStrength, bool passive)
        {
@@ -3,6 +3,7 @@ using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Xml.Linq;

@@ -16,16 +17,22 @@ namespace Barotrauma.Items.Components
        {
            uiElements.Clear();

+            var visibleElements = customInterfaceElementList.Where(ciElement => !string.IsNullOrEmpty(ciElement.Label));
+
            GUILayoutGroup paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.9f, 0.8f), GuiFrame.RectTransform, Anchor.Center),
                childAnchor: customInterfaceElementList.Count > 1 ? Anchor.TopCenter : Anchor.Center)
-                { RelativeSpacing = 0.05f };
+            {
+                RelativeSpacing = 0.05f,
+                Stretch = visibleElements.Count() > 2
+            };

-            float elementSize = Math.Min(1.0f / customInterfaceElementList.Count, 0.5f);
-            foreach (CustomInterfaceElement ciElement in customInterfaceElementList)
+            float elementSize = Math.Min(1.0f / visibleElements.Count(), 0.5f);
+            foreach (CustomInterfaceElement ciElement in visibleElements)
            {
                if (ciElement.ContinuousSignal)
                {
-                    var tickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, elementSize), paddedFrame.RectTransform), ciElement.Label)
+                    var tickBox = new GUITickBox(new RectTransform(new Vector2(1.0f, elementSize), paddedFrame.RectTransform),
+                        TextManager.Get(ciElement.Label, returnNull: true) ?? ciElement.Label)
                    {
                        UserData = ciElement
                    };
@@ -45,7 +52,8 @@ namespace Barotrauma.Items.Components
                }
                else
                {
-                    var btn = new GUIButton(new RectTransform(new Vector2(1.0f, elementSize), paddedFrame.RectTransform), ciElement.Label, style: "GUIButtonLarge")
+                    var btn = new GUIButton(new RectTransform(new Vector2(1.0f, elementSize), paddedFrame.RectTransform), 
+                        TextManager.Get(ciElement.Label, returnNull: true) ?? ciElement.Label, style: "GUIButtonLarge")
                    {
                        UserData = ciElement
                    };
@@ -66,6 +74,24 @@ namespace Barotrauma.Items.Components
            }
        }

+        public override void CreateEditingHUD(SerializableEntityEditor editor)
+        {
+            base.CreateEditingHUD(editor);
+
+            PropertyDescriptorCollection properties = TypeDescriptor.GetProperties(customInterfaceElementList[0]);
+            PropertyDescriptor labelProperty = properties.Find("Label", false);
+            PropertyDescriptor signalProperty = properties.Find("Signal", false);
+            for (int i = 0; i< customInterfaceElementList.Count; i++)
+            {
+                editor.CreateStringField(customInterfaceElementList[i],
+                    new SerializableProperty(labelProperty, customInterfaceElementList[i]),
+                    customInterfaceElementList[i].Label, "Label #" + (i + 1), "");
+                editor.CreateStringField(customInterfaceElementList[i],
+                    new SerializableProperty(signalProperty, customInterfaceElementList[i]),
+                    customInterfaceElementList[i].Signal, "Signal #" + (i + 1), "");
+            }
+        }
+
        partial void UpdateLabelsProjSpecific()
        {
            for (int i = 0; i < labels.Length && i < uiElements.Count; i++)
@@ -154,8 +154,6 @@ namespace Barotrauma

            public SlotReference(Inventory parentInventory, InventorySlot slot, int slotIndex, bool isSubSlot, Inventory subInventory = null)
            {
-
-
                ParentInventory = parentInventory;
                Slot = slot;
                SlotIndex = slotIndex;
@@ -714,12 +712,15 @@ namespace Barotrauma
                    float scale = Math.Min(Math.Min(iconSize / sprite.size.X, iconSize / sprite.size.Y), 1.5f);
                    Vector2 itemPos = PlayerInput.MousePosition;

-                    if (GUI.MouseOn == null && selectedSlot == null)
+                    bool mouseOnHealthInterface = CharacterHealth.OpenHealthWindow != null && CharacterHealth.OpenHealthWindow.MouseOnElement;
+
+                    if ((GUI.MouseOn == null || mouseOnHealthInterface) && selectedSlot == null)
                    {
                        var shadowSprite = GUI.Style.GetComponentStyle("OuterGlow").Sprites[GUIComponent.ComponentState.None][0];
-                        string toolTip = Character.Controlled.FocusedItem != null ?
-                            TextManager.Get("PutItemIn").Replace("[itemname]", Character.Controlled.FocusedItem.Name) :
-                            TextManager.Get("DropItem");
+                        string toolTip = mouseOnHealthInterface ? TextManager.Get("QuickUseAction.UseTreatment") :                            
+                            Character.Controlled.FocusedItem != null ?
+                                TextManager.Get("PutItemIn").Replace("[itemname]", Character.Controlled.FocusedItem.Name) :
+                                TextManager.Get("DropItem");
                        int textWidth = (int)Math.Max(GUI.Font.MeasureString(draggingItem.Name).X, GUI.SmallFont.MeasureString(toolTip).X);
                        int textSpacing = (int)(15 * GUI.Scale);
                        Point shadowBorders = (new Point(40, 10)).Multiply(GUI.Scale);
@@ -727,7 +728,7 @@ namespace Barotrauma
                            new Rectangle(itemPos.ToPoint() - new Point(iconSize / 2) - shadowBorders, new Point(iconSize + textWidth + textSpacing, iconSize) + shadowBorders.Multiply(2)), Color.Black * 0.8f);
                        GUI.DrawString(spriteBatch, new Vector2(itemPos.X + iconSize / 2 + textSpacing, itemPos.Y - iconSize / 2), draggingItem.Name, Color.White);
                        GUI.DrawString(spriteBatch, new Vector2(itemPos.X + iconSize / 2 + textSpacing, itemPos.Y), toolTip,
-                            color: Character.Controlled.FocusedItem == null ? Color.Red : Color.LightGreen,
+                            color: Character.Controlled.FocusedItem == null && !mouseOnHealthInterface ? Color.Red : Color.LightGreen,
                            font: GUI.SmallFont);
                    }
                    sprite.Draw(spriteBatch, itemPos + Vector2.One * 2, Color.Black, scale: scale);
@@ -853,7 +854,7 @@ namespace Barotrauma
                        if (itemContainer.ContainedStateIndicator?.Texture == null)
                        {
                            containedIndicatorArea.Inflate(0, -2);
-                            GUI.DrawRectangle(spriteBatch, containedIndicatorArea, Color.DarkGray * 0.8f, true);
+                            GUI.DrawRectangle(spriteBatch, containedIndicatorArea, Color.DarkGray * 0.9f, true);
                            GUI.DrawRectangle(spriteBatch,
                                new Rectangle(containedIndicatorArea.X, containedIndicatorArea.Y, (int)(containedIndicatorArea.Width * containedState), containedIndicatorArea.Height),
                                Color.Lerp(Color.Red, Color.Green, containedState) * 0.8f, true);
@@ -867,11 +868,11 @@ namespace Barotrauma

                            if (containedState > 0.0f && containedState < 0.25f)
                            {
-                                indicatorScale += ((float)Math.Sin(Timing.TotalTime * 5.0f) + 1.0f) * 0.1f;
+                                indicatorScale += ((float)Math.Sin(Timing.TotalTime * 5.0f) + 1.0f) * 0.25f;
                            }

                            indicatorSprite.Draw(spriteBatch, containedIndicatorArea.Center.ToVector2(),
-                                Color.DarkGray * 0.6f, 
+                                Color.DarkGray * 0.9f, 
                                origin: indicatorSprite.size / 2,
                                rotate: 0.0f,
                                scale: indicatorScale);
@@ -41,8 +41,6 @@ namespace Barotrauma
        {
            get { return activeSprite; }
        }
-              
-        public float SpriteRotation;

        private GUITextBlock itemInUseWarning;
        private GUITextBlock ItemInUseWarning
@@ -103,9 +101,22 @@ namespace Barotrauma
            return color;
        }

-        partial void SetActiveSprite()
+        partial void SetActiveSpriteProjSpecific()
        {
            activeSprite = prefab.sprite;
+            Holdable holdable = GetComponent<Holdable>();
+            if (holdable != null && holdable.Attached)
+            {
+                foreach (ContainedItemSprite containedSprite in Prefab.ContainedSprites)
+                {
+                    if (containedSprite.UseWhenAttached)
+                    {
+                        activeSprite = containedSprite.Sprite;
+                        return;
+                    }
+                }
+            }
+
            if (Container != null)
            {
                foreach (ContainedItemSprite containedSprite in Prefab.ContainedSprites)
@@ -175,8 +186,7 @@ namespace Barotrauma
            
            Color color = isHighlighted && !GUI.DisableItemHighlights && Screen.Selected != GameMain.GameScreen ? Color.Orange : GetSpriteColor();
            //if (IsSelected && editing) color = Color.Lerp(color, Color.Gold, 0.5f);
-
-            Sprite activeSprite = prefab.sprite;
+            
            BrokenItemSprite fadeInBrokenSprite = null;
            float fadeInBrokenSpriteAlpha = 0.0f;
            if (condition < Prefab.Health)
@@ -567,8 +577,13 @@ namespace Barotrauma
                }

                var componentEditor = new SerializableEntityEditor(listBox.Content.RectTransform, ic, inGame, showName: !inGame);
-                
-                if (inGame) continue;
+
+                if (inGame)
+                {
+                    ic.CreateEditingHUD(componentEditor);
+                    componentEditor.Recalculate();
+                    continue;
+                }

                foreach (var kvp in ic.requiredItems)
                {
@@ -602,6 +617,10 @@ namespace Barotrauma
                    }
                }

+                ic.CreateEditingHUD(componentEditor);
+                componentEditor.Recalculate();
+            }
+
            PositionEditingHUD();
            SetHUDLayout();

@@ -784,7 +803,7 @@ namespace Barotrauma
            {
                if (!ic.CanBeSelected) { continue; }

-                bool useAlternativeLayout = ic.Item != this;
+                bool useAlternativeLayout = activeHUDs.Count > 1;
                bool wasUsingAlternativeLayout = ic.UseAlternativeLayout;
                ic.UseAlternativeLayout = useAlternativeLayout;
                needsLayoutUpdate |= ic.UseAlternativeLayout != wasUsingAlternativeLayout;
@@ -818,14 +837,28 @@ namespace Barotrauma
                case NetEntityEvent.Type.ComponentState:
                    {
                        int componentIndex = msg.ReadRangedInteger(0, components.Count - 1);
-                        (components[componentIndex] as IServerSerializable).ClientRead(type, msg, sendingTime);
+                        if (components[componentIndex] is IServerSerializable serverSerializable)
+                        {
+                            serverSerializable.ClientRead(type, msg, sendingTime);
+                        }
+                        else
+                        {
+                            throw new Exception("Failed to read component state - " + components[componentIndex].GetType() + " is not IServerSerializable.");
+                        }
                    }
                    break;
-                    
+
                case NetEntityEvent.Type.InventoryState:
-                    { 
+                    {
                        int containerIndex = msg.ReadRangedInteger(0, components.Count - 1);
-                        (components[containerIndex] as ItemContainer).Inventory.ClientRead(type, msg, sendingTime);
+                        if (components[containerIndex] is ItemContainer container)
+                        {
+                            container.Inventory.ClientRead(type, msg, sendingTime);
+                        }
+                        else
+                        {
+                            throw new Exception("Failed to read inventory state - " + components[containerIndex].GetType() + " is not an ItemContainer.");
+                        }
                    }
                    break;
                case NetEntityEvent.Type.Status:
@@ -25,12 +25,14 @@ namespace Barotrauma
    class ContainedItemSprite
    {
        public readonly Sprite Sprite;
+        public readonly bool UseWhenAttached;
        public readonly string[] AllowedContainerIdentifiers;
        public readonly string[] AllowedContainerTags;

        public ContainedItemSprite(XElement element, string path = "", bool lazyLoad = false)
        {
            Sprite = new Sprite(element, path, lazyLoad: lazyLoad);
+            UseWhenAttached = element.GetAttributeBool("usewhenattached", false);
            AllowedContainerIdentifiers = element.GetAttributeStringArray("allowedcontaineridentifiers", new string[0], convertToLowerInvariant: true);
            AllowedContainerTags = element.GetAttributeStringArray("allowedcontainertags", new string[0], convertToLowerInvariant: true);
        }