From 5c775b6714e18b3df8b7ac8acb6c3289154c9c9c Mon Sep 17 00:00:00 2001
From: Platinum <dominiclopez391@gmail.com>
Date: Sun, 19 Apr 2020 19:23:36 -0700
Subject: [PATCH] fixed sextypes for stand and carry

---
 1.1/Assemblies/Rimworld-Animations.dll    | Bin 37888 -> 37888 bytes
 Defs/AnimationDefs/Animations_vanilla.xml |   2 +-
 Source/Comps/CompBodyAnimator.cs          |  10 ++++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll
index 0ed48cd8da941a08918605d5260897fc84a30462..122c5452b4c34e6e77e26f5fd1674238c12f1d9d 100644
GIT binary patch
delta 106
zcmZoz!PKyVX+j5!z`3UP8+%Ujuxbb~FtAOI;#~k`{pSso@Md6O;9y`7WMBfziv45c
zV$)&Lwwj#5r_aO1z$B(24AjKHptX51Uu2GeyY=5f@o8?3d#0#Y)P-L++ssq_MFIey
CCL5su

delta 106
zcmZoz!PKyVX+j4}=C)&NHujw4VXf9?U|^XX#k&B?`p+9E;l;qfz`?*E$iM`a75m4?
z#iqlgZ8<rEPoIaAfk~_uq=`X`Ve?|X$Q*$*59ZFpN3xvef0*4nE&SE*%{<j#BmgxB
BABq3~

diff --git a/Defs/AnimationDefs/Animations_vanilla.xml b/Defs/AnimationDefs/Animations_vanilla.xml
index 3bc42df..24f8253 100644
--- a/Defs/AnimationDefs/Animations_vanilla.xml
+++ b/Defs/AnimationDefs/Animations_vanilla.xml
@@ -856,7 +856,7 @@
     <sounds>true</sounds>
     <sexTypes>
       <li>Anal</li>
-      <li>Oral</li>
+      <li>Vaginal</li>
     </sexTypes>
     <actors>
       <li>
diff --git a/Source/Comps/CompBodyAnimator.cs b/Source/Comps/CompBodyAnimator.cs
index 025cb6c..2be7c49 100644
--- a/Source/Comps/CompBodyAnimator.cs
+++ b/Source/Comps/CompBodyAnimator.cs
@@ -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;