From dff5104f0694eac3f457d4aec81372b8384d8ef1 Mon Sep 17 00:00:00 2001
From: Ed86 <email@email.com>
Date: Tue, 9 Jul 2019 11:42:21 +0300
Subject: [PATCH] some debug and wip testing stuff, nothing to be seen here,
move along citizen
---
Source/JobDrivers/JobDriver_GettinLoved.cs | 5 +++++
Source/JobDrivers/JobDriver_GettinRaped.cs | 5 +++++
Source/Modules/Pregnancy/Pregnancy_Helper.cs | 6 +++---
.../JobDrivers/JobDriver_WhoreInvitingVisitors.cs | 9 ++++++---
Source/Modules/Whoring/Whoring_Helper.cs | 4 +++-
Source/WorkGivers/WorkGiver_Fap_Bed.cs | 13 +++++++++++++
6 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/Source/JobDrivers/JobDriver_GettinLoved.cs b/Source/JobDrivers/JobDriver_GettinLoved.cs
index 390c7cb0..50963cb5 100644
--- a/Source/JobDrivers/JobDriver_GettinLoved.cs
+++ b/Source/JobDrivers/JobDriver_GettinLoved.cs
@@ -21,6 +21,11 @@ namespace rjw
//return this.pawn.Reserve(this.Partner, this.job, 1, 0, null) && this.pawn.Reserve(this.Bed, this.job, 1, 0, null);
}
+ public float CalculateSatisfactionPerTick()
+ {
+ return 1.0f;
+ }
+
protected override IEnumerable<Toil> MakeNewToils()
{
//--Log.Message("[RJW]JobDriver_GettinLoved::MakeNewToils is called");
diff --git a/Source/JobDrivers/JobDriver_GettinRaped.cs b/Source/JobDrivers/JobDriver_GettinRaped.cs
index 02cadb30..ca105801 100644
--- a/Source/JobDrivers/JobDriver_GettinRaped.cs
+++ b/Source/JobDrivers/JobDriver_GettinRaped.cs
@@ -46,6 +46,11 @@ namespace rjw
Messages.Message(xxx.get_pawnname(Receiver) + " is getting raped.", Receiver, MessageTypeDefOf.SilentInput);
}
+ public float CalculateSatisfactionPerTick()
+ {
+ return 1.0f;
+ }
+
protected override IEnumerable<Toil> MakeNewToils()
{
ticks_between_hearts = Rand.RangeInclusive(70, 130);
diff --git a/Source/Modules/Pregnancy/Pregnancy_Helper.cs b/Source/Modules/Pregnancy/Pregnancy_Helper.cs
index 6f387aab..1224f361 100644
--- a/Source/Modules/Pregnancy/Pregnancy_Helper.cs
+++ b/Source/Modules/Pregnancy/Pregnancy_Helper.cs
@@ -198,7 +198,7 @@ namespace rjw
public static void Doimpregnate(Pawn pawn, Pawn partner)
{
- if (RJWSettings.DevMode) Log.Message("[RJW] Doimpregnate " + xxx.get_pawnname(pawn) + " is a father " + xxx.get_pawnname(partner) + " is a mother");
+ if (RJWSettings.DevMode) Log.Message("[RJW] Doimpregnate " + xxx.get_pawnname(pawn) + " is a father, " + xxx.get_pawnname(partner) + " is a mother");
// fertility check
float fertility = RJWPregnancySettings.humanlike_impregnation_chance / 100f;
if (xxx.is_animal(partner))
@@ -220,10 +220,10 @@ namespace rjw
if (non_pregnancy_chance > pregnancy_threshold || pregnancy_threshold == 0)
{
- if (RJWSettings.DevMode) Log.Message("[RJW] Impregnation failed. Chance was " + non_pregnancy_chance + " vs " + pregnancy_threshold);
+ if (RJWSettings.DevMode) Log.Message("[RJW] Impregnation failed. Chance: " + pregnancy_threshold.ToStringPercent() + " fail roll: " + non_pregnancy_chance.ToStringPercent());
return;
}
- if (RJWSettings.DevMode) Log.Message("[RJW] Impregnation succeeded. Chance was " + non_pregnancy_chance + " vs " + pregnancy_threshold);
+ if (RJWSettings.DevMode) Log.Message("[RJW] Impregnation succeeded. Chance: " + pregnancy_threshold.ToStringPercent() + " succeess roll: " + non_pregnancy_chance.ToStringPercent());
PregnancyDecider(partner, pawn);
}
diff --git a/Source/Modules/Whoring/JobDrivers/JobDriver_WhoreInvitingVisitors.cs b/Source/Modules/Whoring/JobDrivers/JobDriver_WhoreInvitingVisitors.cs
index a622df74..375238dc 100644
--- a/Source/Modules/Whoring/JobDrivers/JobDriver_WhoreInvitingVisitors.cs
+++ b/Source/Modules/Whoring/JobDrivers/JobDriver_WhoreInvitingVisitors.cs
@@ -33,16 +33,19 @@ namespace rjw
if (PawnUtility.EnemiesAreNearby(TargetPawn))
{
+ //Log.Message("[RJW]JobDriver_InvitingVisitors::DoesTargetPawnAcceptAdvance() fail - enemy near");
return false;
}
if (!allowedJobs.Contains(TargetPawn.jobs.curJob.def))
{
+ //Log.Message("[RJW]JobDriver_InvitingVisitors::DoesTargetPawnAcceptAdvance() fail - not allowed job");
return false;
}
- //Log.Message("Will try " + xxx.WillPawnTryHookup(TargetPawn));
- //Log.Message("Appeal " + xxx.IsHookupAppealing(TargetPawn, Whore));
- //Log.Message("Afford " + xxx.CanAfford(TargetPawn, Whore));
+ //Log.Message("Will try " + WhoringHelper.WillPawnTryHookup(TargetPawn));
+ //Log.Message("Appeal " + WhoringHelper.IsHookupAppealing(TargetPawn, Whore));
+ //Log.Message("Afford " + WhoringHelper.CanAfford(TargetPawn, Whore));
+ //Log.Message("Need sex " + (xxx.need_some_sex(TargetPawn) >= 1));
Whore.skills.Learn(SkillDefOf.Social, 1.2f);
return WhoringHelper.WillPawnTryHookup(TargetPawn) && WhoringHelper.IsHookupAppealing(TargetPawn, Whore) && WhoringHelper.CanAfford(TargetPawn, Whore) && xxx.need_some_sex(TargetPawn) >= 1f;
}
diff --git a/Source/Modules/Whoring/Whoring_Helper.cs b/Source/Modules/Whoring/Whoring_Helper.cs
index 8421552b..a86c4dd7 100644
--- a/Source/Modules/Whoring/Whoring_Helper.cs
+++ b/Source/Modules/Whoring/Whoring_Helper.cs
@@ -188,7 +188,7 @@ namespace rjw
totalAmountOfSilvers += caravanMembers.Sum(animal => animal.inventory.innerContainer.TotalStackCountOfDef(ThingDefOf.Silver));
}
- //--Log.Message("[RJW]CanAfford:: caravan cannot afford the price");
+ //Log.Message("[RJW]CanAfford:: caravan can afford the price: " + (totalAmountOfSilvers >= price));
return totalAmountOfSilvers >= price;
}
@@ -272,6 +272,7 @@ namespace rjw
{
if (PawnUtility.WillSoonHaveBasicNeed(target))
{
+ //Log.Message("IsHookupAppealing - fail: " + xxx.get_pawnname(target) + " has need to do");
return false;
}
float num = target.relations.SecondaryRomanceChanceFactor(whore) / 1.5f;
@@ -305,6 +306,7 @@ namespace rjw
num *= 0.8f + ((float)whore.skills.GetSkill(SkillDefOf.Social).Level / 40); // 0.8 to 1.3
num *= Mathf.InverseLerp(-100f, 0f, target.relations.OpinionOf(whore));
+ //Log.Message("IsHookupAppealing - score: " + num);
return Rand.Range(0.05f, 1f) < num;
}
diff --git a/Source/WorkGivers/WorkGiver_Fap_Bed.cs b/Source/WorkGivers/WorkGiver_Fap_Bed.cs
index 5ca28bc7..567149df 100644
--- a/Source/WorkGivers/WorkGiver_Fap_Bed.cs
+++ b/Source/WorkGivers/WorkGiver_Fap_Bed.cs
@@ -83,6 +83,19 @@ namespace rjw
}
}
+
+ //change textures of be to whore bed
+ //Log.Message("[RJW] bed " + t.GetType().ToString() + " path " + t.Graphic.data.texPath);
+ //t.Graphic.data.texPath = "Things/Building/Furniture/Bed/DoubleBedWhore";
+ //t.Graphic.path = "Things/Building/Furniture/Bed/DoubleBedWhore";
+ //t.DefaultGraphic.data.texPath = "Things/Building/Furniture/Bed/DoubleBedWhore";
+ //t.DefaultGraphic.path = "Things/Building/Furniture/Bed/DoubleBedWhore";
+ //Log.Message("[RJW] bed " + t.GetType().ToString() + " texPath " + t.Graphic.data.texPath);
+ //Log.Message("[RJW] bed " + t.GetType().ToString() + " drawSize " + t.Graphic.data.drawSize);
+ //t.Draw();
+ //t.ExposeData();
+ //Scribe_Values.Look(ref t.Graphic.data.texPath, t.Graphic.data.texPath, "Things/Building/Furniture/Bed/DoubleBedWhore", true);
+
//Log.Message("[RJW]" + this.GetType().ToString() + " extended checks: can start sex");
return true;
}
--
GitLab