diff --git a/1.4/Assemblies/Rimworld-Animations.dll b/1.4/Assemblies/Rimworld-Animations.dll index 6aacdcf..cfec529 100644 Binary files a/1.4/Assemblies/Rimworld-Animations.dll and b/1.4/Assemblies/Rimworld-Animations.dll differ diff --git a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs index 260d924..00227c4 100644 --- a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -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; diff --git a/Patch_HumanoidAlienRaces/1.4/Assemblies/Patch_HumanoidAlienRaces.dll b/Patch_HumanoidAlienRaces/1.4/Assemblies/Patch_HumanoidAlienRaces.dll index 2736148..221ddb1 100644 Binary files a/Patch_HumanoidAlienRaces/1.4/Assemblies/Patch_HumanoidAlienRaces.dll and b/Patch_HumanoidAlienRaces/1.4/Assemblies/Patch_HumanoidAlienRaces.dll differ diff --git a/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll b/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll index 5543661..a9d0d5f 100644 Binary files a/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll and b/Patch_SexToysMasturbation/1.4/Assemblies/Patch_SexToysMasturbation.dll differ diff --git a/Patch_SexToysMasturbation/1.4/Defs/.gitkeep b/Patch_SexToysMasturbation/1.4/Defs/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/Patch_SexToysMasturbation/1.4/Defs/AnimationDefs/.gitkeep b/Patch_SexToysMasturbation/1.4/Defs/AnimationDefs/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/Patch_SexToysMasturbation/1.4/Defs/AnimationDefs/Animations_Dildo.xml b/Patch_SexToysMasturbation/1.4/Defs/AnimationDefs/Animations_Dildo.xml new file mode 100644 index 0000000..f3a6d62 --- /dev/null +++ b/Patch_SexToysMasturbation/1.4/Defs/AnimationDefs/Animations_Dildo.xml @@ -0,0 +1,465 @@ + + + + Masturbation_DildoVaginal + + vagina + true + +
  • Masturbation
    • +     + +
  • + +
  • Human
    • + + true + +     + + +
  • + Masturbating + true + 917 + 0 + +
  • + LayingPawn + +
  • + + 40 + 73.01611 + 40.0739746 + 0 + 0.054543376 + 0.112624526 + 0 + 3 + 3 +
    • +
  • + + Slimy + 30 + 76.4867554 + 45.3887634 + 0 + 0.0506898165 + 0.08564949 + 0 + 3 + 3 +
    • +
  • + + 30 + 78.22131 + 48.0072327 + 0 + 0.039129138 + 0.07794231 + 0 + 3 + 3 +
    • +
  • + + 30 + 76.4867554 + 45.3887634 + 0 + 0.0506898165 + 0.08564949 + 0 + 3 + 3 +
    • +
  • + + 1 + 73.01611 + 40.0739746 + 0 + 0.054543376 + 0.112624526 + 0 + 3 + 3 +
    • + + +
  • + +
  • + + 40 + -0.359264076 + -0.00901746 + 114.011215 +
    • +
  • + + 30 + -0.2783391 + -0.0514066666 + 81.16443 +
    • +
  • + + 30 + -0.1704393 + -0.0668209046 + 72.8611145 +
    • +
  • + + 30 + -0.2783391 + -0.0514066666 + 81.16443 +
    • +
  • + + 1 + -0.359264076 + -0.00901746 + 114.011215 +
    • + + + + +
  • + GettingIntoPosition + false + 0 + +
  • + LayingPawn + +
  • + + 50 + 73.01611 + 40.0739746 + 0 + 0.054543376 + 0.112624526 + 0 + 3 + 3 +
    • +
  • + Slimy + 1 + 81.65927 + 58.8843079 + 0 + 0.03912908 + 0.08950315 + 0 + 3 + 3 +
    • + + +
  • + +
  • + + 50 + -0.359264076 + -0.00901746 + 114.011215 +
    • +
  • + + 1 + -0.2899 + -0.0282852575 + 98.13748 +
    • + + + + +
  • + FastMasturbation + true + 0 + 1610 + +
  • + LayingPawn + +
  • + 20 + 81.65927 + 58.8843079 + 0 + 0.03912908 + 0.08950315 + 0 + 3 + 3 +
    • +
  • + Slimy + 25 + 85.17255 + 58.0615845 + 0 + 0.03527552 + 0.0471138731 + 0 + 3 + 3 +
    • +
  • + 1 + 81.65927 + 58.8843079 + 0 + 0.03912908 + 0.08950315 + 0 + 3 + 3 +
    • + + +
  • + +
  • + + 25 + -0.2899 + -0.0282852575 + 98.13748 +
    • +
  • + + 20 + -0.178146541 + -0.01672452 + 96.95889 +
    • +
  • + + 1 + -0.2899 + -0.0282852575 + 98.13748 +
    • + + + + +
  • + VeryFastMasturbation + true + 0 + 225 + +
  • + LayingPawn + +
  • + 6 + 81.65927 + 58.8843079 + 0 + 0.03912908 + 0.08950315 + 0 + 3 + 3 +
    • +
  • + Slimy + 8 + 85.17255 + 58.0615845 + 0 + 0.03527552 + 0.0471138731 + 0 + 3 + 3 +
    • +
  • + 1 + 81.65927 + 58.8843079 + 0 + 0.03912908 + 0.08950315 + 0 + 3 + 3 +
    • + + +
  • + +
  • + + 6 + -0.2899 + -0.0282852575 + 98.13748 +
    • +
  • + + 8 + -0.178146541 + -0.01672452 + 96.95889 +
    • +
  • + + 1 + -0.2899 + -0.0282852575 + 98.13748 +
    • + + + + +
  • + Orgasm + false + 0 + +
  • + LayingPawn + +
  • + Slimy + 6 + 81.65927 + 58.8843079 + 0 + 0.03912908 + 0.08950315 + 0 + 3 + 3 +
    • +
  • + True + Cum + 80 + 85.17255 + 58.0615845 + 0 + 0.03527552 + 0.0471138731 + 0 + 3 + 3 +
    • +
  • + True + Cum + 90 + 92.15109 + 96.34238 + 0 + 0.0237147212 + 0.0432603136 + 0 + 3 + 3 +
    • +
  • + True + Cum + 70 + 92.15109 + 96.34238 + 0 + 0.0237147212 + 0.0432603136 + 0 + 3 + 3 +
    • +
  • + 70 + 92.15109 + 96.34238 + 0 + 0.0237147212 + 0.0432603136 + 0 + 3 + 3 +
    • +
  • + 1 + 81.65927 + 58.8843079 + 0 + 0.03912908 + 0.08950315 + 0 + 3 + 3 +
    • + + +
  • + +
  • + + 6 + -0.2899 + -0.0282852575 + 98.13748 +
    • +
  • + + 80 + -0.178146541 + -0.01672452 + 96.95889 +
    • +
  • + + 90 + -0.178146541 + -0.01672452 + 96.95889 +
    • +
  • + + 70 + -0.178146541 + -0.01672452 + 96.95889 +
    • +
  • + + 70 + -0.178146541 + -0.01672452 + 96.95889 +
    • +
  • + + 1 + -0.2899 + -0.0282852575 + 98.13748 +
    • + + + + +     +     +     diff --git a/Patch_SexToysMasturbation/Source/Patches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Patch_SexToysMasturbation/Source/Patches/HarmonyPatch_JobDriver_SexBaseInitiator.cs index ef3f4fb..9f29203 100644 --- a/Patch_SexToysMasturbation/Source/Patches/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/Patch_SexToysMasturbation/Source/Patches/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -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