From e8a3c201ac89628dcd8b23a504b256822222c8d0 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Sat, 23 Oct 2021 21:16:17 -0700 Subject: [PATCH] head addon fix --- 1.3/Assemblies/Rimworld-Animations.dll | Bin 54784 -> 54784 bytes 1.3/Source/AnimationUtility.cs | 2 +- 1.3/Source/Comps/CompBodyAnimator.cs | 2 +- .../OtherModPatches/HarmonyPatch_AlienRace.cs | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/1.3/Assemblies/Rimworld-Animations.dll b/1.3/Assemblies/Rimworld-Animations.dll index c6415a5b77e8b8aaa938d73905d221d2be90eb48..27e7b69e3747e1c2f315cff4b8177f1c5322d621 100644 GIT binary patch delta 4466 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 diff --git a/1.3/Source/AnimationUtility.cs b/1.3/Source/AnimationUtility.cs index cb8fed3..9b9d58d 100644 --- a/1.3/Source/AnimationUtility.cs +++ b/1.3/Source/AnimationUtility.cs @@ -171,7 +171,7 @@ namespace Rimworld_Animations { bodyFacing = anim.headFacing; angle = anim.headAngle; quat = Quaternion.AngleAxis(anim.headAngle, Vector3.up); - //pos = anim.getPawnHeadOffset(); + pos = anim.getPawnHeadOffset(); } } diff --git a/1.3/Source/Comps/CompBodyAnimator.cs b/1.3/Source/Comps/CompBodyAnimator.cs index 013d1d6..52d60f0 100644 --- a/1.3/Source/Comps/CompBodyAnimator.cs +++ b/1.3/Source/Comps/CompBodyAnimator.cs @@ -413,7 +413,7 @@ namespace Rimworld_Animations { public Vector3 getPawnHeadOffset() { - return Quaternion.AngleAxis(bodyAngle, Vector3.up) * headBob; + return Quaternion.AngleAxis(bodyAngle, Vector3.up) * (pawn.Drawer.renderer.BaseHeadOffsetAt(headFacing) + headBob); } diff --git a/1.3/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs b/1.3/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs index d70844c..3d947a8 100644 --- a/1.3/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs +++ b/1.3/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs @@ -71,7 +71,6 @@ namespace Rimworld_Animations { { Quaternion addonRotation = Quaternion.AngleAxis(pawnAnimator.headAngle < 0 ? 360 - (360 % pawnAnimator.headAngle) : pawnAnimator.headAngle, Vector3.up); - var pseudoRootLoc = addonRotation * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.headFacing); /* * * genital rotation is borked