From 2e18be1953b57550a19b3b1bb9158b5a092af7ae Mon Sep 17 00:00:00 2001 From: Platinum Date: Fri, 29 May 2020 23:27:06 -0700 Subject: [PATCH] changed drawtracker to move with offset --- 1.1/Assemblies/Rimworld-Animations.dll | Bin 52736 -> 52736 bytes .../Patches/HarmonyPatch_Pawn_DrawTracker.cs | 11 +++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index a907d238e94b480f942c4573a146cd6629d89ae2..3aa8e1ce7407a9f8a65cec3b92a8b8330a5ae138 100644 GIT binary patch delta 4011 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 ZYjw}LkD~GY*LY5t9JQbOoOBh*{{>2=c`E<_ diff --git a/Source/Patches/HarmonyPatch_Pawn_DrawTracker.cs b/Source/Patches/HarmonyPatch_Pawn_DrawTracker.cs index 863a3db..45a5886 100644 --- a/Source/Patches/HarmonyPatch_Pawn_DrawTracker.cs +++ b/Source/Patches/HarmonyPatch_Pawn_DrawTracker.cs @@ -13,12 +13,19 @@ namespace Rimworld_Animations { public static class HarmonyPatch_Pawn_DrawTracker { public static bool Prefix(ref Pawn ___pawn, ref Vector3 __result) { - if(___pawn.TryGetComp() != null && ___pawn.TryGetComp().isAnimating) { + CompBodyAnimator bodyAnim = ___pawn.TryGetComp(); + + if (bodyAnim != null && bodyAnim.isAnimating) { __result = ___pawn.TryGetComp().anchor + ___pawn.TryGetComp().deltaPos; + + if (bodyAnim.CurrentAnimation?.actors[bodyAnim.ActorIndex]?.offsetsByDefName != null && bodyAnim.CurrentAnimation.actors[bodyAnim.ActorIndex].offsetsByDefName.ContainsKey(___pawn.def.defName)) { + __result.x += bodyAnim.CurrentAnimation.actors[bodyAnim.ActorIndex].offsetsByDefName[___pawn.def.defName].x; + __result.z += bodyAnim.CurrentAnimation.actors[bodyAnim.ActorIndex].offsetsByDefName[___pawn.def.defName].y; + } + return false; } return true; - } } }