OBT/1.2.1(Summer update)

Sync with upstream

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

@@ -168,6 +168,9 @@ namespace Barotrauma.Items.Components
             set { attachedByDefault = value; }
         }
 
+#if DEBUG
+        [Editable]
+#endif
         [Serialize("0.0,0.0", IsPropertySaveable.No, description: "The position the character holds the item at (in pixels, as an offset from the character's shoulder)."+
             " For example, a value of 10,-100 would make the character hold the item 100 pixels below the shoulder and 10 pixels forwards.")]
         public Vector2 HoldPos
@@ -177,8 +180,10 @@ namespace Barotrauma.Items.Components
         }
         //the distance from the holding characters elbow to center of the physics body of the item
         protected Vector2 holdPos;
-        
 
+#if DEBUG
+        [Editable]
+#endif
         [Serialize("0.0,0.0", IsPropertySaveable.No, description: "The position the character holds the item at when aiming (in pixels, as an offset from the character's shoulder)."+
             " Works similarly as HoldPos, except that the position is rotated according to the direction the player is aiming at. For example, a value of 10,-100 would make the character hold the item 100 pixels below the shoulder and 10 pixels forwards when aiming directly to the right.")]
         public Vector2 AimPos
@@ -279,6 +284,9 @@ namespace Barotrauma.Items.Components
         /// <summary>
         /// For setting the handle positions using status effects
         /// </summary>
+#if DEBUG
+        [Editable]
+#endif
         public Vector2 Handle1
         {
             get { return ConvertUnits.ToDisplayUnits(handlePos[0]); }
@@ -299,6 +307,9 @@ namespace Barotrauma.Items.Components
         /// <summary>
         /// For setting the handle positions using status effects
         /// </summary>
+#if DEBUG
+        [Editable]
+#endif
         public Vector2 Handle2
         {
             get { return ConvertUnits.ToDisplayUnits(handlePos[1]); }

Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Pickable.cs

@@ -119,7 +119,7 @@ namespace Barotrauma.Items.Components
             return OnPicked(picker, pickDroppedStack: true);
         }
 
-        public virtual bool OnPicked(Character picker, bool pickDroppedStack)
+        public bool OnPicked(Character picker, bool pickDroppedStack, bool playSound = true)
         {
             //if the item has multiple Pickable components (e.g. Holdable and Wearable, check that we don't equip it in hands when the item is worn or vice versa)
             if (item.GetComponents<Pickable>().Any())
@@ -156,7 +156,7 @@ namespace Barotrauma.Items.Components
 
                 ApplyStatusEffects(ActionType.OnPicked, 1.0f, picker);
 #if CLIENT
-                if (!GameMain.Instance.LoadingScreenOpen && picker == Character.Controlled) { SoundPlayer.PlayUISound(GUISoundType.PickItem); }
+                if (!GameMain.Instance.LoadingScreenOpen && playSound && picker == Character.Controlled) { SoundPlayer.PlayUISound(GUISoundType.PickItem); }
                 PlaySound(ActionType.OnPicked,  picker);
 #endif
                 if (pickDroppedStack)
@@ -164,7 +164,7 @@ namespace Barotrauma.Items.Components
                     foreach (var droppedItem in droppedStack)
                     {
                         if (droppedItem == item) { continue; }
-                        droppedItem.GetComponent<Pickable>().OnPicked(picker, pickDroppedStack: false);
+                        droppedItem.GetComponent<Pickable>().OnPicked(picker, pickDroppedStack: false, playSound: false);
                     }
                 }
                 return true;