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

Update for RJW 4.6.7.2:

Browse source 
accounts for orgasm ticker changes
orgasm ticker count accounts for animation length vs standard jobdriver length difference
Accounts for neverending loop settings in RJW
todo: remove unnecessary harmonypatch in sextick next RJW update
This commit is contained in:
c0ffee 2021-04-20 11:37:50 -07:00
parent e5ce0db627
commit 6550627272
8 changed files with 161 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

47
Source/Comps/CompBodyAnimator.cs
View file

@ -159,9 +159,8 @@ namespace Rimworld_Animations {
//tick once for initialization
tickAnim();
}
public override void CompTick() {
base.CompTick();
@ -208,8 +207,16 @@ namespace Rimworld_Animations {
if (animTicks < anim.animationTimeTicks) {
tickStage();
} else {
if(LoopNeverending())
{
ResetOnLoop();
} else
{
isAnimating = false;
}
isAnimating = false;
}
}
@ -227,9 +234,16 @@ namespace Rimworld_Animations {
}
if(curStage >= anim.animationStages.Count) {
isAnimating = false;
pawn.jobs.curDriver.ReadyForNextToil();
if (LoopNeverending())
{
ResetOnLoop();
}
else
{
isAnimating = false;
pawn.jobs.curDriver.ReadyForNextToil();
}
} else {
tickClip();
}
@ -444,5 +458,26 @@ namespace Rimworld_Animations {
tickAnim();
}
public bool LoopNeverending()
{
if(pawn?.jobs?.curDriver != null &&
(pawn.jobs.curDriver is JobDriver_Sex) && (pawn.jobs.curDriver as JobDriver_Sex).neverendingsex ||
(pawn.jobs.curDriver is JobDriver_SexBaseReciever) && (pawn.jobs.curDriver as JobDriver_Sex).Partner?.jobs?.curDriver != null && ((pawn.jobs.curDriver as JobDriver_Sex).Partner.jobs.curDriver as JobDriver_Sex).neverendingsex)
{
return true;
}
return false;
}
public void ResetOnLoop()
{
curStage = 1;
animTicks = 0;
stageTicks = 0;
clipTicks = 0;
tickAnim();
}
}
}