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

Carrying stunned/unconscious/dead people up ladders woot!!!

Browse Source 
Properly orient grabbed player on climbing and shoulder grab
Allow interaction with buttons, ladders, etc. when grabbing someone
This commit is contained in:
Alex Noir
2017-12-08 22:30:47 +03:00
parent de7489db8b
commit e050404278
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Barotrauma/BarotraumaShared/Source/Characters/Animation/HumanoidAnimController.cs
View File

@@ -869,7 +869,34 @@ namespace Barotrauma
character.SelectedConstruction = null; character.SelectedConstruction = null;
IgnorePlatforms = false; IgnorePlatforms = false;
} }
else if (character.SelectedCharacter != null && !character.SelectedCharacter.AllowInput)
{
Limb targetLeftHand = character.SelectedCharacter.AnimController.GetLimb(LimbType.LeftHand);
Limb targetRightHand = character.SelectedCharacter.AnimController.GetLimb(LimbType.RightHand);
Limb targetTorso = character.SelectedCharacter.AnimController.GetLimb(LimbType.Torso);
if (character.SelectedCharacter.AnimController.Dir != Dir)
character.SelectedCharacter.AnimController.Flip();
targetTorso.pullJoint.Enabled = true;
targetTorso.pullJoint.WorldAnchorB = torso.SimPosition + (Vector2.UnitX * -Dir) * 0.2f;
targetTorso.pullJoint.MaxForce = 5000.0f;
if (!targetLeftHand.IsSevered)
{
targetLeftHand.pullJoint.Enabled = true;
targetLeftHand.pullJoint.WorldAnchorB = torso.SimPosition + (new Vector2(1 * Dir, 1)) * 0.2f;
targetLeftHand.pullJoint.MaxForce = 5000.0f;
}
if (!targetRightHand.IsSevered)
{
targetRightHand.pullJoint.Enabled = true;
targetRightHand.pullJoint.WorldAnchorB = torso.SimPosition + (new Vector2(1 * Dir, 1)) * 0.2f;
targetRightHand.pullJoint.MaxForce = 5000.0f;
}
character.SelectedCharacter.AnimController.IgnorePlatforms = true;
}
} }
private void UpdateCPR(float deltaTime) private void UpdateCPR(float deltaTime)
@@ -880,11 +907,13 @@ namespace Barotrauma
return; return;
} }
Character target = character.SelectedCharacter;
Crouching = true; Crouching = true;
Vector2 diff = character.SelectedCharacter.SimPosition - character.SimPosition; Vector2 diff = target.SimPosition - character.SimPosition;
Limb targetHead = character.SelectedCharacter.AnimController.GetLimb(LimbType.Head); Limb targetHead = target.AnimController.GetLimb(LimbType.Head);
Limb targetTorso = character.SelectedCharacter.AnimController.GetLimb(LimbType.Torso); Limb targetTorso = target.AnimController.GetLimb(LimbType.Torso);
Limb head = GetLimb(LimbType.Head); Limb head = GetLimb(LimbType.Head);
Limb torso = GetLimb(LimbType.Torso); Limb torso = GetLimb(LimbType.Torso);
@@ -986,6 +1015,9 @@ namespace Barotrauma
pullLimb.pullJoint.WorldAnchorB = targetLimb.SimPosition; pullLimb.pullJoint.WorldAnchorB = targetLimb.SimPosition;
pullLimb.pullJoint.MaxForce = 5000.0f; pullLimb.pullJoint.MaxForce = 5000.0f;
targetMovement *= 0.7f; //Carrying people like that takes a lot of effort. targetMovement *= 0.7f; //Carrying people like that takes a lot of effort.
if (target.AnimController.Dir != Dir)
target.AnimController.Flip();
} }
else else
{ {

2
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
View File

@@ -1308,7 +1308,7 @@ namespace Barotrauma
findFocusedTimer -= deltaTime; findFocusedTimer -= deltaTime;
} }
if (SelectedCharacter != null && IsKeyHit(InputType.Select)) if (SelectedCharacter != null && focusedItem == null && IsKeyHit(InputType.Select)) //Let people use ladders and buttons and stuff when dragging chars
{ {
DeselectCharacter(); DeselectCharacter();
} }