AblativeAbsolute/rimworld-animations
1
0
Fork 0
mirror of https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git synced 2024-08-15 00:43:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

4.1.1 compatibility

Browse source
This commit is contained in:
Platinum 2020-04-26 08:03:57 -07:00
parent 2b2eee2e6f
commit 150e567a1d
7 changed files with 34 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/JobDrivers/JobDriver_SexBaseRecieverLovedForAnimation.cs
View file

@ -41,11 +41,10 @@ namespace Rimworld_Animations {
get_loved.FailOn(() => Partner.CurJobDef != DefDatabase<JobDef>.GetNamed("JoinInBedAnimation", true));
get_loved.defaultCompleteMode = ToilCompleteMode.Never;
get_loved.socialMode = RandomSocialMode.Off;
get_loved.handlingFacing = true;
get_loved.AddPreTickAction(delegate {
if (pawn.IsHashIntervalTick(ticks_between_hearts))
MoteMaker.ThrowMetaIcon(pawn.Position, pawn.Map, ThingDefOf.Mote_Heart);
if (pawn.IsHashIntervalTick(ticks_between_thrusts))
xxx.sexTick(pawn, Partner, false);
});
get_loved.AddFinishAction(delegate {
if (xxx.is_human(pawn))

18
Source/JobDrivers/JobDriver_SexCasualForAnimation.cs
View file

@ -14,11 +14,8 @@ namespace Rimworld_Animations {
public readonly TargetIndex ipartner = TargetIndex.A;
public readonly TargetIndex ibed = TargetIndex.B;
public Pawn Partner => (Pawn)job.GetTarget(ipartner);
public new Building_Bed Bed => (Building_Bed)job.GetTarget(ibed);
public override bool TryMakePreToilReservations(bool errorOnFailed) {
return ReservationUtility.Reserve(base.pawn, Partner, job, xxx.max_rapists_per_prisoner, 0, null, errorOnFailed);
return pawn.Reserve(Target, job, xxx.max_rapists_per_prisoner, 0, null, errorOnFailed);
}
protected override IEnumerable<Toil> MakeNewToils() {
@ -49,6 +46,7 @@ namespace Rimworld_Animations {
sexToil.FailOn(() => (Partner.CurJobDef == null) || Partner.CurJobDef != DefDatabase<JobDef>.GetNamed("GettinLovedAnimation", true)); //partner jobdriver is not sexbaserecieverlovedforanim
sexToil.socialMode = RandomSocialMode.Off;
sexToil.defaultCompleteMode = ToilCompleteMode.Never;
sexToil.handlingFacing = true;
sexToil.initAction = delegate {
usedCondom = (CondomUtility.TryUseCondom(base.pawn) || CondomUtility.TryUseCondom(Partner));
@ -61,10 +59,9 @@ namespace Rimworld_Animations {
if(Gen.IsHashIntervalTick(pawn, ticks_between_hearts)) {
MoteMaker.ThrowMetaIcon(pawn.Position, pawn.Map, ThingDefOf.Mote_Heart);
}
PawnUtility.GainComfortFromCellIfPossible(pawn, false);
PawnUtility.GainComfortFromCellIfPossible(Partner, false);
xxx.reduce_rest(Partner);
xxx.reduce_rest(pawn, 2);
SexTick(pawn, Partner);
SexUtility.reduce_rest(Partner);
SexUtility.reduce_rest(pawn, 2);
if (ticks_left <= 0)
ReadyForNextToil();
@ -72,16 +69,13 @@ namespace Rimworld_Animations {
sexToil.AddFinishAction(delegate {
End();
if(xxx.is_human(pawn)) {
pawn.Drawer.renderer.graphics.ResolveApparelGraphics();
}
});
yield return sexToil;
Toil finish = new Toil();
finish.initAction = delegate {
SexUtility.ProcessSex(pawn, Partner, usedCondom);
SexUtility.ProcessSex(pawn, Partner, usedCondom, isRape, isCoreLovin: false, isWhoring, sexType);
};
finish.defaultCompleteMode = ToilCompleteMode.Instant;
yield return finish;