From 36caeeda7ef4d45046b94c00c5de2cce319a6f8f Mon Sep 17 00:00:00 2001 From: c0ffee Date: Sun, 25 Jul 2021 22:56:01 -0700 Subject: [PATCH] addon rot fix --- 1.3/Assemblies/Rimworld-Animations.dll | Bin 54272 -> 54272 bytes Rimworld-Animations.csproj | 2 +- .../OtherModPatches/HarmonyPatch_AlienRace.cs | 19 ++++++++++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/1.3/Assemblies/Rimworld-Animations.dll b/1.3/Assemblies/Rimworld-Animations.dll index 1e489226e29d74f9eb85640c0cb73ba73dcaf748..43d8f0ef0f46b54b0753098cb2ed9d911d0d289f 100644 GIT binary patch delta 6593 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 ao|heeye;{Z`rvC* + @@ -121,7 +122,6 @@ - diff --git a/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs b/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs index bdbbe9c..c58930d 100644 --- a/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs +++ b/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs @@ -11,6 +11,7 @@ using Verse; using AlienRace; namespace Rimworld_Animations { + [HarmonyPatch(typeof(AlienRace.HarmonyPatches), "DrawAddons")] public static class HarmonyPatch_AlienRace { @@ -71,11 +72,23 @@ namespace Rimworld_Animations { } } + public static bool Prefix(PawnRenderFlags renderFlags, ref Vector3 vector, ref Vector3 headOffset, Pawn pawn, ref Quaternion quat, ref Rot4 rotation) + { + + CompBodyAnimator anim = pawn.TryGetComp(); + if (!renderFlags.FlagSet(PawnRenderFlags.Portrait) && anim.isAnimating) + { + quat = Quaternion.AngleAxis(anim.bodyAngle, Vector3.up); + } + + return true; + + } } [HarmonyPatch(typeof(PawnGraphicSet), "ResolveApparelGraphics")] public static class HarmonyPatch_ResolveApparelGraphics - { + { public static bool Prefix(ref Pawn ___pawn) { @@ -86,4 +99,6 @@ namespace Rimworld_Animations { return true; } } -} \ No newline at end of file +} + +