From 416f88b874ad5c6f89298f16914ac6f392dc2ba2 Mon Sep 17 00:00:00 2001 From: Platinum Date: Wed, 22 Apr 2020 18:57:46 -0700 Subject: [PATCH] bugfix: added jobdefs to facialanimation --- 1.1/Assemblies/Rimworld-Animations.dll | Bin 45568 -> 46080 bytes .../Patches/HarmonyPatch_FacialAnimation.cs | 12 ++++++++++++ 2 files changed, 12 insertions(+) diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index f746b869c154e04d84f854641bb03f276981d867..aaf78d60b06c620d2150cc58069403869c5c0cfa 100644 GIT binary patch delta 4309 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 xf~|GLYz8SSD?M}D9Eancll&O rjwLovinDefNames = new List{ + "Lovin", "JoinInBed", + "JoinInBedAnimation", + "GettinLovedAnimation", "GettinLoved", "GettinLicked", "GettinSucked", @@ -69,6 +72,10 @@ namespace Rimworld_Animations { public static bool Prefix_IsSameA(JobDef job, string ___jobDef, ref bool __result) { + if(job?.defName != null) { + Log.Message("Defname: " + job.defName); + } + if(___jobDef != null && ___jobDef == "Lovin" && job?.defName != null && rjwLovinDefNames.Contains(job?.defName)) { __result = true; return false; @@ -79,6 +86,11 @@ namespace Rimworld_Animations { public static bool Prefix_IsSameB(string jobName, string ___jobDef, ref bool __result) { + if (jobName != null) { + Log.Message("Defname: " + jobName); + } + + if (___jobDef != null && ___jobDef == "Lovin" && jobName != null && rjwLovinDefNames.Contains(jobName)) { __result = true; return false;