updates for 1.3

This commit is contained in:
c0ffee 2022-01-23 15:29:13 -08:00
parent da8939c4b8
commit 00e8d5cf4e
8 changed files with 58 additions and 19 deletions

View file

@ -10,6 +10,7 @@ namespace RJW_ToysAndMasturbation {
public class CompProperties_SexToy : CompProperties {
public Gender primaryGender = Gender.Female;
public float satisfactionModifier = 1.5f;
public CompProperties_SexToy() {
compClass = typeof(CompSexToy);
}

View file

@ -11,7 +11,7 @@ using rjw;
namespace RJW_ToysAndMasturbation {
public class CompSexToy : ThingComp {
public static IntVec3 FapLocation(Pawn p) => (new JobGiver_Masturbate()).FindFapLocation(p);
public static IntVec3 FapLocation(Pawn p) => CasualSex_Helper.FindSexLocation(p);
public CompProperties_SexToy Props => (CompProperties_SexToy)props;
@ -34,8 +34,8 @@ namespace RJW_ToysAndMasturbation {
yield return new FloatMenuOption(FloatMenuOptionLabel(pawn), delegate {
if (RJWPreferenceSettings.FapInBed && pawn.jobs.curDriver is JobDriver_LayDown) {
Building_Bed bed = ((JobDriver_LayDown)pawn.jobs.curDriver).Bed;
if (RJWPreferenceSettings.FapInBed && pawn.jobs.curDriver is JobDriver_LayDown down) {
Building_Bed bed = down.Bed;
if (bed != null) {
Job j = JobMaker.MakeJob(MasturbateToyDefOf.MasturbateWithToy, parent, bed, bed.Position);
j.count = 1;