AblativeAbsolute/rjw-events
1
0
Fork 0
mirror of https://gitgud.io/c0ffeeeeeeee/rjw-events.git synced 2024-08-14 23:57:42 +00:00
Code Issues 97 Projects Releases Packages Wiki Activity

Various fixes

Browse source
This commit is contained in:
c0ffee 2021-04-12 10:43:58 -07:00
parent 6d1a218b2e
commit 1cfbc2c83e
7 changed files with 57 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/JobDrivers/JobDriver_OrgySex.cs
View file

@ -23,12 +23,13 @@ namespace RJW_Events
{
base.setup_ticks();
JobDef PartnerJob = DefDatabase<JobDef>.GetNamed("GettinOrgySex", true);
this.FailOnDespawnedNullOrForbidden(this.iTarget);
this.FailOnDespawnedOrNull(this.iTarget);
this.FailOn(() => !this.Partner.health.capacities.CanBeAwake);
this.FailOn(() => this.pawn.IsFighting());
this.FailOn(() => this.Partner.IsFighting());
this.FailOn(() => this.pawn.Drafted);
yield return Toils_Goto.GotoThing(this.iTarget, PathEndMode.OnCell);
this.FailOn(() => this.Partner.Drafted);
yield return Toils_Goto.GotoThing(this.iTarget, PathEndMode.ClosestTouch);
yield return new Toil
{
defaultCompleteMode = ToilCompleteMode.Delay,
@ -39,7 +40,7 @@ namespace RJW_Events
tickAction = delegate ()
{
this.pawn.GainComfortFromCellIfPossible(false);
if (this.pawn.Position.DistanceTo(this.Partner.Position) <= 1f)
if (this.pawn.Position.DistanceTo(this.Partner.Position) <= 3f)
{
this.ReadyForNextToil();
}
@ -91,7 +92,7 @@ namespace RJW_Events
toil.AddFinishAction(delegate
{
this.End();
if(LordUtility.GetLord(pawn)?.CurLordToil != null && !(LordUtility.GetLord(pawn).CurLordToil is LordToil_End))
if(LordUtility.GetLord(pawn)?.LordJob != null && LordUtility.GetLord(pawn).LordJob is LordJob_Joinable_Orgy && !(LordUtility.GetLord(pawn).CurLordToil is LordToil_End))
SexUtility.DrawNude(pawn);
});
yield return toil;

3
Source/JobDrivers/JobDriver_OrgySexReceiver.cs
View file

@ -35,6 +35,7 @@ namespace RJW_Events
this.ticks_between_hearts -= 25;
}
this.FailOnDespawnedOrNull(this.iTarget);
this.FailOn(() => !(Partner.jobs.curDriver is JobDriver_Sex));
this.FailOn(() => !base.Partner.health.capacities.CanBeAwake);
this.FailOn(() => this.pawn.Drafted);
this.FailOn(() => base.Partner.Drafted);
@ -69,7 +70,7 @@ namespace RJW_Events
return JobCondition.Succeeded;
}
return JobCondition.Ongoing;
});
});
toil.socialMode = RandomSocialMode.Off;
return toil;
}