diff --git a/src/pregmod/nursery.tw b/src/pregmod/nursery.tw
index 6535386f23ebd72f4e6677a45c7d62e998c99af8..66705e7dd780e62f6861491b11df8eadee399261 100644
--- a/src/pregmod/nursery.tw
+++ b/src/pregmod/nursery.tw
@@ -1,79 +1,73 @@
:: Nursery [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Nursery", $showEncyclopedia = 1, $encyclopedia = "Nursery">>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Nursery", $showEncyclopedia = 1, $encyclopedia = "Nursery", $nurserySlaves = $NurseryiIDs.length>>
<<if $nurseryName != "the Nursery">>
<<set $nurseryNameCaps = $nurseryName.replace("the ", "The ")>>
<</if>>
<<nurseryAssignmentFilter>>
+$nurseryNameCaps
<<switch $nurseryDecoration>>
<<case "Roman Revivalist">>
- is decorated as a Roman whorehouse. Refreshments are served at a bar, and someone is playing pipes in the back.
+ is built as a Roman bath. The flooring is pleasantly warm due to a modernized version of hypocaust heating, and is covered in mosaic depicting slaves enjoying sex.
<<case "Aztec Revivalist">>
- is decorated as an Aztec ode to fertility and nature. Clients may sacrifice a bit of blood to honor the goddess of Filth or to partake in a fertility ritual before joining the girl of their choosing.
+ is built as an Aztec bathhouse. Water steams from the middle of the room and the air is heavy with the scent of herbs and essences. The idols by the door glisten with moisture.
<<case "Egyptian Revivalist">>
- is decorated as an ancient Egyptian fertility temple. Customers are bade relax on couches next to running water so that slaves may dance to entice them.
+ is decorated like an Egyptian water garden. All but the hottest pools include aquatic plants around their edges, and the atmosphere is heavy with perfume.
<<case "Edo Revivalist">>
- is furnished as an Edo period pleasure house, seedy by the standards of the time. Still, girls usually keep their clothes on until they lead patrons back behind the sliding paper screens, though this does not stop silhouettes of the activities within from being visible on them.
+ is decorated like a traditional onsen. The stone-lined pools are surrounded by meticulously kept gardens, and there are proper provisions for bathing in the old Japanese style.
<<case "Arabian Revivalist">>
- is furnished as an Arabian fleshmarket, with the merchandise standing on little platforms, prices visible. Customers are permitted to fondle before making a decision and dragging a girl back behind a curtain.
+ looks like a dream of an Arabian palace garden. Every surface is richly tiled in vibrant colors, and the beguiling scents of perfumes from the Levant hang in the air.
<<case "Chinese Revivalist">>
- is furnished as an old Chinese pleasure house, with each girl set up in her own low room. They stand outside the doors, luring customers back one by one.
+ is gloomy and hot, filled with an oppressive steam that immediately dulls the senses. Though relaxation is possible and indeed easy here, it is a stultifying relaxation whose humid warmth seems to suppress independence.
<<case "Chattel Religionist">>
- is decorated as a place of carnal worship. The air is scented by censers, and the slaves here maintain an air of holiness even when being sodomized in public.
+ is dedicated to the purification of the body and the spirit. The pools are arranged for the completion of self-purification procedures which include ritual masturbation.
<<case "Degradationist">>
- is decorated to look like a dungeon. The decor involves a lot of black leather and burnished steel, and the slaves on offer are mostly chained to beds and walls.
-<<case "Repopulation Focus">>
- is clean and full of soft couches and chairs for its' pregnant whores to lounge upon while showing off their assets. Several of the rooms are prepped to allow a whore to give birth in front of an audience. A supply of freshly squeezed breast milk is available on tap.
-<<case "Eugenics">>
- is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping and poledancing on a stage. Safe sex is greatly encouraged. The real action happens in several reserved rooms dedicated to society's best, since the loud music drowns out private conversations.
+ is utilitarian. There are waterproof cameras positioned throughout the nursery so that anyone who wants to can watch the nude slaves. One wall has a screen showing the current viewer count to keep the slaves aware of this.
<<case "Asset Expansionist">>
- is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping and poledancing on a stage.
+ is utilitarian. It is equipped with all sorts of devices to help slaves care for huge assets, including lifts to help them in and out of the water, and all around showers to help clean and moisturize difficult to reach spots.
<<case "Transformation Fetishist">>
- is sterile and clean. Interactive screens on the walls list the whores and their modifications in clinical detail.
+ is utilitarian. It is equipped with special devices to help speed surgical recovery, including a series of baths designed to prevent scarring.
+<<case "Repopulation Focus">>
+ is comfortable, with waterproof cushions lining the pools. It is equipped with all sorts of devices to aid pregnant slaves, including lifts to help them in and out of the water, baths just for their feet, and all around showers to help clean and moisturize difficult to reach spots.
+<<case "Eugenics">>
+ is comfortable, albeit split in half. One side for the lower classes' slaves, and the other for the elite and their pets.
<<case "Gender Radicalist">>
- is decorated to look like an old world bordello. The rich decor includes erotic photography and pornographic statuary, depicting every possible combination of human sexual congress.
+ is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing slave girls with all different varieties of genitalia orgasming from penetration, to keep the idea at the forefront of the slaves' minds.
<<case "Gender Fundamentalist">>
- is decorated to look like an old world whorehouse. Screens on the walls are showing pornography starring the whores, with prices flashing after each sex act.
+ is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment featuring a lot of beautiful women and handsome men for the slaves' edification.
<<case "Physical Idealist">>
- is decorated to look like a club. Loud music is playing, and the whores that aren't with customers are stripping on a stage. There is a distinct smell of sweat, and there is as much emphasis on the strippers' muscles as their breasts.
+ is not the gym, but it does have some workout equipment, mostly low-impact machines designed to speed recovery. There are special hot baths to ease sore muscles.
<<case "Supremacist">>
- is decorated like an old world gentleman's club. The pictures on the wall depict degradation of every race on earth, except $arcologies[0].FSSupremacistRace people.
+ is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment featuring $arcologies[0].FSSupremacistRace main characters.
<<case "Subjugationist">>
- is decorated to celebrate the degradation of $arcologies[0].FSSubjugationistRace whores. The whores greet customers in stereotypical $arcologies[0].FSSubjugationistRace accents.
+ is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment featuring $arcologies[0].FSSubjugationistRace characters in comic relief roles.
<<case "Paternalist">>
- is decorated to look like a trendy bar. Whores are encouraged to meet customers for a drink and get to know them a little before heading back into a private room.
+ is comfortable, with waterproof cushions lining the pools. There are screens on the walls showing light entertainment written by and intended for smart, loyal slaves.
<<case "Pastoralist">>
- is decorated to look like a dairy. Though it isn't one, there is an intense sexual focus on boobs and lactation, and all the whores have their sizes and productivity proudly posted.
+ is utilitarian. It is equipped with all sorts of devices to help slaves care for huge assets, including lifts to help them in and out of the water, and all around showers to help clean and moisturize difficult to reach spots.
<<case "Maturity Preferentialist">>
- is decorated to look like a refined bar. It has a row of sturdy backless barstools, perfect for a delectable selection of succulent MILFs to perch on.
+ is comfortable, but surprisingly businesslike. It's all about beautification here; there's a bewildering array of mud baths, resting pools, and massage setups, all designed to keep mature slaves looking their very best.
<<case "Youth Preferentialist">>
- is decorated to look like the sort of bar old world students visit on spring break. Vapid music is playing, and when whores aren't with customers, they dance and make out with each other to attract some.
+ is comfortable and fun. There are hot tubs and massage tables for slaves who feel like relaxing, but there's also a colder pool with pool toys for girls who want to play. It even has a small waterslide.
<<case "Body Purist">>
- is decorated to look like an old world bordello. The rich decor includes erotic photography and pornographic statuary, depicting idealized human forms in the act of love.
+ is comfortable, with waterproof cushions lining the pools. Everything is designed for the slaves' comfort; there are even special mud baths to perfect skin clarity.
<<case "Slimness Enthusiast">>
- is decorated to look like an old world bordello. The rich decor includes erotic photography and pornographic statuary, depicting slim, girlish figures playing, dancing, and loving.
+ is comfortable, with waterproof cushions lining the pools. Everything is designed for the slaves' comfort; there are even special mud baths to perfect skin clarity.
<<case "Hedonistic">>
- is comfortable and full of soft couches and chairs for its' overweight whores to lounge upon between clients <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>and enjoy a plate of snacks<<else>>and enjoy a big cup of slave food<</if>>. The smells of fresh baked goods are pumped into the facility to mask the smell of sweat. It's not unusual for a client to fuck a whore right on her chosen couch, since the effort of moving is often too much.
+ is comfortable, with waterproof cushions lining the pools. It is equipped with all sorts of devices to aid hefty slaves, including lifts to help them in and out of the water, specialized moisturizers to keep their skin healthy and smooth, and all around showers to help clean difficult to reach spots and between folds. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food and treats are readily available around the tubs so that relaxing slaves never have to strain to grab a bite to eat<<else>>Feeders connected to the slave food reserves line the pools so that so that relaxing slaves never have to strain to suck down their fill of food<</if>>.
<<default>>
- is utilitarian. There's a businesslike foyer with an area for the merchandise to stand. Customers make their selection (or selections) and then lead the whores back into little rooms.
+ is well-appointed, with massage tables, hot tubs, and a cold pool.
<</switch>>
-<<if $nurserySlaves > 2>>
- $nurseryNameCaps is bustling with activity. Nannies are busily moving about, changing diapers, shushing crying babies, and feeding the ones that need to be fed.
+<<if $nurserySlaves > 3>>
+ It's busy in here. Slaves are relaxing in the warm water, splashing around or just floating. Here and there some of the more sex-starved are in the early stages of intercourse, but most prefer to take time off from it all.
<<elseif $nurserySlaves > 0>>
- $nurseryNameCaps is working steadily. Nannies are busily moving about, changing diapers, shushing crying babies, and feeding the ones that need to be fed.
+ It's sparsely populated; though the few slaves here have little company they like having the water to themselves.
<<elseif $Matron != 0>>
- $Matron.slaveName is alone in $nurseryName, and has nothing to do but keep the place clean<<if $nurseryBabies > 0>> and take care of the babies<</if>>.
+ $Matron.slaveName is alone here, and has nothing to do but keep the place (and her own soft, wet body) spotlessly clean.
<<else>>
- $nurseryNameCaps is empty and desolate.
- <<link "Decommission $nurseryName" "Main">>
- <<set $nurseryName = "the Nursery", $nursery = 0, $nurseryDecoration = "standard", $nurserySlaves = 0, $nurseryBabies = 0>>
- <<for _i = 0; _i < $sectors.length; _i++>>
- <<if $sectors[_i].type == "Nursery">><<set $sectors[_i].type = "Markets">><<break>><</if>>
- <</for>>
- <<goto "Main">>
- <</link>>
+ It's empty and quiet. [[Decommission the Nursery|Main][$nursery = 0, $nurseryDecoration = "standard", $nurseryUpgrade = 0, $nurseryFix = 0]]
<</if>>
<<if $nurserySlaves > 0>>
@@ -81,27 +75,52 @@
<<set _NewPop = $nurserySlaves+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Nursery">>
<<if $Matron != 0>>
- <<= assignJob($Matron, "rest")>>
+ <<= assignJob($Matron, "nanny")>>
<</if>>
<<for $nurserySlaves > 0>>
- <<= assignJob($slaves[$slaveIndices[$BrothiIDs[0]]], "nanny")>>
+ <<= assignJob($slaves[$slaveIndices[$NurseryiIDs[0]]], "nanny")>>
<</for>>
<</link>>
<<if _NewPop > $dormitory>>
@@.red;Dormitory capacity will be exceeded.@@
<</if>>
-<</if>>
+<</if>>
<<set _Tmult0 = Math.trunc($nursery*1000*$upgradeMultiplierArcology)>>
-<br>It can support $nursery nannies. Currently there <<if $nurserySlaves == 1>>is<<else>>are<</if>> $nurserySlaves nann<<if $nurserySlaves != 1>>ies<<else>>y<</if>> at $nurseryName.
-[[Expand the nursery|Nursery][$cash -= _Tmult0, $nursery += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
+<br>$nurseryNameCaps can house $nursery slaves while they recuperate here. Currently $nurserySlaves <<if $nurserySlaves == 1>>is<<else>>are<</if>> recuperating.
+[[Expand the nursery|Nursery][$cash -= _Tmult0, $nursery += 5]] //Costs <<print cashFormat(_Tmult0)>>//
+
+<br>
+<<if $nurseryUpgrade == 1>>
+ $nurseryNameCaps has been upgraded with state of the art temperature treatment options, from hot and cold mineral water pools to baking saunas and dense steam rooms.
+<<else>>
+ <<set _Tmult1 = Math.trunc($nursery*1000*$upgradeMultiplierArcology)>>
+ $nurseryNameCaps is a standard nursery. [[Upgrade the nursery with saunas, steam rooms, and mineral water baths|Nursery][$cash -= _Tmult1, $nurseryUpgrade = 1]] //Costs <<print cashFormat(_Tmult1)>>//
+<</if>>
+
+<<if $Matron != 0>>
+<br>
+<<if $nurseryFix == 2>>
+ $Matron.slaveName is focusing only on the health and wellness of the slaves under her care, obeying your orders to avoid attempting to right mental flaws.
+ [[Order her to only fix mindbroken slaves|Nursery][$nurseryFix = 1]] |
+ [[Let her tend as she sees fit|Nursery][$nurseryFix = 0]]
+<<elseif $nurseryFix == 1>>
+ $Matron.slaveName is focusing on the health and wellness of the slaves under her care, as well as trying to bring mindbroken slaves back, while ignoring any mental hangups a slave may have.
+ [[Order her to not fix flaws|Nursery][$nurseryFix = 2]] |
+ [[Let her tend as she sees fit|Nursery][$nurseryFix = 0]]
+<<else>>
+ $Matron.slaveName is not following any special orders and is tending to your slaves as she sees fit.
+ [[Order her to not fix any flaws|Nursery][$nurseryFix = 2]] |
+ [[Order her to only fix mindbroken slaves|Nursery][$nurseryFix = 1]]
+<</if>>
+<</if>>
<br><br>
<<if $Matron != 0>>
<<set $Flag = 2>>
<<include "Slave Summary">>
<<else>>
- You do not have a slave serving as a Matron. [[Appoint one|Matron Select]]
+ You do not have a slave serving as a nursery Matron. [[Appoint one|Matron Select]]
<</if>>
@@ -109,17 +128,17 @@
<<if ($nursery <= $nurserySlaves)>>
''$nurseryNameCaps is full and cannot hold any more slaves''
<<elseif ($slaves.length > $nurserySlaves)>>
- <<link "''Send a slave to $nurseryName''">>
+ <<link "''Let an obedient slave rest in $nurseryName''">>
<<replace #ComingGoing>>
<<resetAssignmentFilter>>
- <<set $Flag = 0>>
+ <<set $Flag to 0>>
<<include "Slave Summary">>
<</replace>>
<</link>>
<</if>>
<<if $nurserySlaves > 0>>
- | <<link "''Bring a slave out of $nurseryName''">>
+ | <<link "''Prise a slave out of the nursery''">>
<<replace #ComingGoing>>
<<nurseryAssignmentFilter>>
<<set $Flag = 1>>
@@ -128,11 +147,9 @@
<</replace>>
<</link>>
<<else>>
- <br><br>//$nurseryNameCaps is empty for the moment.<br>//
+ <br><br>//The nursery is empty at the moment.<br>//
<</if>>
-<br><br>
-<<assignmentFilter >>
<span id="ComingGoing">
<<nurseryAssignmentFilter>>
<<set $Flag = 1>>