From f8872b6a501843c0e599c7aee496b31468d56705 Mon Sep 17 00:00:00 2001 From: Platinum Date: Sat, 18 Apr 2020 10:22:05 -0700 Subject: [PATCH] mirror fix --- 1.1/Assemblies/Rimworld-Animations.dll | Bin 38400 -> 38400 bytes Source/Comps/CompBodyAnimator.cs | 2 +- ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 6 ++++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index c1d944ff3e238a1422e8f890ca28a7b9c2089b91..437fbbd17a3d960e330af0e3821d68ee60373704 100644 GIT binary patch delta 3742 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 diff --git a/Source/Comps/CompBodyAnimator.cs b/Source/Comps/CompBodyAnimator.cs index b0bcce0..b355a4c 100644 --- a/Source/Comps/CompBodyAnimator.cs +++ b/Source/Comps/CompBodyAnimator.cs @@ -99,7 +99,7 @@ namespace Rimworld_Animations { AlienRaceOffset offset = anim?.actors[actor]?.raceOffsets?.Find(x => x.defName == pawn.def.defName); if (offset != null) { - anchor.x += offset.x; + anchor.x += mirror ? offset.x * -1f : offset.x; anchor.z += offset.z; } diff --git a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs index bbb8cff..a69e129 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -65,10 +65,12 @@ namespace Rimworld_Animations { if (anim != null) { - Log.Message("Now playing " + anim.defName); - bool mirror = GenTicks.TicksGame % 2 == 0; + Log.Message("Now playing " + anim.defName + (mirror ? " mirrored" : "")); + + + IntVec3 pos = pawn.Position; for (int i = 0; i < pawnsToAnimate.Count; i++) {