diff --git a/1.4/Assemblies/Privacy-Please.dll b/1.4/Assemblies/Privacy-Please.dll index bf081da..3c5776e 100644 Binary files a/1.4/Assemblies/Privacy-Please.dll and b/1.4/Assemblies/Privacy-Please.dll differ diff --git a/About/About.xml b/About/About.xml index 4c2456b..d9c853f 100644 --- a/About/About.xml +++ b/About/About.xml @@ -26,31 +26,27 @@
  • rim.job.world
    • -This mod adds a greater awareness of sex to people. When people witness (or are witnessed taking part in) various sexual activities, those involved will exhibit different reactions depending on their traits and ideologies. Sexperience - Ideology is highly recommended in order to help customise your colonists' opinions on different sexual activities. +This mod adds a greater awareness of sex to people. When people witness (or are witnessed taking part in) various sexual activities, those involved will exhibit different reactions depending on their traits and ideologies. Sexperience - Ideology is highly recommended in order to help customise your colonists' opinions on different sexual activities. Sex acts that can provoke reactions include: - - Exhibitionism: Encountering someone lovin' will generally result in the embarrassment of all involved and those copulating to immediately cease their activities (unless they happen to be an Exhibitionist). Reactions can be modified through the Exhibitionism precept - - Masturbation: Finding someone masturbating will likely embarrass both parties. The discovered individual will immediately stopping what they were doing (unless they happen to be an Exhibitionist). Reactions to masturbation can be modified through the Masturbation precept (included in Sexperience - Ideology) - - Cheating: Discovering a partner cheating will greatly upset most people (unless they happen to be a Culkold). Reactions to cheating can be modified through the Infidelity precept - - Bestiality: Witnessing bestiality will generally cause individuals to run away (unless they are a Zoophile). Reactions to bestiality can be modified through the Bestiality precept (included in Sexperience - Ideology) - - Rape: Witnessing rape will generally cause individuals to run away (unless they are a Rapist). Reactions to rape can be modified through the Rape precept (included in Sexperience - Ideology). - - Necrophilia: Witnessing necrophilia will generally cause individuals to run away and likely vomit (unless they are a Necrophile). Reactions to necrophilia can be modified through the Necrophilia precept (included in Sexperience - Ideology). - - Xenophilia: Stumbing upon humanoids of different species lovin' will generally be treated like encountering any other lovein' couple (unless the witness happens to be a Xenophobe). Reactions to xenophilia can be modified through the Alien Dating precept (included in Humanoid Alien Races). + - Exhibitionism: Lovin' couples and masturbators prefer to have some privacy - any interruptions by others during these activities will likely result in severe embarrassment all round. Reactions to these activities can be modified through the Exhibitionism precept (included in this mod). + - Cheating: Discovering a partner cheating will great upsets most people. Reactions to cheating can be modified through the Infidelity precept (included in this mod). + - Bestiality: Witnessing bestiality will deeply disturb most people. Reactions to bestiality can be modified through the Bestiality precept (included in Sexperience - Ideology). + - Rape: Witnessing rape will generally cause people to panic. Reactions to rape can be modified through the Rape precept (included in Sexperience - Ideology). + - Necrophilia: Witnessing necrophilia will generally cause people to freak out and possibly vomit. Reactions to necrophilia can be modified through the Necrophilia precept (included in Sexperience - Ideology). + - Xenophilia: Sexual reactions between humanoids of different alien species can provoke anything from curiosity to digest. Reactions to xenophilia can be modified through the Alien Dating precept (included in Humanoid Alien Races). -Options have been included to toggle whether people should react to these various sex acts and whether people will turn a blind eye to them during rituals and parties. Additional options have been included to customise how colonists, prisoners, slaves, and members of other factions should react to other. +Options have been included to toggle whether people experience these reactions and whether they will trigger during rituals and parties. Additional options have been included to alter how colonists, prisoners, slaves, and members of other factions react to each other’s sexual activities. Three new RJW quirks are also included to further customise individuals - Cuckold, Cuckolder, and Voyeur. Cuckolds like to watch their partners cheated on them, while Cuckolders get a kick out of having their partner watch it happen. Voyeurs just like to watch others in general, providing that what they see doesn't upset them. -This mod also provides improved threesome support. Threesomes can now be triggered via two new ways: +This mod also provides additional group sex support. Group sex can now be triggered via two new ways: - - When a pawn sets off to bed their partner a passer-by might be invited to accompany them. - - If a pawn encounters a couple having sex then they may just might be invited to join in. + - When a pawn sets off to bed their partner, a passer-by might be invited to join them. + - If a passer-by encounters someone having sex, they might be invited to join in on the fun, or perhaps to stay and watch. -The chance of a threesome occurring can be configured in the mod options. In all cases, however, those involved must have a good opinion of each other and the passer-by mustn't be doing a player ordered / important job at the time. +The chance of these events occurring can be configured in the mod options. However, those having sex must have a good opinion of the passer-by, and the passer-by mustn't be doing a player ordered / more important job at the time. -Three new RJW quirks are also included - Cuckold, Cuckolder, and Voyeur. Cuckolds like to watch their partners cheated on them, while Cuckolders get a kick out of having their partner watch it happen. Voyeurs just like to watch others in general (providing what they see isn't too upsetting, of course). - -Misc features -- Any lewd fluids that pawns produce during sex will not be marked for cleaning until they are done. +As an additional quality-of-life feature, any lewd fluids that pawns produce during sex will not be marked for cleaning until the activity is over. diff --git a/About/Manifest.xml b/About/Manifest.xml index 30f4a38..8452bea 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,5 +1,5 @@ 1.0.0 - + https://gitgud.io/AbstractConcept/privacy-please \ No newline at end of file diff --git a/Defs/InteractionDefs.xml b/Defs/InteractionDefs.xml index f806a04..8b327a7 100644 --- a/Defs/InteractionDefs.xml +++ b/Defs/InteractionDefs.xml @@ -4,36 +4,58 @@ InviteToHaveSex - + Privacy_Please.InteractionWorker_NullWorker UI/Interactions/Lovin -
  • r_logentry->[INITIATOR_nameDef] invited [RECIPIENT_nameDef] to have sex with [INITIATOR_objective].
    • +
  • r_logentry->[INITIATOR_nameDef] shyly invited [RECIPIENT_nameDef] to have sex with [INITIATOR_objective].
    • +
  • r_logentry->[INITIATOR_nameDef] waved [RECIPIENT_nameDef] over to join in [INITIATOR_objective] fun.
    • +
  • r_logentry->[INITIATOR_nameDef] enticed [RECIPIENT_nameDef] over to [INITIATOR_objective] side.
    •      InviteToHaveGroupSex - + Privacy_Please.InteractionWorker_NullWorker UI/Interactions/Lovin -
  • r_logentry->[INITIATOR_nameDef] invited [RECIPIENT_nameDef] to a threesome.
    • +
  • r_logentry->[INITIATOR_nameDef] huskily invited [RECIPIENT_nameDef] to join [INITIATOR_objective] for a threesome.
    • +
  • r_logentry->[INITIATOR_nameDef] joking asked if [RECIPIENT_nameDef] wanted to do a 'group activity' together.
    • +
  • r_logentry->[INITIATOR_nameDef] archly inquired if [RECIPIENT_nameDef] would like to join [INITIATOR_objective] for some fun.
    •      InviteVoyeurism - + Privacy_Please.InteractionWorker_NullWorker UI/Interactions/Voyeurism -
  • r_logentry->[INITIATOR_nameDef] invited [RECIPIENT_nameDef] to watch [INITIATOR_objective].
    • +
  • r_logentry->[INITIATOR_nameDef] bade [RECIPIENT_nameDef] to come closer and take a good look at what [INITIATOR_pronoun] was doing.
    • +
  • r_logentry->[INITIATOR_nameDef] put on a lewd display for [RECIPIENT_nameDef].
    • +
  • r_logentry->[INITIATOR_nameDef] let [RECIPIENT_nameDef] know that [INITIATOR_pronoun] didn't mind if [RECIPIENT_pronoun] watched [INITIATOR_objective].
    • +     +     +     + + + InterruptedSex + + Privacy_Please.InteractionWorker_NullWorker + UI/Interactions/Exclaimation + true + + +
  • r_logentry->[INITIATOR_nameDef]'s sudden appearance startled [RECIPIENT_nameDef].
    • +
  • r_logentry->[INITIATOR_nameDef] accidently gatecrashed [RECIPIENT_nameDef]'s private party.
    • +
  • r_logentry->[INITIATOR_nameDef] unintentionally intruded upon [RECIPIENT_nameDef]'s privacy.
    • +
  • r_logentry->[INITIATOR_nameDef] rudely interrupted while [RECIPIENT_nameDef] was getting it on.
    •      diff --git a/Defs/PreceptDefs/PreceptDef_Exhibitionism.xml b/Defs/PreceptDefs/PreceptDef_Exhibitionism.xml index 321867c..b47b85b 100644 --- a/Defs/PreceptDefs/PreceptDef_Exhibitionism.xml +++ b/Defs/PreceptDefs/PreceptDef_Exhibitionism.xml @@ -12,7 +12,7 @@ Exhibitionism_Disapproved Exhibitionism - Being seen having sex is shameful, and embarrassing to witness. + Being seen having sex or masturbating is somewhat shameful, and embarrassing to witness. Low 30 1000 @@ -23,7 +23,7 @@ Exhibitionism_Acceptable Exhibitionism - Sex between contenting individuals deserves no special attention. + Who has the time or energy to worry about whether people are getting it on or not? Low 20 1000 @@ -34,7 +34,7 @@ Exhibitionism_Approved Exhibitionism - Displays of physical intimacy bring a knowing grin to those who witness it. + Intimate displays of sexuality stir primal feelings that most people would try to deny. Medium 10 1000 diff --git a/Defs/PreceptDefs/PreceptDef_Infidelity.xml b/Defs/PreceptDefs/PreceptDef_Infidelity.xml index 7a7f636..56b52e4 100644 --- a/Defs/PreceptDefs/PreceptDef_Infidelity.xml +++ b/Defs/PreceptDefs/PreceptDef_Infidelity.xml @@ -23,7 +23,7 @@ Infidelity_Disapproved Infidelity - Cheating on a partner is considered disrespectful. + Cheating on a partner is considered disrespectful to them. Low 20 1000 @@ -34,7 +34,7 @@ Infidelity_Acceptable Infidelity - Physical intimacy is something to be explored freely, including outside the confines of a relationship. + Sex is something to be explored freely, even if they cross the bounds set by traditional relationships. Low 10 1000 diff --git a/Defs/PreceptDefs/PreceptDef_MasturbationExtension.xml b/Defs/PreceptDefs/PreceptDef_MasturbationExtension.xml deleted file mode 100644 index bf89ecb..0000000 --- a/Defs/PreceptDefs/PreceptDef_MasturbationExtension.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - Masturbation_Acceptable - Masturbation - - Open masturbation is an ordinary activity that deserves no notice. - Low - 10 - 1000 - 5 - - - \ No newline at end of file diff --git a/Defs/SexActReactionDefs.xml b/Defs/SexActReactionDefs.xml index 3446903..b00fcc8 100644 --- a/Defs/SexActReactionDefs.xml +++ b/Defs/SexActReactionDefs.xml @@ -7,26 +7,25 @@ Necrophilia SexActIsNecrophilia - PartookInExhibitionism_Disapproved + PartookInExhibitionism_Disapproved
  • Exhibitionist PartookInExhibitionism_Approved
    • -
  • - Exhibitionism_Acceptable - PartookInExhibitionism_Acceptable -
  • Exhibitionism_Approved PartookInExhibitionism_Approved -
    • + +
  • + Exhibitionism_Acceptable + PartookInExhibitionism_Acceptable +
    • -     + SawNecrophilia_Abhorrent -
  • SawNecrophilia_Abhorrent
  • SawNecrophilia_Horrible
  • SawNecrophilia_Disapproved
  • SawNecrophilia_Acceptable
    • @@ -46,22 +45,22 @@ reactionToBestialityWithOrdinaryAnimal Bestiality - SexActIsBestialityWithOrdinaryAnimal + SexActIsBestialityWithOrdinaryAnimal - PartookInExhibitionism_Disapproved + PartookInExhibitionism_Disapproved
  • Exhibitionist PartookInExhibitionism_Approved
    • -
  • - Exhibitionism_Acceptable - PartookInExhibitionism_Acceptable -
  • Exhibitionism_Approved PartookInExhibitionism_Approved -
    • + +
  • + Exhibitionism_Acceptable + PartookInExhibitionism_Acceptable +
    • @@ -72,22 +71,22 @@ reactionToBestialityWithSpecialAnimal Bestiality - SexActIsBestialityWithSpecialAnimal + SexActIsBestialityWithSpecialAnimal - PartookInExhibitionism_Disapproved + PartookInExhibitionism_Disapproved
  • Exhibitionist PartookInExhibitionism_Approved
    • -
  • - Exhibitionism_Acceptable - PartookInExhibitionism_Acceptable -
  • Exhibitionism_Approved PartookInExhibitionism_Approved -
    • + +
  • + Exhibitionism_Acceptable + PartookInExhibitionism_Acceptable +
    • @@ -98,28 +97,27 @@ reactionToBestiality Bestiality - SexActIsBestiality + SexActIsBestiality - PartookInExhibitionism_Disapproved + PartookInExhibitionism_Disapproved
  • Exhibitionist PartookInExhibitionism_Approved
    • -
  • - Exhibitionism_Acceptable - PartookInExhibitionism_Acceptable -
  • Exhibitionism_Approved PartookInExhibitionism_Approved -
    • + +
  • + Exhibitionism_Acceptable + PartookInExhibitionism_Acceptable +
    • SawBestiality_Abhorrent -
  • SawBestiality_Abhorrent
  • SawBestiality_Horrible
  • SawBestiality_Disapproved
  • SawBestiality_Acceptable
    • @@ -139,28 +137,27 @@ reactionToRape Rape - SexActIsRape + SexActIsRape - PartookInExhibitionism_Disapproved + PartookInExhibitionism_Disapproved
  • Exhibitionist PartookInExhibitionism_Approved
    • -
  • - Exhibitionism_Acceptable - PartookInExhibitionism_Acceptable -
  • Exhibitionism_Approved PartookInExhibitionism_Approved -
    • + +
  • + Exhibitionism_Acceptable + PartookInExhibitionism_Acceptable +
    • SawRape_Abhorrent -
  • SawRape_Abhorrent
  • SawRape_Horrible
  • SawRape_Disapproved
  • SawRape_Acceptable
    • @@ -184,7 +181,6 @@ PartookInInfidelity_Heartbreaking -
  • PartookInInfidelity_Heartbreaking
  • PartookInInfidelity_Disapproved
  • PartookInInfidelity_Acceptable
    •  @@ -198,7 +194,6 @@ SawInfidelity_Heartbreaking -
  • SawInfidelity_Heartbreaking
  • SawInfidelity_Disapproved
  • SawInfidelity_Acceptable
    •  @@ -214,26 +209,32 @@ reactionToXenophilia HAR_AlienDating - SexActIsXenophilia + SexActIsXenophilia - PartookInExhibitionism_Disapproved + PartookInExhibitionism_Disapproved
  • Exhibitionist PartookInExhibitionism_Approved
    • -
  • - Exhibitionism_Acceptable - PartookInExhibitionism_Acceptable -
  • Exhibitionism_Approved PartookInExhibitionism_Approved -
    • + +
  • + Exhibitionism_Acceptable + PartookInExhibitionism_Acceptable +
    • - SawExhibitionism_Disapproved + SawHAR_AlienDating_Acceptable + +
  • SawHAR_AlienDating_Prohibited
    • +
  • SawHAR_AlienDating_Horrible
    • +
  • SawHAR_AlienDating_Preferred
    • +
  • SawHAR_AlienDating_Honorable
    • +
  • @@ -242,81 +243,15 @@ SawHAR_AlienDating_Prohibited
  • - HAR_AlienDating_Prohibited - SawHAR_AlienDating_Prohibited + + -1 + + SawHAR_AlienDating_Honorable
    • -
  • - HAR_AlienDating_Horrible - SawHAR_AlienDating_Horrible -
    • -
  • - Voyeur - SawExhibitionism_Approved -
    • -
  • - Exhibitionism_Disapproved - SawExhibitionism_Disapproved -
    • -
  • - Exhibitionism_Acceptable - SawExhibitionism_Acceptable -
    • -
  • - Exhibitionism_Approved - SawExhibitionism_Approved -
    • - - reactionToMasturbation - Masturbation - SexActIsMasturbation - - PartookInExhibitionism_Disapproved - -
  • - Exhibitionist - PartookInExhibitionism_Approved -
    • -
  • - Exhibitionism_Acceptable - PartookInExhibitionism_Acceptable -
    • -
  • - Exhibitionism_Approved - PartookInExhibitionism_Approved -
    • -     -     - - SawExhibitionism_Disapproved - -
  • - Masturbation_Abhorrent - SawMasturbation_Abhorrent -
    • -
  • - Voyeur - SawExhibitionism_Approved -
    • -
  • - Exhibitionism_Disapproved - SawExhibitionism_Disapproved -
    • -
  • - Exhibitionism_Acceptable - SawExhibitionism_Acceptable -
    • -
  • - Exhibitionism_Approved - SawExhibitionism_Approved -
    • -     -     -     - reactionToExhibitionism Exhibitionism @@ -324,7 +259,6 @@ PartookInExhibitionism_Disapproved -
  • PartookInExhibitionism_Disapproved
  • PartookInExhibitionism_Acceptable
  • PartookInExhibitionism_Approved
    •  @@ -338,7 +272,6 @@ SawExhibitionism_Disapproved -
  • SawExhibitionism_Disapproved
  • SawExhibitionism_Acceptable
  • SawExhibitionism_Approved
    •  diff --git a/Defs/ThoughtDefs/ThoughtDefsBeastiality.xml b/Defs/ThoughtDefs/ThoughtDefsBeastiality.xml index 4c480cc..5c17287 100644 --- a/Defs/ThoughtDefs/ThoughtDefsBeastiality.xml +++ b/Defs/ThoughtDefs/ThoughtDefsBeastiality.xml @@ -17,6 +17,12 @@
  • Zoophile
    •  + +
  • SawBestiality_Horrible
    • +
  • SawBestiality_Disapproved
    • +
  • SawBestiality_Acceptable
    • +
  • SawBestiality_Honorable
    • +     Panic @@ -28,10 +34,10 @@
  • - They mated with some common beast. + They mated with some common beast! Disgraceful. -15
    • -     + Discomfort @@ -50,6 +56,12 @@
  • Zoophile
    •  + +
  • SawBestiality_Abhorrent
    • +
  • SawBestiality_Disapproved
    • +
  • SawBestiality_Acceptable
    • +
  • SawBestiality_Honorable
    • +     Discomfort @@ -68,6 +80,12 @@
  • Zoophile
    •  + +
  • SawBestiality_Abhorrent
    • +
  • SawBestiality_Horrible
    • +
  • SawBestiality_Acceptable
    • +
  • SawBestiality_Honorable
    • +     Discomfort @@ -79,13 +97,19 @@
  • - That didn't look entirely comfortable. - -5 + Hope they don't make too much mess. + 0.01
  • Zoophile
    •  + +
  • SawBestiality_Abhorrent
    • +
  • SawBestiality_Horrible
    • +
  • SawBestiality_Disapproved
    • +
  • SawBestiality_Honorable
    • +     Acceptance @@ -98,9 +122,15 @@
  • The bond between us and our animals makes us strong. - +2 + +3
    • + +
  • SawBestiality_Abhorrent
    • +
  • SawBestiality_Horrible
    • +
  • SawBestiality_Disapproved
    • +
  • SawBestiality_Acceptable
    • +     Approval diff --git a/Defs/ThoughtDefs/ThoughtDefsExhibitionism.xml b/Defs/ThoughtDefs/ThoughtDefsExhibitionism.xml index 4445107..a8f2fc1 100644 --- a/Defs/ThoughtDefs/ThoughtDefsExhibitionism.xml +++ b/Defs/ThoughtDefs/ThoughtDefsExhibitionism.xml @@ -10,10 +10,14 @@
  • - Well, that was awkward... + Urgh. That was awkward... -5
    • -     + + +
  • PartookInExhibitionism_Acceptable
    • +
  • PartookInExhibitionism_Approved
    • +     Acceptance @@ -25,10 +29,14 @@
  • - Eh, it's no big deal. + Uhh, you need something? 0.01
    • + +
  • PartookInExhibitionism_Disapproved
    • +
  • PartookInExhibitionism_Approved
    • +     Uncaring @@ -40,10 +48,14 @@
  • - Heh, hope they enjoyed the show! + This feeling... It's so freeing. 2
    • + +
  • PartookInExhibitionism_Disapproved
    • +
  • PartookInExhibitionism_Acceptable
    • +     Approval @@ -59,7 +71,11 @@ Jeez! Get a room! -5 - + + +
  • SawExhibitionism_Acceptable
    • +
  • SawExhibitionism_Approved
    • +     Acceptance @@ -75,6 +91,10 @@ 0.01 + +
  • SawExhibitionism_Disapproved
    • +
  • SawExhibitionism_Approved
    • +     Uncaring @@ -90,6 +110,10 @@ 2 + +
  • SawExhibitionism_Disapproved
    • +
  • SawExhibitionism_Acceptable
    • +     Approval diff --git a/Defs/ThoughtDefs/ThoughtDefsInfidelity.xml b/Defs/ThoughtDefs/ThoughtDefsInfidelity.xml index 2c46073..d467245 100644 --- a/Defs/ThoughtDefs/ThoughtDefsInfidelity.xml +++ b/Defs/ThoughtDefs/ThoughtDefsInfidelity.xml @@ -14,7 +14,12 @@ I'm so sorry, my love. Please, forgive me... -20 - + + +
  • PartookInInfidelity_Disapproved
    • +
  • PartookInInfidelity_Acceptable
    • +
  • PartookInInfidelity_Approved
    • +     Discomfort @@ -30,6 +35,11 @@ -10 + +
  • PartookInInfidelity_Heartbreaking
    • +
  • PartookInInfidelity_Acceptable
    • +
  • PartookInInfidelity_Approved
    • +     Discomfort @@ -40,11 +50,16 @@ 1
  • - + Oh hey babe, you wanna join us? 0.01
    • + +
  • PartookInInfidelity_Heartbreaking
    • +
  • PartookInInfidelity_Disapproved
    • +
  • PartookInInfidelity_Approved
    • +     Acceptance @@ -55,11 +70,16 @@ 1
  • - - The look on their face... It just drives me wild! + + The look on their face... It sent my heart racing! 5
    • + +
  • PartookInInfidelity_Heartbreaking
    • +
  • PartookInInfidelity_Disapproved
    • +
  • PartookInInfidelity_Acceptable
    • +     Approval @@ -75,7 +95,12 @@ I feel numb inside. -20 - + + +
  • SawInfidelity_Disapproved
    • +
  • SawInfidelity_Acceptable
    • +
  • SawInfidelity_Approved
    • +     Panic @@ -91,6 +116,11 @@ -10 + +
  • SawInfidelity_Heartbreaking
    • +
  • SawInfidelity_Acceptable
    • +
  • SawInfidelity_Approved
    • +     Discomfort @@ -101,11 +131,16 @@ 1
  • - - Hey you, save some of that energy for me later, OK? + + Hey, save some of that energy for me later, OK? 0.01
    • + +
  • SawInfidelity_Heartbreaking
    • +
  • SawInfidelity_Disapproved
    • +
  • SawInfidelity_Approved
    • +     Acceptance @@ -116,11 +151,16 @@ 1
  • - - Oh, you wicked thing! I'm gunna have to punish you for this later... + + Wicked thing! I'm gunna have to punish you for this... 5
    • + +
  • SawInfidelity_Heartbreaking
    • +
  • SawInfidelity_Disapproved
    • +
  • SawInfidelity_Acceptable
    • +     Approval diff --git a/Defs/ThoughtDefs/ThoughtDefsMasturbation.xml b/Defs/ThoughtDefs/ThoughtDefsMasturbation.xml deleted file mode 100644 index ad25200..0000000 --- a/Defs/ThoughtDefs/ThoughtDefsMasturbation.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - SawMasturbation_Abhorrent - 10 - 3 - 1 - -
  • - - You'll go blind if up keep that up! - -10 -
    • -     - Discomfort -     - - - - - -     diff --git a/Defs/ThoughtDefs/ThoughtDefsNecrophilia.xml b/Defs/ThoughtDefs/ThoughtDefsNecrophilia.xml index e96391b..36e5c74 100644 --- a/Defs/ThoughtDefs/ThoughtDefsNecrophilia.xml +++ b/Defs/ThoughtDefs/ThoughtDefsNecrophilia.xml @@ -16,7 +16,13 @@
  • Necrophiliac
    • -     + + +
  • SawNecrophilia_Horrible
    • +
  • SawNecrophilia_Disapproved
    • +
  • SawNecrophilia_Acceptable
    • +
  • SawNecrophilia_Approved
    • +     Nausea @@ -35,6 +41,12 @@
  • Necrophiliac
    •  + +
  • SawNecrophilia_Abhorrent
    • +
  • SawNecrophilia_Disapproved
    • +
  • SawNecrophilia_Acceptable
    • +
  • SawNecrophilia_Approved
    • +     Discomfort @@ -53,6 +65,12 @@
  • Necrophiliac
    •  + +
  • SawNecrophilia_Abhorrent
    • +
  • SawNecrophilia_Horrible
    • +
  • SawNecrophilia_Acceptable
    • +
  • SawNecrophilia_Approved
    • +     Discomfort @@ -64,13 +82,19 @@
  • - They better bury what's left when they're done. - -5 + They better bury what's left when they're done... + 0.01
  • Necrophiliac
    •  + +
  • SawNecrophilia_Abhorrent
    • +
  • SawNecrophilia_Horrible
    • +
  • SawNecrophilia_Disapproved
    • +
  • SawNecrophilia_Approved
    • +     Acceptance @@ -83,9 +107,15 @@
  • Passion transcends the grave. - +2 + +3
    • + +
  • SawNecrophilia_Abhorrent
    • +
  • SawNecrophilia_Horrible
    • +
  • SawNecrophilia_Disapproved
    • +
  • SawNecrophilia_Acceptable
    • +     Approval diff --git a/Defs/ThoughtDefs/ThoughtDefsRape.xml b/Defs/ThoughtDefs/ThoughtDefsRape.xml index 68689ee..7dac63c 100644 --- a/Defs/ThoughtDefs/ThoughtDefsRape.xml +++ b/Defs/ThoughtDefs/ThoughtDefsRape.xml @@ -16,7 +16,13 @@
  • Rapist
    • -     + + +
  • SawRape_Horrible
    • +
  • SawRape_Disapproved
    • +
  • SawRape_Acceptable
    • +
  • SawRape_Honorable
    • +     Panic @@ -35,6 +41,12 @@
  • Rapist
    •  + +
  • SawRape_Abhorrent
    • +
  • SawRape_Disapproved
    • +
  • SawRape_Acceptable
    • +
  • SawRape_Honorable
    • +     Discomfort @@ -53,6 +65,12 @@
  • Rapist
    •  + +
  • SawRape_Abhorrent
    • +
  • SawRape_Horrible
    • +
  • SawRape_Acceptable
    • +
  • SawRape_Honorable
    • +     Discomfort @@ -64,13 +82,19 @@
  • - Oh. Um. Carry on? - -5 + Oh. Um. Carry on...? + 0.01
  • Rapist
    •  + +
  • SawRape_Abhorrent
    • +
  • SawRape_Horrible
    • +
  • SawRape_Disapproved
    • +
  • SawRape_Honorable
    • +     Acceptance @@ -82,10 +106,16 @@
  • - The strong claim the weak. - +2 + The strong will claim the weak. + +3
    • + +
  • SawRape_Abhorrent
    • +
  • SawRape_Horrible
    • +
  • SawRape_Disapproved
    • +
  • SawRape_Acceptable
    • +     Approval diff --git a/Defs/ThoughtDefs/ThoughtDefsXenophilia.xml b/Defs/ThoughtDefs/ThoughtDefsXenophilia.xml index 6b3a0a8..128ce07 100644 --- a/Defs/ThoughtDefs/ThoughtDefsXenophilia.xml +++ b/Defs/ThoughtDefs/ThoughtDefsXenophilia.xml @@ -10,13 +10,19 @@
  • - Filthy degenerates. + Urgh. Filthy degenerates... -15
    • -1 - + + +
  • SawHAR_AlienDating_Horrible
    • +
  • SawHAR_AlienDating_Acceptable
    • +
  • SawHAR_AlienDating_Preferred
    • +
  • SawHAR_AlienDating_Honorable
    • +     Discomfort @@ -28,19 +34,23 @@
  • - Urgh. It's just not right... + It's just not right... -10
    • -1 + +
  • SawHAR_AlienDating_Prohibited
    • +
  • SawHAR_AlienDating_Acceptable
    • +
  • SawHAR_AlienDating_Preferred
    • +
  • SawHAR_AlienDating_Honorable
    • +     Discomfort - - - - + diff --git a/Source/.vs/SourceCode/v16/.suo b/Source/.vs/SourceCode/v16/.suo index 1092bdd..5ead8cb 100644 Binary files a/Source/.vs/SourceCode/v16/.suo and b/Source/.vs/SourceCode/v16/.suo differ diff --git a/Source/Scripts/Comps/CompPawnThoughtData.cs b/Source/Scripts/Comps/CompPawnThoughtData.cs index 5035921..1b6fef2 100644 --- a/Source/Scripts/Comps/CompPawnThoughtData.cs +++ b/Source/Scripts/Comps/CompPawnThoughtData.cs @@ -15,6 +15,8 @@ namespace Privacy_Please private Pawn pawn; private int lastExclaimationTick = -1; private int exclaimationCoolDown = 90; + private int lastInvitationTick = 600; + private int invitationCoolDown = 600; public override void Initialize(CompProperties props) { @@ -50,5 +52,16 @@ namespace Privacy_Please FleckMaker.ThrowMetaIcon(pawn.Position, pawn.Map, FleckDefOf.IncapIcon); } } + + public bool CanSendAnInvitionForSex() + { + if (Find.TickManager.TicksGame > invitationCoolDown + lastInvitationTick) + { + lastInvitationTick = Find.TickManager.TicksGame; + return true; + } + + return false; + } } } diff --git a/Source/Scripts/Defs/SexActReactionDef.cs b/Source/Scripts/Defs/SexActReactionDef.cs index a8d4754..5ab147d 100644 --- a/Source/Scripts/Defs/SexActReactionDef.cs +++ b/Source/Scripts/Defs/SexActReactionDef.cs @@ -45,43 +45,41 @@ namespace Privacy_Please public SexActThoughtDef replacementThoughtDef; } - public void DetermineReactionOfPawns(Pawn pawn, Pawn witness, out ReactionToSexDiscovery reactionOfPawn, out ReactionToSexDiscovery reactionOfWitness, bool applyThoughtDefs = false) + public void DetermineReactionOfPawns(Pawn pawn, Pawn witness, out ReactionToSexAct reactionOfPawn, out ReactionToSexAct reactionOfWitness, bool applyThoughtDefs = false) { reactionOfPawn = DetermineReaction(pawn, witness, pawnReaction, applyThoughtDefs); reactionOfWitness = DetermineReaction(witness, pawn, witnessReaction, applyThoughtDefs); } - public ReactionToSexDiscovery DetermineReaction(Pawn reactor, Pawn otherPawn, SubSexActReactionDef reaction, bool applyThoughtDef) + public ReactionToSexAct DetermineReaction(Pawn reactor, Pawn otherPawn, SubSexActReactionDef reaction, bool applyThoughtDef) { JobDriver_Sex jobDriver = reactor.jobs.curDriver as JobDriver_Sex; // Reactors who do not have thoughts applied to them - if (reactor.IsUnableToSenseSex()) return ReactionToSexDiscovery.Ignored; - if (reactor.HostileTo(otherPawn)) return ReactionToSexDiscovery.StopSex; - if (reactor.RaceProps.Animal || reactor.RaceProps.IsMechanoid) return ReactionToSexDiscovery.Ignored; - if (otherPawn.RaceProps.Animal || otherPawn.RaceProps.IsMechanoid) return ReactionToSexDiscovery.Uncaring; - if (BasicSettings.slavesIgnoreSex && (reactor.IsPrisoner || reactor.IsSlave)) return ReactionToSexDiscovery.Uncaring; - if (BasicSettings.otherFactionsIgnoreSex && reactor.Faction.IsPlayer == false) return ReactionToSexDiscovery.Uncaring; - if (BasicSettings.colonistsIgnoreSlaves && (otherPawn.IsPrisoner || otherPawn.IsSlave)) return ReactionToSexDiscovery.Uncaring; - if (BasicSettings.colonistsIgnoreOtherFactions && otherPawn.Faction.IsPlayer == false) return ReactionToSexDiscovery.Uncaring; + if (reactor.IsUnableToSenseSex()) return ReactionToSexAct.Ignored; + if (reactor.HostileTo(otherPawn)) return ReactionToSexAct.Ignored; + if (reactor.RaceProps.Animal || reactor.RaceProps.IsMechanoid) return ReactionToSexAct.Ignored; + if (otherPawn.RaceProps.Animal || otherPawn.RaceProps.IsMechanoid) return ReactionToSexAct.Uncaring; + if (BasicSettings.slavesIgnoreSex && (reactor.IsPrisoner || reactor.IsSlave)) return ReactionToSexAct.Uncaring; + if (BasicSettings.otherFactionsIgnoreSex && reactor.Faction.IsPlayer == false) return ReactionToSexAct.Uncaring; + if (BasicSettings.colonistsIgnoreSlaves && (otherPawn.IsPrisoner || otherPawn.IsSlave)) return ReactionToSexAct.Uncaring; + if (BasicSettings.colonistsIgnoreOtherFactions && otherPawn.Faction.IsPlayer == false) return ReactionToSexAct.Uncaring; // Apply thoughtDef SexActThoughtDef thoughtDef = GetThoughtDefForReactor(reactor, reaction, out Precept precept); - ReactionToSexDiscovery reactionToSexAct = thoughtDef.reactionToSexDiscovery; - if (applyThoughtDef) - { reactor.needs.mood.thoughts.memories.TryGainMemory(thoughtDef, otherPawn, precept); } + if (thoughtDef == null) return ReactionToSexAct.Uncaring; + if (applyThoughtDef) reactor.needs.mood.thoughts.memories.TryGainMemory(thoughtDef, otherPawn, precept); - var nullifyingTraits = ThoughtUtility.GetNullifyingTraits(thoughtDef)?.ToList(); - - if (applyThoughtDef && thoughtDef.stages[0].baseMoodEffect < 0 && nullifyingTraits?.Any(x => x.HasTrait(reactor)) != true) - { reactor.TryGetComp()?.TryToExclaim(); } - + var nullifyingTraits = ThoughtUtility.GetNullifyingTraits(thoughtDef)?.ToList(); + if (applyThoughtDef && thoughtDef.stages[0].baseMoodEffect < 0 && nullifyingTraits?.Any(x => x.HasTrait(reactor)) != true) reactor.TryGetComp()?.TryToExclaim(); + // Reactors who have their reactions changed after applying thoughtDefs - if (BasicSettings.whoringIsUninteruptable && jobDriver?.Sexprops?.isWhoring == true) return ReactionToSexDiscovery.Uncaring; - if (BasicSettings.rapeIsUninteruptable && jobDriver?.Sexprops?.isRape == true) return ReactionToSexDiscovery.Uncaring; + if ((otherPawn.jobs.curDriver as JobDriver_Sex)?.Sexprops.isWhoring == true) return ReactionToSexAct.Ignored; + if (BasicSettings.whoringIsUninteruptable && jobDriver?.Sexprops?.isWhoring == true) return ReactionToSexAct.Uncaring; + if (BasicSettings.rapeIsUninteruptable && jobDriver?.Sexprops?.isRape == true) return ReactionToSexAct.Uncaring; - return reactionToSexAct; + return thoughtDef.reactionToSexDiscovery; } private SexActThoughtDef GetThoughtDefForReactor(Pawn reactor, SubSexActReactionDef reaction, out Precept precept) diff --git a/Source/Scripts/Defs/SexActThoughtDef.cs b/Source/Scripts/Defs/SexActThoughtDef.cs index da08eaa..f9b4352 100644 --- a/Source/Scripts/Defs/SexActThoughtDef.cs +++ b/Source/Scripts/Defs/SexActThoughtDef.cs @@ -9,6 +9,6 @@ namespace Privacy_Please { public class SexActThoughtDef : ThoughtDef { - public ReactionToSexDiscovery reactionToSexDiscovery = ReactionToSexDiscovery.Acceptance; + public ReactionToSexAct reactionToSexDiscovery = ReactionToSexAct.Acceptance; } } diff --git a/Source/Scripts/Patches/HarmonyPatch_RJW.cs b/Source/Scripts/Patches/HarmonyPatch_RJW.cs index 42bb763..f5011dc 100644 --- a/Source/Scripts/Patches/HarmonyPatch_RJW.cs +++ b/Source/Scripts/Patches/HarmonyPatch_RJW.cs @@ -21,7 +21,8 @@ namespace Privacy_Please __instance is JobDriver_SexBaseInitiator && pawn.GetAllSexParticipants().Count == 2 && (__instance is JobDriver_JoinInSex) == false && - Random.value < BasicSettings.chanceForOtherToJoinInSex) + Random.value < BasicSettings.chanceForOtherToJoinInSex && + pawn.TryGetComp()?.CanSendAnInvitionForSex() == true) { DebugMode.Message("Find another to join in sex?"); @@ -33,12 +34,10 @@ namespace Privacy_Please Pawn other = thing as Pawn; if (other == null || pawn == other) continue; - DebugMode.Message("Checking " + other.LabelShort); - SexInteractionUtility.GetReactionsToSexDiscovery(pawn.jobs.curDriver as JobDriver_Sex, other, out ReactionToSexDiscovery reactionOfPawn, out ReactionToSexDiscovery reactionOfOther, false); - DebugMode.Message("Reaction: " + reactionOfOther); + SexInteractionUtility.GetReactionsToSexAct(pawn.jobs.curDriver as JobDriver_Sex, other, out ReactionToSexAct reactionOfPawn, out ReactionToSexAct reactionOfOther, false); // Find candidates to invite - if ((int)reactionOfOther >= (int)ReactionToSexDiscovery.Acceptance && SexInteractionUtility.PasserbyCanBePropositionedForSex(other, pawn.GetAllSexParticipants())) + if ((int)reactionOfOther >= (int)ReactionToSexAct.Acceptance && SexInteractionUtility.PasserbyCanBePropositionedForSex(other, pawn.GetAllSexParticipants())) { DebugMode.Message(other.NameShortColored + " is a potential candidate"); candidates.Add(other); diff --git a/Source/Scripts/Utilities/Enums.cs b/Source/Scripts/Utilities/Enums.cs index 4138ddf..ab50129 100644 --- a/Source/Scripts/Utilities/Enums.cs +++ b/Source/Scripts/Utilities/Enums.cs @@ -1,6 +1,6 @@ namespace Privacy_Please { - public enum ReactionToSexDiscovery + public enum ReactionToSexAct { Approval = 1, Uncaring = 0, @@ -9,6 +9,6 @@ Panic = -3, Nausea = -4, Ignored = -99, - StopSex = -100, + Invalid = -100, } } diff --git a/Source/Scripts/Utilities/ModDefOf.cs b/Source/Scripts/Utilities/ModDefOf.cs index 57479b6..7c95235 100644 --- a/Source/Scripts/Utilities/ModDefOf.cs +++ b/Source/Scripts/Utilities/ModDefOf.cs @@ -37,5 +37,12 @@ namespace Privacy_Please public static InteractionDef InviteToHaveSex; public static InteractionDef InviteToHaveGroupSex; public static InteractionDef InviteVoyeurism; + public static InteractionDef InterruptedSex; + } + + [DefOf] + public static class ModSexActReactionDefOf + { + public static SexActReactionDef reactionToExhibitionism; } } diff --git a/Source/Scripts/Utilities/PrivacyUtility.cs b/Source/Scripts/Utilities/PrivacyUtility.cs index e6a25c7..5aa6317 100644 --- a/Source/Scripts/Utilities/PrivacyUtility.cs +++ b/Source/Scripts/Utilities/PrivacyUtility.cs @@ -33,11 +33,14 @@ namespace Privacy_Please 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 && jobDriver?.Sexprops.isWhoring != true && SexInteractionUtility.PasserbyCanBePropositionedForSex(witness, pawn.GetAllSexParticipants()); + SexInteractionUtility.GetReactionsToSexAct(jobDriver, witness, out ReactionToSexAct reactionOfPawn, out ReactionToSexAct reactionOfWitness, true); + + bool tryToPropositionTheWitness = Random.value < BasicSettings.chanceForOtherToJoinInSex && + SexInteractionUtility.PasserbyCanBePropositionedForSex(witness, pawn.GetAllSexParticipants()) && + pawn.TryGetComp()?.CanSendAnInvitionForSex() == true; // Try to proposition the witness - if ((int)reactionOfPawn >= (int)ReactionToSexDiscovery.Acceptance && (int)reactionOfWitness >= (int)ReactionToSexDiscovery.Acceptance && tryToPropositionTheWitness) + if ((int)reactionOfPawn >= (int)ReactionToSexAct.Acceptance && (int)reactionOfWitness >= (int)ReactionToSexAct.Acceptance && tryToPropositionTheWitness) { // Voyeurism if (witness.IsVoyeur() || (witness.IsCuckold() && SexInteractionUtility.SexParticipantsIncludesACheatingPartner(witness, pawn.GetAllSexParticipants()))) @@ -77,13 +80,15 @@ namespace Privacy_Please } // The proposition failed. Is this awkward for those having sex? - else if ((int)reactionOfPawn < (int)ReactionToSexDiscovery.Uncaring) + else if ((int)reactionOfPawn < (int)ReactionToSexAct.Uncaring) { + Find.PlayLog.Add(new PlayLogEntry_Interaction(ModInteractionDefOf.InterruptedSex, witness, pawn, new List())); + // The pawn is uncomfortable and is stopping sex foreach (Pawn participant in pawn.GetAllSexParticipants()) { - JobDriver_Sex participantJobDriver = participant.jobs.curDriver as JobDriver_Sex; - + JobDriver_Sex participantJobDriver = participant.jobs.curDriver as JobDriver_Sex; + if (participantJobDriver?.ticks_left > 60) { participantJobDriver.ticks_left = 60; } } diff --git a/Source/Scripts/Utilities/SexInteractionUtility.cs b/Source/Scripts/Utilities/SexInteractionUtility.cs index f887c38..53ce3ce 100644 --- a/Source/Scripts/Utilities/SexInteractionUtility.cs +++ b/Source/Scripts/Utilities/SexInteractionUtility.cs @@ -80,12 +80,12 @@ namespace Privacy_Please return false; } - public static void GetReactionsToSexDiscovery(JobDriver_Sex jobDriver, Pawn witness, out ReactionToSexDiscovery reactionOfPawn, out ReactionToSexDiscovery reactionOfWitness, bool applyThoughtDefs = false) + public static void GetReactionsToSexAct(JobDriver_Sex jobDriver, Pawn witness, out ReactionToSexAct reactionOfPawn, out ReactionToSexAct reactionOfWitness, bool applyThoughtDefs = false) { Pawn pawn = jobDriver.pawn; - - reactionOfPawn = ReactionToSexDiscovery.Uncaring; - reactionOfWitness = ReactionToSexDiscovery.Uncaring; + + reactionOfPawn = ReactionToSexAct.Uncaring; + reactionOfWitness = ReactionToSexAct.Uncaring; // Determine if there are any issues with the sex event and the witness' morals and apply thoughtDefs as required foreach (SexActReactionDef sexActReactionDef in DefDatabase.AllDefs) @@ -98,13 +98,16 @@ namespace Privacy_Please if ((bool)methodInfo.Invoke(null, new object[] { jobDriver, witness })) { sexActReactionDef.DetermineReactionOfPawns(pawn, witness, out reactionOfPawn, out reactionOfWitness, applyThoughtDefs); break; } } - + + DebugMode.Message("Reaction of " + pawn.NameShortColored + " to " + witness.NameShortColored + "'s presence: " + reactionOfPawn.ToString()); + DebugMode.Message("Reaction of " + witness.NameShortColored + " to " + pawn.NameShortColored + "'s activities: " + reactionOfWitness.ToString()); + // Exit here if thoughtDefs are not being applied if (applyThoughtDefs == false || BasicSettings.majorTabooCanCausePanic == false) return; if (witness?.Drafted == true || witness?.mindState?.duty?.def.alwaysShowWeapon == true) return; // Panic reaction - if (reactionOfWitness == ReactionToSexDiscovery.Panic) + if (reactionOfWitness == ReactionToSexAct.Panic) { Job job = JobMaker.MakeJob(JobDefOf.FleeAndCower, CellFinderLoose.GetFleeDest(witness, new List() { pawn }, 24f), pawn); @@ -114,7 +117,7 @@ namespace Privacy_Please } // Vomit reaction - else if (reactionOfWitness == ReactionToSexDiscovery.Nausea) + else if (reactionOfWitness == ReactionToSexAct.Nausea) { Job jobVomit = JobMaker.MakeJob(JobDefOf.Vomit); Job jobFlee = JobMaker.MakeJob(JobDefOf.FleeAndCower, CellFinderLoose.GetFleeDest(witness, new List() { pawn }, 24f), pawn); @@ -175,14 +178,9 @@ namespace Privacy_Please return BasicSettings.worryAboutXeno && jobDriver.Partner != null && jobDriver.Partner.def.defName != jobDriver.pawn.def.defName; } - public static bool SexActIsMasturbation(JobDriver_Sex jobDriver, Pawn witness = null) - { - return jobDriver.pawn.IsMasturbating(); - } - public static bool SexActIsExhibitionism(JobDriver_Sex jobDriver, Pawn witness = null) { - return BasicSettings.worryAboutExhibitionism && jobDriver.pawn.IsHavingSex(); + return BasicSettings.worryAboutExhibitionism && (jobDriver.pawn.IsMasturbating() || jobDriver.pawn.IsHavingSex()); } public static bool SexActIsInfidelity(JobDriver_Sex jobDriver, Pawn witness = null) diff --git a/Source/obj/Debug/Privacy-Please.dll b/Source/obj/Debug/Privacy-Please.dll index bf081da..3c5776e 100644 Binary files a/Source/obj/Debug/Privacy-Please.dll and b/Source/obj/Debug/Privacy-Please.dll differ diff --git a/Source/obj/Debug/Privacy-Please.pdb b/Source/obj/Debug/Privacy-Please.pdb index 6feeb37..aaebfd4 100644 Binary files a/Source/obj/Debug/Privacy-Please.pdb and b/Source/obj/Debug/Privacy-Please.pdb differ diff --git a/Source/obj/Debug/SourceCode.csprojAssemblyReference.cache b/Source/obj/Debug/SourceCode.csprojAssemblyReference.cache index b632428..8b8f20f 100644 Binary files a/Source/obj/Debug/SourceCode.csprojAssemblyReference.cache and b/Source/obj/Debug/SourceCode.csprojAssemblyReference.cache differ diff --git a/Textures/UI/Interactions/Exclaimation.png b/Textures/UI/Interactions/Exclaimation.png new file mode 100644 index 0000000..411fe9f Binary files /dev/null and b/Textures/UI/Interactions/Exclaimation.png differ