From f9fd75823d40b75c06d70427a6b4e8c2ae2df654 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 24 Jan 2018 13:24:57 -0500
Subject: [PATCH] partial implementation of $seePreg
---
src/cheats/mod_EditArcologyCheat.tw | 2 ++
src/cheats/mod_EditFSCheat.tw | 4 ++-
src/npc/databases/dSlavesDatabase.tw | 4 +++
src/npc/startingGirls/startingGirls.tw | 2 ++
src/pregmod/newChildIntro.tw | 2 ++
src/pregmod/seFCTVinstall.tw | 2 +-
src/pregmod/seFCTVshows.tw | 4 +++
src/uncategorized/BackwardsCompatibility.tw | 5 ++-
src/uncategorized/brothelAdvertisement.tw | 2 ++
src/uncategorized/clubAdvertisement.tw | 2 ++
src/uncategorized/dairy.tw | 34 +++++++++----------
src/uncategorized/dispensary.tw | 4 ++-
src/uncategorized/futureSocities.tw | 3 +-
src/uncategorized/genericPlotEvents.tw | 4 ++-
src/uncategorized/managePenthouse.tw | 2 +-
src/uncategorized/masterSuite.tw | 2 ++
src/uncategorized/newSlaveIntro.tw | 4 +--
src/uncategorized/nonRandomEvent.tw | 2 +-
src/uncategorized/personalAssistantOptions.tw | 8 +++++
19 files changed, 65 insertions(+), 27 deletions(-)
diff --git a/src/cheats/mod_EditArcologyCheat.tw b/src/cheats/mod_EditArcologyCheat.tw
index b9f56609394..a207da4fe46 100644
--- a/src/cheats/mod_EditArcologyCheat.tw
+++ b/src/cheats/mod_EditArcologyCheat.tw
@@ -356,6 +356,7 @@ __Player Character__
<<radiobutton "$HA.schoolAnnexed" 0>> 0
| <<radiobutton "$HA.schoolAnnexed" 1>> 1 (Failed)
+<<if $seePreg != 0>>
<br><br>''The Cattle Ranch:''
<br>TCR Students Bought: <<textbox "$TCR.studentsBought" $TCR.studentsBought>>
<br>TCR Upgrades: ''$TCR.schoolUpgrade''
@@ -371,6 +372,7 @@ __Player Character__
<br>TCR Failed: ''$TCR.schoolAnnexed'' |
<<radiobutton "$TCR.schoolAnnexed" 0>> 0
| <<radiobutton "$TCR.schoolAnnexed" 1>> 1 (Failed)
+<</if>>
<<if ($seeDicks != 0)>>
<br><br>''L'École des Enculées:''
diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw
index 035748cdcb7..541aa1b204f 100644
--- a/src/cheats/mod_EditFSCheat.tw
+++ b/src/cheats/mod_EditFSCheat.tw
@@ -126,6 +126,7 @@
<br>[[Apply and reset Gender Radicalism|MOD_Edit FS Cheat][$arcologies[0].FSGenderRadicalist = "unset",$arcologies[0].FSGenderRadicalistDecoration = 20,$arcologies[0].FSGenderRadicalistLawBeauty = 0, $arcologies[0].FSGenderRadicalistLawFuta = 0]]
+<<if $seePreg != 0>>
<br><br>
<<if $arcologies[0].FSRepopulationFocus != "unset">>
@@ -175,7 +176,8 @@
| <<radiobutton "$arcologies[0].FSRestartSMR" 1>> 1 (Passed.)
<br>[[Apply and reset Repopulation Efforts|MOD_Edit FS Cheat][$arcologies[0].FSRepopulationFocus = "unset",$arcologies[0].FSRepopulationFocusDecoration = 20,$arcologies[0].FSRepopulationFocusLaw = 0, $arcologies[0].FSRepopulationFocusSMR = 0]]
-
+<</if>>
+
<br><br>
<<if $arcologies[0].FSPaternalist != "unset">>
diff --git a/src/npc/databases/dSlavesDatabase.tw b/src/npc/databases/dSlavesDatabase.tw
index ba56a986d5b..8ef49c7a442 100644
--- a/src/npc/databases/dSlavesDatabase.tw
+++ b/src/npc/databases/dSlavesDatabase.tw
@@ -470,9 +470,11 @@
<<set _HS.slaveName = "Caroline", _HS.birthName = "Carl", _HS.ID = _i++, _HS.prestigeDesc = "She was once a rising free cities politician who argued for compulsory female enslavement, but she became an addict, fell into debt, and was subsequently enslaved.", _HS.birthWeek = random(0,51), _HS.actualAge = 44, _HS.physicalAge = 44, _HS.visualAge = 44, _HS.ovaryAge = 44, _HS.health = 60, _HS.devotion = 90, _HS.height = 145, _HS.heightImplant = -1, _HS.nationality = "French", _HS.eyeColor = "blue", _HS.hColor = "blonde", _HS.pubicHColor = "blonde", _HS.skin = "tanned", _HS.hLength = 70, _HS.hStyle = "ass-length", _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.heels = 1, _HS.boobs = 1100, _HS.boobsImplant = 400, _HS.nipplesPiercing = 1, _HS.areolae = 1, _HS.butt = 4, _HS.buttImplant = 2, _HS.face = 55, _HS.faceImplant = 65, _HS.lips = 55, _HS.lipsImplant = 2, _HS.vagina = 1, _HS.vaginaLube = 1, _HS.preg = -2, _HS.anus = 2, _HS.anusTat = "bleached", _HS.makeup = 3, _HS.nails = 1, _HS.earPiercing = 1, _HS.navelPiercing = 1, _HS.legsTat = "degradation", _HS.stampTat = "degradation", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 15, _HS.entertainSkill = 35, _HS.drugs = "breast injections", _HS.addict = 1, _HS.clothes = "slutty jewelry", _HS.collar = "tight steel", _HS.intelligence = -2, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "humiliation", _HS.behavioralFlaw = "arrogant", _HS.customTat = "She has a tattoo down her left arm, which reads = 'Once a tall, muscular, handsome man with a big dick and big balls.'", _HS.customDesc = "Since becoming a slave she has been turned into a little bimbo.">>
<<set $heroSlaves.push(_HS)>>
+<<if $seePreg != 0>>
<<set _HS = {}>>
<<set _HS.slaveName = "'Milkmaid' Megan", _HS.birthName = "Megan", _HS.origin = "She was sold to you from the public slave market, and was probably kidnapped or otherwise forced into slavery.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 34, _HS.physicalAge = 34, _HS.visualAge = 34, _HS.ovaryAge = 34, _HS.health = 100, _HS.devotion = 100, _HS.nationality = "American", _HS.skin = "lightened", _HS.hStyle = "long", _HS.pubicHStyle = "bushy", _HS.waist = -55, _HS.boobs = 1350, _HS.lactation = 1, _HS.butt = 3, _HS.vagina = 2, _HS.vaginaLube = 1, _HS.vaginaPiercing = 1, _HS.preg = 27, _HS.pregWeek = 27, _HS.pregKnown = 1, _HS.belly = 5000, _HS.bellyPreg = 5000, _HS.births = 1, _HS.anus = 3, _HS.ovaries = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 35, _HS.combatSkill = 0, _HS.collar = "heavy gold", _HS.shoes = "flats", _HS.energy = 100, _HS.attrXY = 40, _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
+<</if>>
<<set _HS = {}>>
<<set _HS.slaveName = "Horsepussy", _HS.birthName = "Amber", _HS.origin = "She was sold to you from the public slave market, and was probably kidnapped or otherwise forced into slavery.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 35, _HS.physicalAge = 35, _HS.visualAge = 35, _HS.ovaryAge = 35, _HS.health = 80, _HS.devotion = 55.7, _HS.height = 190, _HS.nationality = "American", _HS.eyeColor = "blue", _HS.skin = "pale", _HS.hLength = 10, _HS.pubicHStyle = "waxed", _HS.boobs = 500, _HS.butt = 5, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.clitPiercing = 3, _HS.clitSetting = "vanilla", _HS.anus = 3, _HS.ovaries = 1, _HS.anusPiercing = 1, _HS.makeup = 1, _HS.brand = "SLAVE", _HS.brandLocation = "buttocks", _HS.earPiercing = 1, _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 100, _HS.entertainSkill = 35, _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = 3, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetishKnown = 1, _HS.customTat = "Her nickname, 'Horsepussy,' is tattooed on her forehead.", _HS.customDesc = "Her pussy has been extensively surgically altered. Her labia are large and puffy, sticking out nearly an inch from her crotch. Her cunt is exquisitely pink at the center, but her large labia are dark at the edges, almost black.">>
@@ -528,9 +530,11 @@
<<set $heroSlaves.push(_HS)>>
/* not much to change, lowered weight (‘perfect slim body’), set to mute and changed flaw to odd- described as creepy */
+<<if $seePreg != 0>>
<<set _HS = {}>>
<<set _HS.slaveName = "'Fucknugget' Pillow", _HS.birthName = "Anika", _HS.origin = "She sold herself into slavery to escape life on the streets.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 37, _HS.physicalAge = 37, _HS.visualAge = 37, _HS.ovaryAge = 37, _HS.health = 80, _HS.devotion = 100, _HS.weight = 40, _HS.race = "surgically altered to look latina", _HS.eyeColor = "blue", _HS.hColor = "red", _HS.pubicHColor = "red", _HS.hStyle = "long", _HS.waist = -100, _HS.amp = 1, _HS.boobs = 6260, _HS.boobsImplant = 4200, _HS.nipplesPiercing = 2, _HS.areolae = 3, _HS.boobsTat = "flowers", _HS.lactation = 2, _HS.butt = 12, _HS.buttImplant = 1, _HS.buttTat = "flowers", _HS.face = 55, _HS.faceImplant = 15, _HS.lips = 55, _HS.lipsImplant = 10, _HS.lipsPiercing = 2, _HS.lipsTat = "flowers", _HS.tonguePiercing = 2, _HS.vagina = 3, _HS.vaginaLube = 1, _HS.vaginaPiercing = 2, _HS.vaginaTat = "flowers", _HS.preg = 37, _HS.pregWeek = 37, _HS.pregKnown = 1, _HS.belly = 13000, _HS.bellyPreg = 13000, _HS.births = 2, _HS.birthsTotal = 2, _HS.clitPiercing = 3, _HS.clitSetting = "boobs", _HS.anus = 2, _HS.ovaries = 1, _HS.anusPiercing = 2, _HS.anusTat = "flowers", _HS.makeup = 3, _HS.earPiercing = 2, _HS.nosePiercing = 2, _HS.eyebrowPiercing = 2, _HS.navelPiercing = 2, _HS.shouldersTat = "advertisements", _HS.stampTat = "flowers", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 15, _HS.aphrodisiacs = 1, _HS.addict = 99, _HS.clothes = "restrictive latex", _HS.collar = "leather with cowbell", _HS.intelligence = -2, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "boobs", _HS.fetishKnown = 1>>
<<set $heroSlaves.push(_HS)>>
+<</if>>
<<set _HS = {}>>
<<set _HS.slaveName = "'DoL Toy' Allie", _HS.birthName = "Aliana", _HS.origin = "She is an enslaved member of an anti-slavery extremist group.", _HS.ID = _i++, _HS.birthWeek = random(0,51), _HS.actualAge = 33, _HS.physicalAge = 33, _HS.visualAge = 33, _HS.ovaryAge = 33, _HS.health = 80, _HS.devotion = 65, _HS.height = 155, _HS.nationality = "Mexican", _HS.race = "latina", _HS.hColor = "raven black with red highlights", _HS.skin = "light brown", _HS.hLength = 10, _HS.pubicHStyle = "waxed", _HS.waist = -55, _HS.boobs = 700, _HS.butt = 3, _HS.face = 15, _HS.lips = 35, _HS.lipsTat = "permanent makeup", _HS.vagina = 2, _HS.vaginaLube = 1, _HS.bellyAccessory = "an extreme corset", _HS.clitPiercing = 3, _HS.clitSetting = "submissive", _HS.anus = 2, _HS.ovaries = 1, _HS.stampTat = "degradation", _HS.vaginalSkill = 100, _HS.oralSkill = 100, _HS.analSkill = 100, _HS.whoreSkill = 35, _HS.entertainSkill = 15, _HS.collar = "heavy gold", _HS.shoes = "heels", _HS.intelligence = 1, _HS.intelligenceImplant = 1, _HS.attrXY = 40, _HS.fetish = "submissive", _HS.fetishKnown = 1, _HS.customTat = "Her left butt cheek is tattooed with a small shield bearing the words 'Daughter of Liberty' with a large red 'not' symbol added over it.">>
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 1c0ae85eae0..9ec4ef687b1 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -922,6 +922,7 @@ Her nationality is $activeSlave.nationality.
<<link "Normal">><<set $activeSlave.vaginaLube = 1>><<replace "#wetness">>Normal.<</replace>><<StartingGirlsCost>><</link>> |
<<link "Excessive">><<set $activeSlave.vaginaLube = 2>><<replace "#wetness">>Excessive.<</replace>><<StartingGirlsCost>><</link>>
+<<if $seePreg != 0>>
<br>''Pregnancy:''
<span id="preg">
<<if $activeSlave.preg > 39>>Ready to drop.
@@ -957,6 +958,7 @@ Her nationality is $activeSlave.nationality.
<</if>>
<</if>>
</span>
+<</if>>
<span id="dickblock">
<<if $seeDicks != 0 || $makeDicks == 1>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index dd28e3031d6..f331240c3bf 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -626,6 +626,7 @@ You slowly strip down, gauging her reactions to your show, until you are fully n
<</replace>>
<</link>>
+<<if $seePreg != 0>>
<<if isFertile($activeSlave)>>
<br><<link "Impregnate her">>
<<set $activeSlave.preg = 1>>
@@ -653,6 +654,7 @@ You slowly strip down, gauging her reactions to your show, until you are fully n
<</replace>>
<</link>>
<</if>>
+<</if>>
<br><<link "Break her in publicly">>
<<replace "#result">>
diff --git a/src/pregmod/seFCTVinstall.tw b/src/pregmod/seFCTVinstall.tw
index c0edec0224f..35585b6acbc 100644
--- a/src/pregmod/seFCTVinstall.tw
+++ b/src/pregmod/seFCTVinstall.tw
@@ -8,4 +8,4 @@ You've been sitting in your office into the early afternoon going over bothersom
You browse the guide: Homeshopping networks, random dramas, how-tos and a myriad of other things. Of more interest are some of the programs showing glimpses into foreign arcologies and how they are using the service to help mold society.
-<br><br><i>While FCTV excludes any dick-based, hyperpregnancy, and extreme content based on your settings, it may still hint at that content. If you wish to be absolutely sure, don't watch FCTV or do not install the receiver.</i>
+<br><br><i>While FCTV attempts to exclude any dick-based, pregnancy, hyperpregnancy, and extreme content based on your settings, it may still hint at that content, especially the more mundane of it. If you wish to be absolutely sure, don't watch FCTV or do not install the receiver.</i>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 240d364815d..c98f15cc541 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -36,6 +36,10 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $randShow = either(0,1,2,3,4,5,6,7,9,11,12)>>
There is an audible tone from your screen, which then displays a message: <i>Too much happiness detected, changing program.</i>
<</if>>
+<<if $seePreg == 0 && ($randShow == 8 || $randShow == 5)>>
+ <<set $randShow = either(0,1,2,3,4,6,7,9,11,12)>>
+ There is an audible tone from your screen, which then displays a message: <i>Too much baking detected, changing program.</i>
+<</if>>
<<if $seeDicks == 0 && $makeDicks == 0 && $randShow == 10>>
<<set $randShow = either(0,1,2,3,4,11,12)>>
There is an audible tone from your screen, which then displays a message: <i>Too many hot dogs detected, changing program.</i>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 99fe5aa0b5c..48b70303956 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -441,7 +441,10 @@
<<set $seeHyperPreg = 0>>
<</if>>
<<if ndef $seePreg>>
- <<set $seePreg = 0>>
+ <<set $seePreg = 1>>
+<</if>>
+<<if $seePreg == 0>>
+ <<set $seePreg = 1>>
<</if>>
<<if ndef $retainCareer>>
<<set $retainCareer = 1>>
diff --git a/src/uncategorized/brothelAdvertisement.tw b/src/uncategorized/brothelAdvertisement.tw
index 650d6ed4fa8..b7ba8e22fe1 100644
--- a/src/uncategorized/brothelAdvertisement.tw
+++ b/src/uncategorized/brothelAdvertisement.tw
@@ -159,11 +159,13 @@ Body mods:
<<if $brothelAdsModded != 0>><<link "Variety">><<set $brothelAdsModded = 0>><<goto "Brothel Advertisement">><</link>><<else>>Variety<</if>>
<br>
+<<if $seePreg != 0>>
Pregnancy:
<<if $brothelAdsPreg != 1>><<link "Gravid">><<set $brothelAdsPreg = 1>><<goto "Brothel Advertisement">><</link>> | <<else>>Gravid | <</if>>
<<if $brothelAdsPreg != -1>><<link "None">><<set $brothelAdsPreg = -1>><<goto "Brothel Advertisement">><</link>> | <<else>>None | <</if>>
<<if $brothelAdsPreg != 0>><<link "Variety">><<set $brothelAdsPreg = 0>><<goto "Brothel Advertisement">><</link>><<else>>Variety<</if>>
<br>
+<</if>>
Age:
<<if $brothelAdsOld != 1>><<link "MILF">><<set $brothelAdsOld = 1>><<goto "Brothel Advertisement">><</link>> | <<else>>MILF | <</if>>
diff --git a/src/uncategorized/clubAdvertisement.tw b/src/uncategorized/clubAdvertisement.tw
index d7b9539dd80..6db82173b58 100644
--- a/src/uncategorized/clubAdvertisement.tw
+++ b/src/uncategorized/clubAdvertisement.tw
@@ -171,11 +171,13 @@ Age:
<<if $clubAdsOld != 0>><<link "Variety">><<set $clubAdsOld = 0>><<goto "Club Advertisement">><</link>> <<else>>Variety<</if>>
<br>
+<<if $seePreg != 0>>
Pregnancy:
<<if $clubAdsPreg != 1>><<link "Gravid">><<set $clubAdsPreg = 1>><<goto "Club Advertisement">><</link>> | <<else>>Gravid | <</if>>
<<if $clubAdsPreg != -1>><<link "None">><<set $clubAdsPreg = -1>><<goto "Club Advertisement">><</link>> | <<else>>None | <</if>>
<<if $clubAdsPreg != 0>><<link "Variety">><<set $clubAdsPreg = 0>><<goto "Club Advertisement">><</link>><<else>>Variety<</if>>
<br>
+<</if>>
<<if $seeDicks != 0>>
Genitalia:
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 8b05c643dc7..8f1d52cec16 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -326,23 +326,24 @@ $dairyNameCaps
<</if>>
-<br>
-<<if $dairyPregUpgrade == 1>>
- $dairyNameCaps can support cow pregnancies.
- <br> Fertile cows' wombs are
- <<if $dairyPregSetting == 3>>
- ''worked to capacity.'' [[Industrial|Dairy][$dairyPregSetting = 2]]
- <<elseif $dairyPregSetting == 2>>
- ''industrially employed.'' <<if ($seeExtreme != 0) && ($seeHyperPreg == 1) && ($dairyRestraintsSetting == 2) && ($dairyHyperPregRemodel == 1)>> [[Mass Production|Dairy][$dairyPregSetting = 3]] | <</if>>[[Moderate|Dairy][$dairyPregSetting = 1, $dairyPregSettingChanged = -1]]
- <<elseif $dairyPregSetting == 1>>
- ''for hire.'' [[Not for hire|Dairy][$dairyPregSetting = 0]]<<if ($seeExtreme != 0) && ($dairyRestraintsSetting == 2)>> | [[Industrial|Dairy][$dairyPregSetting = 2, $dairyPregSettingChanged = 1]]<</if>>
+<<if $seePreg != 0>>
+ <br>
+ <<if $dairyPregUpgrade == 1>>
+ $dairyNameCaps can support cow pregnancies.
+ <br> Fertile cows' wombs are
+ <<if $dairyPregSetting == 3>>
+ ''worked to capacity.'' [[Industrial|Dairy][$dairyPregSetting = 2]]
+ <<elseif $dairyPregSetting == 2>>
+ ''industrially employed.'' <<if ($seeExtreme != 0) && ($seeHyperPreg == 1) && ($dairyRestraintsSetting == 2) && ($dairyHyperPregRemodel == 1)>> [[Mass Production|Dairy][$dairyPregSetting = 3]] | <</if>>[[Moderate|Dairy][$dairyPregSetting = 1, $dairyPregSettingChanged = -1]]
+ <<elseif $dairyPregSetting == 1>>
+ ''for hire.'' [[Not for hire|Dairy][$dairyPregSetting = 0]]<<if ($seeExtreme != 0) && ($dairyRestraintsSetting == 2)>> | [[Industrial|Dairy][$dairyPregSetting = 2, $dairyPregSettingChanged = 1]]<</if>>
+ <<else>>
+ ''not for hire.'' [[For hire|Dairy][$dairyPregSetting = 1]]
+ <</if>>
<<else>>
- ''not for hire.'' [[For hire|Dairy][$dairyPregSetting = 1]]
+ $dairyNameCaps is not prepared to support cow pregnancies, and therefore cannot be used to contract out fertile slaves' wombs.
+ <br> [[Upgrade the dairy to support pregnancies|Dairy][$cash -= 2500, $dairyPregUpgrade = 1]] //Costs <<print cashFormat(2500)>> and will increase upkeep costs//
<</if>>
-<<else>>
- $dairyNameCaps is not prepared to support cow pregnancies, and therefore cannot be used to contract out fertile slaves' wombs.
- <br> [[Upgrade the dairy to support pregnancies|Dairy][$cash -= 2500, $dairyPregUpgrade = 1]] //Costs <<print cashFormat(2500)>> and will increase upkeep costs//
-
<</if>>
<br>
@@ -391,7 +392,6 @@ $dairyNameCaps
$dairyNameCaps's milking racks have been remodeled to allow cows' abnormal pregnancies room to grow.
<<else>>
$dairyNameCaps's milking racks can be remodeled to hold hyper-pregnant cattle. [[Expand the milking racks|Dairy][$cash -= _Tmult1, $dairyHyperPregRemodel = 1]] //Costs <<print cashFormat(_Tmult1)>>//
-
<</if>>
<</if>>
@@ -489,7 +489,7 @@ $dairyNameCaps
<br>
<<if $milkmaidImpregnates == 1>>
Keeping the cows pregnant is part of her job. [[Order her to stop impregnating|Dairy][$milkmaidImpregnates = 0]]
- <<else>>
+ <<elseif $seePreg != 0>>
She could be directed to keep the cows pregnant herself. [[Order her to impregnate|Dairy][$milkmaidImpregnates = 1]]
<</if>>
<</if>>
diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw
index 09b96ff4460..264a8404e02 100644
--- a/src/uncategorized/dispensary.tw
+++ b/src/uncategorized/dispensary.tw
@@ -336,6 +336,7 @@ Pharmacological Upgrades
<br>
<</if>>
+<<if $seePreg != 0>>
<br>
Fertility Focused Pharmacology
<hr>
@@ -379,6 +380,7 @@ Fertility Focused Pharmacology
The fabricator is producing highly effective fertility agents. There is a warning present involving overdosing and instances of ten or more children.
<br>
<</if>>
+<</if>>
<br>
Implant Production
@@ -398,7 +400,7 @@ Implant Production
<br>
<</if>>
-<<if $ImplantProductionUpgrade == 1 && $seeHyperPreg == 1 && $seeExtreme == 1>>
+<<if $ImplantProductionUpgrade == 1 && $seeHyperPreg == 1 && $seeExtreme == 1 && $seePreg != 0>>
<<if ($permaPregImplant == 0) and ($rep <= 4000*$upgradeMultiplierMedicine)>>
//You lack the reputation to access experimental pregnancy generator schematics//
<br>
diff --git a/src/uncategorized/futureSocities.tw b/src/uncategorized/futureSocities.tw
index 39df5f91b0c..dff3f99d710 100644
--- a/src/uncategorized/futureSocities.tw
+++ b/src/uncategorized/futureSocities.tw
@@ -707,6 +707,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
+<<if $seePreg != 0>>
<<if $arcologies[0].FSRestart == "unset">>
<<if $arcologies[0].FSRepopulationFocus != "unset">>
<br>''You are pursuing'' the belief that mass breeding will save humanity.
@@ -810,7 +811,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<</if>>
<</if>>
-
+<</if>>
<<if $seeDicks != 0 || $makeDicks == 1>>
<<if $arcologies[0].FSGenderFundamentalist is "unset">>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 9dd8df18c1b..e8cd6b28f65 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -148,7 +148,9 @@ The crowd of nude slaves led up to the lawn and chained to rings along one edge
<<set $seed.push("convent")>>
<<set $seed.push("school")>>
<<set $seed.push("housewives")>>
- <<set $seed.push("maternity")>>
+ <<if $seePreg != 0>>
+ <<set $seed.push("maternity")>>
+ <</if>>
<</if>>
<<if ($seeDicks >= 25)>>
<<set $seed.push("conversion")>>
diff --git a/src/uncategorized/managePenthouse.tw b/src/uncategorized/managePenthouse.tw
index cbff8aca846..f9112de3573 100644
--- a/src/uncategorized/managePenthouse.tw
+++ b/src/uncategorized/managePenthouse.tw
@@ -92,7 +92,7 @@ __Penthouse Facilities__
<br>
-<<if $familyTesting == 1>>
+<<if $familyTesting == 1 && $seePreg != 0>>
<<if $arcologyUpgrade.grid == 1>>
<<if $incubator == 0>>
[[Install an incubation chamber to rapidly age children|Manage Penthouse][$cash -= Math.trunc(100000*$upgradeMultiplierArcology), $incubator = 1, $PC.engineering += 1]]
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index fb91dfc7a68..d0288394c92 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -301,6 +301,7 @@ $masterSuiteNameCaps is furnished
<<set _Tmult0 = Math.trunc($masterSuite*1000*$upgradeMultiplierArcology)>>
[[Expand the Master Suite|Master Suite][$cash -= _Tmult0, $masterSuite += 2, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
+<<if $seePreg != 0>>
<br>
<<if $masterSuiteUpgradePregnancy == 1>>
The master suite has been further upgraded to support fertile slaves and encourage slave pregnancy, providing additional rest areas, better access to amenities, and a dedicated birthing chamber.
@@ -325,6 +326,7 @@ $masterSuiteNameCaps is furnished
<<else>>
The master suite does not currently have special customizations to support slave pregnancy. [[Refit the suite to support and encourage slave pregnancy|Master Suite][$cash -= _Tmult3, $masterSuiteUpgradePregnancy = 1]] //Costs <<print cashFormat(_Tmult3)>>//
<</if>>
+<</if>>
<br><br>
<<if $Concubine != 0>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 4f1f0c306e5..960ba63bc11 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1200,7 +1200,7 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
<</link>>
<</if>>
-
+<<if $seePreg != 0>>
<<if isFertile($activeSlave)>>
| <<link "Impregnate her">>
<<replace "#introResult">>
@@ -1229,7 +1229,7 @@ The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if
<<set $activeSlave.pregSource = -1>>
<</link>>
<</if>>
-
+<</if>>
<<if ($activeSlave.devotion < -10) && ($activeSlave.vagina == 0)>>
<br>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index 0c82c7ba50a..6f1971bb590 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -54,7 +54,7 @@
<<goto "P mercenary romeo">>
<<elseif (_effectiveWeek == 46) && ($mercenaries > 0)>>
<<goto "P raid invitation">>
-<<elseif (_effectiveWeek == 52) && ($seeHyperPreg == 1) && $badB != 1>>
+<<elseif (_effectiveWeek == 52) && ($seeHyperPreg == 1) && $seePreg != 0 && $badB != 1>>
<<set _valid = $slaves.find(function(s) { return s.drugs == "breast injections" || s.drugs == "hyper breast injections"; })>>
<<if def _valid>>
<<set $badB = 1, $Event = "bad breasts">>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index 0a016d9daa8..0eb8ac225ac 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -271,6 +271,7 @@ It has no impact on public opinion.
<</if>>
<br>
<</if>>
+<<if $seePreg != 0>>
<<if $assistantAppearance != "goddess">> [[Goddess|Personal assistant options][$assistantAppearance = "goddess"]]
<<if $PAPublic == 1>>
<<set _seed = []>>
@@ -298,6 +299,7 @@ It has no impact on public opinion.
<</if>>
<br>
<</if>>
+<</if>>
<<if $assistantAppearance != "amazon">> [[Amazon|Personal assistant options][$assistantAppearance = "amazon"]]
<<if $PAPublic == 1>>
<<set _seed = []>>
@@ -396,6 +398,7 @@ It has no impact on public opinion.
<br>
<</if>>
<</if>>
+<<if $seePreg != 0>>
<<if $assistantAppearance != "hypergoddess" && $seeHyperPreg == 1>> [[Hyper Goddess|Personal assistant options][$assistantAppearance = "hypergoddess"]]
<<if $PAPublic == 1>>
<<set _seed = []>>
@@ -419,6 +422,7 @@ It has no impact on public opinion.
<</if>>
<br>
<</if>>
+<</if>>
<<if $assistantAppearance != "loli" && $minimumSlaveAge < 13>> [[Loli|Personal assistant options][$assistantAppearance = "loli"]]
<<if $PAPublic == 1>>
<<set _seed = []>>
@@ -443,6 +447,7 @@ It has no impact on public opinion.
<</if>>
<br>
<</if>>
+<<if $seePreg != 0>>
<<if $assistantAppearance != "preggololi" && $fertilityAge < 13 && $minimumSlaveAge < 13>> [[Preggololi|Personal assistant options][$assistantAppearance = "preggololi"]]
<<if $PAPublic == 1>>
<<set _seed = []>>
@@ -466,6 +471,7 @@ It has no impact on public opinion.
<</if>>
<br>
<</if>>
+<</if>>
<<if $assistantAppearance != "fairy">> [[Fairy|Personal assistant options][$assistantAppearance = "fairy"]]
<<if $PAPublic == 1>>
<<set _seed = []>>
@@ -486,6 +492,7 @@ It has no impact on public opinion.
<</if>>
<br>
<</if>>
+<<if $seePreg != 0>>
<<if $assistantAppearance != "pregnant fairy">> [[Pregnant Fairy|Personal assistant options][$assistantAppearance = "pregnant fairy"]]
<<if $PAPublic == 1>>
<<set _seed = []>>
@@ -507,6 +514,7 @@ It has no impact on public opinion.
<</if>>
<br>
<</if>>
+<</if>>
<<if $assistantExtra1 == 1>>
<<if $assistantAppearance != "slimegirl">> [[Slime Girl|Personal assistant options][$assistantAppearance = "slimegirl"]]
<<if $PAPublic == 1>>
--
GitLab