Bug fixes

- Animation keys should be better synced with the animation (fewer instance of missing keys)
- Copied keyframes and cloned stages should no longer be linked to each other
-If you delete the first keyframe in a clip, instead of denying you, it will reset the associated actor it to its default starting position
- You can now move keyframes over the first one in a clip and override it. If less than two keys remain, new keys will be generated to a minimum of a two
- Fixed error when cycling through actor body parts
This commit is contained in:
AbstractConcept 2022-11-05 23:01:38 -05:00
parent 03e634e56c
commit a6a550af53
26 changed files with 519 additions and 469 deletions

View file

@ -23,7 +23,7 @@
<defName>Exhibitionism_Acceptable</defName>
<issue>Exhibitionism</issue>
<label>acceptable</label>
<description>Sex infront of others is normal and deserves no special attention.</description>
<description>Having sex out in the open 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>Physical intimacy is to be celebrated.</description>
<description>Displays of physical intimacy are 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>test</description>
<description>Infidelity is a betrayal that will not soon be forgiven or forgotten.</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>test</description>
<description>Cheating on a partner is considered disrespectful.</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>test</description>
<description>Physical intimacy is something that should be explored freely with others.</description>
<impact>Low</impact>
<displayOrderInIssue>10</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact>

View file

@ -0,0 +1,15 @@
<?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,57 +1,126 @@
<?xml version="1.0" encoding="utf-8" ?>
<Defs>
<Privacy_Please.SexActReactionDef>
<defName>reactionToExhibitionism</defName>
<issueDefName>Exhibitionism</issueDefName>
<sexActCheck>SexActIsExhibitionism</sexActCheck>
<witnessReaction>
<defaultThoughtDef>SawExhibitionism_Disapproved</defaultThoughtDef>
<associatedThoughtDefs>
<li>SawExhibitionism_Disapproved</li>
<li>SawExhibitionism_Acceptable</li>
<li>SawExhibitionism_Approved</li>
</associatedThoughtDefs>
<!-- 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>
<requiredQuirk>Voyeur</requiredQuirk>
<replacementThoughtDef>SawExhibitionism_Approved</replacementThoughtDef>
<requiredTraits>
<li>Necrophiliac</li>
</requiredTraits>
<replacementThoughtDef>PartookInNecrophilia_Honorable</replacementThoughtDef>
</li>
</replacementThoughts>
</witnessReaction>
</pawnReaction>
<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>
<replacementThoughts>
<li>
<requiredTraits>
<li>Necrophiliac</li>
</requiredTraits>
<replacementThoughtDef>SawNecrophilia_Honorable</replacementThoughtDef>
</li>
</replacementThoughts>
</witnessReaction>
</Privacy_Please.SexActReactionDef>
<Privacy_Please.SexActReactionDef>
<defName>reactionToMasturbation</defName>
<issueDefName>Masturbation</issueDefName>
<sexActCheck>SexActIsMasturbation</sexActCheck>
<witnessReaction>
<defaultThoughtDef>SawMasturbation_Disapproved</defaultThoughtDef>
<associatedThoughtDefs>
<li>SawMasturbation_Abhorrent</li>
<li>SawMasturbation_Disapproved</li>
<li>SawMasturbation_Acceptable</li>
</associatedThoughtDefs>
<Privacy_Please.SexActReactionDef>
<defName>reactionToBestiality</defName>
<issueDefName>Bestiality</issueDefName>
<sexActCheck>SexActIsBestiality</sexActCheck>
<pawnReaction>
<defaultThoughtDef>PartookInBestiality_Disapproved</defaultThoughtDef>
<replacementThoughts>
<li>
<requiredQuirk>Voyeur</requiredQuirk>
<replacementThoughtDef>SawMasturbation_Approved</replacementThoughtDef>
<requiredTraits>
<li>Zoophile</li>
</requiredTraits>
<replacementThoughtDef>PartookInBestiality_Honorable</replacementThoughtDef>
</li>
</replacementThoughts>
</witnessReaction>
</pawnReaction>
<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>
<replacementThoughts>
<li>
<requiredTraits>
<li>Zoophile</li>
</requiredTraits>
<replacementThoughtDef>SawBestiality_Honorable</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>
</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>
<associatedThoughtDefs>
<preceptThoughtDefs>
<li>SawInfidelity_Heartbreaking</li>
<li>SawInfidelity_Disapproved</li>
<li>SawInfidelity_Acceptable</li>
</associatedThoughtDefs>
</preceptThoughtDefs>
<replacementThoughts>
<li>
<requiredQuirk>Cuckold</requiredQuirk>
@ -65,15 +134,32 @@
<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>
<associatedThoughtDefs>
<preceptThoughtDefs>
<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>
</associatedThoughtDefs>
</preceptThoughtDefs>
<replacementThoughts>
<li>
<requiredTraits>
@ -90,77 +176,81 @@
</replacementThoughts>
</witnessReaction>
</Privacy_Please.SexActReactionDef>
<Privacy_Please.SexActReactionDef>
<defName>reactionToBestiality</defName>
<issueDefName>Bestiality</issueDefName>
<sexActCheck>SexActIsBestiality</sexActCheck>
<witnessReaction>
<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>
<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>
<requiredTraits>
<li>Zoophile</li>
</requiredTraits>
<replacementThoughtDef>SawBestiality_Honorable</replacementThoughtDef>
<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>
</witnessReaction>
</Privacy_Please.SexActReactionDef>
<Privacy_Please.SexActReactionDef>
<defName>reactionToNecrophilia</defName>
<issueDefName>Necrophilia</issueDefName>
<sexActCheck>SexActIsNecrophilia</sexActCheck>
</pawnReaction>
<witnessReaction>
<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>
<defaultThoughtDef>SawMasturbation_Disapproved</defaultThoughtDef>
<preceptThoughtDefs>
<li>SawMasturbation_Abhorrent</li>
<li>SawMasturbation_Disapproved</li>
<li>SawMasturbation_Acceptable</li>
</preceptThoughtDefs>
<replacementThoughts>
<li>
<requiredTraits>
<li>Necrophiliac</li>
</requiredTraits>
<replacementThoughtDef>SawNecrophilia_Honorable</replacementThoughtDef>
<requiredQuirk>Voyeur</requiredQuirk>
<replacementThoughtDef>SawMasturbation_Approved</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>
<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>
<requiredTraits>
<li>Rapist</li>
</requiredTraits>
<replacementThoughtDef>SawRape_Honorable</replacementThoughtDef>
<requiredQuirk>Exhibitionist</requiredQuirk>
<replacementThoughtDef>PartookInExhibitionism_Approved</replacementThoughtDef>
</li>
</replacementThoughts>
</witnessReaction>
</pawnReaction>
<witnessReaction>
<defaultThoughtDef>SawExhibitionism_Disapproved</defaultThoughtDef>
<preceptThoughtDefs>
<li>SawExhibitionism_Disapproved</li>
<li>SawExhibitionism_Acceptable</li>
<li>SawExhibitionism_Approved</li>
</preceptThoughtDefs>
<replacementThoughts>
<li>
<requiredQuirk>Voyeur</requiredQuirk>
<replacementThoughtDef>SawExhibitionism_Approved</replacementThoughtDef>
</li>
</replacementThoughts>
</witnessReaction>
</Privacy_Please.SexActReactionDef>
</Defs>

View file

@ -2,138 +2,9 @@
<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>
@ -149,64 +20,6 @@
</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>
<reactionToSexAct>Outrage</reactionToSexAct>
<reactionToSexDiscovery>Outrage</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -35,7 +35,7 @@
<nullifyingTraits>
<li>Zoophile</li>
</nullifyingTraits>
<reactionToSexAct>Discomfort</reactionToSexAct>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -53,7 +53,7 @@
<nullifyingTraits>
<li>Zoophile</li>
</nullifyingTraits>
<reactionToSexAct>Discomfort</reactionToSexAct>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -71,7 +71,7 @@
<nullifyingTraits>
<li>Zoophile</li>
</nullifyingTraits>
<reactionToSexAct>Acceptance</reactionToSexAct>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -86,7 +86,7 @@
<baseMoodEffect>+2</baseMoodEffect>
</li>
</stages>
<reactionToSexAct>Approval</reactionToSexAct>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
</Defs>

View file

@ -1,7 +1,56 @@
<?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>
@ -11,11 +60,11 @@
<stages>
<li>
<label>walked in on some lovin'</label>
<description>test</description>
<description>Jeez! Get a room!</description>
<baseMoodEffect>-4</baseMoodEffect>
</li>
</stages>
<reactionToSexAct>Discomfort</reactionToSexAct>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -27,11 +76,11 @@
<stages>
<li>
<label>passed by some lovin'</label>
<description>test</description>
<description>Don't mind me, just passing through.</description>
<baseMoodEffect>0</baseMoodEffect>
</li>
</stages>
<reactionToSexAct>Acceptance</reactionToSexAct>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -43,11 +92,11 @@
<stages>
<li>
<label>observed some lovin'</label>
<description>test</description>
<baseMoodEffect>2</baseMoodEffect>
<description>Damn, that's hot!</description>
<baseMoodEffect>3</baseMoodEffect>
</li>
</stages>
<reactionToSexAct>Approval</reactionToSexAct>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
</Defs>

