This commit is contained in:
Platinum 2020-06-04 14:31:41 -07:00
parent 81fd210b9a
commit 2f046a7977
3 changed files with 279 additions and 282 deletions

View file

@ -463,6 +463,15 @@
<li>Oral</li>
</sexTypes>
<actors>
<li>
<!--each type cooresponds to an animation clip in each animationStage-->
<defNames>
<li>Human</li>
</defNames>
<bodyTypeOffset>
<Hulk>(0, -0.2)</Hulk>
</bodyTypeOffset>
</li>
<li>
<defNames>
<li>Human</li>
@ -474,15 +483,6 @@
<Hulk>(0, 0.2)</Hulk>
</bodyTypeOffset>
</li>
<li>
<!--each type cooresponds to an animation clip in each animationStage-->
<defNames>
<li>Human</li>
</defNames>
<bodyTypeOffset>
<Hulk>(0, -0.2)</Hulk>
</bodyTypeOffset>
</li>
</actors>
<animationStages>
<li>
@ -491,42 +491,6 @@
<playTimeTicks>1140</playTimeTicks>
<stageIndex>0</stageIndex>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>35</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.473</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>180</genitalAngle>
</li>
<li>
<tickDuration>59</tickDuration>
<bodyAngle>0</bodyAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.490</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.003</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.473</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>180</genitalAngle>
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.PawnAnimationClip">
<keyframes>
<li>
@ -656,7 +620,120 @@
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>35</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.473</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>180</genitalAngle>
</li>
<li>
<tickDuration>59</tickDuration>
<bodyAngle>0</bodyAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.490</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.003</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.473</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>180</genitalAngle>
</li>
</keyframes>
</li>
</animationClips>
</li>
<li>
<stageName>Face_Fuck</stageName>
<isLooping>true</isLooping>
<playTimeTicks>300</playTimeTicks>
<stageIndex>0</stageIndex>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<keyframes>
<li>
<tickDuration>15</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.255</bodyOffsetZ>
<bodyFacing>0</bodyFacing>
<headFacing>0</headFacing>
<headBob>0</headBob>
</li>
<li>
<soundEffect>Suck</soundEffect>
<tickDuration>14</tickDuration>
<bodyAngle>0</bodyAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.270</bodyOffsetZ>
<bodyFacing>0</bodyFacing>
<headFacing>0</headFacing>
<headBob>-0.06</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.255</bodyOffsetZ>
<bodyFacing>0</bodyFacing>
<headFacing>0</headFacing>
<headBob>0</headBob>
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>15</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.473</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>180</genitalAngle>
</li>
<li>
<tickDuration>14</tickDuration>
<bodyAngle>0</bodyAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.575</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.051</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.473</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>180</genitalAngle>
</li>
</keyframes>
</li>
</animationClips>
</li>
<li>
@ -793,85 +870,6 @@
</li>
</animationClips>
</li>
<li>
<stageName>Face_Fuck</stageName>
<isLooping>true</isLooping>
<playTimeTicks>300</playTimeTicks>
<stageIndex>0</stageIndex>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<keyframes>
<li>
<tickDuration>15</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.255</bodyOffsetZ>
<bodyFacing>0</bodyFacing>
<headFacing>0</headFacing>
<headBob>0</headBob>
</li>
<li>
<soundEffect>Suck</soundEffect>
<tickDuration>14</tickDuration>
<bodyAngle>0</bodyAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.270</bodyOffsetZ>
<bodyFacing>0</bodyFacing>
<headFacing>0</headFacing>
<headBob>-0.06</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.255</bodyOffsetZ>
<bodyFacing>0</bodyFacing>
<headFacing>0</headFacing>
<headBob>0</headBob>
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>15</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.473</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>180</genitalAngle>
</li>
<li>
<tickDuration>14</tickDuration>
<bodyAngle>0</bodyAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.575</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.051</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.473</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>180</genitalAngle>
</li>
</keyframes>
</li>
</animationClips>
</li>
</animationStages>
</Rimworld_Animations.AnimationDef>
@ -1993,16 +1991,6 @@
</sexTypes>
<actors>
<li>
<defNames>
<li>Human</li>
</defNames>
<isFucking>true</isFucking>
<controlGenitalAngle>true</controlGenitalAngle>
<bodyTypeOffset>
<Hulk>(0, -0.2)</Hulk>
</bodyTypeOffset>
</li>
<li>
<!--each type cooresponds to an animation clip in each animationStage-->
@ -2016,6 +2004,17 @@
</bodyTypeOffset>
</li>
<li>
<defNames>
<li>Human</li>
</defNames>
<isFucking>true</isFucking>
<controlGenitalAngle>true</controlGenitalAngle>
<bodyTypeOffset>
<Hulk>(0, -0.2)</Hulk>
</bodyTypeOffset>
</li>
</actors>
<animationStages>
@ -2025,45 +2024,6 @@
<playTimeTicks>1340</playTimeTicks>
<stageIndex>0</stageIndex>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>33</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>0</genitalAngle>
</li>
<li>
<tickDuration>33</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.313</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0.045</headBob>
<genitalAngle>0</genitalAngle>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>0</genitalAngle>
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.PawnAnimationClip">
<keyframes>
<!--Turning hips-->
@ -2236,21 +2196,12 @@
<headBob>0</headBob>
</li>
</keyframes>
</li>
</animationClips>
</li>
<li>
<stageName>Fast_Fuck</stageName>
<isLooping>true</isLooping>
<playTimeTicks>780</playTimeTicks>
<stageIndex>0</stageIndex>
<animationClips>
</li>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>13</tickDuration>
<tickDuration>33</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
@ -2261,7 +2212,7 @@
<genitalAngle>0</genitalAngle>
</li>
<li>
<tickDuration>13</tickDuration>
<tickDuration>33</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
@ -2284,6 +2235,14 @@
</li>
</keyframes>
</li>
</animationClips>
</li>
<li>
<stageName>Fast_Fuck</stageName>
<isLooping>true</isLooping>
<playTimeTicks>780</playTimeTicks>
<stageIndex>0</stageIndex>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<keyframes>
<li>
@ -2319,21 +2278,11 @@
</li>
</keyframes>
</li>
</animationClips>
</li>
<li>
<stageName>Cum</stageName>
<isLooping>true</isLooping>
<playTimeTicks>594</playTimeTicks>
<stageIndex>0</stageIndex>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>10</tickDuration>
<tickDuration>13</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
@ -2344,7 +2293,7 @@
<genitalAngle>0</genitalAngle>
</li>
<li>
<tickDuration>10</tickDuration>
<tickDuration>13</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
@ -2352,88 +2301,7 @@
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0.045</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.313</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0.045</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.313</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0.045</headBob>
</li>
<li>
<tickDuration>45</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>40</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>0</genitalAngle>
</li>
<li>
<tickDuration>1</tickDuration>
@ -2448,6 +2316,14 @@
</li>
</keyframes>
</li>
</animationClips>
</li>
<li>
<stageName>Cum</stageName>
<isLooping>true</isLooping>
<playTimeTicks>594</playTimeTicks>
<stageIndex>0</stageIndex>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<keyframes>
<li>
@ -2569,6 +2445,125 @@
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>0</genitalAngle>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.313</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0.045</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.313</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0.045</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.313</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0.045</headBob>
</li>
<li>
<tickDuration>45</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>40</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.363</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
<genitalAngle>0</genitalAngle>
</li>
</keyframes>
</li>
</animationClips>
</li>
</animationStages>

View file

@ -19,8 +19,10 @@ namespace Rimworld_Animations {
//aggressors last
participants = participants.OrderBy(p => p.jobs.curDriver is rjw.JobDriver_SexBaseInitiator).ToList();
//animal anims don't matter who is initiator
participants = participants.OrderBy(p => rjw.xxx.is_animal(p)).ToList();
//pawns that can fuck first
participants = participants.OrderBy(p => rjw.xxx.can_fuck(p)).ToList();
List<Pawn> localParticipants = new List<Pawn>(participants);
IEnumerable<AnimationDef> options = DefDatabase<AnimationDef>.AllDefs.Where((AnimationDef x) => {