From 9a6df8606d4ad08cbd415dfc8b097c27e7e90d0f Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 25 Oct 2022 13:11:55 -0700 Subject: [PATCH] fixed beast anim error --- 1.4/Assemblies/Rimworld-Animations.dll | Bin 61952 -> 61952 bytes 1.4/Source/Comps/CompBodyAnimator.cs | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/1.4/Assemblies/Rimworld-Animations.dll b/1.4/Assemblies/Rimworld-Animations.dll index 61fc905e0910054597f26ff1dc44bab4e94efa4d..91ec0173ab56b4b5d87cbdc5a16c4b96d0bacd79 100644 GIT binary patch delta 6390 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 QGwSN!=)Q2C)bzCc3(i=U*8l(j diff --git a/1.4/Source/Comps/CompBodyAnimator.cs b/1.4/Source/Comps/CompBodyAnimator.cs index 3ac2478..6683b2a 100644 --- a/1.4/Source/Comps/CompBodyAnimator.cs +++ b/1.4/Source/Comps/CompBodyAnimator.cs @@ -405,7 +405,9 @@ namespace Rimworld_Animations { if(headFacing.IsHorizontal && mirror) { headFacing = headFacing.Opposite; } - headBob = new Vector3(0, 0, clip.HeadBob.Evaluate(clipPercent)) * pawn.story.bodyType.bodyGraphicScale; + headBob = new Vector3(0, 0, clip.HeadBob.Evaluate(clipPercent)); + Vector2 bodyOffset = (pawn.story?.bodyType?.bodyGraphicScale != null ? pawn.story.bodyType.bodyGraphicScale : Vector2.one); + headBob.z *= bodyOffset.x; lastDrawFrame = RealTime.frameCount;