vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #560 from ursinewalrus/placeItemsWhereHandIs

Browse Source 
Place items where hand is
This commit is contained in:
Joonas Rikkonen
2018-08-02 10:44:45 +03:00
committed by GitHub
parent 5ba3f9384a 8c8d3e300f
commit 7f58e4619b
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/Holdable.cs
+18 -1
View File
@@ -160,7 +160,24 @@ namespace Barotrauma.Items.Components
if (item.body != null) if (item.body != null)
{ {
item.body.ResetDynamics(); item.body.ResetDynamics();
item.SetTransform(picker.SimPosition, 0.0f); Limb heldHand;
Limb arm;
if (picker.Inventory.IsInLimbSlot(item, InvSlotType.LeftHand))
{
heldHand = picker.AnimController.GetLimb(LimbType.LeftHand);
arm = picker.AnimController.GetLimb(LimbType.LeftArm);
}
else
{
heldHand = picker.AnimController.GetLimb(LimbType.RightHand);
arm = picker.AnimController.GetLimb(LimbType.RightArm);
}
float xDif = (heldHand.SimPosition.X - arm.SimPosition.X) / 2f;
float yDif = (heldHand.SimPosition.Y - arm.SimPosition.Y) / 2.5f;
//hand simPosition is actually in the wrist so need to move the item out from it slightly
item.SetTransform(heldHand.SimPosition + new Vector2(xDif,yDif), 0.0f);
} }
picker.DeselectItem(item); picker.DeselectItem(item);