Unstable v0.10.6.0 (October 13th 2020)

Barotrauma/BarotraumaClient/ClientSource/Items/CharacterInventory.cs

@@ -144,17 +144,13 @@ namespace Barotrauma
         protected override ItemInventory GetActiveEquippedSubInventory(int slotIndex)
         {
             var item = Items[slotIndex];
-            if (item == null) return null;
+            if (item == null) { return null; }
 
             var container = item.GetComponent<ItemContainer>();
-            if (container == null || 
-                !character.CanAccessInventory(container.Inventory) ||
-                !container.KeepOpenWhenEquipped || 
-                !character.HasEquippedItem(container.Item))
+            if (container == null || !container.KeepOpenWhenEquippedBy(character))
             {
                 return null;
             }
-
             return container.Inventory;
         }
 
@@ -626,7 +622,7 @@ namespace Barotrauma
                         {
                             var itemContainer = item.GetComponent<ItemContainer>();
                             if (itemContainer != null && 
-                                itemContainer.KeepOpenWhenEquipped && 
+                                itemContainer.KeepOpenWhenEquippedBy(character) && 
                                 character.CanAccessInventory(itemContainer.Inventory) &&
                                 !highlightedSubInventorySlots.Any(s => s.Inventory == itemContainer.Inventory))
                             {

Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemContainer.cs

@@ -70,6 +70,7 @@ namespace Barotrauma.Items.Components
 
         [Serialize(false, false, description: "Should the inventory of this item be kept open when the item is equipped by a character.")]
         public bool KeepOpenWhenEquipped { get; set; }
+
         [Serialize(false, false, description: "Can the inventory of this item be moved around on the screen by the player.")]
         public bool MovableFrame { get; set; }
 
@@ -162,6 +163,30 @@ namespace Barotrauma.Items.Components
             }            
         }
 
+        public bool KeepOpenWhenEquippedBy(Character character)
+        {
+            if (!character.CanAccessInventory(Inventory) ||
+                !KeepOpenWhenEquipped ||
+                !character.HasEquippedItem(Item))
+            {
+                return false;
+            }
+
+            //if holding 2 different "always open" items in different hands, don't force them to stay open
+            if (character.SelectedItems[0] != null &&
+                character.SelectedItems[1] != null &&
+                character.SelectedItems[0] != character.SelectedItems[1])
+            {
+                if ((character.SelectedItems[0].GetComponent<ItemContainer>()?.KeepOpenWhenEquipped ?? false) &&
+                    (character.SelectedItems[1].GetComponent<ItemContainer>()?.KeepOpenWhenEquipped ?? false))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
         public void Draw(SpriteBatch spriteBatch, bool editing = false, float itemDepth = -1)
         {
             if (hideItems || (item.body != null && !item.body.Enabled)) { return; }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Signal/Wire.cs

@@ -342,7 +342,8 @@ namespace Barotrauma.Items.Components
                     }
                     else
                     {
-                        if (Vector2.DistanceSquared(nodeWorldPos, draggingWire.nodes[(int)highlightedNodeIndex]) > Submarine.GridSize.X * Submarine.GridSize.X || PlayerInput.IsShiftDown())
+                        if ((highlightedNodeIndex.HasValue && Vector2.DistanceSquared(nodeWorldPos, draggingWire.nodes[(int)highlightedNodeIndex]) > Submarine.GridSize.X * Submarine.GridSize.X) || 
+                            PlayerInput.IsShiftDown())
                         {
                             selectedNodeIndex = highlightedNodeIndex;
                         }

Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs

@@ -286,7 +286,7 @@ namespace Barotrauma.Items.Components
                 rotation + MathHelper.PiOver2, item.Scale,
                 SpriteEffects.None, item.SpriteDepth + (barrelSprite.Depth - item.Sprite.Depth));
 
-            if (!editing || GUI.DisableHUD) { return; }
+            if (!editing || GUI.DisableHUD || !item.IsSelected) { return; }
 
             float widgetRadius = 60.0f;
 
@@ -305,8 +305,6 @@ namespace Barotrauma.Items.Components
                 drawPos + new Vector2((float)Math.Cos((maxRotation + minRotation) / 2), (float)Math.Sin((maxRotation + minRotation) / 2)) * widgetRadius,
                 Color.LightGreen);
 
-            if (!item.IsSelected) { return; }
-
             Widget minRotationWidget = GetWidget("minrotation", spriteBatch, size: 10, initMethod: (widget) =>
             {
                  widget.Selected += () =>

Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs

@@ -404,8 +404,8 @@ namespace Barotrauma
                 container = (this as ItemInventory).Container;
             }
 
-            if (container == null) return false;
-            return owner.SelectedCharacter != null || !container.KeepOpenWhenEquipped || (!(owner is Character)) || !owner.HasEquippedItem(container.Item);
+            if (container == null) { return false; }
+            return owner.SelectedCharacter != null|| (!(owner is Character character)) || !container.KeepOpenWhenEquippedBy(character)  || !owner.HasEquippedItem(container.Item);
         }
 
         protected virtual bool HideSlot(int i)