From 61fa2feb26b347dad6e0b6d66e35f0dbc9efdcd3 Mon Sep 17 00:00:00 2001 From: c0ffee12 Date: Sat, 24 Jul 2021 07:32:04 -0700 Subject: [PATCH] ideology compatibility --- 1.3/Assemblies/RJW-Events.dll | Bin 18944 -> 19968 bytes RJW-Events.csproj | 1 + Source/DefOfs/OrgyDutyDefOf.cs | 22 ++++++++++++++++++ .../GatheringWorkers/GatheringWorker_Orgy.cs | 17 ++++++++++++++ Source/JobGivers/JobGiver_FindOrgyPartner.cs | 2 +- Source/LordJobs/LordJob_Joinable_Orgy.cs | 10 ++++++++ 6 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 Source/DefOfs/OrgyDutyDefOf.cs diff --git a/1.3/Assemblies/RJW-Events.dll b/1.3/Assemblies/RJW-Events.dll index 9e29d18d2fa6517acaa7c6855c34d5182e200acc..03e87bd8a29f154b76578756d15489fb8df5f8d0 100644 GIT binary patch literal 19968 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 + diff --git a/Source/DefOfs/OrgyDutyDefOf.cs b/Source/DefOfs/OrgyDutyDefOf.cs new file mode 100644 index 0000000..c3cfd4f --- /dev/null +++ b/Source/DefOfs/OrgyDutyDefOf.cs @@ -0,0 +1,22 @@ +using RimWorld; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Verse.AI; + +namespace RJW_Events +{ + [DefOf] + public static class OrgyDutyDefOf + { + static OrgyDutyDefOf() + { + DefOfHelper.EnsureInitializedInCtor(typeof(DutyDefOf)); + } + + public static DutyDef Orgy; + + } +} diff --git a/Source/GatheringWorkers/GatheringWorker_Orgy.cs b/Source/GatheringWorkers/GatheringWorker_Orgy.cs index c2a3ae5..b04491a 100644 --- a/Source/GatheringWorkers/GatheringWorker_Orgy.cs +++ b/Source/GatheringWorkers/GatheringWorker_Orgy.cs @@ -22,5 +22,22 @@ namespace RJW_Events return RCellFinder.TryFindGatheringSpot(organizer, this.def, false, out spot); } + public override bool CanExecute(Map map, Pawn organizer = null) + { + + if(ModLister.IdeologyInstalled) + { + var ideo = Faction.OfPlayer.ideos.PrimaryIdeo; + if (!ideo.HasPrecept(DefDatabase.GetNamed("Lovin_FreeApproved", true))) + { + return false; + } + + } + + return base.CanExecute(map, organizer); + + } + } } diff --git a/Source/JobGivers/JobGiver_FindOrgyPartner.cs b/Source/JobGivers/JobGiver_FindOrgyPartner.cs index 27e3fd2..ad9ae06 100644 --- a/Source/JobGivers/JobGiver_FindOrgyPartner.cs +++ b/Source/JobGivers/JobGiver_FindOrgyPartner.cs @@ -54,7 +54,7 @@ namespace RJW_Events List targets = LordUtility.GetLord(pawn).ownedPawns.Where((Pawn p) => { - if(p?.mindState?.duty == null) + if(p?.mindState?.duty == null && p.mindState.duty.def != OrgyDutyDefOf.Orgy) { return false; } diff --git a/Source/LordJobs/LordJob_Joinable_Orgy.cs b/Source/LordJobs/LordJob_Joinable_Orgy.cs index 6bf3c03..be89c73 100644 --- a/Source/LordJobs/LordJob_Joinable_Orgy.cs +++ b/Source/LordJobs/LordJob_Joinable_Orgy.cs @@ -52,6 +52,16 @@ namespace RJW_Events { if (!CasualSex_Helper.CanHaveSex(p)) return 0; + if (ModLister.IdeologyInstalled) + { + var ideo = p.ideo.Ideo; + if (!ideo.HasPrecept(DefDatabase.GetNamed("Lovin_FreeApproved", true))) + { + return 0; + } + + } + return base.VoluntaryJoinPriorityFor(p); }