From defa0ac6776a2c7723d3b6c971c35a2e23574e42 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 17 Mar 2018 00:42:32 -0400
Subject: [PATCH] various text fixes and incest encouragement policy.
---
src/cheats/mod_EditFSCheat.tw | 2 +-
src/events/intro/initNationalities.tw | 3 +
src/init/setupVars.tw | 1 +
src/uncategorized/BackwardsCompatibility.tw | 7 ++
src/uncategorized/arcmgmt.tw | 2 +-
src/uncategorized/arcologyDescription.tw | 3 +-
src/uncategorized/assistantEvents.tw | 2 +-
src/uncategorized/barracks.tw | 2 +-
src/uncategorized/fsDevelopments.tw | 5 ++
src/uncategorized/futureSocities.tw | 2 +-
src/uncategorized/peConcubineInterview.tw | 9 +-
.../personalAssistantAppearance.tw | 14 +--
src/uncategorized/policies.tw | 16 +++-
src/uncategorized/saRelationships.tw | 90 +++++++++++++++++++
src/uncategorized/saServeThePublic.tw | 8 ++
src/uncategorized/saWhore.tw | 8 ++
src/uncategorized/spaReport.tw | 6 +-
src/utility/assayWidgets.tw | 10 +--
18 files changed, 164 insertions(+), 26 deletions(-)
diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw
index 541aa1b204f..33b7592888a 100644
--- a/src/cheats/mod_EditFSCheat.tw
+++ b/src/cheats/mod_EditFSCheat.tw
@@ -532,7 +532,7 @@
<<radiobutton "$arcologies[0].FSEgyptianRevivalistLaw" 0>> 0 (Not passed.)
| <<radiobutton "$arcologies[0].FSEgyptianRevivalistLaw" 1>> 1 (Passed.)
- <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0]]
+ <br>[[Apply and reset other Revivalisms|MOD_Edit FS Cheat][$arcologies[0].FSRomanRevivalist = "unset",$arcologies[0].FSRomanRevivalistDecoration = 20,$arcologies[0].FSRomanRevivalistLaw = 0,$arcologies[0].FSAztecRevivalist = "unset",$arcologies[0].FSAztecRevivalistDecoration = 20,$arcologies[0].FSAztecRevivalistLaw = 0,$arcologies[0].FSEdoRevivalistDecoration = 20,$arcologies[0].FSEdoRevivalistLaw = 0,$arcologies[0].FSArabianRevivalist = "unset",$arcologies[0].FSArabianRevivalistDecoration = 20,$arcologies[0].FSArabianRevivalistLaw = 0,$arcologies[0].FSChineseRevivalist = "unset",$arcologies[0].FSChineseRevivalistDecoration = 20,$arcologies[0].FSChineseRevivalistLaw = 0,$arcologies[0].FSEgyptianRevivalistIncestPolicy = 0]]
<br><br>
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index e135b73a840..0484cb90c47 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -677,5 +677,8 @@
<<set $arcologies[0].FSHedonisticDecadenceDietResearch = 0>>
<<set $arcologies[0].FSCummunismResearch = 0>>
+<<set $arcologies[0].FSEgyptianRevivalistIncestPolicy = 0>>
+<<set $arcologies[0].FSEgyptianRevivalistInterest = 0>>
+
<<set $showStartingGirlsExplanation = 1>>
<<goto "Starting Girls">>
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index ebc975daa32..18ceda704bb 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -1278,6 +1278,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
<<set setup.ArcologyNamesRepopulationist = ["Hope", "The Womb", "Holders of the Future", "Future", "Haven of the Pregnant", "Sacred Womb", "Glorious Mother"]>>
<<set setup.ArcologyNamesHedonisticDecadence = ["Sloth", "Gluttony", "New Wisconsin", "Indulgence", "Stuffedtopia", "Plumpland", "Decadence", "All You Can Eat"]>>
<<set setup.ArcologyNamesCummunism = ["Cumstantine", "Mother Cumtry", "Crusty Cummies", "Cummunist Russwhore", "Jizzington upon Wank", "Arscrotzka", "Free Slave Central", "Da Cumrade", "Cumstantinople"]>>
+<<set setup.ArcologyNamesIncestFetishist = ["Oedipal City", "Oeditropolis", "Sib City", "Incestral Home", "Family Fortunes", "Familial Embrace", "Pure Blood"]>>
<<set setup.badWords = ["fuck", "shit", "ass", "cock", "piss", "dick", "slut", "cum", "whore", "butt", "boob", "cunt", "cunny", "pussy", "junk", "trash", "slave"]>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index d47fa344ceb..dc1c009fa6d 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1437,6 +1437,13 @@
<<set $arcologies[0].FSEgyptianRevivalistLaw = 0>>
<</if>>
+<<if ndef $arcologies[0].FSEgyptianRevivalistIncestPolicy>>
+ <<set $arcologies[0].FSEgyptianRevivalistIncestPolicy = 0>>
+<</if>>
+<<if ndef $arcologies[0].FSEgyptianRevivalistInterest>>
+ <<set $arcologies[0].FSEgyptianRevivalistInterest = 0>>
+<</if>>
+
<<if def $FSEdoRevivalist && $FSEdoRevivalist != "unset">>
<<set $arcologies[0].FSEdoRevivalist = $FSEdoRevivalist>>
<<unset $FSEdoRevivalist>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index c20177958c8..6b17e731dc2 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -183,7 +183,7 @@ This week, <<if _flux > 0>>few to none<<else>>many<</if>> of $arcologies[0].name
<<if $arcologies[0].FSRomanRevivalistLaw == 1>>The citizens take pride in their martial duties, preferring to wear utilitarian clothing even when off duty.<</if>>
<<if $arcologies[0].FSGenderRadicalistDecoration == 100>>Every single one of the slaves is female by virtue of her fuckable asshole.
<<elseif $arcologies[0].FSGenderFundamentalistSMR == 1>>Almost every citizen is an upstanding man, while the slave population is almost completely female.<</if>>
-<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>>Close relationships between citizens and slaves, especially slave siblings, are common.<</if>>
+<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>>Close relationships between citizens and slaves, especially slave siblings, are common.<<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>Close relationships between citizens, slaves and siblings are common.<</if>>
<<if $arcologies[0].FSSubjugationistLawME == 1>>$arcologies[0].FSSubjugationistRace subhumans form a majority of the slaves.<</if>>
<<if $arcologies[0].FSChattelReligionistLaw == 1>>The slave population as a whole is unusually accepting of its station.<</if>>
<<if $arcologies[0].FSPaternalistLaw == 1>>The slaves are well cared for, and it can sometimes be difficult to tell slaves from citizens.
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index e7fd93a9d4b..a8b94e396ed 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -637,7 +637,8 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<<elseif $arcologies[0].FSYouthPreferentialistLaw == 1>>Most citizens shine with youth and enthusiasm.<</if>>
<<if $arcologies[0].FSGenderRadicalistDecoration == 100>>Every single one of the slaves is female by virtue of her fuckable asshole.
<<elseif $arcologies[0].FSGenderFundamentalistSMR == 1>>Almost every citizen is an upstanding man, while the slave population is almost completely female.<</if>>
-<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>>Close relationships between citizens and slaves, especially slave siblings, are common.<</if>>
+<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>>Close relationships between citizens and slaves, especially slave siblings, are common.
+<<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>Close relationships between citizens, slaves and siblings are common.<</if>>
<<if $arcologies[0].FSSubjugationistLawME == 1>>$arcologies[0].FSSubjugationistRace subhumans form a majority of the slaves.<</if>>
<<if $arcologies[0].FSChattelReligionistLaw == 1>>The slave population as a whole is unusually accepting of its station.<</if>>
<<if $arcologies[0].FSPaternalistLaw == 1>>The slaves are well cared for, and it can sometimes be difficult to tell slaves from citizens.
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 82a5518401c..071cac18a9d 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -818,7 +818,7 @@ of your personal assistant pops up on the nearest screen. "<<if $PC.title != 0>
<<elseif $arcologies[0].FSRestart != "unset">>
casts a contraceptive spell; her pussy vanishes.
<<elseif $arcologies[0].FSBodyPurist != "unset">>
- casts a purifying spell; nothing happens, at first. The front of her robes, above her lower belly, steadily becoming transparent. Moments later, her skin joins in, revealing a inactive egg vibrator concealed in her pussy. $assistantName squeals in embarrassment and hurries offscreen.
+ casts a purifying spell; nothing happens, at first. The front of her robes, above her lower belly, steadily becomes transparent. Moments later, her skin joins in, revealing a inactive egg vibrator concealed in her pussy. $assistantName squeals in embarrassment and hurries offscreen.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
casts a spell to inflate her breasts; they rapidly swell, along with her ass, belly, thighs and lips until she looks like an overinflated blowup doll. She struggles to bring a rubbery arm to her O-shaped lips before giving up and rebounding back into place; she really is a blowup sex doll!
<<elseif $arcologies[0].FSYouthPreferentialist != "unset">>
diff --git a/src/uncategorized/barracks.tw b/src/uncategorized/barracks.tw
index ecf16cdc649..582b6cc9de9 100644
--- a/src/uncategorized/barracks.tw
+++ b/src/uncategorized/barracks.tw
@@ -157,7 +157,7 @@ You head up a deck, to the staff area, and up one more, to look into the living
<<if $mercenariesHelpCorp > 0>>
<br><br>
- As you leave, a squad moves thunderously into the bay, fresh from a slave raid on behalf of your corporation. Most of their captures have been dropped off with the corporate receivers, but they've been given a pretty girl who isn't a good training prospect for the corporate brand, a common reward. The squad looks after their weapons and armor first, an inviolable rule, and as they do, they leave their naked slave standing in the middle of the bay, ignored. She isn't even bound, but she's standing nude and alone amongst modern mercenaries, so she knows that resistance is futile. So she does the only thing left available to her,try to cover herself with her hands and cry.
+ As you leave, a squad moves thunderously into the bay, fresh from a slave raid on behalf of your corporation. Most of their captures have been dropped off with the corporate receivers, but they've been given a pretty girl who isn't a good training prospect for the corporate brand, a common reward. The squad looks after their weapons and armor first, an inviolable rule, and as they do, they leave their naked slave standing in the middle of the bay, ignored. She isn't even bound, but she's standing nude and alone amongst modern mercenaries, so she knows that resistance is futile. So she does the only thing left available to her, try to cover herself with her hands and cry.
<</if>>
<br><br>
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 541de3f1df9..67b426c6fee 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -640,6 +640,11 @@ With her $assistantAppearance appearance, $assistantName's public visibility mes
<<set $arcologies[0].FSRestart = $FSLockinLevel>>
<</if>>
+/* warm up policy influence */
+<<if $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1 && $arcologies[0].FSEgyptianRevivalistInterest < 26>>
+ <<set $arcologies[0].FSEgyptianRevivalistInterest += $arcologies[0].FSEgyptianRevivalistIncestPolicy>>
+<</if>>
+
<<if ($arcologies[0].FSSupremacistSMR + $arcologies[0].FSSubjugationistSMR + $arcologies[0].FSGenderRadicalistSMR + $arcologies[0].FSGenderFundamentalistSMR + $arcologies[0].FSPaternalistSMR + $arcologies[0].FSDegradationistSMR + $arcologies[0].FSBodyPuristSMR + $arcologies[0].FSTransformationFetishistSMR + $arcologies[0].FSYouthPreferentialistSMR + $arcologies[0].FSMaturityPreferentialistSMR + $arcologies[0].FSSlimnessEnthusiastSMR + $arcologies[0].FSAssetExpansionistSMR + $arcologies[0].FSPastoralistSMR + $arcologies[0].FSPhysicalIdealistSMR + $arcologies[0].FSChattelReligionistSMR + $arcologies[0].FSRomanRevivalistSMR + $arcologies[0].FSAztecRevivalistSMR + $arcologies[0].FSEgyptianRevivalistSMR + $arcologies[0].FSEdoRevivalistSMR + $arcologies[0].FSRepopulationFocusSMR + $arcologies[0].FSRestartSMR + $arcologies[0].FSHedonisticDecadenceSMR + $arcologies[0].FSArabianRevivalistSMR + $arcologies[0].FSChineseRevivalistSMR) > 0>>
The slave market regulations help ensure the arcology's slaves fit within its society.
<</if>>
diff --git a/src/uncategorized/futureSocities.tw b/src/uncategorized/futureSocities.tw
index 752fa057890..8f8feeb026c 100644
--- a/src/uncategorized/futureSocities.tw
+++ b/src/uncategorized/futureSocities.tw
@@ -1656,7 +1656,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<<else>>
<<if $FSCredits > 0>>
- <br>''''[[Egyptian Revivalism|Future Society][$arcologies[0].FSEgyptianRevivalist = 4, $FSCredits -= 1]]: a vision of a Pharaoh's Egypt.
+ <br>''''[[Egyptian Revivalism|Future Society][$arcologies[0].FSEgyptianRevivalist = (4+$arcologies[0].FSEgyptianRevivalistInterest), $FSCredits -= 1, $arcologies[0].FSEgyptianRevivalistIncestPolicy = 0]]: a vision of a Pharaoh's Egypt.
<<else>>
/*//''Egyptian Revivalism'': a vision of Pharaoh's Egypt.//*/
<</if>>
diff --git a/src/uncategorized/peConcubineInterview.tw b/src/uncategorized/peConcubineInterview.tw
index 84025f6b896..d058bc561d8 100644
--- a/src/uncategorized/peConcubineInterview.tw
+++ b/src/uncategorized/peConcubineInterview.tw
@@ -304,10 +304,10 @@ You receive an official communication from a popular talk show hosted in one of
Blood empire reborn,
<<elseif $arcologies[0].FSEgyptianRevivalist > 0>>
the land of the Pharaoh<<s>> reborn,
- <<elseif $arcologies[0].FSGenderRadicalist > 0>>
- more a<<ss>> than you can po<<ss>>ibly fuck,
<</if>>
- <<if $arcologies[0].FSGenderFundamentalist > 0>>
+ <<if $arcologies[0].FSGenderRadicalist > 0>>
+ more a<<ss>> than you can po<<ss>>ibly fuck,
+ <<elseif $arcologies[0].FSGenderFundamentalist > 0>>
so much pu<<ss>>y it'<<s>> unbelievable,
<</if>>
<<if $arcologies[0].FSChattelReligionist > 0>>
@@ -345,6 +345,9 @@ You receive an official communication from a popular talk show hosted in one of
MILF<<s>> on their tenth,
<</if>>
lip<<s>>, tongue<<s>>,
+ <<if $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ in<<c>>e<<s>>t,
+ <</if>>
<<if $arcologies[0].FSSlimnessEnthusiast == "unset">>
huge breast<<s>> and plu<<sh>> a<<ss>>e<<s>>,
<<elseif $arcologies[0].FSAssetExpansionist == "unset">>
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 3e919e0a066..e60c34c274f 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -596,7 +596,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<case "physical idealist">>
girl wearing spats and a tight shirt. She occasionally renders herself sweaty, as if just finishing exercising.
<<case "hedonistic decadence">>
- girl wearing spats barely pulled over her big ass and a tight shirt that rides up her chubby belly. It seem's someone snuck out of gym class.
+ girl wearing spats barely pulled over her big ass and a tight shirt that rides up her chubby belly. It seems someone snuck out of gym class.
<<case "gender radicalist">>
girl wearing shorts and a t-shirt. She's changed her appearance recently to make herself quite androgynous.
<<case "gender fundamentalist">>
@@ -1201,7 +1201,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<if $assistantFSOptions>>
<<switch $assistantFSAppearance>>
<<case "paternalist">>
- She still hasn't managed to undo the spell; her chest is still unnatural smooth, not one nipple peaks the fabric of the robe.
+ She still hasn't managed to undo the spell; her chest is still unnaturally smooth, not one nipple peaks the fabric of the robe.
<<case "degradationist">>
She still hasn't managed to undo the spell; her face, hands and every surface of her body are completely covered in tattoos. It is especially noticeable when she talks that her tongue is tattoo'd too; wonder what decorates the surfaces of her body you can't see?
<<case "roman revivalist">>
@@ -1241,7 +1241,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<case "pastoralist">>
She's managed to shrink her nine breasts somewhat; they are merely head sized now. The front of her robes are strained from her excessive number of milky tits.
<<case "maturity preferentialist">>
- She's managed to rein in her aging spell and with a little size up to her breasts, hips and ass makes a very pleasant milf.
+ She's managed to reign in her aging spell and with a little size up to her breasts, hips and ass makes a very pleasant milf.
<<case "youth preferentialist">>
<<if $minimumSlaveAge == 3>>
She's adjusted her tiny body slightly to be less feeble. Now she is a fully capable and adorable toddler witch in an oversized robe, though she has to fight to keep her hat from covering her entire head.
@@ -1357,7 +1357,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
wearing absolutely nothing. She periodically twitches when you aren't looking and you swear you see movement under her skin.
<</if>>
<<if ($cockFeeder == 1) && ($seed == 1)>>
- She is steadily thrusting several tentacles extending from her crotch down and down the throat of a recognizable little representation of one of your slaves. The slave must be down in the kitchen, getting a meal out of the food dispensers. She notices you watching and moans as multiple bulges work their way down her shafts and into the slave. Your eyes are drawn to the hapless girl's rapidly swelling stomach as the creatures seed takes root.
+ She is steadily thrusting several tentacles extending from her crotch down the throat of a recognizable little representation of one of your slaves. The slave must be down in the kitchen, getting a meal out of the food dispensers. She notices you watching and moans as multiple bulges work their way down her shafts and into the slave. Your eyes are drawn to the hapless girl's rapidly swelling stomach as the creature's seed takes root.
<<elseif ($suppository == 1) && ($seed == 2)>>
A recognizable little representation of one of your slaves is before her, writhing in pleasure and pain, as multiple tentacles fuck her ass. The slave must be receiving her drugs from one of the dildo dispensers. She notices you watching and moans as multiple bulges work their way down her shafts and into the slave. Your eyes are drawn to the hapless girl's rapidly swelling stomach as the creatures seed takes root.
<<elseif ($masturbationAllowed == 1) && ($seed == 3)>>
@@ -1367,7 +1367,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<elseif ($seed == 5) && ($invasionVictory > 0)>>
She's partially enveloped a representation of one of your security drones. When she sees you looking at her, she bluntly states, "This one did good. Captured many for your nest."
<<elseif ($seed == 6) && ($studio == 1)>>
- She is holding dozens of cameras at a recognizable little representation of one of your slaves masturbating. The slave must be using one of the penthouse's many vibrators, and $assistantName is likely turning the feed of it into a porno.
+ She is holding dozens of cameras at a recognizable little representation of one of your slaves masturbating. The slave must be using one of the penthouse's many vibrators, and $assistantName is likely turning the feed of it into a porno.
<<elseif ($seed == 7) && ($marketAssistantAnnounced == 1)>>
She's accompanied by your market assistant's fecund avatar.
<<if $marketAssistantRelationship == "cute">>
@@ -1473,7 +1473,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<elseif $marketAssistantRelationship == "nonconsensual">>
The market assistant is being violently penetrated by $assistantName, her bloated belly swaying in tune to her thrusts. The hapless girl struggles in discomfort as the incubus blows another load into her already full womb, causing cum to backflow out of her now loose pussy. $assistantName leans back, motions to you, and asks, "Plenty of holes still to go around, if you want one!"
<<elseif $marketAssistantRelationship == "incestuous">>
- The market assistant is eagerly riding her big brother, $assistantName's dick. You can't help but notice how full her breasts have gotten and how plump her ass and thighs now are. She moans with lust as $assistantName cums into her fertile pussy; a glowing sigil appearing below her navel. She is well on her way to becoming the succubus consort of her once human brother.
+ The market assistant is eagerly riding her big brother, <<print $assistantName>>'s, dick. You can't help but notice how full her breasts have gotten and how plump her ass and thighs now are. She moans with lust as $assistantName cums into her fertile pussy; a glowing sigil appearing below her navel. She is well on her way to becoming the succubus consort of her once human brother.
<<else>>
The market assistant is embracing $assistantName as she is lovingly penetrated by the caring incubus. They pull each other close as they cum together, locking lips and refusing to let go until the other is completely satisfied. It takes quite some before they settle down and wave to you, thanking you deeply for the true love you've gifted them.
<</if>>
@@ -1518,7 +1518,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<case "transformation fetishist">>
She has her jeans unbuttoned and is absentmindedly trying to jerk off. When she notices you watching, she waves her throbbing erection at you, inviting you to lend a pair of hands.
<<case "pastoralist">>
- She is laying on her back, legs squeezing her immense balls as cums again and again across herself. When she notices you watching, she struggles to sit up before giving into the sensations and blowing another load across your desk.
+ She is laying on her back, legs squeezing her immense balls as she cums again and again across herself. When she notices you watching, she struggles to sit up before giving into the sensations and blowing another load across your desk.
<<case "maturity preferentialist">>
She has a hand down her pants. When she notices you watching, she begins eagerly stroking herself while describing, in detail, what she'd love to do to you.
<<case "youth preferentialist">>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index b34c35b67b8..d497e0bf97c 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -157,7 +157,7 @@
[[Repeal|Policies][$MixedMarriage = 0]]
<</if>>
-<<if $OralEncouragement + $OralDiscouragement + $VaginalEncouragement + $VaginalDiscouragement + $AnalEncouragement + $AnalDiscouragement + $sexualOpeness > 0>>
+<<if $OralEncouragement + $OralDiscouragement + $VaginalEncouragement + $VaginalDiscouragement + $AnalEncouragement + $AnalDiscouragement + $sexualOpeness + $arcologies[0].FSEgyptianRevivalistIncestPolicy > 0>>
<br><br>__Sexual Trendsetting__
<<if $OralEncouragement == 1>>
@@ -191,10 +191,16 @@
<</if>>
<<if $sexualOpeness == 1>>
- <br>''Penetrative Sex Campaign:'' you are use your personal influence to attempt to make getting fucked by slaves fashionable, but mostly to garner acceptance for your sexual preference.
+ <br>''Penetrative Sex Campaign:'' you are using your personal influence to attempt to make getting fucked by slaves fashionable, but mostly to garner acceptance for your sexual preference.
[[Repeal|Policies][$sexualOpeness = 0, $PC.degeneracy += 30]]
<</if>>
+/* sub FS policies */
+<<if $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ <br>''Incest Encouragement:'' you are using your personal influence to spur interest in incest.
+ [[Repeal|Policies][$arcologies[0].FSEgyptianRevivalistIncestPolicy = 0]]
+<</if>>
+
<</if>>
<<if $ProRefugees + $ProRecruitment + $ProImmigrationCash + $ProImmigrationRep + $AntiImmigrationCash + $AntiImmigrationRep + $ProEnslavementCash + $ProEnslavementRep + $AntiEnslavementCash + $AntiEnslavementRep > 0>>
<br><br>__Population Policy__
@@ -917,6 +923,12 @@
<br> //Will not be well received, but will head off potentially damaging rumors. This policy assumes you wish to be penetrated.//
<</if>>
+/* sub FS policies */
+<<if $arcologies[0].FSEgyptianRevivalistIncestPolicy == 0 && $arcologies[0].FSEgyptianRevivalist == "unset">>
+ <br>''Incest Encouragement:'' you will use your personal influence to spur interest in incest.
+ [[Implement|Policies][$FSEgyptianRevivalistIncestPolicy = 1, $cash -=5000, $rep -= 1000]]
+<</if>>
+
<br><br>__Population Policy__
<<if $arcologies[0].FSDegradationist == "unset">>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index 0fb613f8923..3ee4a75cf6a 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -308,6 +308,15 @@
<<set $repGain += $FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel), $arcologies[0].FSEgyptianRevivalist += 0.05*$FSSingleSlaveRep*$pornFameBonus>>
<</if>>
<</if>>
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Society @@.green;enjoys@@ your incestuous relationship since incest is currently trendy.
+ <<set $repGain += 1.5*$FSSingleSlaveRep>>
+ <<if _SlaveI.bellyPreg >= 1500>>
+ <<if _SlaveI.pregSource == $relation.ID>>
+ @@.green;The effect is enhanced@@ by _SlaveI.slaveName's pureblooded pregnancy.
+ <<set $repGain += $FSSingleSlaveRep>>
+ <</if>>
+ <</if>>
<</if>>
<<elseif _SlaveI.father == -1>>
She
@@ -365,6 +374,15 @@
<<set $repGain += $FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel), $arcologies[0].FSEgyptianRevivalist += 0.05*$FSSingleSlaveRep*$pornFameBonus>>
<</if>>
<</if>>
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Society @@.green;enjoys@@ your incestuous relationship since incest is currently trendy.
+ <<set $repGain += 1.5*$FSSingleSlaveRep>>
+ <<if _SlaveI.bellyPreg >= 1500>>
+ <<if _SlaveI.pregSource == $relation.ID>>
+ @@.green;The effect is enhanced@@ by _SlaveI.slaveName's pureblooded pregnancy.
+ <<set $repGain += $FSSingleSlaveRep>>
+ <</if>>
+ <</if>>
<</if>>
<<elseif $PC.mother == _SlaveI.ID || $PC.father == _SlaveI.ID>>
She
@@ -422,6 +440,15 @@
<<set $repGain += $FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel), $arcologies[0].FSEgyptianRevivalist += 0.05*$FSSingleSlaveRep*$pornFameBonus>>
<</if>>
<</if>>
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Society @@.green;enjoys@@ your incestuous relationship since incest is currently trendy.
+ <<set $repGain += 1.5*$FSSingleSlaveRep>>
+ <<if _SlaveI.bellyPreg >= 1500>>
+ <<if _SlaveI.pregSource == $relation.ID>>
+ @@.green;The effect is enhanced@@ by _SlaveI.slaveName's pureblooded pregnancy.
+ <<set $repGain += $FSSingleSlaveRep>>
+ <</if>>
+ <</if>>
<</if>>
<<elseif areSisters(_SlaveI, $PC) > 0>>
<<set _PCrelative = areSisters(_SlaveI, $PC)>>
@@ -495,6 +522,15 @@
<<set $repGain += $FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel), $arcologies[0].FSEgyptianRevivalist += 0.05*$FSSingleSlaveRep*$pornFameBonus>>
<</if>>
<</if>>
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Society @@.green;enjoys@@ your incestuous relationship since incest is currently trendy.
+ <<set $repGain += 1.5*$FSSingleSlaveRep>>
+ <<if _SlaveI.bellyPreg >= 1500>>
+ <<if _SlaveI.pregSource == $relation.ID>>
+ @@.green;The effect is enhanced@@ by _SlaveI.slaveName's pureblooded pregnancy.
+ <<set $repGain += $FSSingleSlaveRep>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
<<if (_SlaveI.devotion + _SlaveI.trust < 150)>>
@@ -573,6 +609,15 @@
<<set $repGain += $FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel), $arcologies[0].FSEgyptianRevivalist += 0.05*$FSSingleSlaveRep*$pornFameBonus>>
<</if>>
<</if>>
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Society @@.green;enjoys@@ your incestuous relationship since incest is currently trendy.
+ <<set $repGain += 1.5*$FSSingleSlaveRep>>
+ <<if _SlaveI.bellyPreg >= 1500>>
+ <<if _SlaveI.pregSource == $relation.ID>>
+ @@.green;The effect is enhanced@@ by _SlaveI.slaveName's pureblooded pregnancy.
+ <<set $repGain += $FSSingleSlaveRep>>
+ <</if>>
+ <</if>>
<</if>>
<<elseif _SlaveI.father == -1 && _SlaveI.fetish != "mindbroken">>
She
@@ -630,6 +675,15 @@
<<set $repGain += $FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel), $arcologies[0].FSEgyptianRevivalist += 0.05*$FSSingleSlaveRep*$pornFameBonus>>
<</if>>
<</if>>
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Society @@.green;enjoys@@ your incestuous relationship since incest is currently trendy.
+ <<set $repGain += 1.5*$FSSingleSlaveRep>>
+ <<if _SlaveI.bellyPreg >= 1500>>
+ <<if _SlaveI.pregSource == $relation.ID>>
+ @@.green;The effect is enhanced@@ by _SlaveI.slaveName's pureblooded pregnancy.
+ <<set $repGain += $FSSingleSlaveRep>>
+ <</if>>
+ <</if>>
<</if>>
<<elseif ($PC.mother == _SlaveI.ID || $PC.father == _SlaveI.ID) && _SlaveI.fetish != "mindbroken">>
She
@@ -687,6 +741,15 @@
<<set $repGain += $FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel), $arcologies[0].FSEgyptianRevivalist += 0.05*$FSSingleSlaveRep*$pornFameBonus>>
<</if>>
<</if>>
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Society @@.green;enjoys@@ your incestuous relationship since incest is currently trendy.
+ <<set $repGain += 1.5*$FSSingleSlaveRep>>
+ <<if _SlaveI.bellyPreg >= 1500>>
+ <<if _SlaveI.pregSource == $relation.ID>>
+ @@.green;The effect is enhanced@@ by _SlaveI.slaveName's pureblooded pregnancy.
+ <<set $repGain += $FSSingleSlaveRep>>
+ <</if>>
+ <</if>>
<</if>>
<<elseif areSisters(_SlaveI, $PC) > 0 && _SlaveI.fetish != "mindbroken">>
<<set _PCrelative = areSisters(_SlaveI, $PC)>>
@@ -760,6 +823,15 @@
<<set $repGain += $FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel), $arcologies[0].FSEgyptianRevivalist += 0.05*$FSSingleSlaveRep*$pornFameBonus>>
<</if>>
<</if>>
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Society @@.green;enjoys@@ your incestuous relationship since incest is currently trendy.
+ <<set $repGain += 1.5*$FSSingleSlaveRep>>
+ <<if _SlaveI.bellyPreg >= 1500>>
+ <<if _SlaveI.pregSource == $relation.ID>>
+ @@.green;The effect is enhanced@@ by _SlaveI.slaveName's pureblooded pregnancy.
+ <<set $repGain += $FSSingleSlaveRep>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
/* obsolete due to forced marriage
@@ -1177,6 +1249,15 @@
<<set $repGain += $FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel), $arcologies[0].FSEgyptianRevivalist += 0.05*$FSSingleSlaveRep*$pornFameBonus>>
<</if>>
<</if>>
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Society @@.green;enjoys@@ their incestuous relationship since incest is currently trendy.
+ <<set $repGain += 1.5*$FSSingleSlaveRep>>
+ <<if _SlaveI.bellyPreg >= 1500>>
+ <<if _SlaveI.pregSource == $relation.ID>>
+ @@.green;The effect is enhanced@@ by _SlaveI.slaveName's pureblooded pregnancy.
+ <<set $repGain += $FSSingleSlaveRep>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
<<set $relation = 0>>
@@ -1238,6 +1319,15 @@
@@.green;The effect is greatly enhanced@@ by _SlaveI.slaveName's pureblooded pregnancy.
<<set $repGain += $FSSingleSlaveRep * ($arcologies[0].FSEgyptianRevivalist / $FSLockinLevel), $arcologies[0].FSEgyptianRevivalist += 0.05 * $FSSingleSlaveRep * $pornFameBonus>>
<</if>>
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Society @@.green;enjoys@@ their incestuous relationship since incest is currently trendy.
+ <<set $repGain += 1.5*$FSSingleSlaveRep>>
+ <<if _SlaveI.bellyPreg >= 1500>>
+ <<if _SlaveI.pregSource == $relation.ID>>
+ @@.green;The effect is enhanced@@ by _SlaveI.slaveName's pureblooded pregnancy.
+ <<set $repGain += $FSSingleSlaveRep>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
<</if>> /* closes extended family mode */
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index e9c63ce224d..776734fe301 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -473,16 +473,22 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
are public sluts too, she earns extra attention.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Citizens are very excited about being able to participate in incestuous sex.
<</if>>
<<elseif _children.length > 1>>
Since her relatives, _children[0].slaveName and _children[1].slaveName, are public sluts too, she earns extra attention.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Citizens are very excited about being able to participate in incestuous sex.
<</if>>
<<elseif _children.length > 0>>
Since her relative, _children[0].slaveName, is a public slut too, she earns extra attention.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Citizens are very excited about being able to participate in incestuous sex.
<</if>>
<</if>>
<</if>>
@@ -494,6 +500,8 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
Since her $slaves[$j].relation $slaves[$j].slaveName is a public slut too, she earns extra attention.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
Citizens are very excited about being able to participate in incestuous sex like the ancient Egyptians.
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Citizens are very excited about being able to participate in incestuous sex.
<</if>>
<</if>>
<<break>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index 1dddc310910..5a1ba416ca2 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -475,16 +475,22 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da
are selling themselves too, she earns extra ¤ by working with them.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
Customers are very enthusiastic about being able to participate in incestuous sex like the ancient Egyptians.
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Customers are very enthusiastic about being able to participate in incestuous sex.
<</if>>
<<elseif _children.length > 1>>
Since her relatives, _children[0].slaveName and _children[1].slaveName, are selling themselves too, she earns extra ¤ by working with them.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
Customers are very enthusiastic about being able to participate in incestuous sex like the ancient Egyptians.
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Customers are very enthusiastic about being able to participate in incestuous sex.
<</if>>
<<elseif _children.length > 0>>
Since her relative, _children[0].slaveName, is selling herself too, she earns extra ¤ by working with her.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
Customers are very enthusiastic about being able to participate in incestuous sex like the ancient Egyptians.
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Customers are very enthusiastic about being able to participate in incestuous sex.
<</if>>
<</if>>
<</if>>
@@ -496,6 +502,8 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da
Since her $slaves[$j].relation $slaves[$j].slaveName is selling herself too, she earns extra ¤ by working with her.
<<if $arcologies[0].FSEgyptianRevivalist > 20>>
Customers are very enthusiastic about being able to participate in incestuous sex like the ancient Egyptians.
+ <<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
+ Customers are very enthusiastic about being able to participate in incestuous sex.
<</if>>
<</if>>
<<break>>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 8cd1b76355f..f91c0c1eb92 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -87,7 +87,7 @@
<<if ($slaves[$i].fetish == "mindbroken") && ($slaves[$i].health > 20) && (_attendantUsedCure == 0) && ($spaFix != 2)>>
<<set _attendantUsedCure = 1>>
<<if (random(1,100) > 90-$Attendant.devotion)>>
- @@.green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[$i].slaveName could not be reached, and has lavished patient tenderness on her in $spaName. $slaves[$i].slaveName has begun to respond, and is stirring from her mental torpor.
+ <br> @@.green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[$i].slaveName could not be reached, and has lavished patient tenderness on her in $spaName. $slaves[$i].slaveName has begun to respond, and is stirring from her mental torpor.
<<set $slaves[$i].devotion = -3, $slaves[$i].sexualFlaw = "apathetic", $slaves[$i].behavioralFlaw = either("hates men", "odd"), $slaves[$i].fetish = "none", $slaves[$i].fetishKnown = 1>>
<<if ($arcologies[0].FSPaternalist > 0)>>
Society @@.green;strongly approves@@ of $slaves[$i].slaveName being restored to sanity, which advances ideals about enlightened slave ownership.
@@ -197,11 +197,11 @@
<<if $slaves[$i].behavioralFlaw != "none">>
<<SoftenBehavioralFlaw $slaves[$i]>>
<<set _attendantUsedCure += 1>>
- $Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens her behavioral flaw@@ into an appealing quirk.
+ <br> $Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens her behavioral flaw@@ into an appealing quirk.
<<elseif $slaves[$i].sexualFlaw != "none">>
<<SoftenSexualFlaw $slaves[$i]>>
<<set _attendantUsedCure += 1>>
- $Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens her sexual flaw@@ into an appealing quirk.
+ <br> $Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens her sexual flaw@@ into an appealing quirk.
<</if>>
<</if>>
<</for>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 398a7baae0b..10b75791a3b 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -1154,7 +1154,7 @@
<<if $args[0].mother == $slaves[$j].ID>>
<<if $slaves[$j].assignment == $args[0].assignment>>
<<set $FResult += 1>>
- <<if $arcologies[0].FSEgyptianRevivalist > 20>>
+ <<if $arcologies[0].FSEgyptianRevivalist > 20 || $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
<<set $FResult += 1>>
<</if>>
<</if>>
@@ -1162,7 +1162,7 @@
<<if $args[0].father == $slaves[$j].ID>>
<<if $slaves[$j].assignment == $args[0].assignment>>
<<set $FResult += 1>>
- <<if $arcologies[0].FSEgyptianRevivalist > 20>>
+ <<if $arcologies[0].FSEgyptianRevivalist > 20 || $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
<<set $FResult += 1>>
<</if>>
<</if>>
@@ -1170,7 +1170,7 @@
<<if $slaves[$j].mother == $args[0].ID || $slaves[$j].father == $args[0].ID>>
<<if $slaves[$j].assignment == $args[0].assignment>>
<<set $FResult += 1>>
- <<if $arcologies[0].FSEgyptianRevivalist > 20>>
+ <<if $arcologies[0].FSEgyptianRevivalist > 20 || $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
<<set $FResult += 1>>
<</if>>
<</if>>
@@ -1178,7 +1178,7 @@
<<if areSisters($args[0], $slaves[$j]) > 0>>
<<if $slaves[$j].assignment == $args[0].assignment>>
<<set $FResult += 1>>
- <<if $arcologies[0].FSEgyptianRevivalist > 20>>
+ <<if $arcologies[0].FSEgyptianRevivalist > 20 || $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
<<set $FResult += 1>>
<</if>>
<</if>>
@@ -1190,7 +1190,7 @@
<<set _fre = $slaves.findIndex(function(s) { return s.ID == $args[0].relationTarget && s.assignment == $args[0].assignment; })>>
<<if _fre != -1>>
<<set $FResult += 2>>
- <<if $arcologies[0].FSEgyptianRevivalist > 20>>
+ <<if $arcologies[0].FSEgyptianRevivalist > 20 || $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>
<<set $FResult += 2>>
<</if>>
<</if>>
--
GitLab