diff --git a/1.3/Assemblies/RimJobWorldWhoring.dll b/1.3/Assemblies/RimJobWorldWhoring.dll index 34b5e54..918c33d 100644 Binary files a/1.3/Assemblies/RimJobWorldWhoring.dll and b/1.3/Assemblies/RimJobWorldWhoring.dll differ diff --git a/1.3/Source/Mod/JobDrivers/JobDriver_WhoreIsServingVisitors.cs b/1.3/Source/Mod/JobDrivers/JobDriver_WhoreIsServingVisitors.cs index 1516335..ecd45d2 100644 --- a/1.3/Source/Mod/JobDrivers/JobDriver_WhoreIsServingVisitors.cs +++ b/1.3/Source/Mod/JobDrivers/JobDriver_WhoreIsServingVisitors.cs @@ -26,15 +26,17 @@ namespace rjwwhoring this.FailOnDespawnedOrNull(iTarget); this.FailOnDespawnedNullOrForbidden(iBed); - if (WhoringBase.DebugWhoring) ModLog.Message("" + this.GetType().ToString() + ":MakeNewToils() fail conditions check " + !WhoreBed_Utility.CanUseForWhoring(pawn, Bed) + " " + !pawn.CanReserve(Partner)); + if (WhoringBase.DebugWhoring) ModLog.Message("" + this.GetType().ToString() + ":fail conditions check " + !WhoreBed_Utility.CanUseForWhoring(pawn, Bed) + " " + !pawn.CanReserve(Partner)); this.FailOn(() => !WhoreBed_Utility.CanUseForWhoring(pawn, Bed) || !pawn.CanReserve(Partner)); this.FailOn(() => pawn.Drafted); this.FailOn(() => Partner.IsFighting()); yield return Toils_Reserve.Reserve(iTarget, 1, 0); + int basePrice = WhoringHelper.PriceOfWhore(pawn); + float bedMult = WhoreBed_Utility.CalculatePriceFactor(Bed); //yield return Toils_Reserve.Reserve(BedInd, Bed.SleepingSlotsCount, 0); - if (WhoringBase.DebugWhoring) ModLog.Message("" + this.GetType().ToString() + ":MakeNewToils() - generate toils"); + if (WhoringBase.DebugWhoring) ModLog.Message("" + this.GetType().ToString() + ":generate job toils"); Toil gotoBed = new Toil(); gotoBed.defaultCompleteMode = ToilCompleteMode.PatherArrival; gotoBed.FailOnBedNoLongerUsable(iBed, Bed); @@ -42,7 +44,7 @@ namespace rjwwhoring gotoBed.FailOn(() => !Partner.CanReach(Bed, PathEndMode.Touch, Danger.Deadly)); gotoBed.initAction = delegate { - if (WhoringBase.DebugWhoring) ModLog.Message("" + this.GetType().ToString() + ":MakeNewToils() - gotoWhoreBed"); + if (WhoringBase.DebugWhoring) ModLog.Message("" + this.GetType().ToString() + ":gotoWhoreBed"); pawn.pather.StartPath(SleepSpot, PathEndMode.OnCell); Partner.jobs.StopAll(); Job job = JobMaker.MakeJob(JobDefOf.GotoMindControlled, SleepSpot); @@ -73,7 +75,7 @@ namespace rjwwhoring StartPartnerJob.socialMode = RandomSocialMode.Off; StartPartnerJob.initAction = delegate { - if (WhoringBase.DebugWhoring) ModLog.Message("" + this.GetType().ToString() + ":MakeNewToils() - StartPartnerJob"); + if (WhoringBase.DebugWhoring) ModLog.Message("" + this.GetType().ToString() + ":StartPartnerJob"); var gettin_loved = JobMaker.MakeJob(PartnerJob, pawn, Bed); Partner.jobs.StartJob(gettin_loved, JobCondition.InterruptForced); }; @@ -87,7 +89,7 @@ namespace rjwwhoring SexToil.FailOn(() => Partner.CurJob.def != PartnerJob); SexToil.initAction = delegate { - if (WhoringBase.DebugWhoring) ModLog.Message("" + this.GetType().ToString() + ":MakeNewToils() - loveToil"); + if (WhoringBase.DebugWhoring) ModLog.Message("" + this.GetType().ToString() + ":SexToil start"); // refresh bed reservation Bed.ReserveForWhoring(pawn, ticks_left+100); @@ -141,16 +143,16 @@ namespace rjwwhoring if (!(Partner.IsColonist && (pawn.IsPrisonerOfColony || pawn.IsColonist))) { - int basePrice = WhoringHelper.PriceOfWhore(pawn); - float bedMult = WhoreBed_Utility.CalculatePriceFactor(Bed); int netPrice = (int) (basePrice * bedMult); + if (netPrice == 0) + netPrice += 1; int bedTip = netPrice - basePrice; int defect = WhoringHelper.PayPriceToWhore(Partner, netPrice, pawn); if (WhoringBase.DebugWhoring) { - ModLog.Message($"{GetType()}:MakeNewToild() - {Partner} tried to pay {basePrice} + {bedTip} silver to {pawn}"); + ModLog.Message($"{GetType()}:afterSex toil - {Partner} tried to pay {basePrice}(whore price) + {bedTip}(room modifier) silver to {pawn}"); if (defect <= 0) ModLog.Message(" Paid full price"); diff --git a/About/Manifest.xml b/About/Manifest.xml index 5a06e20..986c2e4 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RimJobWorld Whoring - 1.0.0 + 1.0.1
  • RimJobWorld