diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index c931fd9cb9e467fca088bf5b8ff6cfa9a3741cd1..55e9495458b65ee6deec6263a32d9b2affbe3ae0 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -1,4 +1,4 @@
-Pregmod
+Pregmod
0.10.7.1-1.2.x
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 76904d4a69941e8c3f22c4c77e9c63a455df9675..cf9aa3feafdf7cf80e542561a639af92601c2e02 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -11144,18 +11144,18 @@ window.generateChild = function(mother, ova, destination) {
/*:: wombJS [script]*/
/*
-This is womb processor/simulator script. It's take care about calculation of belly sizes based on individual foetus sizes,
+This is womb processor/simulator script. It's take care about calculation of belly sizes based on individual fetus sizes,
with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
Design limitations:
- Mother can't gestate children with different speeds at same time. All speed changes apply to all fetuses.
-- Sizes of inividual fetuses updated only on call of WombGetVolume - not every time as called WombProgress. This is for better overail code speed.
+- Sizes of individual fetuses updated only on call of WombGetVolume - not every time as called WombProgress. This is for better overall code speed.
- For broodmothers we need actual "new ova release" code now. But it's possible to control how many children will be added each time, and so - how much children is ready to birth each time.
Usage from sugarcube code (samples):
WombInit($slave) - before first pregnancy, at slave creation, of as backward compatibility update.
-WombImpregnate($slave, $fetus_count, $fatherID, $initial_age) - should be added after normal impregnation code, with already calcualted fetus count. ID of father - can be used in future for prcess children from different fathers in one pregnancy. Initial age normally 1 (as .preg normally set to 1), but can be raised if needed. Also should be called at time as broodmother implant add another fetus(es), or if new fetuses added from other sources in future (transplanting maybe?)
+WombImpregnate($slave, $fetus_count, $fatherID, $initial_age) - should be added after normal impregnation code, with already calculated fetus count. ID of father - can be used in future for processing children from different fathers in one pregnancy. Initial age normally 1 (as .preg normally set to 1), but can be raised if needed. Also should be called at time as broodmother implant add another fetus(es), or if new fetuses added from other sources in future (transplanting maybe?)
WombProgress($slave, $time_to_add_to_fetuses) - after code that update $slave.preg, time to add should be the same.
diff --git a/src/art/vector_revamp/vectorRevampedArtControlJS.tw b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
index 7e9e80e054a7ba1a64891df5b40ee65fee37c7d9..7eaee403ad845915f833a42ff20c05faaef0ae80 100644
--- a/src/art/vector_revamp/vectorRevampedArtControlJS.tw
+++ b/src/art/vector_revamp/vectorRevampedArtControlJS.tw
@@ -1000,8 +1000,7 @@ class RevampedArtControl {
{
this.pubicTattooText = this.artSlave.dick != 0 ? "Useless" : "Fucktoy";
result.push("Art_Vector_Revamp_Pussy_Tattoo");
- }
-
+ }
switch(this.artSlave.pubicHStyle)
{
case "strip":
@@ -1589,8 +1588,7 @@ class RevampedArtControl {
}
return result;
- }
-
+ }
get headAddonLayer() {
var result = [];
@@ -1624,8 +1622,7 @@ class RevampedArtControl {
}
}
return result;
- }
-
+ }
get hairForeLayer() {
var result = [];
diff --git a/src/facilities/nursery/acDump.tw b/src/facilities/nursery/acDump.tw
index fe9358ac540a37cf5d08b4b0f430205428d95ffc..c86e28e3e74a92f4b18e5aa2f182ba195fdeba76 100644
--- a/src/facilities/nursery/acDump.tw
+++ b/src/facilities/nursery/acDump.tw
@@ -22,7 +22,7 @@
<<set $cribs[$i] = $activeSlave>>
<</if>>
<</if>>
-
+
<</silently>>
<<goto $returnTo>>
diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw
index 3d6942d6787aada24670cdc9362e0d8dcf476475..82dc1cb173512bb2fe7de0199f56f63fbde84ed3 100644
--- a/src/js/wombJS.tw
+++ b/src/js/wombJS.tw
@@ -1,18 +1,18 @@
:: wombJS [script]
/*
-This is womb processor/simulator script. It's take care about calculation of belly sizes based on individual foetus sizes,
+This is womb processor/simulator script. It's take care about calculation of belly sizes based on individual fetus sizes,
with full support of broodmothers implant random turning on and off possibility. Also this can be expanded to store more parents data in each individual fetus in future.
Design limitations:
- Mother can't gestate children with different speeds at same time. All speed changes apply to all fetuses.
-- Sizes of inividual fetuses updated only on call of WombGetVolume - not every time as called WombProgress. This is for better overail code speed.
+- Sizes of individual fetuses updated only on call of WombGetVolume - not every time as called WombProgress. This is for better overall code speed.
- For broodmothers we need actual "new ova release" code now. But it's possible to control how many children will be added each time, and so - how much children is ready to birth each time.
Usage from sugarcube code (samples):
WombInit($slave) - before first pregnancy, at slave creation, of as backward compatibility update.
-WombImpregnate($slave, $fetus_count, $fatherID, $initial_age) - should be added after normal impregnation code, with already calcualted fetus count. ID of father - can be used in future for prcess children from different fathers in one pregnancy. Initial age normally 1 (as .preg normally set to 1), but can be raised if needed. Also should be called at time as broodmother implant add another fetus(es), or if new fetuses added from other sources in future (transplanting maybe?)
+WombImpregnate($slave, $fetus_count, $fatherID, $initial_age) - should be added after normal impregnation code, with already calculated fetus count. ID of father - can be used in future for processing children from different fathers in one pregnancy. Initial age normally 1 (as .preg normally set to 1), but can be raised if needed. Also should be called at time as broodmother implant add another fetus(es), or if new fetuses added from other sources in future (transplanting maybe?)
WombProgress($slave, $time_to_add_to_fetuses) - after code that update $slave.preg, time to add should be the same.
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
index 57162158b7060b0fc1cf965a1c4533fdc7d63c89..f3e128410563fc4c7708bc4118d7c9686fe4f7bb 100644
--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -128,9 +128,9 @@
<br>
Reserved: $PC.womb[_ap].reserve
<</if>>
-
+
<br><br>
-
+
Rename: <<textbox "_tempName" _tempName >> [[Apply | Analyze PC Pregnancy][$PC.womb[_ap].genetics.name = _tempName]]
<<if $PC.womb[_ap].age < 4 && $PC.womb[_ap].fatherID != -6>>
<br>
@@ -142,7 +142,7 @@
<<if $incubator > 0>>
<br>
<<if $PC.womb[_ap].reserve === "incubator">>
- <<link "Don't keep this child in $incubatorName" "Analyze PC Pregnancy">>
+ <<link "Don't keep this child $incubatorName" "Analyze PC Pregnancy">>
<<set $PC.womb[_ap].reserve = "">>
<<set $reservedChildren-->>
<</link>>
@@ -180,5 +180,5 @@
<br><br><hr style="margin:0"><br>
<</capture>>
<</for>>
-
+
<</if>>
diff --git a/src/pregmod/birthStorm.tw b/src/pregmod/birthStorm.tw
index 07d5e8b266efcf5bf3411cbc7c5e6b7b52c2bdbe..c4f669633fab376b5520f476174ceb879d801dd2 100644
--- a/src/pregmod/birthStorm.tw
+++ b/src/pregmod/birthStorm.tw
@@ -1,5 +1,5 @@
:: BirthStorm [nobr]
-
+
<<set $nextButton = "Back", $nextLink = "Slave Interact">>
<<set $activeSlave.curBabies = WombBirth($activeSlave, 34)>> /*Here check - how many children survive this event. 34 weeks minimum.*/
diff --git a/src/pregmod/pcSurgeryDegredation.tw b/src/pregmod/pcSurgeryDegredation.tw
index 90bca901690d66b51e00402c4d366a18b80670de..d6559030a7da6d9953ed06b879f0d6693b30c8b1 100644
--- a/src/pregmod/pcSurgeryDegredation.tw
+++ b/src/pregmod/pcSurgeryDegredation.tw
@@ -136,7 +136,6 @@
<<else>>
See? Your cute little clit agrees with me." She says, poking at the tip of your peeking clit with her free hand. "Shall we see if it's working right?" She circles around till she is between your legs and <<if $PC.belly >= 10000>>disappears behind the curvature of your pregnancy<<else>>disappears between your thighs<</if>>. You feel face brush your inner legs as she brings her mouth to your cunt and begins to enthusiastically eat you out. She is quite good at her job and quickly brings you to climax; your new pussy squirting girl cum across her face. She raises from your crotch and licks her lips. "I always did like the taste of you. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you settle back down to sleep off the rest of the anesthesia before returning to your arcology.
<</if>>
-
<<case "herm2female">>
After a few hours, you awaken in the recovery wing with a distinct soreness between your legs. You pull the covers off of yourself to catch sight of the result of the surgery and
diff --git a/src/pregmod/saPorn.tw b/src/pregmod/saPorn.tw
index 5e4e78026f8ef8d7b318ebab4316fe6357810238..2e196f91f948716c15a901a702442a771e34de58 100644
--- a/src/pregmod/saPorn.tw
+++ b/src/pregmod/saPorn.tw
@@ -1030,8 +1030,6 @@
<<set $slaves[$i].pornFame = $slaves[$i].pornTypeGeneral + $slaves[$i].pornTypeFuckdoll + $slaves[$i].pornTypeRape + $slaves[$i].pornTypePreggo + $slaves[$i].pornTypeBBW + $slaves[$i].pornTypeGainer + $slaves[$i].pornTypeStud + $slaves[$i].pornTypeLoli + $slaves[$i].pornTypeDeepThroat + $slaves[$i].pornTypeStruggleFuck + $slaves[$i].pornTypePainal + $slaves[$i].pornTypeTease + $slaves[$i].pornTypeRomantic + $slaves[$i].pornTypePervert + $slaves[$i].pornTypeCaring + $slaves[$i].pornTypeUnflinching + $slaves[$i].pornTypeSizeQueen + $slaves[$i].pornTypeNeglectful + $slaves[$i].pornTypeCumAddict + $slaves[$i].pornTypeAnalAddict + $slaves[$i].pornTypeAttentionWhore + $slaves[$i].pornTypeBreastGrowth + $slaves[$i].pornTypeAbusive + $slaves[$i].pornTypeMalicious + $slaves[$i].pornTypeSelfHating + $slaves[$i].pornTypeBreeder + $slaves[$i].pornTypeSub + $slaves[$i].pornTypeCumSlut + $slaves[$i].pornTypeAnal + $slaves[$i].pornTypeHumiliation + $slaves[$i].pornTypeBoobs + $slaves[$i].pornTypeDom + $slaves[$i].pornTypeSadist + $slaves[$i].pornTypeMasochist + $slaves[$i].pornTypePregnancy>>
<<set $slaves[$i].pornFame = Math.trunc($slaves[$i].pornFame)>>
-
-
<<if _oldFame > $slaves[$i].pornFame>>
Overall, $his online fame @@.red;dropped@@ this week.
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 6c8d2ff3145d7502084aadada5f6ed117849918c..28cbaffaf78c77b6ec4ab1243749289febf31b16 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -1065,11 +1065,11 @@ The offered price is <<print cashFormat($slaveCost)>>.
The camera cuts to a young blonde girl with her hair braided back in rows. She's wearing a white blouse that's unbuttoned all the way down to her leather corset showing much of her very large rack while hiding little.
<br><br>
"Thank ye, Captain Castbeak!" she positively beams with energy as she bounces around, her barely contained breasts keeping your eye as she sways and jumps around the screen.
- "Today we be keepin' an eye on the acid rain storms as they blow on through the upper Chinese and Mongolian regions on their way to the bearing straight. If ye be located anywhere around here-" She stretches up with a short pointer that you now realize is part of a prosthetic limb attached to her right hand. "-batten down yer hatches an' wait fer the storm ta' blow over".
+ "Today we be keepin' an eye on the acid rain storms as they blow on through the upper Chinese and Mongolian regions on their way to the Bering Strait. If ye be located anywhere around here-" She stretches up with a short pointer that you now realize is part of a prosthetic limb attached to her right hand. "-batten down yer hatches an' wait fer the storm ta' blow over".
<br><br>
The camera shifts down low now as the green screen map behind her shifts to Australia, Lusty stooping over towards the camera to stay in frame gives you a beautiful view straight down her blouse. "And if'n ye be in Australia yer in for another hot and dry one as this unseasonable drought stretches on fer at least another week"
<br><br>
- The camera angle switches again as the map of North America comes on screen overlaid with temperatures. Lusty slowly straightens up and stretches out with a smile clearly giving the camera a show. "An' if'n ye be travelin' across here, beware, this be the worst weather of them all, with dust storms and tornados and lightning storms across the continent. If ye be catchin' our broadcast from here, seek a safe port and stay safe." she points again with her pointer hand all across the Midwest.
+ The camera angle switches again as the map of North America comes on screen overlaid with temperatures. Lusty slowly straightens up and stretches out with a smile clearly giving the camera a show. "An' if'n ye be travelin' across here, beware, this be the worst weather of them all, with dust storms and tornadoes and lightning storms across the continent. If ye be catchin' our broadcast from here, seek a safe port and stay safe." she points again with her pointer hand all across the Midwest.
<br><br>
The weather report continues with more mundane temperature readings and Lusty bubbly bouncing around the screen giving you something to pay attention to when the weather is not about your region.
<br><br>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 389ba6cef5ff01f6cf4cc0618c8b59d925f6851d..98ff5de1943d0ade0b62988b48394e025cd50b8f 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -11,11 +11,11 @@ More elite citizens require their own slaves and will cause the population of sl
_FSScore = 0, /*FS progress for tourism*/
_slaveDemandU = 1, /*Changes to upperclass slave demand*/
_slaveDemandT = 1, /*Changes to topclass slave demand*/
-_expirationFS = 1, /*changes to likelyhood of slave death*/
+_expirationFS = 1, /*changes to likelihood of slave death*/
_slaveProductivity = 0, /*changes to slave productivity*/
_lowerClass = 0, /*fixed amount of changes to lowerclass interest to move in*/
_lowerClassP = 1, /*scaling changes to lowerclass interest ("stacking bonus")*/
-_welfareFS = 1, /*changes to likelyhood of lowerclass getting enslaved*/
+_welfareFS = 1, /*changes to likelihood of lowerclass getting enslaved*/
_middleClass = 0, /*see lowerclass examples for the rest of these*/
_middleClassP = 1,
_upperClass = 0,
@@ -596,7 +596,7 @@ _middleClass *= 1 + ($TSS.subsidize + $GRI.subsidize + $SCP.subsidize + $LDE.sub
_ASlavesRetirement = Math.trunc($NPCSlaves * 0.8),
$NPCSlaves = Math.trunc($NPCSlaves * 0.8),
$CitizenRetirement = 2>>
- You have enacted citizen retirement, the slaves of eligible age are granted freedom.
+ You have enacted citizen retirement, the slaves of eligible age are granted freedom.
<<if _helotsRetirement > 1>>
@@.red;<<print _helotsRetirement>> of your menial slaves@@ were retired.
<<elseif _helotsRetirements > 0>>
@@ -630,7 +630,7 @@ $menialBioreactors -= _expirationBR>>
<<if _expiration > 1>>
<<if _expirationFS <= 0.5>>
@@.red;<<print _expiration>> slaves passed away@@ due to natural causes.
- <<else>>
+ <<else>>
@@.red;<<print _expiration>> slaves died@@ due to the tough working conditions in your arcology.
<</if>>
<<if _expirationPC > 1>>
@@ -1246,18 +1246,18 @@ earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@
<<if $desc.length > 0>>
Your arcology's economy benefits from close social alignment with
<<if $desc.length > 2>>
- ''$desc[0]'',
- <<for $k = 1; $k < $desc.length; $k++>>
- <<if $k < $desc.length-1>>
- ''$desc[$k]'',
- <<else>>
- and ''$desc[$k]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
- <</if>>
- <</for>>
+ ''$desc[0]'',
+ <<for $k = 1; $k < $desc.length; $k++>>
+ <<if $k < $desc.length-1>>
+ ''$desc[$k]'',
+ <<else>>
+ and ''$desc[$k]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
+ <</if>>
+ <</for>>
<<elseif $desc.length == 2>>
- ''$desc[0]'' and ''$desc[1]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
+ ''$desc[0]'' and ''$desc[1]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
<<else>>
- ''$desc[0]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
+ ''$desc[0]''<<if $descNeg.length > 0>>, but<<else>>.<</if>>
<</if>>
<<set _AWeekGrowth += $desc.length>>
<</if>>
@@ -1265,18 +1265,18 @@ earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@
<<if $desc.length == 0>>Your arcology's economy<</if>>
is hindered by social conflicts with
<<if $descNeg.length > 2>>
- ''$descNeg[0]'',
- <<for $k = 1; $k < $descNeg.length; $k++>>
- <<if $k < $descNeg.length-1>>
- ''$descNeg[$k]'',
- <<else>>
- and ''$descNeg[$k]''.
- <</if>>
- <</for>>
+ ''$descNeg[0]'',
+ <<for $k = 1; $k < $descNeg.length; $k++>>
+ <<if $k < $descNeg.length-1>>
+ ''$descNeg[$k]'',
+ <<else>>
+ and ''$descNeg[$k]''.
+ <</if>>
+ <</for>>
<<elseif $descNeg.length == 2>>
- ''$descNeg[0]'' and ''$descNeg[1]''.
+ ''$descNeg[0]'' and ''$descNeg[1]''.
<<else>>
- ''$descNeg[0]''.
+ ''$descNeg[0]''.
<</if>>
<<set _AWeekGrowth -= $descNeg.length>>
<</if>>
@@ -1348,20 +1348,20 @@ earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@
<br>
<<if $TSS.schoolPresent == 1>>
-<br>
-The Slave School has a <<if $TSS.schoolProsperity > 4>>very prosperous<<elseif $TSS.schoolProsperity < -4>>struggling<<else>>thriving<</if>> branch campus in $arcologies[0].name.
-<<if $TSS.schoolProsperity >= 10>>
- It is one of the finest slave schools in the world<<if $rep > 19000>>.<<else>>, @@.green;improving your reputation.@@<<set $rep += 200>><</if>>
- <<set $TSS.subsidize = 0>>
- <<set $TSS.schoolProsperity = 10>>
-<</if>>
-<<if $TSS.subsidize == 1>>
- You have a policy of subsidizing them.
- <<set $TSS.schoolProsperity++>>
-<<elseif $TSS.subsidize == -1>>
- You have a policy of covertly undermining them.
- <<set $TSS.schoolProsperity-->>
-<</if>>
+ <br>
+ The Slave School has a <<if $TSS.schoolProsperity > 4>>very prosperous<<elseif $TSS.schoolProsperity < -4>>struggling<<else>>thriving<</if>> branch campus in $arcologies[0].name.
+ <<if $TSS.schoolProsperity >= 10>>
+ It is one of the finest slave schools in the world<<if $rep > 19000>>.<<else>>, @@.green;improving your reputation.@@<<set $rep += 200>><</if>>
+ <<set $TSS.subsidize = 0>>
+ <<set $TSS.schoolProsperity = 10>>
+ <</if>>
+ <<if $TSS.subsidize == 1>>
+ You have a policy of subsidizing them.
+ <<set $TSS.schoolProsperity++>>
+ <<elseif $TSS.subsidize == -1>>
+ You have a policy of covertly undermining them.
+ <<set $TSS.schoolProsperity-->>
+ <</if>>
<</if>>
<<if $GRI.schoolPresent == 1>>
diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw
index 0a38ffa6e95d2ae70c3854370c06b20ee64fb9d1..e7b8a379c4e0d5a47cc700164bd22ff8bdb43656 100644
--- a/src/uncategorized/arcologyDescription.tw
+++ b/src/uncategorized/arcologyDescription.tw
@@ -39,12 +39,9 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<<if ($arcologies[0].FSSupremacistDecoration == 100) || ($arcologies[0].FSSubjugationistDecoration == 100) || ($arcologies[0].FSGenderRadicalistDecoration == 100) || ($arcologies[0].FSGenderFundamentalistDecoration == 100) || ($arcologies[0].FSPaternalistDecoration == 100) || ($arcologies[0].FSDegradationistDecoration == 100) || ($arcologies[0].FSBodyPuristDecoration == 100) || ($arcologies[0].FSTransformationFetishistDecoration == 100) || ($arcologies[0].FSYouthPreferentialistDecoration == 100) || ($arcologies[0].FSMaturityPreferentialistDecoration == 100) || ($arcologies[0].FSSlimnessEnthusiastDecoration == 100) || ($arcologies[0].FSAssetExpansionistDecoration == 100) || ($arcologies[0].FSPastoralistDecoration == 100) || ($arcologies[0].FSPhysicalIdealistDecoration == 100) || ($arcologies[0].FSChattelReligionistDecoration == 100) || ($arcologies[0].FSRomanRevivalistDecoration == 100) || ($arcologies[0].FSAztecRevivalistDecoration == 100) || ($arcologies[0].FSEgyptianRevivalistDecoration == 100) || ($arcologies[0].FSEdoRevivalistDecoration == 100) || ($arcologies[0].FSArabianRevivalistDecoration == 100) || ($arcologies[0].FSChineseRevivalistDecoration == 100) || ($arcologies[0].FSRepopulationFocusDecoration == 100) || ($arcologies[0].FSRestartDecoration == 100) || ($arcologies[0].FSHedonisticDecadenceDecoration == 100)>>
Outside the main entrance, there is an enormous statue of an idealized
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>
- with several statues of nude slaves at its feet.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure with several statues of nude slaves at its feet.
<<if $arcologies[0].FSSupremacistDecoration == 100>>
- The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>
- has distinctly $arcologies[0].FSSupremacistRace features.
+ The central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure has distinctly $arcologies[0].FSSupremacistRace features.
<</if>>
<<if $arcologies[0].FSSubjugationistDecoration == 100>>
The slaves have exaggerated $arcologies[0].FSSubjugationistRace features.
@@ -56,8 +53,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
The slaves are all perfectly female.
<</if>>
<<if $arcologies[0].FSPaternalistDecoration == 100>>
- The slaves are gazing adoringly up at the central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>.
+ The slaves are gazing adoringly up at the central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure.
<</if>>
<<if $arcologies[0].FSDegradationistDecoration == 100>>
The slaves are cowering, and are wearing chains.
@@ -90,7 +86,9 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<<if $arcologies[0].FSRestartDecoration == 100>>
The central
<<if ($PC.dick == 1) && ($PC.vagina == 1)>>
- shemale figure's balls are oversized and her stomach slightly rounded,
+ futanari figure's balls are oversized and her stomach slightly rounded,
+ <<elseif ($PC.dick == 1) && ($PC.boobs == 1)>>
+ shemale figure's balls are swollen with virile seed,
<<elseif ($PC.dick == 1)>>
male figure's balls are swollen with virile seed,
<<else>>
@@ -103,34 +101,29 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<</if>>
<<if $arcologies[0].FSPhysicalIdealistDecoration == 100>>
Both the central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>
- and the slaves are <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>quite fit<<else>>very muscular<</if>>.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure and the slaves are <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>quite fit<<else>>very muscular<</if>>.
<</if>>
<<if $arcologies[0].FSHedonisticDecadenceDecoration == 100>>
The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>
- has a distinct softness to its body, while the slaves are delightfully rotund.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure has a distinct softness to its body, while the slaves are delightfully rotund.
<</if>>
<<if $arcologies[0].FSChattelReligionistDecoration == 100>>
The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> has a halo behind <<if $PC.title == 1>>his<<else>>her<</if>> head, and the slaves are in attitudes of worship.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure has a halo behind <<if $PC.title == 1>>his<<else>>her<</if>> head, and the slaves are in attitudes of worship.
<</if>>
<<if $arcologies[0].FSRomanRevivalistDecoration == 100>>
The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing a toga; <<if $PC.title == 1>>he<<else>>she<</if>> has a laurel wreath about <<if $PC.title == 1>>his<<else>>her<</if>> brow.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure is wearing a toga; <<if $PC.title == 1>>he<<else>>she<</if>> has a laurel wreath about <<if $PC.title == 1>>his<<else>>her<</if>> brow.
<</if>>
<<if $arcologies[0].FSAztecRevivalistDecoration == 100>>
The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing a feathered cloak, ornamented with jewels; <<if $PC.title == 1>>he<<else>>she<</if>> has a giant headdress on <<if $PC.title == 1>>his<<else>>her<</if>> head.
+ <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure is wearing a feathered cloak, ornamented with jewels; <<if $PC.title == 1>>he<<else>>she<</if>> has a giant headdress on <<if $PC.title == 1>>his<<else>>her<</if>> head.
<</if>>
<<if $arcologies[0].FSEgyptianRevivalistDecoration == 100>>
- The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing a pharaoh's crown.
+ The central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure is wearing a pharaoh's crown.
<</if>>
<<if $arcologies[0].FSEdoRevivalistDecoration == 100>>
- The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>>
- figure has a hand resting confidently on the hilts of the sheathed katana and wakizashi
+ The central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure has a hand resting confidently on the hilts of the sheathed katana and wakizashi
<<if ($PC.title == 1)>>
he
<<else>>
@@ -145,12 +138,10 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
waist.
<</if>>
<<if $arcologies[0].FSArabianRevivalistDecoration == 100>>
- The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing a turban and flowing robes.
+ The central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure is wearing a turban and flowing robes.
<</if>>
<<if $arcologies[0].FSChineseRevivalistDecoration == 100>>
- The central
- <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale figure<<else>>male figure<</if>><<else>>female figure<</if>> is wearing the robes of an ancient Chinese
+ The central <<if ($PC.dick == 1)>><<if ($PC.vagina == 1)>>futanari<<elseif ($PC.boobs == 1)>>shemale<<else>>male<</if>><<else>>female<</if>> figure is wearing the robes of an ancient Chinese
<<if ($PC.title == 1)>>
Emperor.
<<else>>
@@ -514,7 +505,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el
<</if>>
<<if $arcologies[0].FSPhysicalIdealistDecoration >= 80>>
<<if $arcologies[0].FSFitLaw == 1>>
- Their bodies are uniformly fit and healthy<<if $arcologies[0].FSRomanRevivalist > 0>> in the hellenistic tradition<</if>>.
+ Their bodies are uniformly fit and healthy<<if $arcologies[0].FSRomanRevivalist > 0>> in the Hellenistic tradition<</if>>.
<<else>>
Their musculature is uniformly stunning. Swole acceptance is high here.
<</if>>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 5441b59c5c015e373c85a24a424fe9f1f76c4bd7..635b855bd8df76f65dc9033b742b66c47a4f1de1 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -203,7 +203,7 @@ __Sex Slave Purchase Options__
<</if>>
<<if ($seeDicks != 0)>>
- <br> [[L'école des Enculées][$slavesSeen += 1]] |
+ <br> [[L'École des Enculées][$slavesSeen += 1]] |
<<if $cash > _minimumFive>>
[[(x5)|Bulk Slave Generate][$slaveMarket = "LDE", $introType = "bulk", $numSlaves = 5]] |
<</if>>
diff --git a/src/uncategorized/hgSelect.tw b/src/uncategorized/hgSelect.tw
index 3bf4a7bd2126ab67b120ef41105ee53a1b0ab9bc..d41eb839c782f70860755c512686813f3962e22f 100644
--- a/src/uncategorized/hgSelect.tw
+++ b/src/uncategorized/hgSelect.tw
@@ -9,22 +9,7 @@
<<if ($HeadGirl != 0)>>
<<set $HeadGirl = getSlave($HeadGirl.ID)>>
<<setLocalPronouns $HeadGirl>>
- <<if $surnameOrder != 1>>
- <<switch $HeadGirl.nationality>>
- <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
- <<if $HeadGirl.slaveSurname>>
- <<set _HGName = $HeadGirl.slaveSurname + " " + $HeadGirl.slaveName>>
- <<else>>
- <<set _HGName = $HeadGirl.slaveName>>
- <</if>>
- <<default>>
- <<set _HGName = $HeadGirl.slaveName>>
- <<if $HeadGirl.slaveSurname>><<set _HGName += " " + $HeadGirl.slaveSurname>><</if>>
- <</switch>>
- <<else>>
- <<set _HGName = $HeadGirl.slaveName>>
- <<if $HeadGirl.slaveSurname>><<set _HGName += " " + $HeadGirl.slaveSurname>><</if>>
- <</if>>
+ <<set _HGName = SlaveFullName($HeadGirl)>>
''__@@.pink;_HGName@@__'' is serving as your Head Girl<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>> and Consort; it is $his role to serve and comfort you at your side, in addition to performing normal head girl duties<</if>>.
<br><br>
<</if>>
diff --git a/src/uncategorized/lecoleDesEnculees.tw b/src/uncategorized/lecoleDesEnculees.tw
index b6b64f110b3ee20f8b38793ab73dbc1a02759f27..88f7c33ab48363ba29a252a8dfc79b1af4866a92 100644
--- a/src/uncategorized/lecoleDesEnculees.tw
+++ b/src/uncategorized/lecoleDesEnculees.tw
@@ -1,4 +1,4 @@
-:: L'école des Enculées [nobr]
+:: L'École des Enculées [nobr]
<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Slave Schools">>
/* Multi-Purchase Support */
@@ -7,9 +7,9 @@
<<set $nextButton = "Continue", $nextLink = "Bulk Slave Intro", $slaveMarket = "LDE", $returnTo = "Main", $newSlaveIndex = 0>>
<</if>>
-//L'école des Enculées is one of the oldest networks of slave schools, but because its training must be started early, it is only now beginning to produce and show a return on its investors' stakes. It aims to produce graduates more feminine than the average naturally born female, in spite of their having been born male. The school is a global leader in hormonal feminization, which allows it to produce curvier slaves than many schools that focus on natural females. It also retains its graduates for a year after their majority and their enslavement, so as to be able to legally subject them to intensive sexual conditioning that focuses on their prostates as their main remaining locus of arousal. <<if $LDE.schoolUpgrade != 0>><br><br>Since you have endowed <<if $LDE.schoolUpgrade == 1>>the regular application of drugs to induce extreme infatuation in its graduates towards the first dominant person they encounter, any graduate purchased here will now promptly fall in love with you.<<else>>research into narrowly targeted hormonal treatments, its graduates are now available with generous members despite their femininity.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the institution, you also receive a discount on them.<</if>>//
+//L'École des Enculées is one of the oldest networks of slave schools, but because its training must be started early, it is only now beginning to produce and show a return on its investors' stakes. It aims to produce graduates more feminine than the average naturally born female, in spite of their having been born male. The school is a global leader in hormonal feminization, which allows it to produce curvier slaves than many schools that focus on natural females. It also retains its graduates for a year after their majority and their enslavement, so as to be able to legally subject them to intensive sexual conditioning that focuses on their prostates as their main remaining locus of arousal. <<if $LDE.schoolUpgrade != 0>><br><br>Since you have endowed <<if $LDE.schoolUpgrade == 1>>the regular application of drugs to induce extreme infatuation in its graduates towards the first dominant person they encounter, any graduate purchased here will now promptly fall in love with you.<<else>>research into narrowly targeted hormonal treatments, its graduates are now available with generous members despite their femininity.<</if>> As a major <<if $PC.title == 0>>benefactrix<<else>>benefactor<</if>> of the institution, you also receive a discount on them.<</if>>//
-<br><br>L'école des Enculées offers a fresh graduate for inspection via video call. The interview takes place in the dormitory for the oldest class of girls. Absurdly sexual squeals repeatedly interrupt the call, making it very clear that someone close by the interviewee is experiencing a strong combination of anal pain and anal pleasure.
+<br><br>L'École des Enculées offers a fresh graduate for inspection via video call. The interview takes place in the dormitory for the oldest class of girls. Absurdly sexual squeals repeatedly interrupt the call, making it very clear that someone close by the interviewee is experiencing a strong combination of anal pain and anal pleasure.
<<GenerateMarketSlave "LDE">>
<<slaveCost $activeSlave>>
@@ -24,7 +24,7 @@
<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[["Buy " + $him + " and check out other slaves to order"|L'école des Enculées][$cash -= $slaveCost, $LDE.schoolSale = 0, $LDE.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other slaves to order"|L'École des Enculées][$cash -= $slaveCost, $LDE.schoolSale = 0, $LDE.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
<br>[["Buy " + $his + " slave contract"|New Slave Intro][$cash -= $slaveCost, $LDE.schoolSale = 0, $LDE.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>
@@ -33,7 +33,7 @@
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<br>[["Decline to purchase " + $him + " and check out another slave"|L'école des Enculées][$slavesSeen += 1]]
+<br>[["Decline to purchase " + $him + " and check out another slave"|L'École des Enculées][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw
index 4ecdaeda42721867659fd9513e909cd1b32bc178..19f03ca9abcdba9a4fa8c12b7e2439e6b2d9be39 100644
--- a/src/uncategorized/seBirth.tw
+++ b/src/uncategorized/seBirth.tw
@@ -30,16 +30,7 @@ I need to break single passage to several widgets, as it's been overcomplicated
<</if>>
<</if>>
<<set $dispositionId = _.uniqueId('babyDisposition-')>>
- <<if $surnameOrder != 1>>
- <<switch $activeSlave.nationality>>
- <<case "Cambodian" "Chinese" "Hungarian" "Japanese" "Korean" "Mongolian" "Taiwanese" "Vietnamese">>
- Birth report: @@.coral;<<if $slaves[$i].slaveSurname>>$slaves[$i].slaveSurname <</if>>$activeSlave.slaveName@@
- <<default>>
- Birth report: @@.coral;$slaves[$i].slaveName <<if $slaves[$i].slaveSurname != 0>>$slaves[$i].slaveSurname<</if>>@@
- <</switch>>
- <<else>>
- Birth report: @@.coral;$slaves[$i].slaveName <<if $slaves[$i].slaveSurname != 0>>$slaves[$i].slaveSurname<</if>>@@
- <</if>>
+ Birth report: @@.coral;<<= SlaveFullName($slaves[$i])>>@@
<br>
<<seBirthPreChek>>
<<seBirthPreScene>>
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index a991b409b80bf4c4975215e2b67f7caa536565ba..be53f96e5e8aef3b8da82c28ba313ec265ec95b2 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -159,7 +159,7 @@
<</if>>
<<if ($seeDicks != 0)>>
<<if $LDE.schoolSale != 0>>
- <br>@@.yellow;For your first purchase, @@<strong>[[L'école des Enculées][$slavesSeen += 1]]</strong>@@.yellow; will sell at half price this week.@@
+ <br>@@.yellow;For your first purchase, @@<strong>[[L'École des Enculées][$slavesSeen += 1]]</strong>@@.yellow; will sell at half price this week.@@
<</if>>
<<if $TGA.schoolSale != 0>>
<br>@@.yellow;For your first purchase, @@<strong>[[The Gymnasium-Academy][$slavesSeen += 1]]</strong>@@.yellow; will sell at half price this week.@@