diff --git a/1.3/Assemblies/RJW-Events.dll b/1.3/Assemblies/RJW-Events.dll
new file mode 100644
index 0000000..9e29d18
Binary files /dev/null and b/1.3/Assemblies/RJW-Events.dll differ
diff --git a/RJW-Events.csproj b/RJW-Events.csproj
index ded03f0..7f12073 100644
--- a/RJW-Events.csproj
+++ b/RJW-Events.csproj
@@ -40,7 +40,7 @@
False
- ..\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;
}