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

fixed sextypes for stand and carry

Browse source
This commit is contained in:
Platinum 2020-04-19 19:23:36 -07:00
parent 0d398b7656
commit 5c775b6714
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
1.1/Assemblies/Rimworld-Animations.dll
View file

Binary file not shown.

2
Defs/AnimationDefs/Animations_vanilla.xml
View file

@ -856,7 +856,7 @@
<sounds>true</sounds>
<sexTypes>
<li>Anal</li>
<li>Oral</li>
<li>Vaginal</li>
</sexTypes>
<actors>
<li>

10
Source/Comps/CompBodyAnimator.cs
View file

@ -122,7 +122,7 @@ namespace Rimworld_Animations {
base.CompTick();
if(Animating) {
if(isAnimating) {
if (pawn?.jobs?.curDriver == null || (pawn?.jobs?.curDriver != null && !(pawn?.jobs?.curDriver is rjw.JobDriver_Sex))) {
isAnimating = false;
}
@ -133,7 +133,7 @@ namespace Rimworld_Animations {
}
public void animatePawn(ref Vector3 rootLoc, ref float angle, ref Rot4 bodyFacing, ref Rot4 headFacing) {
if(!Animating) {
if(!isAnimating) {
return;
}
rootLoc = anchor + deltaPos;
@ -149,13 +149,13 @@ namespace Rimworld_Animations {
public void tickAnim() {
if (!Animating) return;
if (!isAnimating) return;
animTicks++;
if (animTicks < anim.animationTimeTicks) {
tickStage();
} else {
Animating = false;
isAnimating = false;
}
}
@ -164,7 +164,9 @@ namespace Rimworld_Animations {
stageTicks++;
if(stageTicks >= stage.playTimeTicks) {
curStage++;
stageTicks = 0;
clipTicks = 0;
clipPercent = 0;