Skip to content
Snippets Groups Projects
Commit bab220e7 authored by Ed86's avatar Ed86
Browse files

disabled jobgivers for drafted pawns, so pawns should not try sexing while drafted

parent 27e05a30
No related branches found
No related tags found
No related merge requests found
...@@ -20,6 +20,8 @@ namespace rjw ...@@ -20,6 +20,8 @@ namespace rjw
protected override Job TryGiveJob(Pawn pawn) protected override Job TryGiveJob(Pawn pawn)
{ {
if (pawn.Drafted) return null;
// Most checks are now done in ThinkNode_ConditionalBestiality // Most checks are now done in ThinkNode_ConditionalBestiality
DebugText("[RJW] JobGiver_Bestiality::TryGiveJob( " + xxx.get_pawnname(pawn) + " ) called"); DebugText("[RJW] JobGiver_Bestiality::TryGiveJob( " + xxx.get_pawnname(pawn) + " ) called");
......
...@@ -54,6 +54,8 @@ namespace rjw ...@@ -54,6 +54,8 @@ namespace rjw
if (!xxx.is_healthy(rapist) || rapist.IsDesignatedComfort() || (!SexUtility.ReadyForLovin(rapist) && !xxx.is_frustrated(rapist))) return null; if (!xxx.is_healthy(rapist) || rapist.IsDesignatedComfort() || (!SexUtility.ReadyForLovin(rapist) && !xxx.is_frustrated(rapist))) return null;
} }
if (rapist.Drafted) return null;
//Log.Message("[RJW] JobGiver_ComfortPrisonerRape::TryGiveJob( " + xxx.get_pawnname(rapist) + " ) called1"); //Log.Message("[RJW] JobGiver_ComfortPrisonerRape::TryGiveJob( " + xxx.get_pawnname(rapist) + " ) called1");
if (!xxx.can_rape(rapist)) return null; if (!xxx.can_rape(rapist)) return null;
......
...@@ -139,6 +139,8 @@ namespace rjw ...@@ -139,6 +139,8 @@ namespace rjw
{ {
//--Log.Message("[RJW] JobGiver_DoFappin::TryGiveJob( " + xxx.get_pawnname(fapper) + " ) called"); //--Log.Message("[RJW] JobGiver_DoFappin::TryGiveJob( " + xxx.get_pawnname(fapper) + " ) called");
if (fapper.Drafted) return null;
if (!xxx.can_be_fucked(fapper) && !xxx.can_fuck(fapper)) return null; if (!xxx.can_be_fucked(fapper) && !xxx.can_fuck(fapper)) return null;
// Whores only fap if frustrated, unless imprisoned. // Whores only fap if frustrated, unless imprisoned.
......
...@@ -84,6 +84,7 @@ namespace rjw ...@@ -84,6 +84,7 @@ namespace rjw
{ {
//--Log.Message("[RJW] JobGiver_JoinInBed( " + xxx.get_pawnname(pawn) + " ) called"); //--Log.Message("[RJW] JobGiver_JoinInBed( " + xxx.get_pawnname(pawn) + " ) called");
if (pawn.Drafted) return null;
if (!SexUtility.ReadyForLovin(pawn) && !xxx.is_frustrated(pawn)) return null; if (!SexUtility.ReadyForLovin(pawn) && !xxx.is_frustrated(pawn)) return null;
if (pawn.CurJob == null || pawn.CurJob.def == JobDefOf.LayDown) if (pawn.CurJob == null || pawn.CurJob.def == JobDefOf.LayDown)
......
...@@ -20,6 +20,8 @@ namespace rjw ...@@ -20,6 +20,8 @@ namespace rjw
//Log.Message("[RJW] JobGiver_RapeEnemy::TryGiveJob( " + xxx.get_pawnname(rapist) + " ) 1 " + Find.TickManager.TicksGame); //Log.Message("[RJW] JobGiver_RapeEnemy::TryGiveJob( " + xxx.get_pawnname(rapist) + " ) 1 " + Find.TickManager.TicksGame);
//Log.Message("[RJW] JobGiver_RapeEnemy::TryGiveJob( " + xxx.get_pawnname(rapist) + " ) 2 " + rapist.mindState.canLovinTick); //Log.Message("[RJW] JobGiver_RapeEnemy::TryGiveJob( " + xxx.get_pawnname(rapist) + " ) 2 " + rapist.mindState.canLovinTick);
if (rapist.Drafted) return null;
if (rapist.health.hediffSet.HasHediff(HediffDef.Named("Hediff_RapeEnemyCD")) || !rapist.health.capacities.CanBeAwake || !(SexUtility.ReadyForLovin(rapist) || xxx.need_some_sex(rapist) <= 1f)) if (rapist.health.hediffSet.HasHediff(HediffDef.Named("Hediff_RapeEnemyCD")) || !rapist.health.capacities.CanBeAwake || !(SexUtility.ReadyForLovin(rapist) || xxx.need_some_sex(rapist) <= 1f))
//if (rapist.health.hediffSet.HasHediff(HediffDef.Named("Hediff_RapeEnemyCD")) || !rapist.health.capacities.CanBeAwake || (SexUtility.ReadyForLovin(rapist) || xxx.is_human(rapist) ? xxx.need_some_sex(rapist) <= 1f : false)) //if (rapist.health.hediffSet.HasHediff(HediffDef.Named("Hediff_RapeEnemyCD")) || !rapist.health.capacities.CanBeAwake || (SexUtility.ReadyForLovin(rapist) || xxx.is_human(rapist) ? xxx.need_some_sex(rapist) <= 1f : false))
return null; return null;
......
...@@ -46,6 +46,8 @@ namespace rjw ...@@ -46,6 +46,8 @@ namespace rjw
// filter out necro for nymphs // filter out necro for nymphs
if (!RJWSettings.necrophilia_enabled) return null; if (!RJWSettings.necrophilia_enabled) return null;
if (rapist.Drafted) return null;
//--Log.Message("[RJW] JobGiver_ViolateCorpse::TryGiveJob for ( " + xxx.get_pawnname(rapist) + " )"); //--Log.Message("[RJW] JobGiver_ViolateCorpse::TryGiveJob for ( " + xxx.get_pawnname(rapist) + " )");
if (SexUtility.ReadyForLovin(rapist) || xxx.need_some_sex(rapist) > 1f) if (SexUtility.ReadyForLovin(rapist) || xxx.need_some_sex(rapist) > 1f)
{ {
......
...@@ -123,13 +123,16 @@ namespace rjw ...@@ -123,13 +123,16 @@ namespace rjw
if (!potentialClients.Any()) return null; if (!potentialClients.Any()) return null;
//Log.Message("[RJW] JobGiver_WhoreInvitingVisitors::FindAttractivePawn number of potential clients " + potentialClients.Count()); //Log.Message("[RJW] JobGiver_WhoreInvitingVisitors::FindAttractivePawn whore: " + xxx.get_pawnname(whore));
//Log.Message("[RJW] JobGiver_WhoreInvitingVisitors::FindAttractivePawn number of potential clients pass1 " + potentialClients.Count());
IEnumerable<Pawn> guestsSpawned = potentialClients.Where(x => x.Faction != whore.Faction IEnumerable<Pawn> guestsSpawned = potentialClients.Where(x => x.Faction != whore.Faction
&& WhoringHelper.CanAfford(x, whore, priceOfWhore) && WhoringHelper.CanAfford(x, whore, priceOfWhore)
&& !MemoryChecker(x, ThoughtDef.Named("RJWFailedSolicitation")) && !MemoryChecker(x, ThoughtDef.Named("RJWFailedSolicitation"))
&& x != LovePartnerRelationUtility.ExistingLovePartner(whore)); && x != LovePartnerRelationUtility.ExistingLovePartner(whore));
//Log.Message("[RJW] JobGiver_WhoreInvitingVisitors::FindAttractivePawn number of potential clients pass2 " + potentialClients.Count());
if (guestsSpawned.Any()) if (guestsSpawned.Any())
{ {
//Log.Message("[RJW] JobGiver_WhoreInvitingVisitors::FindAttractivePawn number of acceptable guests " + guestsSpawned.Count()); //Log.Message("[RJW] JobGiver_WhoreInvitingVisitors::FindAttractivePawn number of acceptable guests " + guestsSpawned.Count());
...@@ -159,10 +162,12 @@ namespace rjw ...@@ -159,10 +162,12 @@ namespace rjw
{ {
// Most things are now checked in the ThinkNode_ConditionalWhore. // Most things are now checked in the ThinkNode_ConditionalWhore.
if (pawn.Drafted) return null;
//Log.Message("[RJW] JobGiver_WhoreInvitingVisitors::TryGiveJob( " + xxx.get_pawnname(pawn) + " ) called"); //Log.Message("[RJW] JobGiver_WhoreInvitingVisitors::TryGiveJob( " + xxx.get_pawnname(pawn) + " ) called");
if (!SexUtility.ReadyForLovin(pawn)) if (!SexUtility.ReadyForLovin(pawn))
{ {
//Whores need rest too, but this'll redude the wait a bit every it triggers. //Whores need rest too, but this'll reduxe the wait a bit every it triggers.
pawn.mindState.canLovinTick -= 40; pawn.mindState.canLovinTick -= 40;
return null; return null;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment