mirror of
https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git
synced 2024-08-15 00:43:45 +00:00
thread check
This commit is contained in:
parent
21de5442e9
commit
6ebd521519
5 changed files with 147 additions and 4 deletions
Binary file not shown.
142
Defs/AnimationDefs/Animations_Vanilla2.xml
Normal file
142
Defs/AnimationDefs/Animations_Vanilla2.xml
Normal file
|
@ -0,0 +1,142 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8" ?>
|
||||||
|
<!--This is just because the last vanilla got too long-->
|
||||||
|
|
||||||
|
<Defs>
|
||||||
|
<!--
|
||||||
|
<Rimworld_Animations.AnimationDef>
|
||||||
|
<defName>Missionary</defName>
|
||||||
|
<label>missionary</label>
|
||||||
|
<sounds>true</sounds>
|
||||||
|
<sexTypes>
|
||||||
|
<li>Anal</li>
|
||||||
|
<li>Vaginal</li>
|
||||||
|
</sexTypes>
|
||||||
|
|
||||||
|
<actors>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
<defNames>
|
||||||
|
<li>Human</li>
|
||||||
|
</defNames>
|
||||||
|
<isFucked>true</isFucked>
|
||||||
|
<initiator>false</initiator>
|
||||||
|
<bodyTypeOffset>
|
||||||
|
<Hulk>(-0.2, 0)</Hulk>
|
||||||
|
</bodyTypeOffset>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
<defNames>
|
||||||
|
<li>Human</li>
|
||||||
|
</defNames>
|
||||||
|
<isFucking>true</isFucking>
|
||||||
|
<initiator>true</initiator>
|
||||||
|
<controlGenitalAngle>true</controlGenitalAngle>
|
||||||
|
<bodyTypeOffset>
|
||||||
|
<Hulk>(0, 0.2)</Hulk>
|
||||||
|
</bodyTypeOffset>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
</actors>
|
||||||
|
|
||||||
|
<animationStages>
|
||||||
|
<li>
|
||||||
|
<stageName>breathing</stageName>
|
||||||
|
<isLooping>true</isLooping>
|
||||||
|
<playTimeTicks>1340</playTimeTicks>
|
||||||
|
<stageIndex>0</stageIndex>
|
||||||
|
<animationClips>
|
||||||
|
<li Class="Rimworld_Animations.PawnAnimationClip">
|
||||||
|
<keyframes>
|
||||||
|
<li>
|
||||||
|
<tickDuration>40</tickDuration>
|
||||||
|
<bodyAngle>-77.75698</bodyAngle>
|
||||||
|
<headAngle>-61.0781555</headAngle>
|
||||||
|
<genitalAngle>0</genitalAngle>
|
||||||
|
<bodyOffsetZ>0.102672577</bodyOffsetZ>
|
||||||
|
<bodyOffsetX>-0.293373376</bodyOffsetX>
|
||||||
|
<headBob>0</headBob>
|
||||||
|
<bodyFacing>1</bodyFacing>
|
||||||
|
<headFacing>1</headFacing>
|
||||||
|
<soundEffect/>
|
||||||
|
<quiver>false</quiver>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<tickDuration>40</tickDuration>
|
||||||
|
<bodyAngle>-68.58234</bodyAngle>
|
||||||
|
<headAngle>-51.9035034</headAngle>
|
||||||
|
<genitalAngle>0</genitalAngle>
|
||||||
|
<bodyOffsetZ>0.112280637</bodyOffsetZ>
|
||||||
|
<bodyOffsetX>-0.270739377</bodyOffsetX>
|
||||||
|
<headBob>0</headBob>
|
||||||
|
<bodyFacing>1</bodyFacing>
|
||||||
|
<headFacing>1</headFacing>
|
||||||
|
<soundEffect/>
|
||||||
|
<quiver>false</quiver>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<tickDuration>1</tickDuration>
|
||||||
|
<bodyAngle>-77.75698</bodyAngle>
|
||||||
|
<headAngle>-61.0781555</headAngle>
|
||||||
|
<genitalAngle>0</genitalAngle>
|
||||||
|
<bodyOffsetZ>0.102672577</bodyOffsetZ>
|
||||||
|
<bodyOffsetX>-0.293373376</bodyOffsetX>
|
||||||
|
<headBob>0</headBob>
|
||||||
|
<bodyFacing>1</bodyFacing>
|
||||||
|
<headFacing>1</headFacing>
|
||||||
|
<soundEffect/>
|
||||||
|
<quiver>false</quiver>
|
||||||
|
</li>
|
||||||
|
</keyframes>
|
||||||
|
</li>
|
||||||
|
<li Class="Rimworld_Animations.PawnAnimationClip">
|
||||||
|
<layer>LayingPawn</layer>
|
||||||
|
<keyframes>
|
||||||
|
<li>
|
||||||
|
<tickDuration>40</tickDuration>
|
||||||
|
<bodyAngle>-12.2784309</bodyAngle>
|
||||||
|
<headAngle>-9.951447</headAngle>
|
||||||
|
<genitalAngle>0</genitalAngle>
|
||||||
|
<bodyOffsetZ>0.2986659</bodyOffsetZ>
|
||||||
|
<bodyOffsetX>0.185442165</bodyOffsetX>
|
||||||
|
<headBob>0</headBob>
|
||||||
|
<bodyFacing>3</bodyFacing>
|
||||||
|
<headFacing>3</headFacing>
|
||||||
|
<soundEffect/>
|
||||||
|
<quiver>false</quiver>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<tickDuration>40</tickDuration>
|
||||||
|
<bodyAngle>-12.2784309</bodyAngle>
|
||||||
|
<headAngle>-14.1778421</headAngle>
|
||||||
|
<genitalAngle>0</genitalAngle>
|
||||||
|
<bodyOffsetZ>0.3229217</bodyOffsetZ>
|
||||||
|
<bodyOffsetX>0.181031</bodyOffsetX>
|
||||||
|
<headBob>0</headBob>
|
||||||
|
<bodyFacing>3</bodyFacing>
|
||||||
|
<headFacing>3</headFacing>
|
||||||
|
<soundEffect/>
|
||||||
|
<quiver>false</quiver>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<tickDuration>1</tickDuration>
|
||||||
|
<bodyAngle>-12.2784309</bodyAngle>
|
||||||
|
<headAngle>-9.951447</headAngle>
|
||||||
|
<genitalAngle>0</genitalAngle>
|
||||||
|
<bodyOffsetZ>0.2986659</bodyOffsetZ>
|
||||||
|
<bodyOffsetX>0.185442165</bodyOffsetX>
|
||||||
|
<headBob>0</headBob>
|
||||||
|
<bodyFacing>3</bodyFacing>
|
||||||
|
<headFacing>3</headFacing>
|
||||||
|
<soundEffect/>
|
||||||
|
<quiver>false</quiver>
|
||||||
|
</li>
|
||||||
|
</keyframes>
|
||||||
|
</li>
|
||||||
|
</animationClips>
|
||||||
|
</li>
|
||||||
|
</animationStages>
|
||||||
|
|
||||||
|
</Rimworld_Animations.AnimationDef>
|
||||||
|
-->
|
||||||
|
</Defs>
|
|
@ -114,6 +114,7 @@
|
||||||
<Content Include="Defs\AnimationDefs\Animations_Masturbate.xml" />
|
<Content Include="Defs\AnimationDefs\Animations_Masturbate.xml" />
|
||||||
<Content Include="Defs\AnimationDefs\Animations_Multi.xml" />
|
<Content Include="Defs\AnimationDefs\Animations_Multi.xml" />
|
||||||
<Content Include="Defs\AnimationDefs\Animations_vanilla.xml" />
|
<Content Include="Defs\AnimationDefs\Animations_vanilla.xml" />
|
||||||
|
<Content Include="Defs\AnimationDefs\Animations_Vanilla2.xml" />
|
||||||
<Content Include="Defs\JobDefs\Jobs_SexForAnim.xml" />
|
<Content Include="Defs\JobDefs\Jobs_SexForAnim.xml" />
|
||||||
<Content Include="Defs\MainTabDefs\MainButtonDef.xml" />
|
<Content Include="Defs\MainTabDefs\MainButtonDef.xml" />
|
||||||
<Content Include="Defs\SoundDefs\Sounds_Sex.xml" />
|
<Content Include="Defs\SoundDefs\Sounds_Sex.xml" />
|
||||||
|
|
|
@ -78,10 +78,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 != "Doggystyle")
|
if (x.defName != "Missionary")
|
||||||
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");
|
||||||
|
|
|
@ -102,8 +102,6 @@ namespace Rimworld_Animations {
|
||||||
}
|
}
|
||||||
public void StartAnimation(AnimationDef anim, int actor, bool mirror = false, bool shiver = false, bool fastAnimForQuickie = false) {
|
public void StartAnimation(AnimationDef anim, int actor, bool mirror = false, bool shiver = false, bool fastAnimForQuickie = false) {
|
||||||
|
|
||||||
isAnimating = true;
|
|
||||||
|
|
||||||
AlienRaceOffset raceOffset = anim?.actors[actor]?.raceOffsets?.Find(x => x.defName == pawn.def.defName);
|
AlienRaceOffset raceOffset = anim?.actors[actor]?.raceOffsets?.Find(x => x.defName == pawn.def.defName);
|
||||||
|
|
||||||
if (raceOffset != null) {
|
if (raceOffset != null) {
|
||||||
|
@ -154,6 +152,8 @@ namespace Rimworld_Animations {
|
||||||
//tick once for initialization
|
//tick once for initialization
|
||||||
tickAnim();
|
tickAnim();
|
||||||
|
|
||||||
|
isAnimating = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
public override void CompTick() {
|
public override void CompTick() {
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue