From c8b96b4b5cbbb47ffee54e12d29e30f730a3167c Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 13 Apr 2021 12:40:37 -0700 Subject: [PATCH] further miscellaneous improvements --- Assemblies/RJW-Events.dll | Bin 18432 -> 18432 bytes Defs/DutyDefs/DutyDefs_Sex.xml | 2 +- Defs/GatheringDefs/Gatherings_Sex.xml | 2 +- Source/JobDrivers/JobDriver_OrgySex.cs | 2 +- .../JobDrivers/JobDriver_OrgySexReceiver.cs | 2 +- Source/LordJobs/LordJob_Joinable_Orgy.cs | 12 ++++++------ Source/Patches/HarmonyPatch_ReclotheOnEnd.cs | 4 ++-- .../Patches/HarmonyPatch_StayNudeForOrgy.cs | 4 +++- 8 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Assemblies/RJW-Events.dll b/Assemblies/RJW-Events.dll index fac724e1cfb9535474f76a302b960f1506f1c65f..ce48f3fad3916c48ddde2bf839069eb1e3937c92 100644 GIT binary patch delta 8764 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 diff --git a/Defs/DutyDefs/DutyDefs_Sex.xml b/Defs/DutyDefs/DutyDefs_Sex.xml index b2219b1..c6048b3 100644 --- a/Defs/DutyDefs/DutyDefs_Sex.xml +++ b/Defs/DutyDefs/DutyDefs_Sex.xml @@ -19,7 +19,7 @@
  • - 0.45 + 0.40
  • diff --git a/Defs/GatheringDefs/Gatherings_Sex.xml b/Defs/GatheringDefs/Gatherings_Sex.xml index a344ed3..d560fd2 100644 --- a/Defs/GatheringDefs/Gatherings_Sex.xml +++ b/Defs/GatheringDefs/Gatherings_Sex.xml @@ -9,7 +9,7 @@ The orgy has been called off. The orgy has finished. Orgy - GatheringWorker_Party + RJW_Events.GatheringWorker_Orgy
  • PartySpot
    •  diff --git a/Source/JobDrivers/JobDriver_OrgySex.cs b/Source/JobDrivers/JobDriver_OrgySex.cs index e6b8c73..95ddeb1 100644 --- a/Source/JobDrivers/JobDriver_OrgySex.cs +++ b/Source/JobDrivers/JobDriver_OrgySex.cs @@ -63,7 +63,7 @@ namespace RJW_Events }; Toil toil = new Toil(); toil.defaultCompleteMode = ToilCompleteMode.Never; - toil.socialMode = RandomSocialMode.Off; + toil.socialMode = RandomSocialMode.Normal; toil.defaultDuration = this.duration; toil.handlingFacing = true; toil.FailOn(() => this.Partner.CurJob.def != PartnerJob); diff --git a/Source/JobDrivers/JobDriver_OrgySexReceiver.cs b/Source/JobDrivers/JobDriver_OrgySexReceiver.cs index 6ee70fc..f8eb63d 100644 --- a/Source/JobDrivers/JobDriver_OrgySexReceiver.cs +++ b/Source/JobDrivers/JobDriver_OrgySexReceiver.cs @@ -54,7 +54,7 @@ namespace RJW_Events { Toil toil = new Toil(); toil.defaultCompleteMode = ToilCompleteMode.Never; - toil.socialMode = RandomSocialMode.Off; + toil.socialMode = RandomSocialMode.Normal; toil.handlingFacing = true; toil.tickAction = delegate () { diff --git a/Source/LordJobs/LordJob_Joinable_Orgy.cs b/Source/LordJobs/LordJob_Joinable_Orgy.cs index 567c155..34630d0 100644 --- a/Source/LordJobs/LordJob_Joinable_Orgy.cs +++ b/Source/LordJobs/LordJob_Joinable_Orgy.cs @@ -50,15 +50,15 @@ namespace RJW_Events public override float VoluntaryJoinPriorityFor(Pawn p) { - if (!CasualSex_Helper.CanHaveSex(p) || p.Map.mapPawns.FreeColonists.Exists((Pawn p1) => - { - - return p.relations.SecondaryRomanceChanceFactor(p1) > 0 || p1.relations.SecondaryRomanceChanceFactor(p) > 0; - - })) return 0; + if (!CasualSex_Helper.CanHaveSex(p)) return 0; return base.VoluntaryJoinPriorityFor(p); } + public bool IsGatheringAboutToEnd() + { + return timeoutTrigger.TicksLeft < 300; + } + } } diff --git a/Source/Patches/HarmonyPatch_ReclotheOnEnd.cs b/Source/Patches/HarmonyPatch_ReclotheOnEnd.cs index 4b0f197..8dc1ddd 100644 --- a/Source/Patches/HarmonyPatch_ReclotheOnEnd.cs +++ b/Source/Patches/HarmonyPatch_ReclotheOnEnd.cs @@ -15,9 +15,9 @@ namespace RJW_Events public static void Postfix(LordToil_Party toil) { List ownedPawns = toil.lord.ownedPawns; - foreach(Pawn p in ownedPawns) + for (int i = 0; i < ownedPawns.Count; i++) { - p.Drawer.renderer.graphics.ResolveApparelGraphics(); + ownedPawns[i].Drawer.renderer.graphics.ResolveApparelGraphics(); } } } diff --git a/Source/Patches/HarmonyPatch_StayNudeForOrgy.cs b/Source/Patches/HarmonyPatch_StayNudeForOrgy.cs index 10c8196..4090c21 100644 --- a/Source/Patches/HarmonyPatch_StayNudeForOrgy.cs +++ b/Source/Patches/HarmonyPatch_StayNudeForOrgy.cs @@ -14,7 +14,9 @@ namespace RJW_Events { public static bool Prefix(PawnGraphicSet __instance) { - if(LordUtility.GetLord(__instance.pawn)?.LordJob != null && LordUtility.GetLord(__instance.pawn).LordJob is LordJob_Joinable_Orgy) + if(LordUtility.GetLord(__instance.pawn)?.LordJob != null && + LordUtility.GetLord(__instance.pawn).LordJob is LordJob_Joinable_Orgy && + !(LordUtility.GetLord(__instance.pawn).LordJob as LordJob_Joinable_Orgy).IsGatheringAboutToEnd()) { return false; }