From 1e05e7a3dcbb1ab7465ca02cb61615126b8b205e Mon Sep 17 00:00:00 2001 From: Platinum Date: Fri, 10 Apr 2020 22:03:25 -0700 Subject: [PATCH] vanilla lovin does animation --- 1.1/Assemblies/Rimworld-Animations.dll | Bin 36864 -> 37888 bytes About/About.xml | 18 ++++++++-- Defs/AnimationDefs/Animations_Masturbate.xml | 4 +-- Rimworld-Animations.csproj | 1 + .../JobDriver_SexCasualForAnimation.cs | 1 - .../HarmonyPatch_DoLovinAnimationPatch.cs | 28 ++++++++++++++++ ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 31 ++++++++++++++++++ 7 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 Source/Patches/rjwPatches/HarmonyPatch_DoLovinAnimationPatch.cs diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index 3ffb81f23c2c96849031b7683d9e041fb1553192..adf6fc4c17ff3e0d3e2280ab716dc5b4be7bd82b 100644 GIT binary patch delta 12978 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 JqP?&4e*oe&@%aD% delta 12161 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 Rimworld-Animations - Platinumspoons + C0ffee + https://gitgud.io/Platinumspoons/rimworld-animations/
  • 1.1
  • @@ -20,12 +21,23 @@ https://github.com/UnlimitedHugs/RimworldHugsLib/releases/latest steam://url/CommunityFilePage/818773962 +
  • + rim.job.world + RimJobWorld + https://www.loverslab.com/topic/110270-mod-rimjobworld/ +
  • UnlimitedHugs.HugsLib
  • brrainz.harmony
  • +
  • rim.job.world
  • -Rimworld Animations! Hurray! - + Rimworld Animations! Hurray! + + Questions or bugs? + Chat with me on the forums: https://www.loverslab.com/topic/140386-rjw-animations/ + Or on the rjw discord: https://discord.gg/CXwHhv8 + + diff --git a/Defs/AnimationDefs/Animations_Masturbate.xml b/Defs/AnimationDefs/Animations_Masturbate.xml index 41b633c..2968fa1 100644 --- a/Defs/AnimationDefs/Animations_Masturbate.xml +++ b/Defs/AnimationDefs/Animations_Masturbate.xml @@ -2,8 +2,8 @@ \ No newline at end of file diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index d7b24af..5a34225 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -90,6 +90,7 @@ + diff --git a/Source/JobDrivers/JobDriver_SexCasualForAnimation.cs b/Source/JobDrivers/JobDriver_SexCasualForAnimation.cs index 0100f96..ee111f9 100644 --- a/Source/JobDrivers/JobDriver_SexCasualForAnimation.cs +++ b/Source/JobDrivers/JobDriver_SexCasualForAnimation.cs @@ -38,7 +38,6 @@ namespace Rimworld_Animations { Toil startPartnerSex = new Toil(); startPartnerSex.initAction = delegate { - Log.Message("Attempting to start job..."); Job gettinLovedJob = JobMaker.MakeJob(DefDatabase.GetNamed("GettinLovedAnimation"), pawn, Bed); // new gettin loved toil that wakes up the pawn goes here Partner.jobs.jobQueue.EnqueueFirst(gettinLovedJob); diff --git a/Source/Patches/rjwPatches/HarmonyPatch_DoLovinAnimationPatch.cs b/Source/Patches/rjwPatches/HarmonyPatch_DoLovinAnimationPatch.cs new file mode 100644 index 0000000..a69a068 --- /dev/null +++ b/Source/Patches/rjwPatches/HarmonyPatch_DoLovinAnimationPatch.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using HarmonyLib; +using RimWorld; +using Verse; +using rjw; +using Verse.AI; + +namespace Rimworld_Animations { + + [HarmonyPatch(typeof(JobGiver_DoLovin), "TryGiveJob")] + public static class HarmonyPatch_DoLovinAnimationPatch { + + public static void Postfix(ref Pawn pawn, ref Job __result) { + + if(__result != null) { + + RestUtility.WakeUp(pawn); + Pawn partnerInMyBed = LovePartnerRelationUtility.GetPartnerInMyBed(pawn); + __result = JobMaker.MakeJob(DefDatabase.GetNamed("JoinInBedAnimation", true), partnerInMyBed, partnerInMyBed.CurrentBed()); + } + + } + } +} diff --git a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs index d3e0f6f..35331b0 100644 --- a/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/Source/Patches/rjwPatches/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -107,6 +107,37 @@ namespace Rimworld_Animations { public static void Postfix(ref JobDriver_SexBaseInitiator __instance) { + //Stolen from vanilla lovin + //to make sure vanilla lovin variables are set + if(__instance.pawn?.mindState?.canLovinTick != null) { + + SimpleCurve LovinIntervalHoursFromAgeCurve = new SimpleCurve + { + new CurvePoint(16f, 1.5f), + new CurvePoint(22f, 1.5f), + new CurvePoint(30f, 4f), + new CurvePoint(50f, 12f), + new CurvePoint(75f, 36f) + }; + + int ticksToNextLovin; + if (DebugSettings.alwaysDoLovin) { + + ticksToNextLovin = 100; + + } else { + + float centerX = LovinIntervalHoursFromAgeCurve.Evaluate(__instance.pawn.ageTracker.AgeBiologicalYearsFloat); + + centerX = Rand.Gaussian(centerX, 0.3f); + if (centerX < 0.5f) { + centerX = 0.5f; + } + ticksToNextLovin = (int)(centerX * 2500f); + } + __instance.pawn.mindState.canLovinTick = Find.TickManager.TicksGame + ticksToNextLovin; + } + if (__instance.Target.jobs?.curDriver is JobDriver_SexBaseReciever) { if (__instance.pawn.TryGetComp().isAnimating) {