From 7596fe86c6fe041a27bedcc5e543aa78d4e6e8dc Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 3 May 2024 08:43:34 -0700 Subject: [PATCH] patch for graphic variant workers not rendering at all --- 1.5/Assemblies/Rimworld-Animations.dll | Bin 49152 -> 49152 bytes ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 2 -- .../HarmonyPatch_PawnRenderNodeWorker.cs | 7 ------- .../PawnRenderNodeWorker_GraphicVariants.cs | 9 ++++----- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index 20b8459db34fb08f4b9b10777a165fd327af3813..5605695ccee38076a66aae1760d7ad5d4708c35b 100644 GIT binary patch delta 5298 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 delta 5299 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 diff --git a/1.5/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/1.5/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs index 0663775..e30e0b9 100644 --- a/1.5/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/1.5/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -35,9 +35,7 @@ namespace Rimworld_Animations { { if (RJWAnimationSettings.debugMode) { - Log.Message("1"); Log.Message("Participant: " + participant.Name); - Log.Message("2"); Log.Message("JobDriver: " + participant.CurJobDef.defName); } diff --git a/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNodeWorker.cs b/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNodeWorker.cs index 4e8b0f0..e71462d 100644 --- a/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNodeWorker.cs +++ b/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNodeWorker.cs @@ -31,13 +31,6 @@ namespace Rimworld_Animations return true; } - //set graphic variant nodes to invisible when not animating - if (node is PawnRenderNode_GraphicVariants) - { - __result = false; - return false; - } - return true; } diff --git a/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs b/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs index 184caff..1192bb0 100644 --- a/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs +++ b/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs @@ -18,14 +18,13 @@ namespace Rimworld_Animations if (parms.Portrait) return false; //don't draw if not visible at tick - if (node.AnimationWorker is AnimationWorker_KeyframesExtended extendedAnimator - && !extendedAnimator.visibleAtTick(node.tree.AnimationTick)) + if (node.AnimationWorker is AnimationWorker_KeyframesExtended extendedAnimator) { - return false; + return extendedAnimator.visibleAtTick(node.tree.AnimationTick); } - - return true; + //don't draw at all if not animating + return false; } protected override Material GetMaterial(PawnRenderNode node, PawnDrawParms parms) {