AblativeAbsolute/privacy-please
1
0
Fork 0
mirror of https://gitgud.io/AbstractConcept/privacy-please.git synced 2024-08-15 00:03:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Revert "Bug fixes""

Browse source 
This reverts commit 127206926b.
This commit is contained in:
AbstractConcept 2022-11-05 23:14:02 -05:00
parent 127206926b
commit 599475390a
26 changed files with 519 additions and 469 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Source/Scripts/Patches/HarmonyPatch_RJW.cs
View file

@ -34,7 +34,7 @@ namespace Privacy_Please
ThoughtDef thoughtDef = null; // SexInteractionUtility.GetThoughtsAboutSexAct(other, __instance, out Precept precept);
// Find candidates to invite
if (other != null && thoughtDef?.hediff == null && SexInteractionUtility.CouldInvitePasserbyForSex(other, pawn.GetAllSexParticipants()))
if (other != null && thoughtDef?.hediff == null && SexInteractionUtility.PasserbyCanBePropositionedForSex(other, pawn.GetAllSexParticipants()))
{
DebugMode.Message(other.NameShortColored + " is a potential candidate");
candidates.Add(other);
@ -64,29 +64,8 @@ namespace Privacy_Please
{
if (pawn.IsHashIntervalTick(90))
{
if (pawn.IsMasturbating() && PrivacyUtility.PawnHasPrivacy(pawn, 8f) == false)
{ pawn.jobs.EndCurrentJob(JobCondition.InterruptForced, false, false); }
else if (pawn.IsHavingSex())
{
bool havePrivacy = true;
List<Pawn> participants = pawn.GetAllSexParticipants();
foreach (Pawn participant in participants)
{
if (PrivacyUtility.PawnHasPrivacy(participant, 8f) == false)
{ havePrivacy = false; }
}
if (__instance.Sexprops != null && (__instance.Sexprops.isRape || __instance.Sexprops.isWhoring))
{ return; }
if (havePrivacy == false)
{
foreach (Pawn participant in participants)
{ participant.jobs.EndCurrentJob(JobCondition.InterruptForced, false, false); }
}
}
if (pawn.IsMasturbating() || pawn.IsHavingSex())
{ PrivacyUtility.PrivacyCheckForPawn(pawn, 8f); }
}
}
}