From bc23c0d62f7504780479e9e480a316c73f5c199f Mon Sep 17 00:00:00 2001 From: c0ffee12 Date: Fri, 23 Jul 2021 15:49:39 -0700 Subject: [PATCH] update for 1.3 --- 1.3/Assemblies/RJW-Events.dll | Bin 0 -> 18944 bytes RJW-Events.csproj | 2 +- Source/GatheringWorkers/GatheringWorker_Orgy.cs | 3 ++- Source/JobDrivers/JobDriver_OrgySex.cs | 2 +- Source/JobDrivers/JobDriver_OrgySexReceiver.cs | 2 +- Source/LordJobs/LordJob_Joinable_Orgy.cs | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 1.3/Assemblies/RJW-Events.dll diff --git a/1.3/Assemblies/RJW-Events.dll b/1.3/Assemblies/RJW-Events.dll new file mode 100644 index 0000000000000000000000000000000000000000..9e29d18d2fa6517acaa7c6855c34d5182e200acc GIT binary patch literal 18944 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 - ..\rjw-master\1.2\Assemblies\RJW.dll + ..\rjw\1.3\Assemblies\RJW.dll False diff --git a/Source/GatheringWorkers/GatheringWorker_Orgy.cs b/Source/GatheringWorkers/GatheringWorker_Orgy.cs index ebf91cc..c2a3ae5 100644 --- a/Source/GatheringWorkers/GatheringWorker_Orgy.cs +++ b/Source/GatheringWorkers/GatheringWorker_Orgy.cs @@ -18,7 +18,8 @@ namespace RJW_Events } protected override bool TryFindGatherSpot(Pawn organizer, out IntVec3 spot) { - return RCellFinder.TryFindGatheringSpot_NewTemp(organizer, this.def, false, out spot); + + return RCellFinder.TryFindGatheringSpot(organizer, this.def, false, out spot); } } diff --git a/Source/JobDrivers/JobDriver_OrgySex.cs b/Source/JobDrivers/JobDriver_OrgySex.cs index 0fe5193..9d3cc1f 100644 --- a/Source/JobDrivers/JobDriver_OrgySex.cs +++ b/Source/JobDrivers/JobDriver_OrgySex.cs @@ -79,7 +79,7 @@ namespace RJW_Events { if (this.pawn.IsHashIntervalTick(this.ticks_between_hearts)) { - this.ThrowMetaIcon(this.pawn.Position, this.pawn.Map, ThingDefOf.Mote_Heart); + FleckMaker.ThrowMetaIcon(this.pawn.Position, this.pawn.Map, FleckDefOf.Heart); } this.SexTick(this.pawn, this.Partner, true, true); SexUtility.reduce_rest(this.Partner, 1f); diff --git a/Source/JobDrivers/JobDriver_OrgySexReceiver.cs b/Source/JobDrivers/JobDriver_OrgySexReceiver.cs index d3c0187..c98feb7 100644 --- a/Source/JobDrivers/JobDriver_OrgySexReceiver.cs +++ b/Source/JobDrivers/JobDriver_OrgySexReceiver.cs @@ -61,7 +61,7 @@ namespace RJW_Events { if (this.pawn.IsHashIntervalTick(this.ticks_between_hearts)) { - base.ThrowMetaIcon(this.pawn.Position, this.pawn.Map, ThingDefOf.Mote_Heart); + FleckMaker.ThrowMetaIcon(this.pawn.Position, this.pawn.Map, FleckDefOf.Heart); } }; toil.AddEndCondition(delegate diff --git a/Source/LordJobs/LordJob_Joinable_Orgy.cs b/Source/LordJobs/LordJob_Joinable_Orgy.cs index d1f4368..6bf3c03 100644 --- a/Source/LordJobs/LordJob_Joinable_Orgy.cs +++ b/Source/LordJobs/LordJob_Joinable_Orgy.cs @@ -55,7 +55,7 @@ namespace RJW_Events return base.VoluntaryJoinPriorityFor(p); } - public bool IsGatheringAboutToEnd() + public new bool IsGatheringAboutToEnd() { return timeoutTrigger.TicksLeft < 300; }