Revert "Bug fixes"

This reverts commit a6a550af53.
This commit is contained in:
AbstractConcept 2022-11-05 23:04:23 -05:00
parent a6a550af53
commit 127206926b
26 changed files with 481 additions and 531 deletions

Binary file not shown.

Binary file not shown.

View File

@ -23,7 +23,7 @@
<defName>Exhibitionism_Acceptable</defName>
<issue>Exhibitionism</issue>
<label>acceptable</label>
<description>Having sex out in the open is normal and deserves no special attention.</description>
<description>Sex infront of others is normal and deserves no special attention.</description>
<impact>Low</impact>
<displayOrderInIssue>20</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact>
@ -34,7 +34,7 @@
<defName>Exhibitionism_Approved</defName>
<issue>Exhibitionism</issue>
<label>approved</label>
<description>Displays of physical intimacy are to be celebrated.</description>
<description>Physical intimacy is to be celebrated.</description>
<impact>Medium</impact>
<displayOrderInIssue>10</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact>

View File

@ -12,7 +12,7 @@
<defName>Infidelity_Heartbreaking</defName>
<issue>Infidelity</issue>
<label>heartbreaking</label>
<description>Infidelity is a betrayal that will not soon be forgiven or forgotten.</description>
<description>test</description>
<impact>Low</impact>
<displayOrderInIssue>30</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact>
@ -23,7 +23,7 @@
<defName>Infidelity_Disapproved</defName>
<issue>Infidelity</issue>
<label>disapproved</label>
<description>Cheating on a partner is considered disrespectful.</description>
<description>test</description>
<impact>Low</impact>
<displayOrderInIssue>20</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact>
@ -34,7 +34,7 @@
<defName>Infidelity_Acceptable</defName>
<issue>Infidelity</issue>
<label>acceptable</label>
<description>Physical intimacy is something that should be explored freely with others.</description>
<description>test</description>
<impact>Low</impact>
<displayOrderInIssue>10</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact>

View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<PreceptDef MayRequire="rjw.sexperience.ideology">
<defName>Masturbation_Acceptable</defName>
<issue>Masturbation</issue>
<label>acceptable</label>
<description>Masturbation is a normal, healthy activity.</description>
<impact>Low</impact>
<displayOrderInIssue>10</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact>
<defaultSelectionWeight>100</defaultSelectionWeight>
</PreceptDef>
</Defs>

View File

@ -1,126 +1,57 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<!-- Defs need to be listed is order of priority - they will be checked in this order -->
<Privacy_Please.SexActReactionDef>
<defName>reactionToNecrophilia</defName>
<issueDefName>Necrophilia</issueDefName>
<sexActCheck>SexActIsNecrophilia</sexActCheck>
<pawnReaction>
<defaultThoughtDef>PartookInNecrophilia_Disapproved</defaultThoughtDef>
<replacementThoughts>
<li>
<requiredTraits>
<li>Necrophiliac</li>
</requiredTraits>
<replacementThoughtDef>PartookInNecrophilia_Honorable</replacementThoughtDef>
</li>
</replacementThoughts>
</pawnReaction>
<Privacy_Please.SexActReactionDef>
<defName>reactionToExhibitionism</defName>
<issueDefName>Exhibitionism</issueDefName>
<sexActCheck>SexActIsExhibitionism</sexActCheck>
<witnessReaction>
<defaultThoughtDef>SawNecrophilia_Abhorrent</defaultThoughtDef>
<preceptThoughtDefs>
<li>SawNecrophilia_Abhorrent</li>
<li>SawNecrophilia_Horrible</li>
<li>SawNecrophilia_Disapproved</li>
<li>SawNecrophilia_Acceptable</li>
<li>SawNecrophilia_Honorable</li>
</preceptThoughtDefs>
<defaultThoughtDef>SawExhibitionism_Disapproved</defaultThoughtDef>
<associatedThoughtDefs>
<li>SawExhibitionism_Disapproved</li>
<li>SawExhibitionism_Acceptable</li>
<li>SawExhibitionism_Approved</li>
</associatedThoughtDefs>
<replacementThoughts>
<li>
<requiredTraits>
<li>Necrophiliac</li>
</requiredTraits>
<replacementThoughtDef>SawNecrophilia_Honorable</replacementThoughtDef>
<requiredQuirk>Voyeur</requiredQuirk>
<replacementThoughtDef>SawExhibitionism_Approved</replacementThoughtDef>
</li>
</replacementThoughts>
</witnessReaction>
</witnessReaction>
</Privacy_Please.SexActReactionDef>
<Privacy_Please.SexActReactionDef>
<defName>reactionToBestiality</defName>
<issueDefName>Bestiality</issueDefName>
<sexActCheck>SexActIsBestiality</sexActCheck>
<pawnReaction>
<defaultThoughtDef>PartookInBestiality_Disapproved</defaultThoughtDef>
<replacementThoughts>
<li>
<requiredTraits>
<li>Zoophile</li>
</requiredTraits>
<replacementThoughtDef>PartookInBestiality_Honorable</replacementThoughtDef>
</li>
</replacementThoughts>
</pawnReaction>
<Privacy_Please.SexActReactionDef>
<defName>reactionToMasturbation</defName>
<issueDefName>Masturbation</issueDefName>
<sexActCheck>SexActIsMasturbation</sexActCheck>
<witnessReaction>
<defaultThoughtDef>SawBestiality_Abhorrent</defaultThoughtDef>
<preceptThoughtDefs>
<li>SawBestiality_Abhorrent</li>
<li>SawBestiality_Horrible</li>
<li>SawBestiality_Disapproved</li>
<li>SawBestiality_Acceptable</li>
<li>SawBestiality_Honorable</li>
</preceptThoughtDefs>
<defaultThoughtDef>SawMasturbation_Disapproved</defaultThoughtDef>
<associatedThoughtDefs>
<li>SawMasturbation_Abhorrent</li>
<li>SawMasturbation_Disapproved</li>
<li>SawMasturbation_Acceptable</li>
</associatedThoughtDefs>
<replacementThoughts>
<li>
<requiredTraits>
<li>Zoophile</li>
</requiredTraits>
<replacementThoughtDef>SawBestiality_Honorable</replacementThoughtDef>
<requiredQuirk>Voyeur</requiredQuirk>
<replacementThoughtDef>SawMasturbation_Approved</replacementThoughtDef>
</li>
</replacementThoughts>
</witnessReaction>
</Privacy_Please.SexActReactionDef>
<Privacy_Please.SexActReactionDef>
<defName>reactionToRape</defName>
<issueDefName>Rape</issueDefName>
<sexActCheck>SexActIsRape</sexActCheck>
<pawnReaction>
<defaultThoughtDef>PartookInRape_Disapproved</defaultThoughtDef>
<replacementThoughts>
<li>
<requiredTraits>
<li>Rapist</li>
</requiredTraits>
<replacementThoughtDef>PartookInRape_Honorable</replacementThoughtDef>
</li>
</replacementThoughts>
</pawnReaction>
<witnessReaction>
<defaultThoughtDef>SawRape_Abhorrent</defaultThoughtDef>
<preceptThoughtDefs>
<li>SawRape_Abhorrent</li>
<li>SawRape_Horrible</li>
<li>SawRape_Disapproved</li>
<li>SawRape_Acceptable</li>
<li>SawRape_Honorable</li>
</preceptThoughtDefs>
<replacementThoughts>
<li>
<requiredTraits>
<li>Rapist</li>
</requiredTraits>
<replacementThoughtDef>SawRape_Honorable</replacementThoughtDef>
</li>
</replacementThoughts>
</witnessReaction>
</witnessReaction>
</Privacy_Please.SexActReactionDef>
<Privacy_Please.SexActReactionDef>
<defName>reactionToInfidelity</defName>
<issueDefName>Infidelity</issueDefName>
<sexActCheck>SexActIsInfidelity</sexActCheck>
<pawnReaction>
<defaultThoughtDef>PartookInInfidelity_Disapproved</defaultThoughtDef>
</pawnReaction>
<witnessReaction>
<defaultThoughtDef>SawInfidelity_Heartbreaking</defaultThoughtDef>
<preceptThoughtDefs>
<associatedThoughtDefs>
<li>SawInfidelity_Heartbreaking</li>
<li>SawInfidelity_Disapproved</li>
<li>SawInfidelity_Acceptable</li>
</preceptThoughtDefs>
</associatedThoughtDefs>
<replacementThoughts>
<li>
<requiredQuirk>Cuckold</requiredQuirk>
@ -134,32 +65,15 @@
<defName>reactionToXenophilia</defName>
<issueDefName>HAR_AlienDating</issueDefName>
<sexActCheck>SexActIsRape</sexActCheck>
<pawnReaction>
<defaultThoughtDef>PartookInHAR_AlienDating_Acceptable</defaultThoughtDef>
<replacementThoughts>
<li>
<requiredTraits>
<Xenophobia>1</Xenophobia>
</requiredTraits>
<replacementThoughtDef>PartookInHAR_AlienDating_Prohibited</replacementThoughtDef>
</li>
<li>
<requiredTraits>
<Xenophobia>-1</Xenophobia>
</requiredTraits>
<replacementThoughtDef>PartookInHAR_AlienDating_Know_Honorable</replacementThoughtDef>
</li>
</replacementThoughts>
</pawnReaction>
<witnessReaction>
<defaultThoughtDef>SawHAR_AlienDating_Acceptable</defaultThoughtDef>
<preceptThoughtDefs>
<associatedThoughtDefs>
<li>SawHAR_AlienDating_Prohibited</li>
<li>SawHAR_AlienDating_Horrible</li>
<li>SawHAR_AlienDating_Acceptable</li>
<li>SawHAR_AlienDating_Preferred</li>
<li>SawHAR_AlienDating_Know_Honorable</li>
</preceptThoughtDefs>
</associatedThoughtDefs>
<replacementThoughts>
<li>
<requiredTraits>
@ -176,81 +90,77 @@
</replacementThoughts>
</witnessReaction>
</Privacy_Please.SexActReactionDef>
<Privacy_Please.SexActReactionDef>
<defName>reactionToMasturbation</defName>
<issueDefName>Masturbation</issueDefName>
<sexActCheck>SexActIsMasturbation</sexActCheck>
<pawnReaction>
<defaultThoughtDef>PartookInMasturbation_Disapproved</defaultThoughtDef>
<preceptThoughtDefs>
<li>PartookInMasturbation_Abhorrent</li>
<li>PartookInMasturbation_Disapproved</li>
<li>PartookInMasturbation_Acceptable</li>
</preceptThoughtDefs>
<replacementThoughts>
<li>
<preceptThoughtDefs>Exhibitionism_Approved</preceptThoughtDefs>
<replacementThoughtDef>PartookInMasturbation_Exhibitionism_Approved</replacementThoughtDef>
</li>
<li>
<preceptThoughtDefs>Exhibitionism_Acceptable</preceptThoughtDefs>
<replacementThoughtDef>PartookInMasturbation_Exhibitionism_Acceptable</replacementThoughtDef>
</li>
<li>
<requiredQuirk>Exhibitionist</requiredQuirk>
<replacementThoughtDef>PartookInMasturbation_Approved</replacementThoughtDef>
</li>
</replacementThoughts>
</pawnReaction>
<Privacy_Please.SexActReactionDef>
<defName>reactionToBestiality</defName>
<issueDefName>Bestiality</issueDefName>
<sexActCheck>SexActIsBestiality</sexActCheck>
<witnessReaction>
<defaultThoughtDef>SawMasturbation_Disapproved</defaultThoughtDef>
<preceptThoughtDefs>
<li>SawMasturbation_Abhorrent</li>
<li>SawMasturbation_Disapproved</li>
<li>SawMasturbation_Acceptable</li>
</preceptThoughtDefs>
<defaultThoughtDef>SawBestiality_Abhorrent</defaultThoughtDef>
<associatedThoughtDefs>
<li>SawBestiality_Abhorrent</li>
<li>SawBestiality_Horrible</li>
<li>SawBestiality_Disapproved</li>
<li>SawBestiality_Acceptable</li>
<li>SawBestiality_Honorable</li>
</associatedThoughtDefs>
<replacementThoughts>
<li>
<requiredQuirk>Voyeur</requiredQuirk>
<replacementThoughtDef>SawMasturbation_Approved</replacementThoughtDef>
<requiredTraits>
<li>Zoophile</li>
</requiredTraits>
<replacementThoughtDef>SawBestiality_Honorable</replacementThoughtDef>
</li>
</replacementThoughts>
</witnessReaction>
</witnessReaction>
</Privacy_Please.SexActReactionDef>
<Privacy_Please.SexActReactionDef>
<defName>reactionToExhibitionism</defName>
<issueDefName>Exhibitionism</issueDefName>
<sexActCheck>SexActIsExhibitionism</sexActCheck>
<pawnReaction>
<defaultThoughtDef>PartookInExhibitionism_Disapproved</defaultThoughtDef>
<preceptThoughtDefs>
<li>PartookInExhibitionism_Disapproved</li>
<li>PartookInExhibitionism_Acceptable</li>
<li>PartookInExhibitionism_Approved</li>
</preceptThoughtDefs>
<replacementThoughts>
<li>
<requiredQuirk>Exhibitionist</requiredQuirk>
<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
</li>
</replacementThoughts>
</pawnReaction>
<Privacy_Please.SexActReactionDef>
<defName>reactionToNecrophilia</defName>
<issueDefName>Necrophilia</issueDefName>
<sexActCheck>SexActIsNecrophilia</sexActCheck>
<witnessReaction>
<defaultThoughtDef>SawExhibitionism_Disapproved</defaultThoughtDef>
<preceptThoughtDefs>
<li>SawExhibitionism_Disapproved</li>
<li>SawExhibitionism_Acceptable</li>
<li>SawExhibitionism_Approved</li>
</preceptThoughtDefs>
<defaultThoughtDef>SawNecrophilia_Abhorrent</defaultThoughtDef>
<associatedThoughtDefs>
<li>SawNecrophilia_Abhorrent</li>
<li>SawNecrophilia_Horrible</li>
<li>SawNecrophilia_Disapproved</li>
<li>SawNecrophilia_Acceptable</li>
<li>SawNecrophilia_Honorable</li>
</associatedThoughtDefs>
<replacementThoughts>
<li>
<requiredQuirk>Voyeur</requiredQuirk>
<replacementThoughtDef>SawExhibitionism_Approved</replacementThoughtDef>
<requiredTraits>
<li>Necrophiliac</li>
</requiredTraits>
<replacementThoughtDef>SawNecrophilia_Honorable</replacementThoughtDef>
</li>
</replacementThoughts>
</witnessReaction>
</witnessReaction>
</Privacy_Please.SexActReactionDef>
<Privacy_Please.SexActReactionDef>
<defName>reactionToRape</defName>
<issueDefName>Rape</issueDefName>
<sexActCheck>SexActIsRape</sexActCheck>
<witnessReaction>
<defaultThoughtDef>SawRape_Abhorrent</defaultThoughtDef>
<associatedThoughtDefs>
<li>SawRape_Abhorrent</li>
<li>SawRape_Horrible</li>
<li>SawRape_Disapproved</li>
<li>SawRape_Acceptable</li>
<li>SawRape_Honorable</li>
</associatedThoughtDefs>
<replacementThoughts>
<li>
<requiredTraits>
<li>Rapist</li>
</requiredTraits>
<replacementThoughtDef>SawRape_Honorable</replacementThoughtDef>
</li>
</replacementThoughts>
</witnessReaction>
</Privacy_Please.SexActReactionDef>
</Defs>

View File

@ -2,9 +2,138 @@
<Defs>
<ThoughtDef>
<defName>SeenMasturbating</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>3</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>was caught masturbatin'</label>
<description>I'm so embarrassed!</description>
<baseMoodEffect>-12</baseMoodEffect>
</li>
</stages>
<nullifyingPrecepts>
<li>Exhibitionism_Acceptable</li>
<li>Exhibitionism_Approved</li>
</nullifyingPrecepts>
</ThoughtDef>
<ThoughtDef>
<defName>SeenHavingSex</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>3</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>was caught lovin'</label>
<description>Well, that was awkward!</description>
<baseMoodEffect>-8</baseMoodEffect>
</li>
</stages>
<nullifyingPrecepts>
<li>Exhibitionism_Acceptable</li>
<li>Exhibitionism_Approved</li>
</nullifyingPrecepts>
</ThoughtDef>
<ThoughtDef>
<defName>SeenMasturbatingExhibitionist</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stages>
<li>
<label>exhibitionist caught masturbatin'</label>
<description>It's OK, come and have a closer look...</description>
<baseMoodEffect>4</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
<ThoughtDef>
<defName>SeenHavingSexExhibitionist</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stages>
<li>
<label>exhibitionist caught lovin'</label>
<description>Heheh, hope they enjoyed the show!</description>
<baseMoodEffect>6</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
<ThoughtDef>
<defName>SawMasturbation</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>saw someone masturbatin'</label>
<description>Argh! I'm so sorry!</description>
<baseMoodEffect>-6</baseMoodEffect>
</li>
</stages>
<nullifyingPrecepts>
<li>Exhibitionism_Acceptable</li>
<li>Exhibitionism_Approved</li>
</nullifyingPrecepts>
</ThoughtDef>
<ThoughtDef>
<defName>SawSex</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>saw someone lovin'</label>
<description>Jeez! Get a room!</description>
<baseMoodEffect>-4</baseMoodEffect>
</li>
</stages>
<nullifyingPrecepts>
<li>Exhibitionism_Acceptable</li>
<li>Exhibitionism_Approved</li>
</nullifyingPrecepts>
</ThoughtDef>
<ThoughtDef>
<defName>SawMasturbationVoyeur</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stages>
<li>
<label>voyeur saw some masturbatin'</label>
<description>I think that awoke something in me...</description>
<baseMoodEffect>4</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
<ThoughtDef>
<defName>SawSexVoyeur</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stages>
<li>
<label>voyeur saw some lovin'</label>
<description>Damn. So hot!</description>
<baseMoodEffect>6</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
<ThoughtDef>
<defName>CaughtCheating</defName>
<thoughtClass>Thought_Memory</thoughtClass>
@ -20,6 +149,64 @@
</stages>
</ThoughtDef>
<ThoughtDef>
<defName>SeenCommittingTaboo</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>2.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>caught committing a taboo</label>
<description>I'm so ashamed.</description>
<baseMoodEffect>-15</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
<ThoughtDef>
<defName>SeenCommittingMajorTaboo</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>3.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>caught committing a major taboo</label>
<description>How can I face the world after this?</description>
<baseMoodEffect>-20</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
<ThoughtDef>
<defName>SawTaboo</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>2.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>witnessed a taboo</label>
<description>What vile degeneracy!</description>
<baseMoodEffect>-10</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
<ThoughtDef>
<defName>SawMajorTaboo</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>3.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>witnessed a major taboo</label>
<description>Disgusting vermin! You'll get yours!</description>
<baseMoodEffect>-15</baseMoodEffect>
</li>
</stages>
</ThoughtDef>
</Defs>

View File

@ -17,7 +17,7 @@
<nullifyingTraits>
<li>Zoophile</li>
</nullifyingTraits>
<reactionToSexDiscovery>Outrage</reactionToSexDiscovery>
<reactionToSexAct>Outrage</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -35,7 +35,7 @@
<nullifyingTraits>
<li>Zoophile</li>
</nullifyingTraits>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
<reactionToSexAct>Discomfort</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -53,7 +53,7 @@
<nullifyingTraits>
<li>Zoophile</li>
</nullifyingTraits>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
<reactionToSexAct>Discomfort</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -71,7 +71,7 @@
<nullifyingTraits>
<li>Zoophile</li>
</nullifyingTraits>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
<reactionToSexAct>Acceptance</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -86,7 +86,7 @@
<baseMoodEffect>+2</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
<reactionToSexAct>Approval</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
</Defs>

View File

@ -1,56 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<!-- Pawn thoughts -->
<Privacy_Please.SexActThoughtDef>
<defName>PartookInExhibitionism_Disapproved</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>caught lovin'</label>
<description>That was soooo awkward!</description>
<baseMoodEffect>-8</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>PartookInExhibitionism_Acceptable</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>caught lovin'</label>
<description>Eh, it's no big deal.</description>
<baseMoodEffect>0</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>PartookInExhibitionism_Approved</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>exhibitionist caught lovin'</label>
<description>Mmm, enjoying the show?</description>
<baseMoodEffect>6</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<!-- Witness thoughts -->
<Privacy_Please.SexActThoughtDef>
<defName>SawExhibitionism_Disapproved</defName>
<thoughtClass>Thought_Memory</thoughtClass>
@ -60,11 +11,11 @@
<stages>
<li>
<label>walked in on some lovin'</label>
<description>Jeez! Get a room!</description>
<description>test</description>
<baseMoodEffect>-4</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
<reactionToSexAct>Discomfort</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -76,11 +27,11 @@
<stages>
<li>
<label>passed by some lovin'</label>
<description>Don't mind me, just passing through.</description>
<description>test</description>
<baseMoodEffect>0</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
<reactionToSexAct>Acceptance</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -92,11 +43,11 @@
<stages>
<li>
<label>observed some lovin'</label>
<description>Damn, that's hot!</description>
<baseMoodEffect>3</baseMoodEffect>
<description>test</description>
<baseMoodEffect>2</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
<reactionToSexAct>Approval</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
</Defs>

View File

@ -2,96 +2,42 @@
<Defs>
<!-- Pawn thoughts -->
<Privacy_Please.SexActThoughtDef>
<defName>PartookInInfidelity_Heartbreaking</defName>
<durationDays>3</durationDays>
<stackLimit>3</stackLimit>
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label>Caught cheating</label>
<description>{1}, I'm so sorry. Please, forgive me...</description>
<baseMoodEffect>-20</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>PartookInInfidelity_Disapproved</defName>
<durationDays>3</durationDays>
<stackLimit>3</stackLimit>
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label>Caught cheating</label>
<description>Sorry, {1}. Please don't be too mad?</description>
<baseMoodEffect>-10</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>PartookInInfidelity_Acceptable</defName>
<durationDays>3</durationDays>
<stackLimit>3</stackLimit>
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label>Caught cheating</label>
<description></description>
<baseMoodEffect>Oh hey babe, you wanna join us?</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>PartookInInfidelity_Approved</defName>
<durationDays>3</durationDays>
<stackLimit>3</stackLimit>
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label>Cluckold</label>
<description></description>
<baseMoodEffect></baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<!-- Witness thoughts -->
<Privacy_Please.SexActThoughtDef>
<defName>SawInfidelity_Heartbreaking</defName>
<durationDays>3</durationDays>
<stackLimit>3</stackLimit>
<hediff>Indignant</hediff>
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label></label>
<label>horrified by xenophilia</label>
<description>Filthy degenerates!</description>
<baseMoodEffect>-20</baseMoodEffect>
<baseMoodEffect>-15</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Outrage</reactionToSexDiscovery>
<nullifyingTraitDegrees>
<Xenophobia>-1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexAct>Outrage</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>SawInfidelity_Disapproved</defName>
<durationDays>3</durationDays>
<stackLimit>3</stackLimit>
<hediff>Disquiet</hediff>
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label></label>
<description></description>
<label>disturbed by xenophilia</label>
<description>Oh! That's not right...</description>
<baseMoodEffect>-10</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
<nullifyingTraitDegrees>
<Xenophobia>-1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexAct>Discomfort</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -101,12 +47,15 @@
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label></label>
<description></description>
<baseMoodEffect>-5</baseMoodEffect>
<label>saw xenophilia</label>
<description>Oops, sorry about walking in on you!</description>
<baseMoodEffect>-4</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
<nullifyingTraitDegrees>
<Xenophobia>1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexAct>Acceptance</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -116,12 +65,15 @@
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label></label>
<description></description>
<baseMoodEffect></baseMoodEffect>
<label>noticed xenophilia</label>
<description>I wonder what their kids would look like?</description>
<baseMoodEffect>+1</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
<nullifyingTraitDegrees>
<Xenophobia>1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexAct>Approval</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
</Defs>

View File

@ -2,132 +2,68 @@
<Defs>
<!-- Pawn thoughts -->
<Privacy_Please.SexActThoughtDef>
<defName>PartookInMasturbation_Abhorrent</defName>
<durationDays>3</durationDays>
<stackLimit>3</stackLimit>
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label>caught masturbatin'</label>
<description>I'm disgusted with myself.</description>
<baseMoodEffect>-15</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>PartookInMasturbation_Disapproved</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>caught masturbatin'</label>
<description>I feel nothing but shame.</description>
<baseMoodEffect>-5</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>PartookInMasturbation_Acceptable</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>caught masturbatin'</label>
<description>That was a little humiliating.</description>
<baseMoodEffect>-5</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>PartookInMasturbation_Approved</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>exhibitionist caught masturbatin'</label>
<description>Come closer, that a good look!</description>
<baseMoodEffect>-5</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<!-- Witness thoughts -->
<Privacy_Please.SexActThoughtDef>
<defName>SawMasturbation_Abhorrent</defName>
<durationDays>3</durationDays>
<stackLimit>3</stackLimit>
<hediff>Indignant</hediff>
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label>disgusted by masturbatin'</label>
<description>You'll go blind if up keep that up!</description>
<description>You'll go blind you know!</description>
<baseMoodEffect>-15</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Outrage</reactionToSexDiscovery>
<reactionToSexAct>Outrage</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>SawMasturbation_Disapproved</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>3</durationDays>
<stackLimit>3</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>shocked by masturbatin'</label>
<description>Argh! I'm so sorry!</description>
<baseMoodEffect>-10</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>SawMasturbation_Acceptable</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1</durationDays>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>saw someone masturbatin'</label>
<description>Well, that was embarrassing.</description>
<description>Argh! I'm so sorry!</description>
<baseMoodEffect>-5</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
<reactionToSexAct>Discomfort</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>SawMasturbation_Acceptable</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>saw someone masturbatin'</label>
<description>Argh! I'm so sorry!</description>
<baseMoodEffect>-5</baseMoodEffect>
</li>
</stages>
<reactionToSexAct>Acceptance</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>SawMasturbation_Approved</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1</durationDays>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>voyeur saw masturbatin'</label>
<description>I think that awoke something in me...</description>
<baseMoodEffect>3</baseMoodEffect>
<label>saw someone masturbatin'</label>
<description>Argh! I'm so sorry!</description>
<baseMoodEffect>-5</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
<reactionToSexAct>Approval</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
</Defs>

View File

@ -17,7 +17,7 @@
<nullifyingTraits>
<li>Necrophiliac</li>
</nullifyingTraits>
<reactionToSexDiscovery>Outrage</reactionToSexDiscovery>
<reactionToSexAct>Outrage</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -35,7 +35,7 @@
<nullifyingTraits>
<li>Necrophiliac</li>
</nullifyingTraits>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
<reactionToSexAct>Discomfort</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -53,7 +53,7 @@
<nullifyingTraits>
<li>Necrophiliac</li>
</nullifyingTraits>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
<reactionToSexAct>Discomfort</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -71,7 +71,7 @@
<nullifyingTraits>
<li>Necrophiliac</li>
</nullifyingTraits>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
<reactionToSexAct>Acceptance</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -86,7 +86,7 @@
<baseMoodEffect>+2</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
<reactionToSexAct>Approval</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
</Defs>

View File

@ -17,7 +17,7 @@
<nullifyingTraits>
<li>Rapist</li>
</nullifyingTraits>
<reactionToSexDiscovery>Outrage</reactionToSexDiscovery>
<reactionToSexAct>Outrage</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -35,7 +35,7 @@
<nullifyingTraits>
<li>Rapist</li>
</nullifyingTraits>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
<reactionToSexAct>Discomfort</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -53,7 +53,7 @@
<nullifyingTraits>
<li>Rapist</li>
</nullifyingTraits>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
<reactionToSexAct>Discomfort</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -71,7 +71,7 @@
<nullifyingTraits>
<li>Rapist</li>
</nullifyingTraits>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
<reactionToSexAct>Acceptance</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -86,7 +86,7 @@
<baseMoodEffect>+2</baseMoodEffect>
</li>
</stages>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
<reactionToSexAct>Approval</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
</Defs>

View File

@ -18,7 +18,7 @@
<nullifyingTraitDegrees>
<Xenophobia>-1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexDiscovery>Outrage</reactionToSexDiscovery>
<reactionToSexAct>Outrage</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -37,7 +37,7 @@
<nullifyingTraitDegrees>
<Xenophobia>-1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
<reactionToSexAct>Discomfort</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -55,7 +55,7 @@
<nullifyingTraitDegrees>
<Xenophobia>1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
<reactionToSexAct>Acceptance</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -73,7 +73,7 @@
<nullifyingTraitDegrees>
<Xenophobia>1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
<reactionToSexAct>Approval</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -91,7 +91,7 @@
<nullifyingTraitDegrees>
<Xenophobia>1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
<reactionToSexAct>Approval</reactionToSexAct>
</Privacy_Please.SexActThoughtDef>
</Defs>

Binary file not shown.

View File

@ -33,7 +33,7 @@ namespace Privacy_Please
public class SubSexActReactionDef
{
public SexActThoughtDef defaultThoughtDef;
public List<SexActThoughtDef> preceptThoughtDefs;
public List<SexActThoughtDef> associatedThoughtDefs;
public List<ReplacementThought> replacementThoughts;
}
@ -41,20 +41,21 @@ namespace Privacy_Please
{
public List<TraitRequirement> requiredTraits;
public string requiredQuirk;
public PreceptDef requiredPreceptDef;
public SexActThoughtDef replacementThoughtDef;
}
public void DetermineReactionOfPawns(Pawn pawn, Pawn witness, out ReactionToSexDiscovery reactionOfPawn, out ReactionToSexDiscovery reactionOfWitness, bool applyThoughtDefs)
public ReactionToSexAct DetermineReactionOfPawns(Pawn pawn, Pawn witness, bool applyThoughtDefs)
{
reactionOfPawn = DetermineReaction(pawn, witness, pawnReaction, applyThoughtDefs);
reactionOfWitness = DetermineReaction(witness, pawn, witnessReaction, applyThoughtDefs);
DetermineReactionOfPawn(pawn, witness, pawnReaction, applyThoughtDefs);
ReactionToSexAct reactionToSexAct = DetermineReactionOfPawn(witness, pawn, witnessReaction, applyThoughtDefs);
return reactionToSexAct;
}
public ReactionToSexDiscovery DetermineReaction(Pawn reactor, Pawn otherPawn, SubSexActReactionDef reaction, bool applyThoughtDef)
public ReactionToSexAct DetermineReactionOfPawn(Pawn reactor, Pawn otherPawn, SubSexActReactionDef reaction, bool applyThoughtDef)
{
SexActThoughtDef thoughtDef = GetThoughtDefForReactor(reactor, reaction, out Precept precept);
ReactionToSexDiscovery reactionToSexAct = thoughtDef.reactionToSexDiscovery;
ReactionToSexAct reactionToSexAct = thoughtDef.reactionToSexAct;
if (applyThoughtDef)
{ reactor.needs.mood.thoughts.memories.TryGainMemory(thoughtDef, otherPawn, precept); }
@ -82,22 +83,16 @@ namespace Privacy_Please
if (replacementThought.requiredQuirk != null && xxx.has_quirk(reactor, replacementThought.requiredQuirk))
{ return replacementThought.replacementThoughtDef; }
if (replacementThought.requiredPreceptDef != null && reactor.ideo.Ideo.HasPrecept(replacementThought.requiredPreceptDef))
{
precept = reactor.ideo.Ideo.GetPrecept(replacementThought.requiredPreceptDef);
return replacementThought.replacementThoughtDef;
}
}
}
precept = reactor.GetPreceptForIssue(issueDef);
if (precept != null && reaction.preceptThoughtDefs.NullOrEmpty() == false)
if (precept != null && reaction.associatedThoughtDefs.NullOrEmpty() == false)
{
string thoughtDefName = precept.def.defName;
foreach (SexActThoughtDef associatedThoughtDef in reaction.preceptThoughtDefs)
foreach (SexActThoughtDef associatedThoughtDef in reaction.associatedThoughtDefs)
{
if (associatedThoughtDef.defName.Contains(thoughtDefName))
{ return associatedThoughtDef; }

View File

@ -9,6 +9,6 @@ namespace Privacy_Please
{
public class SexActThoughtDef : ThoughtDef
{
public ReactionToSexDiscovery reactionToSexDiscovery = ReactionToSexDiscovery.Acceptance;
public ReactionToSexAct reactionToSexAct = ReactionToSexAct.Acceptance;
}
}

View File

@ -19,9 +19,15 @@ namespace Privacy_Please
return bed != null;
}
public static bool IsSeated(this Pawn pawn, out Building seat)
{
seat = pawn.Position.GetThingList(pawn.Map).FirstOrDefault(x => x is Building && x.def.building.isSittable) as Building;
return seat != null;
}
public static bool IsHavingSex(this Pawn pawn)
{
if (pawn?.jobs?.curDriver == null || pawn.jobs.curDriver is JobDriver_Sex == false)
if (pawn?.jobs?.curDriver == null || pawn.Dead || pawn.jobs.curDriver is JobDriver_Sex == false)
{ return false; }
JobDriver_Sex jobdriver = pawn.jobs.curDriver as JobDriver_Sex;
@ -31,7 +37,7 @@ namespace Privacy_Please
public static bool IsMasturbating(this Pawn pawn)
{
if (pawn?.jobs?.curDriver == null || pawn.jobs.curDriver is JobDriver_Sex == false)
if (pawn?.jobs?.curDriver == null || pawn.Dead || pawn.jobs.curDriver is JobDriver_Sex == false)
{ return false; }
JobDriver_Sex jobdriver = pawn.jobs.curDriver as JobDriver_Sex;
@ -41,12 +47,12 @@ namespace Privacy_Please
public static Pawn GetSexInitiator(this Pawn pawn)
{
if (pawn?.jobs?.curDriver != null && pawn.jobs.curDriver is JobDriver_SexBaseInitiator)
if (pawn?.jobs?.curDriver != null && pawn.Dead == false && pawn.jobs.curDriver is JobDriver_SexBaseInitiator)
{ return pawn; }
JobDriver_SexBaseReciever jobDriver = pawn.jobs.curDriver as JobDriver_SexBaseReciever;
if (jobDriver?.Partner?.jobs?.curDriver != null && jobDriver.Partner.jobs.curDriver is JobDriver_SexBaseInitiator)
if (jobDriver?.Partner?.jobs?.curDriver != null && jobDriver.Partner.Dead == false && jobDriver.Partner.jobs.curDriver is JobDriver_SexBaseInitiator)
{ return jobDriver.Partner; }
return null;
@ -59,7 +65,7 @@ namespace Privacy_Please
JobDriver_SexBaseInitiator jobDriver = pawn.jobs.curDriver as JobDriver_SexBaseInitiator;
if (jobDriver?.Partner?.jobs?.curDriver != null && jobDriver.Partner.jobs.curDriver is JobDriver_SexBaseReciever)
if (jobDriver?.Partner?.jobs?.curDriver != null && jobDriver.Partner.Dead == false && jobDriver.Partner.jobs.curDriver is JobDriver_SexBaseReciever)
{ return jobDriver.Partner; }
return null;
@ -113,6 +119,11 @@ namespace Privacy_Please
return lovers.Any(x => x.otherPawn == other);
}
//public static bool GetThoughtOnIssue(this Pawn pawn, string issueDefName, out Precept precept)
//{
//}
public static Precept GetPreceptForIssue(this Pawn pawn, IssueDef issueDef)
{
if (issueDef == null || pawn?.Ideo == null)
@ -153,27 +164,16 @@ namespace Privacy_Please
public static bool IsUnfazedBySex(this Pawn pawn)
{
if (IsUnableToSenseSex(pawn))
{ return true; }
if (pawn.AnimalOrWildMan() || pawn.RaceProps.IsMechanoid)
if (pawn.Dead ||
pawn.AnimalOrWildMan() ||
pawn.RaceProps.IsMechanoid ||
pawn.Awake() == false ||
pawn.Suspended)
{ return true; }
if (BasicSettings.slavesIgnoreSex && (pawn.IsPrisoner || pawn.IsSlave)) return true;
if (BasicSettings.otherFactionsIgnoreSex && pawn.Faction.IsPlayer == false) return true;
if (pawn.Faction.HostileTo(Faction.OfPlayer)) return true;
if (pawn.Drafted == false && pawn.mindState?.duty?.def?.alwaysShowWeapon == true) return true;
return false;
}
public static bool IsUnableToSenseSex(this Pawn pawn)
{
if (pawn.Dead ||
pawn.Awake() == false ||
pawn.Suspended ||
pawn.MentalState != null)
{ return true; }
return false;
}

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.PasserbyCanBePropositionedForSex(other, pawn.GetAllSexParticipants()))
if (other != null && thoughtDef?.hediff == null && SexInteractionUtility.CouldInvitePasserbyForSex(other, pawn.GetAllSexParticipants()))
{
DebugMode.Message(other.NameShortColored + " is a potential candidate");
candidates.Add(other);
@ -64,8 +64,29 @@ namespace Privacy_Please
{
if (pawn.IsHashIntervalTick(90))
{
if (pawn.IsMasturbating() || pawn.IsHavingSex())
{ PrivacyUtility.PrivacyCheckForPawn(pawn, 8f); }
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); }
}
}
}
}
}

View File

@ -24,8 +24,8 @@ namespace Privacy_Please
public static bool majorTabooCanStartFights = false;
public static bool ignoreRitualAndPartySex = true;
public static bool slavesIgnoreSex = false;
public static bool ignoreSlaveRape = false;
public static bool otherFactionsIgnoreSex = false;
public static bool whoringIsUninteruptable = true;
public static bool underwearSufficentForIdeos = true;
public static bool exposedUnderwearMood = true;
@ -44,6 +44,7 @@ namespace Privacy_Please
Scribe_Values.Look(ref worryAboutXeno, "worryAboutXeno", true);
Scribe_Values.Look(ref worryAboutMasturbation, "worryAboutMasturbation", true);
Scribe_Values.Look(ref worryAboutIncest, "worryAboutIncest", true);
Scribe_Values.Look(ref ignoreSlaveRape, "ignoreSlaveRape", false);
Scribe_Values.Look(ref majorTabooCanStartFights, "majorTabooCanStartFights", false);
Scribe_Values.Look(ref ignoreRitualAndPartySex, "ignoreRitualAndPartySex", false);
Scribe_Values.Look(ref slavesIgnoreSex, "slavesIgnoreSex", false);
@ -98,6 +99,10 @@ namespace Privacy_Please
listingStandard.CheckboxLabeled("worry_about_infidelity".Translate(), ref BasicSettings.worryAboutInfidelity, "worry_about_infidelity_desc".Translate());
listingStandard.CheckboxLabeled("worry_about_beastiality".Translate(), ref BasicSettings.worryAboutBeastiality, "worry_about_beastiality_desc".Translate());
listingStandard.CheckboxLabeled("worry_about_rape".Translate(), ref BasicSettings.worryAboutRape, "worry_about_rape_desc".Translate());
if (BasicSettings.worryAboutRape)
{ listingStandard.CheckboxLabeled("ignore_slave_rape".Translate(), ref BasicSettings.ignoreSlaveRape); }
listingStandard.CheckboxLabeled("worry_about_necro".Translate(), ref BasicSettings.worryAboutNecro, "worry_about_necro_desc".Translate());
listingStandard.CheckboxLabeled("worry_about_xeno".Translate(), ref BasicSettings.worryAboutXeno, "worry_about_xeno_desc".Translate());

View File

@ -1,13 +1,10 @@
namespace Privacy_Please
{
public enum ReactionToSexDiscovery
public enum ReactionToSexAct
{
Approval = 1,
Acceptance = 0,
Discomfort = -1,
Outrage = -2,
Panick = -3,
Nauseated = -3,
Random = -99,
}
}

View File

@ -1,8 +1,8 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
using RimWorld;
using Verse;
using Verse.AI;
@ -13,16 +13,18 @@ namespace Privacy_Please
{
public static class PrivacyUtility
{
public static void PrivacyCheckForPawn(Pawn pawn, float radius)
public static bool PawnHasPrivacy(Pawn pawn, float radius)
{
//if (pawn.IsUnfazedBySex())
//{ return true; }
if (pawn.IsHavingSex() == false && pawn.IsMasturbating() == false)
{ return; }
{ return true; }
if (BasicSettings.ignoreRitualAndPartySex && pawn.IsPartOfRitualOrGathering())
{ return; }
//if (pawn.GetLord() != null && (pawn.GetLord().LordJob is LordJob_Ritual || pawn.GetLord().LordJob is LordJob_Joinable_Party) && BasicSettings.ignoreRitualAndPartySex)
//{ return true; }
// Local variables
JobDriver_Sex jobDriver = pawn.jobs.curDriver as JobDriver_Sex;
bool hasPrivacy = true;
pawn.IsInBed(out Building bed);
foreach (Thing thing in GenRadial.RadialDistinctThingsAround(pawn.Position, pawn.Map, radius, true))
@ -33,21 +35,18 @@ namespace Privacy_Please
// Caught having sex
if (SexInteractionUtility.PawnCaughtLovinByWitness(pawn, witness))
{
// Get the pawn's and witness' reaction to the discovery
SexInteractionUtility.GetReactionsToSexDiscovery(jobDriver, witness, out ReactionToSexDiscovery reactionOfPawn, out ReactionToSexDiscovery reactionOfWitness, true);
bool tryToPropositionTheWitness = Random.value < BasicSettings.chanceForOtherToJoinInSex && SexInteractionUtility.PasserbyCanBePropositionedForSex(witness, pawn.GetAllSexParticipants());
// Try to proposition the witness
if ((int)reactionOfPawn >= (int)ReactionToSexDiscovery.Acceptance && (int)reactionOfWitness >= (int)ReactionToSexDiscovery.Acceptance && tryToPropositionTheWitness)
// Try to invite intruder to join in
if (SexInteractionUtility.GetReactionToSexAct(witness, pawn.jobs.curDriver as JobDriver_Sex) >= (int)ReactionToSexAct.Acceptance)
{
// Voyeurism
if (pawn.IsVoyeur() || (pawn.IsCuckold() && SexInteractionUtility.SexParticipantsIncludesACheatingPartner(witness, pawn.GetAllSexParticipants())))
// TODO roll for sex
if (CasualSex_Helper.CanHaveSex(witness) && xxx.IsTargetPawnOkay(witness) &&
(xxx.has_quirk(witness, "Voyeur") || (xxx.has_quirk(witness, "Cuckold") && SexInteractionUtility.SexParticipantsIncludesACheatingPartner(witness, pawn.GetAllSexParticipants()))))
{
Job job = new Job(DefDatabase<JobDef>.GetNamed("WatchSex", false), pawn.GetSexReceiver(), bed);
witness.jobs.TryTakeOrderedJob(job);
}
// Consensual sex
else if (pawn.IsMasturbating())
{
if (bed == null)
@ -63,7 +62,6 @@ namespace Privacy_Please
}
}
// Threesome
else if (pawn.GetSexReceiver() != null)
{
Job job = new Job(DefDatabase<JobDef>.GetNamed("JoinInSex", false), pawn.GetSexReceiver(), bed);
@ -71,18 +69,16 @@ namespace Privacy_Please
}
}
// The proposition failed. Awwkkkwaaarrddd....
else if (pawn.IsUnfazedBySex() == false && (int)reactionOfPawn < (int)ReactionToSexDiscovery.Approval)
{
if (BasicSettings.whoringIsUninteruptable && jobDriver?.Sexprops.isWhoring == true)
{ return; }
// The pawn is uncomfortable and is stopping sex
foreach (Pawn participant in pawn.GetAllSexParticipants())
{ participant.jobs.EndCurrentJob(JobCondition.InterruptForced, false, false); }
}
else
{ hasPrivacy = false; }
}
}
return BasicSettings.needPrivacy == false ||
hasPrivacy ||
xxx.has_quirk(pawn, "Exhibitionist") ||
pawn?.ideo?.Ideo.HasPrecept(ModPreceptDefOf.Exhibitionism_Acceptable) == true ||
pawn?.ideo?.Ideo.HasPrecept(ModPreceptDefOf.Exhibitionism_Approved) == true;
}
}
}

View File

@ -14,13 +14,19 @@ namespace Privacy_Please
{
public static bool PawnCaughtLovinByWitness(Pawn pawn, Pawn witness)
{
if (witness == null || pawn == witness || witness.IsUnableToSenseSex() || witness.CanSee(pawn) == false)
return true;
if (witness == null ||
pawn == witness ||
(pawn.IsMasturbating() == false && pawn.IsHavingSex() == false) ||
witness.IsUnfazedBySex() == false ||
witness.CanSee(pawn) == false)
{ return false; }
List<Pawn> sexParticipants = pawn.GetAllSexParticipants();
bool witnessIsJoiningSex = witness.jobs.curDriver is JobDriver_SexBaseInitiator && sexParticipants.Contains((witness.jobs.curDriver as JobDriver_SexBaseInitiator).Partner);
bool witnessIsApproachingSexParticipant = witness.jobs.curDriver is JobDriver_SexBaseInitiator && sexParticipants.Contains((witness.jobs.curDriver as JobDriver_SexBaseInitiator).Partner);
if (sexParticipants.Contains(witness) || witnessIsJoiningSex)
if (sexParticipants.Contains(witness) || witnessIsApproachingSexParticipant)
{ return false; }
return true;
@ -56,34 +62,41 @@ namespace Privacy_Please
return false;
}
public static bool PasserbyCanBePropositionedForSex(Pawn passerby, List<Pawn> participants)
public static bool CouldInvitePasserbyForSex(Pawn passerby, List<Pawn> participants)
{
if (passerby == null ||
participants.Contains(passerby) ||
participants.Any(x => x.CanSee(passerby) == false))
participants.Contains(passerby) ||
passerby.IsUnfazedBySex() == false ||
participants.All(x => x.CanSee(passerby) == false))
{ return false; }
if (participants.Count > 2 ||
participants.Any(x => x.IsForbidden(passerby) || x.HostileTo(passerby)) ||
participants.Any(x => x.IsForbidden(passerby) || x.HostileTo(passerby) || PawnIsCheatingOnPartner(x, passerby)) ||
CasualSex_Helper.CanHaveSex(passerby) == false ||
xxx.IsTargetPawnOkay(passerby) == false)
xxx.IsTargetPawnOkay(passerby) == false)
{ return false; }
if (passerby.MentalState != null ||
passerby.jobs.curDriver is JobDriver_Flee ||
passerby.jobs.curDriver is JobDriver_AttackMelee ||
passerby.jobs.curDriver is JobDriver_Vomit)
{ return false; }
if (SexUtility.ReadyForHookup(passerby) &&
(passerby?.jobs?.curJob == null || (passerby.jobs.curJob.playerForced == false && CasualSex_Helper.quickieAllowedJobs.Contains(passerby.jobs.curJob.def))) &&
participants.Any(x => SexAppraiser.would_fuck(x, passerby) > 0.1f && SexAppraiser.would_fuck(passerby, x) > 0.1f) &&
participants.All(x => SexAppraiser.would_fuck(x, passerby, false, false, true) > 0.1f && SexAppraiser.would_fuck(passerby, x, false, false, true) > 0.1f))
{ return true; }
{
return true;
}
return false;
}
public static void GetReactionsToSexDiscovery(JobDriver_Sex jobDriver, Pawn witness, out ReactionToSexDiscovery reactionOfPawn, out ReactionToSexDiscovery reactionOfWitness, bool applyThoughtDefs = false)
public static ReactionToSexAct GetReactionToSexAct(Pawn witness, JobDriver_Sex jobDriver, bool applyThoughtDefs = false)
{
Pawn pawn = jobDriver.pawn;
reactionOfPawn = ReactionToSexDiscovery.Acceptance;
reactionOfWitness = ReactionToSexDiscovery.Acceptance;
ReactionToSexAct reactionOfWitness = ReactionToSexAct.Acceptance;
// Determine if there are any issues with the sex event and the witness' morals
foreach (SexActReactionDef sexActReactionDef in DefDatabase<SexActReactionDef>.AllDefs)
@ -96,9 +109,11 @@ namespace Privacy_Please
if ((bool)methodInfo.Invoke(null, new object[] { jobDriver }))
{
DebugMode.Message(sexActReactionDef.defName);
sexActReactionDef.DetermineReactionOfPawns(pawn, witness, out reactionOfPawn, out reactionOfWitness, applyThoughtDefs);
reactionOfWitness = sexActReactionDef.DetermineReactionOfPawns(pawn, witness, applyThoughtDefs);
}
}
return reactionOfWitness;
}
public static bool SexActIsNecrophilia(JobDriver_Sex jobDriver)

Binary file not shown.

Binary file not shown.