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

Unstable 0.1500.4.0 (Shrek edition)

Browse Source
This commit is contained in:
Markus Isberg
2021-09-23 21:29:31 +09:00
parent 5a6bbcc79e
commit 3043a9a7bc
124 changed files with 3571 additions and 1848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/AnimController.cs
+25 -3
View File
@@ -42,6 +42,10 @@ namespace Barotrauma
}
else
{
if (this is HumanoidAnimController humanAnimController && humanAnimController.Crouching)
{
return humanAnimController.HumanCrouchParams;
}
return IsMovingFast ? RunParams : WalkParams;
}
}
@@ -96,7 +100,12 @@ namespace Barotrauma
{
if (CanWalk)
{
return new List<AnimationParams> { WalkParams, RunParams, SwimSlowParams, SwimFastParams };
var anims = new List<AnimationParams> { WalkParams, RunParams, SwimSlowParams, SwimFastParams };
if (this is HumanoidAnimController humanAnimController)
{
anims.Add(humanAnimController.HumanCrouchParams);
}
return anims;
}
else
{
@@ -154,7 +163,7 @@ namespace Barotrauma
public virtual void UpdateUseItem(bool allowMovement, Vector2 handWorldPos) { }
public float GetSpeed(AnimationType type)
public virtual float GetSpeed(AnimationType type)
{
GroundedMovementParams movementParams;
switch (type)
@@ -207,7 +216,14 @@ namespace Barotrauma
}
else
{
animType = AnimationType.Walk;
if (this is HumanoidAnimController humanAnimController && humanAnimController.Crouching)
{
animType = AnimationType.Crouch;
}
else
{
animType = AnimationType.Walk;
}
}
}
return GetSpeed(animType);
@@ -221,6 +237,12 @@ namespace Barotrauma
return WalkParams;
case AnimationType.Run:
return RunParams;
case AnimationType.Crouch:
if (this is HumanoidAnimController humanAnimController)
{
return humanAnimController.HumanCrouchParams;
}
throw new NotImplementedException(type.ToString());
case AnimationType.SwimSlow:
return SwimSlowParams;
case AnimationType.SwimFast: