AblativeAbsolute
/
rjw-events
mirror of https://gitgud.io/c0ffeeeeeeee/rjw-events.git
1
0
Fork 0
Code Issues 41 Packages Projects Releases Wiki Activity

update for 1.3

This commit is contained in:
c0ffee12 2021-07-23 15:49:39 -07:00
parent fdb7dbfc86
commit bc23c0d62f
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
1.3/Assemblies/RJW-Events.dll Normal file
View File

Binary file not shown.

2
RJW-Events.csproj
View File

@ -40,7 +40,7 @@
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="RJW"> <Reference Include="RJW">
<HintPath>..\rjw-master\1.2\Assemblies\RJW.dll</HintPath> <HintPath>..\rjw\1.3\Assemblies\RJW.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />

3
Source/GatheringWorkers/GatheringWorker_Orgy.cs
View File

@ -18,7 +18,8 @@ namespace RJW_Events
} }
protected override bool TryFindGatherSpot(Pawn organizer, out IntVec3 spot) 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);
} }
} }

2
Source/JobDrivers/JobDriver_OrgySex.cs
View File

@ -79,7 +79,7 @@ namespace RJW_Events
{ {
if (this.pawn.IsHashIntervalTick(this.ticks_between_hearts)) 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); this.SexTick(this.pawn, this.Partner, true, true);
SexUtility.reduce_rest(this.Partner, 1f); SexUtility.reduce_rest(this.Partner, 1f);

2
Source/JobDrivers/JobDriver_OrgySexReceiver.cs
View File

@ -61,7 +61,7 @@ namespace RJW_Events
{ {
if (this.pawn.IsHashIntervalTick(this.ticks_between_hearts)) 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 toil.AddEndCondition(delegate

2
Source/LordJobs/LordJob_Joinable_Orgy.cs
View File

@ -55,7 +55,7 @@ namespace RJW_Events
return base.VoluntaryJoinPriorityFor(p); return base.VoluntaryJoinPriorityFor(p);
} }
public bool IsGatheringAboutToEnd() public new bool IsGatheringAboutToEnd()
{ {
return timeoutTrigger.TicksLeft < 300; return timeoutTrigger.TicksLeft < 300;
} }