From a940108cc32c09d0baeafed465f705360bed7103 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 2 Apr 2021 09:18:43 -0700 Subject: [PATCH] Update for RJW 4.6.6 + tweaks to allow threesomes again --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 60416 -> 60416 bytes About/Manifest.xml | 2 +- Rimworld-Animations.csproj | 2 +- ...Driver_SexBaseRecieverLovedForAnimation.cs | 23 +++++++++++++++++- .../JobDriver_SexCasualForAnimation.cs | 17 ++++++++++--- ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 6 ++++- 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index 98f263438e0e19a0cbfbfe292ea40e81d068112f..c1f2488aedb77b28efa6f1aedb8a479604b695ed 100644 GIT binary patch delta 19937 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 delta 19507 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%0A6P8u%A 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 SPLW4++v_@eUfS5z{C@yNGfe{k diff --git a/About/Manifest.xml b/About/Manifest.xml index a33398c..dcde0e4 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,5 +1,5 @@  Rimworld-Animations - 1.0.14 + 1.0.15 \ No newline at end of file diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index c878498..98c35d0 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -45,7 +45,7 @@ False - ..\RJW\1.2\Assemblies\RJW.dll + ..\rjw-master\1.2\Assemblies\RJW.dll False diff --git a/Source/JobDrivers/JobDriver_SexBaseRecieverLovedForAnimation.cs b/Source/JobDrivers/JobDriver_SexBaseRecieverLovedForAnimation.cs index 4b5d844..d8d99d2 100644 --- a/Source/JobDrivers/JobDriver_SexBaseRecieverLovedForAnimation.cs +++ b/Source/JobDrivers/JobDriver_SexBaseRecieverLovedForAnimation.cs @@ -47,7 +47,19 @@ namespace Rimworld_Animations { yield return Toils_Reserve.Reserve(ibed, Bed.SleepingSlotsCount, 0); Toil get_loved = new Toil(); - get_loved.FailOn(() => Partner.CurJobDef != DefDatabase.GetNamed("JoinInBedAnimation", true)); + get_loved.FailOn(() => { + + for (int i = 0; i < parteners.Count; i++) + { + if (parteners[i].CurJobDef != DefDatabase.GetNamed("JoinInBedAnimation", true)) + { + return true; + } + } + + return false; + + }); get_loved.defaultCompleteMode = ToilCompleteMode.Never; get_loved.socialMode = RandomSocialMode.Off; get_loved.handlingFacing = true; @@ -55,6 +67,15 @@ namespace Rimworld_Animations { if (pawn.IsHashIntervalTick(ticks_between_hearts)) MoteMaker.ThrowMetaIcon(pawn.Position, pawn.Map, ThingDefOf.Mote_Heart); }); + get_loved.AddEndCondition(() => + { + if (parteners.Count <= 0) + { + return JobCondition.Succeeded; + } + return JobCondition.Ongoing; + + }); get_loved.AddFinishAction(delegate { if (xxx.is_human(pawn)) pawn.Drawer.renderer.graphics.ResolveApparelGraphics(); diff --git a/Source/JobDrivers/JobDriver_SexCasualForAnimation.cs b/Source/JobDrivers/JobDriver_SexCasualForAnimation.cs index 25e46f3..3fabe14 100644 --- a/Source/JobDrivers/JobDriver_SexCasualForAnimation.cs +++ b/Source/JobDrivers/JobDriver_SexCasualForAnimation.cs @@ -27,7 +27,7 @@ namespace Rimworld_Animations { yield return Toils_Reserve.Reserve(ipartner, xxx.max_rapists_per_prisoner, 0, null); Toil goToPawnInBed = Toils_Goto.GotoThing(ipartner, PathEndMode.OnCell); - goToPawnInBed.FailOn(() => !RestUtility.InBed(Partner) && !xxx.in_same_bed(Partner, pawn)); + goToPawnInBed.FailOn(() => !RestUtility.InBed(Partner) && Partner.CurJobDef != DefDatabase.GetNamed("GettinLovedAnimation") && !xxx.in_same_bed(Partner, pawn)); yield return goToPawnInBed; @@ -35,10 +35,14 @@ namespace Rimworld_Animations { Toil startPartnerSex = new Toil(); startPartnerSex.initAction = delegate { - Job gettinLovedJob = JobMaker.MakeJob(DefDatabase.GetNamed("GettinLovedAnimation"), pawn, Bed); // new gettin loved toil that wakes up the pawn goes here + if(Partner.CurJobDef != DefDatabase.GetNamed("GettinLovedAnimation")) // allows threesomes + { + Job gettinLovedJob = JobMaker.MakeJob(DefDatabase.GetNamed("GettinLovedAnimation"), pawn, Bed); // new gettin loved toil that wakes up the pawn goes here + + Partner.jobs.jobQueue.EnqueueFirst(gettinLovedJob); + Partner.jobs.EndCurrentJob(JobCondition.InterruptForced); + } - Partner.jobs.jobQueue.EnqueueFirst(gettinLovedJob); - Partner.jobs.EndCurrentJob(JobCondition.InterruptForced); }; yield return startPartnerSex; @@ -55,6 +59,11 @@ namespace Rimworld_Animations { sexToil.AddPreTickAction(delegate { + if(!Partner.TryGetComp().isAnimating) + { + pawn.TryGetComp().isAnimating = false; + } + ticks_left--; if(Gen.IsHashIntervalTick(pawn, ticks_between_hearts)) { MoteMaker.ThrowMetaIcon(pawn.Position, pawn.Map, ThingDefOf.Mote_Heart); diff --git a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs index f5cb52d..87a9ef2 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -106,7 +106,6 @@ namespace Rimworld_Animations { (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_left = anim.animationTimeTicks; (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticksLeftThisToil = anim.animationTimeTicks; (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).duration = anim.animationTimeTicks; - (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_remaining = anim.animationTimeTicks; if(!AnimationSettings.hearts) { (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_between_hearts = Int32.MaxValue; } @@ -115,11 +114,16 @@ namespace Rimworld_Animations { } else { Log.Message("No animation found"); + + /* + //if pawn isn't already animating, if (!pawn.TryGetComp().isAnimating) { (pawn.jobs.curDriver as JobDriver_SexBaseReciever).increase_time(duration); //they'll just do the thrusting anim } + + */ } } }