From eead6ae7ca87926ce5391841b83da61f725c49d1 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 3 May 2024 06:54:32 -0700 Subject: [PATCH 1/5] null ref checks for jobs --- .gitignore | 6 +++ 1.5/Assemblies/Rimworld-Animations.dll | Bin 49152 -> 49152 bytes ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 41 +++++++----------- Rimworld-Animations.csproj | 6 +++ 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 1c79e0c..67e62ea 100644 --- a/.gitignore +++ b/.gitignore @@ -348,3 +348,9 @@ healthchecksdb /Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs /Source/Patches/ThingAnimationPatches/HarmonyPatch_ThingDrawAt.cs /Defs/AnimationDefs/Animations_SexToys.xml +/1.5/Defs/AnimationDefs/BasicBestiality/HumanRotatedOffset.xml +/1.5/Defs/AnimationDefs/BasicBestiality/BasicBestiality4v1.xml +/1.5/Defs/AnimationDefs/BasicBestiality/BasicBestiality3v1.xml +/1.5/Defs/AnimationDefs/BasicBestiality/BasicBestiality2v1.xml +/1.5/Defs/AnimationDefs/BasicBestiality/BasicBestiality1v1.xml +/1.5/Defs/AnimationDefs/BasicBestiality/!BasicBestiality.xml diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index fc2cf06011a61963092030846830eb6c7d04d29f..91abcb8ac45f54ec462779ab38bd1062e252feee 100644 GIT binary patch delta 11946 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 H$^QQUAGGXs 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 3ba2def..024d43e 100644 --- a/1.5/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/1.5/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -11,50 +11,38 @@ namespace Rimworld_Animations { [HarmonyPatch(typeof(JobDriver_SexBaseInitiator), "Start")] static class HarmonyPatch_JobDriver_SexBaseInitiator_Start { public static void Postfix(ref JobDriver_SexBaseInitiator __instance) { - /* - These particular jobs need special code - don't play anim for now - */ - if(__instance is JobDriver_Masturbate || __instance is JobDriver_ViolateCorpse) { - - return; - - } - - if(!RJWAnimationSettings.PlayAnimForNonsexualActs && NonSexualAct(__instance)) - { - return; - } Pawn pawn = __instance.pawn; Pawn partner = __instance.Target as Pawn; - Building_Bed bed = __instance.Bed; + if (partner?.jobs?.curDriver is JobDriver_SexBaseReciever partnerSexBaseReceiver) { Pawn Target = __instance.Target as Pawn; - int preAnimDuration = __instance.duration; - - List participants = partnerSexBaseReceiver.parteners.Append(partner).ToList(); GroupAnimationDef groupAnimation = AnimationUtility.FindGroupAnimation(participants, out int reorder); if (groupAnimation != null) { - Thing anchor; - if (bed != null) anchor = bed; - else anchor = partner; + + Thing anchor = (Thing)__instance.Bed ?? partner; AnimationUtility.StartGroupAnimation(participants, groupAnimation, reorder, anchor); int animTicks = AnimationUtility.GetAnimationLength(pawn); foreach(Pawn participant in participants) { - (participant.jobs.curDriver as JobDriver_Sex).ticks_left = animTicks; - (participant.jobs.curDriver as JobDriver_Sex).sex_ticks = animTicks; - (participant.jobs.curDriver as JobDriver_Sex).orgasmStartTick = animTicks; - (participant.jobs.curDriver as JobDriver_Sex).duration = animTicks; + //null ref check for pawns that might have lost their jobs or become null for some reason + if (participant?.jobs?.curDriver is JobDriver_Sex participantJobDriver) + { + participantJobDriver.ticks_left = animTicks; + participantJobDriver.sex_ticks = animTicks; + participantJobDriver.orgasmStartTick = animTicks; + participantJobDriver.duration = animTicks; + } + + } } } @@ -92,7 +80,8 @@ namespace Rimworld_Animations { } //stop partner's other partners (threesome pawns) animating - if (__instance.Partner.jobs.curDriver is JobDriver_SexBaseReciever partnerReceiverJob) + //added null ref checks for instances when pawns get nulled or lose their jobs + if (__instance.Partner?.jobs?.curDriver is JobDriver_SexBaseReciever partnerReceiverJob) { foreach(Pawn pawn in partnerReceiverJob.parteners) { diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index 619c1b1..e527804 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -143,6 +143,12 @@ + + + + + + From 775d3d913e9da3270d8b3374c5807400b5b154ce Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 3 May 2024 07:35:55 -0700 Subject: [PATCH 2/5] debug logging info --- 1.5/Assemblies/Rimworld-Animations.dll | Bin 49152 -> 49152 bytes ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 11 ++++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index 91abcb8ac45f54ec462779ab38bd1062e252feee..20b8459db34fb08f4b9b10777a165fd327af3813 100644 GIT binary patch delta 4864 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 KC98iR?Ee6}US;b5 delta 4619 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 Q5KgBB?H}DDrLE2X0}$Cq0RR91 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 024d43e..0663775 100644 --- a/1.5/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/1.5/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -23,9 +23,9 @@ namespace Rimworld_Animations { List participants = partnerSexBaseReceiver.parteners.Append(partner).ToList(); GroupAnimationDef groupAnimation = AnimationUtility.FindGroupAnimation(participants, out int reorder); + if (groupAnimation != null) { - Thing anchor = (Thing)__instance.Bed ?? partner; AnimationUtility.StartGroupAnimation(participants, groupAnimation, reorder, anchor); @@ -33,6 +33,15 @@ namespace Rimworld_Animations { foreach(Pawn participant in participants) { + if (RJWAnimationSettings.debugMode) + { + Log.Message("1"); + Log.Message("Participant: " + participant.Name); + Log.Message("2"); + Log.Message("JobDriver: " + participant.CurJobDef.defName); + + } + //null ref check for pawns that might have lost their jobs or become null for some reason if (participant?.jobs?.curDriver is JobDriver_Sex participantJobDriver) { From 7596fe86c6fe041a27bedcc5e543aa78d4e6e8dc Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 3 May 2024 08:43:34 -0700 Subject: [PATCH 3/5] 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) { From e639ae8fb85e3e1a46b9fba707214d780a48f0e2 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 3 May 2024 10:51:59 -0700 Subject: [PATCH 4/5] Further debug logging for animations --- 1.5/Assemblies/Rimworld-Animations.dll | Bin 49152 -> 49152 bytes .../GroupAnimations/GroupAnimationDef.cs | 5 ----- 1.5/Source/Utilities/AnimationUtility.cs | 6 ++++++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index 5605695ccee38076a66aae1760d7ad5d4708c35b..0e30d692071325c762949c63dbd04d758f95f5a5 100644 GIT binary patch delta 7454 zcmZu#34Bw<)<1J|m)x86CT-d@ZE0weUbNa=HfEGxwhFB^m$H5+ zYT6uDh0SL#%mqQTRvBZF=}=V8utfTxGqRed1g<3y)A0d=tfGqpIX;%dD-{}`rd2sq zp{6TK_b7cia4D&$rvshHTI$Lyylx%RT*O#!HjkOjK@%_rpGe# zdTc?nSGKb0)M}n)K(W?r#WqwdhEocqnrBciR-(E9vkKj&tL7P6niY<5lTD4}Vn#Dm zQ#z>+&d22w@>wI>+LJ^UqTUcniv}=DLnu9|yM~ZI8sydt-P#ZeBtWLFHiWXG`P`GO zYYoPBOpzGw4phU|SbNRUfygsJeA$EDkJ zyY4Vv!hq;T%;a_JZr#d1r|~ix@zXwy=0ZLC3^wT5hmG+HdW=OVINik;kMU{}eNfhe zG4n%5Kg9t2wuxE8ubcRUevh4xu_2U^umlpLZU|*YPqQfgQQP}*UM$8Jl`L(8js{Tg zSW)ycG{q8u?Q1UD7tL4-E|>NybS0?(w!|_M)nu_HmTfM{|5{y&?#5|kdy6kN{Lrk3 z1~x6Pp-4ezL2cj29yUcOdPGb%@>| z!mK$5(5}hGTi8V2W-$do!@)B0cRDe+jQlVCJ~+hscV-tO2Wh{~xv_T;)b+)kD@wD2 z*mz`*;<0+v$UhiMm)lnW?j2iEhEsHkvl$;XT8%?2 z_@6P9xCI@_WUKLh$Hc1f0W+{==ymGOWUgv_*pZuDgiCi7<+c~B@*=!$kK4c-(X2eh z9DC#=G$dvq@-e+Lx3lL6T6E3$gfY#5(&pUB>kX+D>Wcg)+8dlk}eh5%oth{x|e)L zp9|$EpRs(A6ZB{(BX$z?v~lxTBZO+cFcE8n$d@R=BGi0^t?@Mqn^JTK2o^DNig}pw zFRnydc~eu1P0cqb%woe}@fqJTmw2ZSKd@P_D}hW`8m=~>tz1zTas6Y|ak?ygiToYL z&i|h72@f228r3wP@gp{Nt9(Jmr6|uigUImWki$xvHS!Z8m~$4TLq!HIN_o!Di01u* zLP=L6KheSYCFC5Po1d+oN1G;8Mt-Fm^LsddMZ`<=iq@LX=vVp0d@(TVyhu7A# z8LPxo=>kJ`n13T~7`|@$Lv%WB65SrzMkg7mS$`q{qW765Rz1JW_~~N&NvTn)v3b@V zx;F0%`hl@f+kjMdn;j78q%Hw+p3dtsN@t%Z!h04Avpu45fu876O@5~13c8T9bYa01 z;gm?fEhuz!xLj#&;ex+do-J%5tK&BmX%~_77!Y*=LI~gEJvvK|i zK5m-ngzh&gThKAxI70V!9~vuAU=~iffb$D6Hsok6T6`BR?9_<9m~5$HmS2)BqnV|j zH7RNgv)q+z8Otn9$(C`UAC%`0^C}tS0Yaq`7_t6NOQ{3>b07iL)F!ybcn9O5-iDk z0Mp=pXSt8|%v13=?A7%(L5h+?D?Gle

at$8KX~<-9xyJ%A1Jd3 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 delta 7507 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 diff --git a/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs b/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs index fb9eb43..de2d7d8 100644 --- a/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs +++ b/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs @@ -19,11 +19,6 @@ namespace Rimworld_Animations public bool canAnimationBeUsed(List actors) { - if (RJWAnimationSettings.debugMode) - { - Log.Message("[anims] Checking if " + defName + " is valid animation"); - } - if (!contexts.NullOrEmpty()) { foreach (BaseGroupAnimationContext context in contexts) diff --git a/1.5/Source/Utilities/AnimationUtility.cs b/1.5/Source/Utilities/AnimationUtility.cs index 61e3d1f..1fdc73c 100644 --- a/1.5/Source/Utilities/AnimationUtility.cs +++ b/1.5/Source/Utilities/AnimationUtility.cs @@ -44,6 +44,12 @@ namespace Rimworld_Animations { //each participant gets their own unique extendedanimatoranchor, important for scribe_deep saving List allAnimationsForPawn = groupAnimationDef.GetAllAnimationsForActor(i, seed, reorder); BaseExtendedAnimatorAnchor animatorAnchor = new ExtendedAnimatorAnchor_Thing(anchor); + + if (RJWAnimationSettings.debugMode) + { + Log.Message("Now playing animation: " + groupAnimationDef.defName); + } + participants[i].TryGetComp().PlayGroupAnimation(allAnimationsForPawn, position, rotation, animatorAnchor); } } From 8a93f3b087db60c62ad9b9fbf7b793ac8e6be3a5 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 3 May 2024 12:58:47 -0700 Subject: [PATCH 5/5] set extended keyframe to default invisible for bugged hand anims --- .gitignore | 2 + 1.5/Assemblies/Rimworld-Animations.dll | Bin 49152 -> 49152 bytes .../Animations/Keyframes/ExtendedKeyframe.cs | 2 +- Rimworld-Animations.csproj | 50 ++++++++++++++++++ 4 files changed, 53 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 67e62ea..2b8784c 100644 --- a/.gitignore +++ b/.gitignore @@ -354,3 +354,5 @@ healthchecksdb /1.5/Defs/AnimationDefs/BasicBestiality/BasicBestiality2v1.xml /1.5/Defs/AnimationDefs/BasicBestiality/BasicBestiality1v1.xml /1.5/Defs/AnimationDefs/BasicBestiality/!BasicBestiality.xml +/1.5/Defs/TestDoNotPush +/1.5/Textures/AnimationProps/BEV diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index 0e30d692071325c762949c63dbd04d758f95f5a5..dd3d63cba405e27312db92eb959446cee0bef148 100644 GIT binary patch delta 46 zcmV+}0MY+|fCGSl1CWRW`meRXv5Zn10T#308_|Oh+u=ZvFpR-TkrhDuQ2OE^v%sG~ EAocea1ONa4 delta 46 zcmV+}0MY+|fCGSl1CWRW!B*Ayv5Zn10T;918_|OhZDAGW?^L2rs$YB*q`(IBv%sG~ EAmaWNKL7v# diff --git a/1.5/Source/Animations/Keyframes/ExtendedKeyframe.cs b/1.5/Source/Animations/Keyframes/ExtendedKeyframe.cs index 4d1031e..45fced9 100644 --- a/1.5/Source/Animations/Keyframes/ExtendedKeyframe.cs +++ b/1.5/Source/Animations/Keyframes/ExtendedKeyframe.cs @@ -14,6 +14,6 @@ namespace Rimworld_Animations public Rot4 rotation = Rot4.North; public SoundDef sound = null; public VoiceTagDef voice = null; - public bool visible = true; + public bool visible = false; } } diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index e527804..294fcea 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -184,6 +184,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +