(c4338b107) Disable aiming when interacting with an item other than ladders.

Barotrauma/BarotraumaClient/Source/Items/Components/Machines/Fabricator.cs

@@ -349,6 +349,18 @@ namespace Barotrauma.Items.Components
             
             var paddedFrame = new GUILayoutGroup(new RectTransform(new Vector2(0.95f, 0.9f), selectedItemFrame.RectTransform, Anchor.Center)) { RelativeSpacing = 0.03f, Stretch = true };
 
+            /*var itemIcon = selectedItem.TargetItem.InventoryIcon ?? selectedItem.TargetItem.sprite;
+            if (itemIcon != null)
+            {
+                GUIImage img = new GUIImage(new RectTransform(new Point(40, 40), paddedFrame.RectTransform),
+                    itemIcon, scaleToFit: true)
+                {
+                    Color = selectedItem.TargetItem.InventoryIconColor
+                };
+            }*/
+            var nameBlock = new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), paddedFrame.RectTransform),
+                selectedItem.TargetItem.Name, textAlignment: Alignment.CenterLeft);
+
             if (GameMain.Client != null)
             {
                 inadequateSkills = selectedItem.RequiredSkills.FindAll(skill => user.GetSkillLevel(skill.Identifier) < skill.Level);

Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs

@@ -1122,7 +1122,6 @@ namespace Barotrauma
             //prevent the hands from going above the top of the ladders
             handPos.Y = Math.Min(-0.5f, handPos.Y);
 
-            // TODO: lock only one hand when aiming?
             if (!PlayerInput.KeyDown(InputType.Aim) || Math.Abs(movement.Y) > 0.01f)
             {
                 MoveLimb(leftHand,

Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs

@@ -489,7 +489,8 @@ namespace Barotrauma.Items.Components
             {
                 scaledHandlePos[0] = handlePos[0] * item.Scale;
                 scaledHandlePos[1] = handlePos[1] * item.Scale;
-                picker.AnimController.HoldItem(deltaTime, item, scaledHandlePos, holdPos + swing, aimPos + swing, picker.IsKeyDown(InputType.Aim) && aimPos != Vector2.Zero, holdAngle);
+                bool aim = picker.IsKeyDown(InputType.Aim) && aimPos != Vector2.Zero && (picker.SelectedConstruction == null || picker.SelectedConstruction.GetComponent<Ladder>() != null);
+                picker.AnimController.HoldItem(deltaTime, item, scaledHandlePos, holdPos + swing, aimPos + swing, aim, holdAngle);
             }
             else
             {

Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/MeleeWeapon.cs

@@ -148,7 +148,8 @@ namespace Barotrauma.Items.Components
             //TODO: refactor the hitting logic (get rid of the magic numbers, make it possible to use different kinds of animations for different items)
             if (!hitting)
             {
-                if (picker.IsKeyDown(InputType.Aim) && reloadTimer <= 0)
+                bool aim = picker.IsKeyDown(InputType.Aim) && reloadTimer <= 0 && (picker.SelectedConstruction == null || picker.SelectedConstruction.GetComponent<Ladder>() != null);
+                if (aim)
                 {
                     hitPos = MathUtils.WrapAnglePi(Math.Min(hitPos + deltaTime * 5f, MathHelper.PiOver4));
                     ac.HoldItem(deltaTime, item, handlePos, aimPos, Vector2.Zero, false, hitPos, holdAngle + hitPos);

Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Throwable.cs

@@ -79,7 +79,8 @@ namespace Barotrauma.Items.Components
 
             if (!throwing)
             {
-                if (picker.IsKeyDown(InputType.Aim))
+                bool aim = picker.IsKeyDown(InputType.Aim) && (picker.SelectedConstruction == null || picker.SelectedConstruction.GetComponent<Ladder>() != null);
+                if (aim)
                 {
                     throwPos = MathUtils.WrapAnglePi(System.Math.Min(throwPos + deltaTime * 5.0f, MathHelper.PiOver2));
                     ac.HoldItem(deltaTime, item, handlePos, aimPos, Vector2.Zero, false, throwPos);

Barotrauma/BarotraumaShared/Source/Items/Item.cs

@@ -1406,17 +1406,7 @@ namespace Barotrauma
                     }
                 }
 
-#if CLIENT
+                if (!pickHit && !selectHit) continue;
-                        //if the cursor is on a UI component, disable interaction with the left mouse button
-                        //to prevent accidentally selecting items when clicking UI elements
-                        if (picker == Character.Controlled && GUI.MouseOn != null)
-                        {
-                            if (GameMain.Config.KeyBind(ic.PickKey).MouseButton == 0) pickHit = false;
-                            if (GameMain.Config.KeyBind(ic.SelectKey).MouseButton == 0) selectHit = false;
-                        }
-#endif
-                    }
-                }
 
                 if (!ic.HasRequiredSkills(picker, out Skill tempRequiredSkill)) hasRequiredSkills = false;