View file

@ -2,42 +2,96 @@
<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>horrified by xenophilia</label>
<label></label>
<description>Filthy degenerates!</description>
<baseMoodEffect>-15</baseMoodEffect>
<baseMoodEffect>-20</baseMoodEffect>
</li>
</stages>
<nullifyingTraitDegrees>
<Xenophobia>-1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexAct>Outrage</reactionToSexAct>
<reactionToSexDiscovery>Outrage</reactionToSexDiscovery>
</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>disturbed by xenophilia</label>
<description>Oh! That's not right...</description>
<label></label>
<description></description>
<baseMoodEffect>-10</baseMoodEffect>
</li>
</stages>
<nullifyingTraitDegrees>
<Xenophobia>-1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexAct>Discomfort</reactionToSexAct>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -47,15 +101,12 @@
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label>saw xenophilia</label>
<description>Oops, sorry about walking in on you!</description>
<baseMoodEffect>-4</baseMoodEffect>
<label></label>
<description></description>
<baseMoodEffect>-5</baseMoodEffect>
</li>
</stages>
<nullifyingTraitDegrees>
<Xenophobia>1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexAct>Acceptance</reactionToSexAct>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
@ -65,15 +116,12 @@
<stackLimitForSameOtherPawn>1</stackLimitForSameOtherPawn>
<stages>
<li>
<label>noticed xenophilia</label>
<description>I wonder what their kids would look like?</description>
<baseMoodEffect>+1</baseMoodEffect>
<label></label>
<description></description>
<baseMoodEffect></baseMoodEffect>
</li>
</stages>
<nullifyingTraitDegrees>
<Xenophobia>1</Xenophobia>
</nullifyingTraitDegrees>
<reactionToSexAct>Approval</reactionToSexAct>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
</Defs>

View file

@ -2,68 +2,132 @@
<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 you know!</description>
<description>You'll go blind if up keep that up!</description>
<baseMoodEffect>-15</baseMoodEffect>
</li>
</stages>
<reactionToSexAct>Outrage</reactionToSexAct>
<reactionToSexDiscovery>Outrage</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>SawMasturbation_Disapproved</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<stackLimit>1</stackLimit>
<durationDays>3</durationDays>
<stackLimit>3</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>saw someone masturbatin'</label>
<label>shocked by masturbatin'</label>
<description>Argh! I'm so sorry!</description>
<baseMoodEffect>-5</baseMoodEffect>
<baseMoodEffect>-10</baseMoodEffect>
</li>
</stages>
<reactionToSexAct>Discomfort</reactionToSexAct>
<reactionToSexDiscovery>Discomfort</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>SawMasturbation_Acceptable</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<durationDays>1</durationDays>
<stackLimit>1</stackLimit>
<stackedEffectMultiplier>0.5</stackedEffectMultiplier>
<stages>
<li>
<label>saw someone masturbatin'</label>
<description>Argh! I'm so sorry!</description>
<description>Well, that was embarrassing.</description>
<baseMoodEffect>-5</baseMoodEffect>
</li>
</stages>
<reactionToSexAct>Acceptance</reactionToSexAct>
<reactionToSexDiscovery>Acceptance</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
<Privacy_Please.SexActThoughtDef>
<defName>SawMasturbation_Approved</defName>
<thoughtClass>Thought_Memory</thoughtClass>
<durationDays>1.0</durationDays>
<durationDays>1</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>
<label>voyeur saw masturbatin'</label>
<description>I think that awoke something in me...</description>
<baseMoodEffect>3</baseMoodEffect>
</li>
</stages>
<reactionToSexAct>Approval</reactionToSexAct>
<reactionToSexDiscovery>Approval</reactionToSexDiscovery>
</Privacy_Please.SexActThoughtDef>
</Defs>

View file

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

View file

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

View file

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