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

reverted to original method of finding animation

Browse source
This commit is contained in:
Platinum 2020-06-04 14:31:34 -07:00
parent 4adc4a6906
commit 81fd210b9a
4 changed files with 4 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

142
Defs/AnimationDefs/Animations_Vanilla2.xml
View file

@ -1,142 +0,0 @@
<?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>

1
Rimworld-Animations.csproj
View file

@ -114,7 +114,6 @@
<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" />

4
Source/AnimationUtility.cs
View file

@ -81,10 +81,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 != "Missionary") if (x.defName != "Doggystyle")
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");

4
Source/Comps/CompBodyAnimator.cs
View file

@ -104,6 +104,8 @@ 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,8 +156,6 @@ namespace Rimworld_Animations {
//tick once for initialization //tick once for initialization
tickAnim(); tickAnim();
isAnimating = true;
} }
public override void CompTick() { public override void CompTick() {