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

409d4d9...aeafa16 (merge human-ai)

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-03-18 22:52:17 +02:00
parent 80ab27df22
commit 3301bed442
88 changed files with 2334 additions and 1657 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs
+6 -3
View File
@@ -130,6 +130,9 @@ namespace Barotrauma
public bool Crouching;
private float upperArmLength = 0.0f, forearmLength = 0.0f;
public float ArmLength => upperArmLength + forearmLength;
public Vector2 RightHandIKPos
{
get;
@@ -1623,7 +1626,7 @@ namespace Barotrauma
Holdable holdable = item.GetComponent<Holdable>();
if (Anim != Animation.Climbing && !usingController && character.Stun <= 0.0f && aim && itemPos != Vector2.Zero)
if (!character.IsClimbing && !usingController && character.Stun <= 0.0f && aim && itemPos != Vector2.Zero)
{
Vector2 mousePos = ConvertUnits.ToSimUnits(character.SmoothedCursorPosition);
@@ -1653,7 +1656,7 @@ namespace Barotrauma
}
Vector2 transformedHoldPos = shoulder.WorldAnchorA;
if (itemPos == Vector2.Zero || Anim == Animation.Climbing || usingController)
if (itemPos == Vector2.Zero || character.IsClimbing || usingController)
{
if (character.SelectedItems[0] == item)
{
@@ -1742,7 +1745,7 @@ namespace Barotrauma
item.SetTransform(currItemPos, itemAngle + itemAngleRelativeToHoldAngle * Dir);
if (Anim == Animation.Climbing) return;
if (character.IsClimbing) return;
for (int i = 0; i < 2; i++)
{