From ad50e7131eeb00a962fa654dab8e19ac3e472380 Mon Sep 17 00:00:00 2001 From: Platinum Date: Wed, 22 Apr 2020 12:35:03 -0700 Subject: [PATCH] disable hearts option --- 1.1/Assemblies/Rimworld-Animations.dll | Bin 44032 -> 44032 bytes ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 3 +++ Source/Settings/AnimationSettings.cs | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index f036008dad997da83bc860dbe8678d597ba86c91..aae5c3d374894171adadd6ee4861ce1315915e5a 100644 GIT binary patch delta 7492 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 delta 7653 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 U#K*t32)Pw~&L=-%J!9nm2j+3gfB*mh diff --git a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs index bac41d5..6600394 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -101,6 +101,9 @@ namespace Rimworld_Animations { (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticksLeftThisToil = anim.animationTimeTicks; (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).duration = anim.animationTimeTicks; (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_remaining = anim.animationTimeTicks; + if(!AnimationSettings.hearts) { + (pawnsToAnimate[i].jobs.curDriver as JobDriver_Sex).ticks_between_hearts = Int32.MaxValue; + } } } diff --git a/Source/Settings/AnimationSettings.cs b/Source/Settings/AnimationSettings.cs index 3288809..8fb4f9e 100644 --- a/Source/Settings/AnimationSettings.cs +++ b/Source/Settings/AnimationSettings.cs @@ -9,12 +9,13 @@ using UnityEngine; namespace Rimworld_Animations { public class AnimationSettings : ModSettings { - public static bool orgasmQuiver, rapeShiver, soundOverride = true; + public static bool orgasmQuiver, rapeShiver, soundOverride = true, hearts = true; public static float shiverIntensity = 2f; public override void ExposeData() { Scribe_Values.Look(ref orgasmQuiver, "orgasmQuiver"); Scribe_Values.Look(ref rapeShiver, "rapeShiver"); + Scribe_Values.Look(ref hearts, "heartsOnLovin"); Scribe_Values.Look(ref soundOverride, "rjwAnimSoundOverride", true); Scribe_Values.Look(ref shiverIntensity, "shiverIntensity", 2f); @@ -36,6 +37,7 @@ namespace Rimworld_Animations { listingStandard.CheckboxLabeled("Enable Sound Override", ref AnimationSettings.soundOverride); listingStandard.CheckboxLabeled("Enable Orgasm Quiver", ref AnimationSettings.orgasmQuiver); listingStandard.CheckboxLabeled("Enable Rape Shiver", ref AnimationSettings.rapeShiver); + listingStandard.CheckboxLabeled("Enable hearts during lovin'", ref AnimationSettings.hearts); listingStandard.Label("Shiver/Quiver Intensity (default 2): " + AnimationSettings.shiverIntensity); AnimationSettings.shiverIntensity = listingStandard.Slider(AnimationSettings.shiverIntensity, 0.0f, 12f);