mirror of
https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git
synced 2024-08-15 00:43:45 +00:00
Update for RJW 4.6.6 + tweaks to allow threesomes again
This commit is contained in:
parent
099ad96551
commit
a940108cc3
6 changed files with 42 additions and 8 deletions
|
@ -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<JobDef>.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<JobDef>.GetNamed("GettinLovedAnimation"), pawn, Bed); // new gettin loved toil that wakes up the pawn goes here
|
||||
if(Partner.CurJobDef != DefDatabase<JobDef>.GetNamed("GettinLovedAnimation")) // allows threesomes
|
||||
{
|
||||
Job gettinLovedJob = JobMaker.MakeJob(DefDatabase<JobDef>.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<CompBodyAnimator>().isAnimating)
|
||||
{
|
||||
pawn.TryGetComp<CompBodyAnimator>().isAnimating = false;
|
||||
}
|
||||
|
||||
ticks_left--;
|
||||
if(Gen.IsHashIntervalTick(pawn, ticks_between_hearts)) {
|
||||
MoteMaker.ThrowMetaIcon(pawn.Position, pawn.Map, ThingDefOf.Mote_Heart);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue