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

Compare commits

base: AblativeAbsolute:4004fa3ccbc596a0e808be24b9998cad238756be
Branches Tags
AblativeAbsolute:master
AblativeAbsolute:masturbateTickFix
AblativeAbsolute:1.5
AblativeAbsolute:fixingfacialanimations
AblativeAbsolute:SimpleCurveBugfix
AblativeAbsolute:ExtraPartAnim2
AblativeAbsolute:HAR-Soft-Dependency
AblativeAbsolute:No-HAR
AblativeAbsolute:Update1.4
AblativeAbsolute:ExtraPartAnim
AblativeAbsolute:ShiftSaveTest
AblativeAbsolute:toys
AblativeAbsolute:Test_GenitalRotationFix
AblativeAbsolute:ChangeSplitJobDriversToPatchesOnMain
AblativeAbsolute:HatsDisplaySelectionPatch
AblativeAbsolute:Dev
...
compare: AblativeAbsolute:85f7bbfa43c2c80b9c747db1e7e61893b76eb87a
Branches Tags
AblativeAbsolute:masturbateTickFix
AblativeAbsolute:1.5
AblativeAbsolute:fixingfacialanimations
AblativeAbsolute:master
AblativeAbsolute:SimpleCurveBugfix
AblativeAbsolute:ExtraPartAnim2
AblativeAbsolute:HAR-Soft-Dependency
AblativeAbsolute:No-HAR
AblativeAbsolute:Update1.4
AblativeAbsolute:ExtraPartAnim
AblativeAbsolute:ShiftSaveTest
AblativeAbsolute:toys
AblativeAbsolute:Test_GenitalRotationFix
AblativeAbsolute:ChangeSplitJobDriversToPatchesOnMain
AblativeAbsolute:HatsDisplaySelectionPatch
AblativeAbsolute:Dev

7 commits
4004fa3ccb ... 85f7bbfa43

Author SHA1 Message Date
Taberu
85f7bbfa43 Merge branch 'master' into 'master' 
Master

See merge request c0ffeeeeeeee/rimworld-animations!7
 2023-06-27 21:52:37 +00:00
c0ffee
08d32e9fa3 rebuild 2023-06-24 22:27:22 -07:00
c0ffeeeeeeee
5ef758c294 Merge branch 'gc-fix-orgasm-progress' into 'master' 
Fix orgasm progress

See merge request c0ffeeeeeeee/rimworld-animations!13
 2023-06-21 20:10:05 +00:00
ghostclinic3YTB
3a0b9deb11 Fix orgasm progress 2023-06-21 20:10:05 +00:00
Taberu
ff1b78eafc Add new file 2023-02-17 09:15:34 +00:00
Taberu
0ec779448a Add new directory 2023-02-17 09:14:22 +00:00
Taberu
e49179dd4d 1.4 defs 2023-02-17 09:14:01 +00:00
8 changed files with 467 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
1.4/Assemblies/Rimworld-Animations.dll
View file

Binary file not shown.

1
1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs
View file

