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

New animation: Cowgirl

Browse source 
Better checks for initiators/aggressors
This commit is contained in:
Platinum 2020-04-20 12:01:31 -07:00
parent 5c775b6714
commit 2eaff0b8da
8 changed files with 620 additions and 8 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.

1
Defs/AnimationDefs/Animations_Beast.xml
View file

@ -21,6 +21,7 @@
<li>Wolf_Arctic</li> <li>Wolf_Arctic</li>
</defNames> </defNames>
<isFucking>true</isFucking> <isFucking>true</isFucking>
<initiator>true</initiator>
</li> </li>
</actors> </actors>

1
Defs/AnimationDefs/Animations_Lesbian.xml
View file

@ -13,6 +13,7 @@
<li>Human</li> <li>Human</li>
</defNames> </defNames>
<isFucked>true</isFucked> <isFucked>true</isFucked>
<initiator>true</initiator>
<requiredGenitals> <requiredGenitals>
<li>Vagina</li> <li>Vagina</li>
</requiredGenitals> </requiredGenitals>

2
Defs/AnimationDefs/Animations_Multi.xml
View file

@ -19,12 +19,14 @@
<li>Human</li> <li>Human</li>
</defNames> </defNames>
<isFucking>true</isFucking> <isFucking>true</isFucking>
<initiator>true</initiator>
</li> </li>
<li> <li>
<defNames> <defNames>
<li>Human</li> <li>Human</li>
</defNames> </defNames>
<isFucking>true</isFucking> <isFucking>true</isFucking>
<initiator>true</initiator>
</li> </li>
</actors> </actors>

574
Defs/AnimationDefs/Animations_vanilla.xml
View file

@ -22,6 +22,7 @@
<li>Human</li> <li>Human</li>
</defNames> </defNames>
<isFucking>true</isFucking> <isFucking>true</isFucking>
<initiator>true</initiator>
</li> </li>
</actors> </actors>
@ -463,12 +464,14 @@
<defNames> <defNames>
<li>Human</li> <li>Human</li>
</defNames> </defNames>
<initiator>true</initiator>
</li> </li>
<li> <li>
<defNames> <defNames>
<li>Human</li> <li>Human</li>
</defNames> </defNames>
<isFucking>true</isFucking> <isFucking>true</isFucking>
<initiator>true</initiator>
</li> </li>
</actors> </actors>
<animationStages> <animationStages>
@ -852,7 +855,7 @@
</Rimworld_Animations.AnimationDef> </Rimworld_Animations.AnimationDef>
<Rimworld_Animations.AnimationDef> <Rimworld_Animations.AnimationDef>
<defName>ReverseStandAndCarry</defName> <defName>ReverseStandAndCarry</defName>
<label>ReverseStandAndCarry</label> <label>reverse stand-and-carry</label>
<sounds>true</sounds> <sounds>true</sounds>
<sexTypes> <sexTypes>
<li>Anal</li> <li>Anal</li>
@ -870,6 +873,7 @@
<defNames> <defNames>
<li>Human</li> <li>Human</li>
</defNames> </defNames>
<initiator>true</initiator>
<isFucking>true</isFucking> <isFucking>true</isFucking>
</li> </li>
</actors> </actors>
@ -1950,6 +1954,574 @@
</animationStages> </animationStages>
</Rimworld_Animations.AnimationDef> </Rimworld_Animations.AnimationDef>
<Rimworld_Animations.AnimationDef>
<defName>Cowgirl</defName>
<label>cowgirl</label>
<sounds>true</sounds>
<sexTypes>
<li>Anal</li>
<li>Vaginal</li>
</sexTypes>
<actors>
<li>
<!--each type cooresponds to an animation clip in each animationStage-->
<defNames>
<li>Human</li>
</defNames>
<isFucked>true</isFucked>
<initiator>true</initiator>
</li>
<li>
<defNames>
<li>Human</li>
</defNames>
<isFucking>true</isFucking>
</li>
</actors>
<animationStages>
<li>
<stageName>Slow_Fuck</stageName>
<isLooping>true</isLooping>
<playTimeTicks>1340</playTimeTicks>
<stageIndex>0</stageIndex>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<keyframes>
<!--Turning hips-->
<li>
<tickDuration>16</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>17</tickDuration>
<bodyAngle>3.5</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>-0.03</bodyOffsetX>
<bodyOffsetZ>0.624</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.02</headBob>
</li>
<li>
<tickDuration>16</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.694</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.03</headBob>
</li>
<li>
<tickDuration>17</tickDuration>
<bodyAngle>-3.5</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0.03</bodyOffsetX>
<bodyOffsetZ>0.624</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.02</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<soundEffect>Fuck</soundEffect>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>16</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>17</tickDuration>
<bodyAngle>3.5</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>-0.03</bodyOffsetX>
<bodyOffsetZ>0.624</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.02</headBob>
</li>
<li>
<tickDuration>16</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.694</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.03</headBob>
</li>
<li>
<tickDuration>17</tickDuration>
<bodyAngle>-3.5</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0.03</bodyOffsetX>
<bodyOffsetZ>0.624</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.02</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<soundEffect>Fuck</soundEffect>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<!--Straight up and down-->
<li>
<tickDuration>33</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>33</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.694</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.03</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<soundEffect>Fuck</soundEffect>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>33</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>33</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.694</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.03</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<soundEffect>Fuck</soundEffect>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>33</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.263</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>33</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.213</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.263</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</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>
<tickDuration>13</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>13</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.694</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.03</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<soundEffect>Fuck</soundEffect>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>13</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.263</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>13</tickDuration>
<bodyAngle>180</bodyAngle>
<headAngle>180</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>-0.213</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.263</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</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>
<tickDuration>10</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.694</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.03</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<soundEffect>Fuck</soundEffect>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.694</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.03</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<soundEffect>Fuck</soundEffect>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>10</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.694</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>-0.03</headBob>
</li>
<li>
<tickDuration>45</tickDuration>
<soundEffect>Cum</soundEffect>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>40</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.534</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>0</bodyAngle>
<headAngle>0</headAngle>
<bodyOffsetX>0</bodyOffsetX>
<bodyOffsetZ>0.554</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</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.263</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.213</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.263</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.263</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.213</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.263</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.263</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.213</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.263</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.263</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.263</bodyOffsetZ>
<bodyFacing>2</bodyFacing>
<headFacing>2</headFacing>
<headBob>0</headBob>
</li>
</keyframes>
</li>
</animationClips>
</li>
</animationStages>
</Rimworld_Animations.AnimationDef>
</Defs> </Defs>

