From f8b68b644dfd606b06f166557109323e24ab27c2 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 23 Jul 2021 15:26:38 -0700 Subject: [PATCH] portrait fixes --- 1.3/Assemblies/Rimworld-Animations.dll | Bin 60416 -> 59904 bytes Source/Patches/HarmonyPatch_AlienRace.cs | 13 ++++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/1.3/Assemblies/Rimworld-Animations.dll b/1.3/Assemblies/Rimworld-Animations.dll index 9a509804060cb364256e7d8312174b10bba515d2..eb9e47683f9324248fda933691f68822f6ca97e9 100644 GIT binary patch delta 11976 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 BnxOyy delta 12298 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 X{e`R9dFn?+K3mxAK7CF!6`21Q?LpU; diff --git a/Source/Patches/HarmonyPatch_AlienRace.cs b/Source/Patches/HarmonyPatch_AlienRace.cs index a98a8dc..1fb5887 100644 --- a/Source/Patches/HarmonyPatch_AlienRace.cs +++ b/Source/Patches/HarmonyPatch_AlienRace.cs @@ -16,11 +16,11 @@ namespace Rimworld_Animations { - public static void RenderHeadAddonInAnimation(Mesh mesh, Vector3 loc, Quaternion quat, Material mat, bool drawNow, Graphic graphic, AlienPartGenerator.BodyAddon bodyAddon, Vector3 v, float num, Vector3 headOffset, Pawn pawn) + public static void RenderHeadAddonInAnimation(Mesh mesh, Vector3 loc, Quaternion quat, Material mat, bool drawNow, Graphic graphic, AlienPartGenerator.BodyAddon bodyAddon, Vector3 v, float num, Vector3 headOffset, Pawn pawn, PawnRenderFlags renderFlags) { CompBodyAnimator pawnAnimator = pawn.TryGetComp(); - if (pawnAnimator.isAnimating && (bodyAddon.drawnInBed || bodyAddon.alignWithHead)) + if (!renderFlags.FlagSet(PawnRenderFlags.Portrait) && pawnAnimator.isAnimating && (bodyAddon.drawnInBed || bodyAddon.alignWithHead)) { Quaternion headQuatInAnimation = Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up); @@ -39,6 +39,7 @@ namespace Rimworld_Animations { GenDraw.DrawMeshNowOrLater(mesh, loc, quat, mat, drawNow); } } + /* public static Rot4 AdjustRotationValueForHeadAddon(Rot4 rotation, AlienPartGenerator.BodyAddon bodyAddon, Pawn pawn) { CompBodyAnimator anim = pawn.TryGetComp(); @@ -53,7 +54,7 @@ namespace Rimworld_Animations { } - } + }*/ public static IEnumerable Transpiler(IEnumerable instructions) @@ -74,10 +75,12 @@ namespace Rimworld_Animations { yield return new CodeInstruction(OpCodes.Ldloc, (object)6); //num yield return new CodeInstruction(OpCodes.Ldarg, (object)2); //headOffset yield return new CodeInstruction(OpCodes.Ldarg, (object)3); //pawn + yield return new CodeInstruction(OpCodes.Ldarg, (object)0); //renderflags yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(HarmonyPatch_AlienRace), "RenderHeadAddonInAnimation")); } + /* else if(ins[i].opcode == OpCodes.Ldarg_S && ins[i].OperandIs((object)5)) //rotation { yield return ins[i]; @@ -85,7 +88,7 @@ namespace Rimworld_Animations { yield return new CodeInstruction(OpCodes.Ldarg, (object)3); //pawn yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(HarmonyPatch_AlienRace), "AdjustRotationValueForHeadAddon")); - } + }*/ else { @@ -227,7 +230,7 @@ namespace Rimworld_Animations { CompBodyAnimator anim = pawn.TryGetComp(); - if (anim.isAnimating) + if (!renderFlags.FlagSet(PawnRenderFlags.Portrait) && anim.isAnimating) { //headOffset = anim.getPawnHeadOffset(); quat = Quaternion.AngleAxis(anim.bodyAngle, Vector3.up);