From d3db12f74479cc7bc720fb3789e90478b3b486cc Mon Sep 17 00:00:00 2001 From: Platinum Date: Tue, 5 May 2020 13:31:42 -0700 Subject: [PATCH] play fast anim for quickie -- enable in options --- 1.1/Assemblies/Rimworld-Animations.dll | Bin 47616 -> 48128 bytes Source/Comps/CompBodyAnimator.cs | 12 ++++++++---- ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 14 +++++++------- Source/Settings/AnimationSettings.cs | 4 +++- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index 6fe10ae072452859cac55c6842db9142e203b303..341fd9de113209c28d6ae1c3592f4fc96bbab09e 100644 GIT binary patch delta 13328 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 Cn(Jx+ diff --git a/Source/Comps/CompBodyAnimator.cs b/Source/Comps/CompBodyAnimator.cs index 4cf8102..7a2f2c4 100644 --- a/Source/Comps/CompBodyAnimator.cs +++ b/Source/Comps/CompBodyAnimator.cs @@ -94,7 +94,7 @@ namespace Rimworld_Animations { anchor = thing.Position.ToVector3Shifted(); } } - public void StartAnimation(AnimationDef anim, int actor, bool mirror = false, bool shiver = false) { + public void StartAnimation(AnimationDef anim, int actor, bool mirror = false, bool shiver = false, bool fastAnimForQuickie = false) { isAnimating = true; @@ -111,7 +111,7 @@ namespace Rimworld_Animations { this.anim = anim; this.mirror = mirror; - curStage = 0; + curStage = fastAnimForQuickie ? 1 : 0; animTicks = 0; stageTicks = 0; clipTicks = 0; @@ -180,11 +180,15 @@ namespace Rimworld_Animations { clipPercent = 0; } - if(curStage >= anim.animationStages.Count && animTicks < anim.animationTimeTicks && pawn.jobs.curDriver is JobDriver_SexBaseInitiator) { + if(curStage >= anim.animationStages.Count) { + isAnimating = false; pawn.jobs.curDriver.ReadyForNextToil(); + + } else { + tickClip(); } - tickClip(); + } diff --git a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs index 310aee1..b297ff8 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -52,16 +52,18 @@ namespace Rimworld_Animations { (Target.jobs.curDriver as JobDriver_SexBaseReciever).parteners.Add(pawn); } + bool quickie = (__instance is JobDriver_SexQuick) && AnimationSettings.fastAnimForQuickie; + if (bed != null) { - RerollAnimations(Target, __instance.duration, bed as Thing, __instance.sexType); + RerollAnimations(Target, __instance.duration, bed as Thing, __instance.sexType, quickie); } else { - RerollAnimations(Target, __instance.duration, sexType: __instance.sexType); + RerollAnimations(Target, __instance.duration, sexType: __instance.sexType, fastAnimForQuickie: quickie); } } } - public static void RerollAnimations(Pawn pawn, int duration, Thing bed = null, xxx.rjwSextype sexType = xxx.rjwSextype.None) { + public static void RerollAnimations(Pawn pawn, int duration, Thing bed = null, xxx.rjwSextype sexType = xxx.rjwSextype.None, bool fastAnimForQuickie = false) { if(pawn == null || !(pawn.jobs?.curDriver is JobDriver_SexBaseReciever)) { Log.Message("Error: Tried to reroll animations when pawn isn't sexing"); @@ -82,8 +84,6 @@ namespace Rimworld_Animations { Log.Message("Now playing " + anim.defName + (mirror ? " mirrored" : "")); - - IntVec3 pos = pawn.Position; for (int i = 0; i < pawnsToAnimate.Count; i++) { @@ -96,7 +96,7 @@ namespace Rimworld_Animations { } bool shiver = pawnsToAnimate[i].jobs.curDriver is JobDriver_SexBaseRecieverRaped; - pawnsToAnimate[i].TryGetComp().StartAnimation(anim, i, mirror, shiver); + pawnsToAnimate[i].TryGetComp().StartAnimation(anim, i, mirror, shiver, fastAnimForQuickie); (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_left = anim.animationTimeTicks; (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticksLeftThisToil = anim.animationTimeTicks; (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).duration = anim.animationTimeTicks; @@ -105,7 +105,7 @@ namespace Rimworld_Animations { (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_between_hearts = Int32.MaxValue; } - } + } } else { Log.Message("Anim not found"); diff --git a/Source/Settings/AnimationSettings.cs b/Source/Settings/AnimationSettings.cs index b563e0c..f385c10 100644 --- a/Source/Settings/AnimationSettings.cs +++ b/Source/Settings/AnimationSettings.cs @@ -9,7 +9,7 @@ using UnityEngine; namespace Rimworld_Animations { public class AnimationSettings : ModSettings { - public static bool orgasmQuiver, rapeShiver, soundOverride = true, hearts = true, controlGenitalRotation = false, applySemenOnAnimationOrgasm = false; + public static bool orgasmQuiver, rapeShiver, soundOverride = true, hearts = true, controlGenitalRotation = false, applySemenOnAnimationOrgasm = false, fastAnimForQuickie = false; public static float shiverIntensity = 2f; public override void ExposeData() { @@ -18,6 +18,7 @@ namespace Rimworld_Animations { Scribe_Values.Look(ref controlGenitalRotation, "controlGenitalRotation", false); Scribe_Values.Look(ref orgasmQuiver, "orgasmQuiver"); + Scribe_Values.Look(ref fastAnimForQuickie, "fastAnimForQuickie"); Scribe_Values.Look(ref rapeShiver, "rapeShiver"); Scribe_Values.Look(ref hearts, "heartsOnLovin"); Scribe_Values.Look(ref applySemenOnAnimationOrgasm, "applySemenOnOrgasm", false); @@ -42,6 +43,7 @@ namespace Rimworld_Animations { listingStandard.CheckboxLabeled("Enable Sound Override", ref AnimationSettings.soundOverride); listingStandard.CheckboxLabeled("Control Genital Rotation", ref AnimationSettings.controlGenitalRotation); + listingStandard.CheckboxLabeled("Play Fast Animation for Quickie", ref AnimationSettings.fastAnimForQuickie); listingStandard.CheckboxLabeled("Apply Semen on Animation Orgasm", ref AnimationSettings.applySemenOnAnimationOrgasm); if(AnimationSettings.applySemenOnAnimationOrgasm) {