From 1195d292b0ef626af2d9e562e0fb5ecd50589d7c Mon Sep 17 00:00:00 2001 From: c0ffee Date: Sat, 28 Aug 2021 10:29:18 -0700 Subject: [PATCH] 4.8.0 changes --- 1.3/Assemblies/Rimworld-Animations.dll | Bin 54784 -> 54784 bytes 1.3/Source/AnimationUtility.cs | 6 +++--- 1.3/Source/Comps/CompBodyAnimator.cs | 5 ++--- 1.3/Source/Defs/AnimationDef.cs | 2 +- .../HarmonyPatch_JobDriver_JoinInBed.cs | 4 ++-- ...HarmonyPatch_JobDriver_SexBaseInitiator.cs | 4 ++-- Rimworld-Animations.csproj | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/1.3/Assemblies/Rimworld-Animations.dll b/1.3/Assemblies/Rimworld-Animations.dll index 6ff134cdfc934971fecfc7b07852e0e00f2d9304..9312f8cabec80ca0dab4c36cd5748231a6cf6516 100644 GIT binary patch delta 19016 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 delta 19354 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 p.jobs.curDriver is rjw.JobDriver_SexBaseInitiator) - .OrderBy(p => p == sexProps.Giver) + .OrderBy(p => p == sexProps.giver) .OrderByDescending(p => rjw.GenderHelper.GetSex(p) == rjw.GenderHelper.Sex.futa) .OrderBy(p => rjw.xxx.can_fuck(p)) .ToList(); @@ -114,10 +114,10 @@ namespace Rimworld_Animations { } return true; }); - List optionsWithInteractionType = options.ToList().FindAll(x => x.interactionDefTypes != null && x.interactionDefTypes.Contains(sexProps.DictionaryKey)); + List optionsWithInteractionType = options.ToList().FindAll(x => x.interactionDefTypes != null && x.interactionDefTypes.Contains(sexProps.sexType.ToStringSafe())); if (optionsWithInteractionType.Any()) { if (AnimationSettings.debugMode) - Log.Message("Selecting animation for interaction type " + sexProps.DictionaryKey.defName + "..."); + Log.Message("Selecting animation for interaction type " + sexProps.sexType.ToStringSafe() + "..."); return optionsWithInteractionType.RandomElement(); } List optionsWithSexType = options.ToList().FindAll(x => x.sexTypes != null && x.sexTypes.Contains(sexType)); diff --git a/1.3/Source/Comps/CompBodyAnimator.cs b/1.3/Source/Comps/CompBodyAnimator.cs index 9e0c9b1..68958da 100644 --- a/1.3/Source/Comps/CompBodyAnimator.cs +++ b/1.3/Source/Comps/CompBodyAnimator.cs @@ -334,11 +334,10 @@ namespace Rimworld_Animations { { if(AnimationSettings.applySemenOnAnimationOrgasm && (pawn?.jobs?.curDriver is JobDriver_Sex)) { - Pawn partner = (pawn.jobs.curDriver as JobDriver_Sex)?.Partner; - if (anim.sexTypes.Contains((pawn.jobs.curDriver as JobDriver_Sex).sexType)) + if (anim.sexTypes.Contains((pawn.jobs.curDriver as JobDriver_Sex).Sexprops.sexType)) { - SemenHelper.calculateAndApplySemen(pawn, partner, (pawn.jobs.curDriver as JobDriver_Sex).sexType); + SemenHelper.calculateAndApplySemen((pawn.jobs.curDriver as JobDriver_Sex).Sexprops); } } } diff --git a/1.3/Source/Defs/AnimationDef.cs b/1.3/Source/Defs/AnimationDef.cs index 119b98d..d0d9d61 100644 --- a/1.3/Source/Defs/AnimationDef.cs +++ b/1.3/Source/Defs/AnimationDef.cs @@ -14,7 +14,7 @@ namespace Rimworld_Animations { public int animationTimeTicks = 0; //do not set manually public bool sounds = false; public List sexTypes = null; - public List interactionDefTypes = null; + public List interactionDefTypes = null; public override void PostLoad() { base.PostLoad(); diff --git a/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_JoinInBed.cs b/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_JoinInBed.cs index 1c7a7ec..18c955e 100644 --- a/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_JoinInBed.cs +++ b/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_JoinInBed.cs @@ -13,7 +13,7 @@ using Verse.AI; namespace Rimworld_Animations { - [HarmonyPatch(typeof(xxx), "in_same_bed")] + [HarmonyPatch(typeof(Bed_Utility), "in_same_bed")] public static class HarmonyPatch_JobDriver_InSameBedPatch { @@ -44,7 +44,7 @@ namespace Rimworld_Animations var toils = __result.ToList(); Toil goToPawnInBed = Toils_Goto.GotoThing(__instance.iTarget, PathEndMode.OnCell); - goToPawnInBed.FailOn(() => !RestUtility.InBed(__instance.Partner) && __instance.Partner.CurJobDef != xxx.gettin_loved && !xxx.in_same_bed(__instance.Partner, __instance.pawn)); + goToPawnInBed.FailOn(() => !RestUtility.InBed(__instance.Partner) && __instance.Partner.CurJobDef != xxx.gettin_loved && !Bed_Utility.in_same_bed(__instance.Partner, __instance.pawn)); toils[1] = goToPawnInBed; diff --git a/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs index 6426d93..9ebf355 100644 --- a/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs +++ b/1.3/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs @@ -36,10 +36,10 @@ namespace Rimworld_Animations { if (bed != null) { - RerollAnimations(Target, out AnimationTimeTicks, bed as Thing, __instance.sexType, quickie, sexProps: __instance.Sexprops); + RerollAnimations(Target, out AnimationTimeTicks, bed as Thing, __instance.Sexprops.sexType, quickie, sexProps: __instance.Sexprops); } else { - RerollAnimations(Target, out AnimationTimeTicks, sexType: __instance.sexType, fastAnimForQuickie: quickie, sexProps: __instance.Sexprops); + RerollAnimations(Target, out AnimationTimeTicks, sexType: __instance.Sexprops.sexType, fastAnimForQuickie: quickie, sexProps: __instance.Sexprops); } diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index 1d6c58a..de0884f 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -44,7 +44,7 @@ False - ..\rjw\1.3\Assemblies\RJW.dll + ..\rjw-master\1.3\Assemblies\RJW.dll False