@ -109,6 +109,7 @@ namespace Rimworld_Animations {
int animTicks = anim.animationTimeTicks - (fastAnimForQuickie ? anim.animationStages[0].playTimeTicks : 0);
(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_left = animTicks;
(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).sex_ticks = animTicks;
(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).orgasmStartTick = animTicks;
(pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).duration = animTicks;

BIN
Patch_HumanoidAlienRaces/1.4/Assemblies/Patch_HumanoidAlienRaces.dll
View file

Binary file not shown.

BIN
Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll
View file

Binary file not shown.

0
Patch_SexToysMasturbation/1.4/Defs/.gitkeep Normal file
View file

0
Patch_SexToysMasturbation/1.4/Defs/AnimationDefs/.gitkeep Normal file
View file

465
Patch_SexToysMasturbation/1.4/Defs/AnimationDefs/Animations_Dildo.xml Normal file
View file

@ -0,0 +1,465 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<Patch_SexToysMasturbation.SexToyAnimationDef>
<defName>Masturbation_DildoVaginal</defName>
<label>dildo masturbation</label>
<requiredBodyPart>vagina</requiredBodyPart>
<sounds>true</sounds>
<sexTypes>
<li>Masturbation</li>
</sexTypes>
<actors>
<li>
<defNames>
<li>Human</li>
</defNames>
<isFucked>true</isFucked>
</li>
</actors>
<animationStages>
<li>
<stageName>Masturbating</stageName>
<isLooping>true</isLooping>
<playTimeTicks>917</playTimeTicks>
<stageIndex>0</stageIndex>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<!--out-->
<tickDuration>40</tickDuration>
<bodyAngle>73.01611</bodyAngle>
<headAngle>40.0739746</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.054543376</bodyOffsetZ>
<bodyOffsetX>0.112624526</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<!--almost out-->
<soundEffect>Slimy</soundEffect>
<tickDuration>30</tickDuration>
<bodyAngle>76.4867554</bodyAngle>
<headAngle>45.3887634</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.0506898165</bodyOffsetZ>
<bodyOffsetX>0.08564949</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<!-- in -->
<tickDuration>30</tickDuration>
<bodyAngle>78.22131</bodyAngle>
<headAngle>48.0072327</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.039129138</bodyOffsetZ>
<bodyOffsetX>0.07794231</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<!--almost out-->
<tickDuration>30</tickDuration>
<bodyAngle>76.4867554</bodyAngle>
<headAngle>45.3887634</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.0506898165</bodyOffsetZ>
<bodyOffsetX>0.08564949</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<!--out-->
<tickDuration>1</tickDuration>
<bodyAngle>73.01611</bodyAngle>
<headAngle>40.0739746</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.054543376</bodyOffsetZ>
<bodyOffsetX>0.112624526</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.ThingAnimationClip">
<keyframes>
<li>
<!--out-->
<tickDuration>40</tickDuration>
<positionX>-0.359264076</positionX>
<positionZ>-0.00901746</positionZ>
<rotation>114.011215</rotation>
</li>
<li>
<!--almost out-->
<tickDuration>30</tickDuration>
<positionX>-0.2783391</positionX>
<positionZ>-0.0514066666</positionZ>
<rotation>81.16443</rotation>
</li>
<li>
<!--in-->
<tickDuration>30</tickDuration>
<positionX>-0.1704393</positionX>
<positionZ>-0.0668209046</positionZ>
<rotation>72.8611145</rotation>
</li>
<li>
<!--almost out-->
<tickDuration>30</tickDuration>
<positionX>-0.2783391</positionX>
<positionZ>-0.0514066666</positionZ>
<rotation>81.16443</rotation>
</li>
<li>
<!--out-->
<tickDuration>1</tickDuration>
<positionX>-0.359264076</positionX>
<positionZ>-0.00901746</positionZ>
<rotation>114.011215</rotation>
</li>
</keyframes>
</li>
</animationClips>
</li>
<li>
<stageName>GettingIntoPosition</stageName>
<isLooping>false</isLooping>
<stageIndex>0</stageIndex>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<!--out-->
<tickDuration>50</tickDuration>
<bodyAngle>73.01611</bodyAngle>
<headAngle>40.0739746</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.054543376</bodyOffsetZ>
<bodyOffsetX>0.112624526</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<soundEffect>Slimy</soundEffect>
<tickDuration>1</tickDuration>
<bodyAngle>81.65927</bodyAngle>
<headAngle>58.8843079</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.03912908</bodyOffsetZ>
<bodyOffsetX>0.08950315</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.ThingAnimationClip">
<keyframes>
<li>
<!--out-->
<tickDuration>50</tickDuration>
<positionX>-0.359264076</positionX>
<positionZ>-0.00901746</positionZ>
<rotation>114.011215</rotation>
</li>
<li>
<!--out-->
<tickDuration>1</tickDuration>
<positionX>-0.2899</positionX>
<positionZ>-0.0282852575</positionZ>
<rotation>98.13748</rotation>
</li>
</keyframes>
</li>
</animationClips>
</li>
<li>
<stageName>FastMasturbation</stageName>
<isLooping>true</isLooping>
<stageIndex>0</stageIndex>
<playTimeTicks>1610</playTimeTicks>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>20</tickDuration>
<bodyAngle>81.65927</bodyAngle>
<headAngle>58.8843079</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.03912908</bodyOffsetZ>
<bodyOffsetX>0.08950315</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<soundEffect>Slimy</soundEffect>
<tickDuration>25</tickDuration>
<bodyAngle>85.17255</bodyAngle>
<headAngle>58.0615845</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.03527552</bodyOffsetZ>
<bodyOffsetX>0.0471138731</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>81.65927</bodyAngle>
<headAngle>58.8843079</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.03912908</bodyOffsetZ>
<bodyOffsetX>0.08950315</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.ThingAnimationClip">
<keyframes>
<li>
<!--out-->
<tickDuration>25</tickDuration>
<positionX>-0.2899</positionX>
<positionZ>-0.0282852575</positionZ>
<rotation>98.13748</rotation>
</li>
<li>
<!--out-->
<tickDuration>20</tickDuration>
<positionX>-0.178146541</positionX>
<positionZ>-0.01672452</positionZ>
<rotation>96.95889</rotation>
</li>
<li>
<!--out-->
<tickDuration>1</tickDuration>
<positionX>-0.2899</positionX>
<positionZ>-0.0282852575</positionZ>
<rotation>98.13748</rotation>
</li>
</keyframes>
</li>
</animationClips>
</li>
<li>
<stageName>VeryFastMasturbation</stageName>
<isLooping>true</isLooping>
<stageIndex>0</stageIndex>
<playTimeTicks>225</playTimeTicks>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<tickDuration>6</tickDuration>
<bodyAngle>81.65927</bodyAngle>
<headAngle>58.8843079</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.03912908</bodyOffsetZ>
<bodyOffsetX>0.08950315</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<soundEffect>Slimy</soundEffect>
<tickDuration>8</tickDuration>
<bodyAngle>85.17255</bodyAngle>
<headAngle>58.0615845</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.03527552</bodyOffsetZ>
<bodyOffsetX>0.0471138731</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>81.65927</bodyAngle>
<headAngle>58.8843079</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.03912908</bodyOffsetZ>
<bodyOffsetX>0.08950315</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.ThingAnimationClip">
<keyframes>
<li>
<!--out-->
<tickDuration>6</tickDuration>
<positionX>-0.2899</positionX>
<positionZ>-0.0282852575</positionZ>
<rotation>98.13748</rotation>
</li>
<li>
<!--out-->
<tickDuration>8</tickDuration>
<positionX>-0.178146541</positionX>
<positionZ>-0.01672452</positionZ>
<rotation>96.95889</rotation>
</li>
<li>
<!--out-->
<tickDuration>1</tickDuration>
<positionX>-0.2899</positionX>
<positionZ>-0.0282852575</positionZ>
<rotation>98.13748</rotation>
</li>
</keyframes>
</li>
</animationClips>
</li>
<li>
<stageName>Orgasm</stageName>
<isLooping>false</isLooping>
<stageIndex>0</stageIndex>
<animationClips>
<li Class="Rimworld_Animations.PawnAnimationClip">
<layer>LayingPawn</layer>
<keyframes>
<li>
<soundEffect>Slimy</soundEffect>
<tickDuration>6</tickDuration>
<bodyAngle>81.65927</bodyAngle>
<headAngle>58.8843079</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.03912908</bodyOffsetZ>
<bodyOffsetX>0.08950315</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<quiver>True</quiver>
<soundEffect>Cum</soundEffect>
<tickDuration>80</tickDuration>
<bodyAngle>85.17255</bodyAngle>
<headAngle>58.0615845</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.03527552</bodyOffsetZ>
<bodyOffsetX>0.0471138731</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<quiver>True</quiver>
<soundEffect>Cum</soundEffect>
<tickDuration>90</tickDuration>
<bodyAngle>92.15109</bodyAngle>
<headAngle>96.34238</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.0237147212</bodyOffsetZ>
<bodyOffsetX>0.0432603136</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<quiver>True</quiver>
<soundEffect>Cum</soundEffect>
<tickDuration>70</tickDuration>
<bodyAngle>92.15109</bodyAngle>
<headAngle>96.34238</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.0237147212</bodyOffsetZ>
<bodyOffsetX>0.0432603136</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<tickDuration>70</tickDuration>
<bodyAngle>92.15109</bodyAngle>
<headAngle>96.34238</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.0237147212</bodyOffsetZ>
<bodyOffsetX>0.0432603136</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
<li>
<tickDuration>1</tickDuration>
<bodyAngle>81.65927</bodyAngle>
<headAngle>58.8843079</headAngle>
<genitalAngle>0</genitalAngle>
<bodyOffsetZ>0.03912908</bodyOffsetZ>
<bodyOffsetX>0.08950315</bodyOffsetX>
<headBob>0</headBob>
<bodyFacing>3</bodyFacing>
<headFacing>3</headFacing>
</li>
</keyframes>
</li>
<li Class="Rimworld_Animations.ThingAnimationClip">
<keyframes>
<li>
<!--out-->
<tickDuration>6</tickDuration>
<positionX>-0.2899</positionX>
<positionZ>-0.0282852575</positionZ>
<rotation>98.13748</rotation>
</li>
<li>
<!--out-->
<tickDuration>80</tickDuration>
<positionX>-0.178146541</positionX>
<positionZ>-0.01672452</positionZ>
<rotation>96.95889</rotation>
</li>
<li>
<!--out-->
<tickDuration>90</tickDuration>
<positionX>-0.178146541</positionX>
<positionZ>-0.01672452</positionZ>
<rotation>96.95889</rotation>
</li>
<li>
<!--out-->
<tickDuration>70</tickDuration>
<positionX>-0.178146541</positionX>
<positionZ>-0.01672452</positionZ>
<rotation>96.95889</rotation>
</li>
<li>
<!--out-->
<tickDuration>70</tickDuration>
<positionX>-0.178146541</positionX>
<positionZ>-0.01672452</positionZ>
<rotation>96.95889</rotation>
</li>
<li>
<!--out-->
<tickDuration>1</tickDuration>
<positionX>-0.2899</positionX>
<positionZ>-0.0282852575</positionZ>
<rotation>98.13748</rotation>
</li>
</keyframes>
</li>
</animationClips>
</li>
</animationStages>
</Patch_SexToysMasturbation.SexToyAnimationDef>
</Defs>

1
Patch_SexToysMasturbation/Source/Patches/HarmonyPatch_JobDriver_SexBaseInitiator.cs
View file

@ -59,6 +59,7 @@ namespace Patch_SexToysMasturbation
(pawn.jobs.curDriver as JobDriver_Sex).ticks_left = anim.animationTimeTicks;
(pawn.jobs.curDriver as JobDriver_Sex).sex_ticks = anim.animationTimeTicks;
(pawn.jobs.curDriver as JobDriver_Sex).orgasmStartTick = anim.animationTimeTicks;
(pawn.jobs.curDriver as JobDriver_Sex).duration = anim.animationTimeTicks;
}
else