From 54381c7655ec13e9c5c7911db24db780f412831b Mon Sep 17 00:00:00 2001 From: c0ffeeeeeeee Date: Tue, 1 Dec 2020 15:41:22 -0800 Subject: [PATCH] compatibility w/ rjw 4.5.1 --- .gitignore | 12 +++++- 1.2/Assemblies/Rimworld-Animations.dll | Bin 57856 -> 57856 bytes ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 2 - .../HarmonyPatch_JoinInBedGiveJob.cs | 35 ++++++++---------- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 4ce6fdd..1c79e0c 100644 --- a/.gitignore +++ b/.gitignore @@ -337,4 +337,14 @@ ASALocalRun/ .localhistory/ # BeatPulse healthcheck temp database -healthchecksdb \ No newline at end of file +healthchecksdb +/Source/Patches/PawnAnimationPatches/HarmonyPatch_Pawn_DrawTracker.cs +/Source/Patches/PawnAnimationPatches/HarmonyPatch_PawnRotation.cs +/Source/Patches/PawnAnimationPatches/HarmonyPatch_PawnRenderer.cs +/Source/Patches/OtherModPatches/HarmonyPatch_ShowHairWithHats.cs +/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs +/Source/Patches/OtherModPatches/HarmonyPatch_DontShaveYourHead.cs +/Source/Patches/OtherModPatches/HarmonyPatch_CSL.cs +/Source/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs +/Source/Patches/ThingAnimationPatches/HarmonyPatch_ThingDrawAt.cs +/Defs/AnimationDefs/Animations_SexToys.xml diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index f202842ee4c858978939c90a0d6e9a541fe7b1f8..6b5f9a87ab9a4571600468d11586a23a08f76d3d 100644 GIT binary patch delta 11425 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 G)c-$TnS-|g delta 11501 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 diff --git a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs index c4813f0..f5cb52d 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -121,8 +121,6 @@ namespace Rimworld_Animations { //they'll just do the thrusting anim } } - - } } diff --git a/Source/Patches/rjwPatches/HarmonyPatch_JoinInBedGiveJob.cs b/Source/Patches/rjwPatches/HarmonyPatch_JoinInBedGiveJob.cs index 7a8b573..f46f401 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_JoinInBedGiveJob.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_JoinInBedGiveJob.cs @@ -37,30 +37,27 @@ namespace Rimworld_Animations { if (pawn.mindState?.duty?.def == DutyDefOf.TravelOrLeave) { // TODO: Some guest pawns keep the TravelOrLeave duty the whole time, I think the ones assigned to guard the pack animals. // That's probably ok, though it wasn't the intention. - if (RJWSettings.DebugLogJoinInBed) Log.Message($"[RJW] JoinInBed.TryGiveJob:({xxx.get_pawnname(pawn)}): has TravelOrLeave, no time for lovin!"); + if (RJWSettings.DebugLogJoinInBed) ModLog.Message($"JoinInBed.TryGiveJob:({xxx.get_pawnname(pawn)}): has TravelOrLeave, no time for lovin [ANIM JOBGIVER]!"); return false; } - if (pawn.CurJob == null || pawn.CurJob.def == JobDefOf.LayDown) { - //--Log.Message(" checking pawn and abilities"); - if (xxx.can_fuck(pawn) || xxx.can_be_fucked(pawn)) { - //--Log.Message(" finding partner"); - Pawn partner = JobGiver_JoinInBed.find_pawn_to_fuck(pawn, pawn.Map); + if ((pawn.CurJob == null || pawn.CurJob.def == JobDefOf.LayDown) && CasualSex_Helper.CanHaveSex(pawn)) { + //--Log.Message(" finding partner"); + Pawn partner = CasualSex_Helper.find_partner(pawn, pawn.Map, bedsex: true); - //--Log.Message(" checking partner"); - if (partner == null) - return false; - - // Can never be null, since find checks for bed. - Building_Bed bed = partner.CurrentBed(); - - // Interrupt current job. - if (pawn.CurJob != null && pawn.jobs.curDriver != null) - pawn.jobs.curDriver.EndJobWith(JobCondition.InterruptForced); - - __result = JobMaker.MakeJob(DefDatabase.GetNamed("JoinInBedAnimation", true), partner, bed); + //--Log.Message(" checking partner"); + if (partner == null) return false; - } + + // Can never be null, since find checks for bed. + Building_Bed bed = partner.CurrentBed(); + + // Interrupt current job. + if (pawn.CurJob != null && pawn.jobs.curDriver != null) + pawn.jobs.curDriver.EndJobWith(JobCondition.InterruptForced); + + __result = JobMaker.MakeJob(DefDatabase.GetNamed("JoinInBedAnimation", true), partner, bed); + return false; } return false;