2
Source/Actors/Actor.cs
View file

@ -10,7 +10,7 @@ namespace Rimworld_Animations {
public List<string> defNames; public List<string> defNames;
public List<string> requiredGenitals; public List<string> requiredGenitals;
public List<AlienRaceOffset> raceOffsets; public List<AlienRaceOffset> raceOffsets;
public bool activeRole = false; public bool initiator = false;
public string gender; public string gender;
public bool isFucking = false; public bool isFucking = false;
public bool isFucked = false; public bool isFucked = false;

46
Source/AnimationUtility.cs
View file

@ -46,10 +46,11 @@ namespace Rimworld_Animations {
if (!x.actors[i].defNames.Contains(localParticipants[i].def.defName)) { if (!x.actors[i].defNames.Contains(localParticipants[i].def.defName)) {
if (rjw.RJWSettings.DevMode) { if (rjw.RJWSettings.DevMode) {
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " is not "); string animInfo = x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " is not ";
foreach(String defname in x.actors[i].defNames) { foreach(String defname in x.actors[i].defNames) {
Log.Message(defname + ", "); animInfo += defname + ", ";
} }
Log.Message(animInfo);
} }
return false; return false;
@ -67,9 +68,10 @@ namespace Rimworld_Animations {
//TESTING ANIMATIONS ONLY REMEMBER TO COMMENT OUT BEFORE PUSH //TESTING ANIMATIONS ONLY REMEMBER TO COMMENT OUT BEFORE PUSH
/* /*
if (x.defName != "ReverseStandAndCarry") if (x.defName != "Cowgirl")
return false; return false;
*/ */
if (x.actors[i].isFucking && !rjw.xxx.can_fuck(localParticipants[i])) { if (x.actors[i].isFucking && !rjw.xxx.can_fuck(localParticipants[i])) {
Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " can't fuck"); Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " can't fuck");
@ -83,19 +85,51 @@ namespace Rimworld_Animations {
} }
return true; return true;
}); });
List<AnimationDef> optionsWithSexType = options.ToList().FindAll(x => x.sexTypes.Contains(sexType)); List<AnimationDef> optionsWithSexType = options.ToList().FindAll(x => x.sexTypes.Contains(sexType));
List<AnimationDef> optionsWithSexTypeAndInitiator = optionsWithSexType.FindAll(x => {
bool initiatorsAlignWithSexType = true;
for (int i = 0; i < x.actors.Count; i++) {
//if the animation not for initiators, but an initiator is playing it
if (x.actors[i].initiator && !(localParticipants[i].jobs.curDriver is rjw.JobDriver_SexBaseInitiator)) {
initiatorsAlignWithSexType = false;
}
}
return initiatorsAlignWithSexType;
});
List<AnimationDef> optionsWithInitiator = options.ToList().FindAll(x => {
bool initiatorsAlignWithSexType = true;
for (int i = 0; i < x.actors.Count; i++) {
//if the animation not for initiators, but an initiator is playing it
if (x.actors[i].initiator && !(localParticipants[i].jobs.curDriver is rjw.JobDriver_SexBaseInitiator)) {
initiatorsAlignWithSexType = false;
}
}
return initiatorsAlignWithSexType;
});
if (optionsWithSexTypeAndInitiator.Any()) {
Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + " and initiators...");
return optionsWithSexType.RandomElement();
}
if (optionsWithSexType.Any()) { if (optionsWithSexType.Any()) {
Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + "..."); Log.Message("Selecting animation for rjwSexType " + sexType.ToStringSafe() + "...");
return optionsWithSexType.RandomElement(); return optionsWithSexType.RandomElement();
} }
if(optionsWithInitiator.Any()) {
Log.Message("Selecting animation for initiators...");
}
if (options != null && options.Any()) { if (options != null && options.Any()) {
Log.Message("Randomly selecting animation..."); Log.Message("Randomly selecting animation...");
return options.RandomElement(); return options.RandomElement();
} }
else else
return null; return null;
} }

2
Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs
View file

@ -41,6 +41,8 @@ namespace Rimworld_Animations {
} }
else if (__instance is JobDriver_Masturbate_Bed) else if (__instance is JobDriver_Masturbate_Bed)
bed = (__instance as JobDriver_Masturbate_Bed).Bed; bed = (__instance as JobDriver_Masturbate_Bed).Bed;
else if (__instance is JobDriver_RapeComfortPawn || __instance is JobDriver_Breeding)
bed = (__instance?.Partner?.jobs?.curDriver as JobDriver_Sex)?.pBed;
if ((__instance.Target as Pawn)?.jobs?.curDriver is JobDriver_SexBaseReciever) { if ((__instance.Target as Pawn)?.jobs?.curDriver is JobDriver_SexBaseReciever) {