diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index e2ef6334bbe0c6b78170113d024b8473e91329d4..0062bb20a36eeb1c6dac41bc77d4ec9051e69ecb 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,20 @@
0.10.7.1-0.5.x
+7/27/2018
+
+ 8
+ -fixes
+ -more widget to JS conversion
+
+7/27/2018
+
+ 7
+ -fixes
+ -more widget to JS conversion
+ -lots more implementation of pronouns
+ -anon's hpreg event
+
7/26/2018
6
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 4437281b79c1dc0c64a15a073c53fc5adc1b8a96..616717cbfb9b05706d06d52da664b018029000ac 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -2849,8 +2849,8 @@ Macro.add('foreach', {
* Height.mean(nationality, race, genes) - returns the mean adult height for the given combination
* Height.mean(slave) - returns the mean (expected) height for the given slave
*
- * Height.random(nationality, race, genes, age) - returns a random height for the given combination,
- * with Gaussian distribution (mean = 1, standard deviation = 0.05) around the mean height
+ * Height.random(nationality, race, genes, age) - returns a random height using the skew-normal distribution
+ * around the mean height for the given arguments
* Height.random(nationality, race, genes) - returns a random height for the given combination of an adult, as above
* Height.random(slave[, options]) - returns a random height for the given slave, as above.
* The additional options object can modify how the values are generated
@@ -2889,9 +2889,9 @@ Macro.add('foreach', {
*
*Skew, spread, limitMult: These are statistics things. BTW, a gaussian distribution is a normal distribution. Just a naming thing.
*
- *Skew: See https://brownmath.com/stat/shape.htm#Skewness. Basically a measure of how asymmetrical the curve is. It doesn't change the mean, and can't move the main mass of the distribution far from the mean! The normal distribution can't do that. You can, however, use it to fatten one or the other tail.
+ *Skew: The shape parameter of a skew-normal distribution. See http://azzalini.stat.unipd.it/SN/Intro/intro.html for more details. Basically a measure of how asymmetrical the curve is. It doesn't move the main mass of the distribution. Rather, it's more like it moves mass from one of the tails into the main mass of the distribution.
*
- *Spread: Changes the average distance from the mean, making the graph wider and shorter. Moves "mass" from the center to the tail. It's basically standard deviation, but named funny because FC codebase.
+ *Spread: Changes the average distance from the mean, making the graph wider and shorter. Moves "mass" from the center to the tail. It's basically standard deviation, but named funny because FC codebase. Changing this can have dramatic effects. It's advised to keep this at or below 0.1 for usual height generation.
*
*limitMult: A clamp, expressed in z-score. (z=1 is one standard dev above mean, for ex.) If it excludes too much of the distribution the other parameters describe, you're going to spend lots of CPU making and throwing away heights. Don't worry about this unless you run into it.
*
@@ -5414,6 +5414,10 @@ if(eventSlave.fetish != "mindbroken") {
}
}
+ if (eventSlave.bellyPreg >= 300000) {
+ State.variables.RESSevent.push("hyperpreg stuck");
+ }
+
if(eventSlave.prestige == 0) {
if(eventSlave.devotion > 50) {
if(eventSlave.trust > 50) {
@@ -6560,6 +6564,10 @@ if(eventSlave.fetish != "mindbroken") {
}
}
+ if (eventSlave.bellyPreg >= 300000) {
+ State.variables.RESSevent.push("hyperpreg stuck");
+ }
+
if(eventSlave.relationship == 4) {
if(eventSlave.devotion > 20) {
if(eventSlave.trust > 20) {
@@ -23333,6 +23341,10 @@ window.generateAge = function generateAge(slave) {
slave.pubertyAgeXY = V.potencyAge;
};
+window.nationalityToRace = function nationalityToRace(slave) {
+ slave.race = hashChoice(setup.raceSelector[slave.nationality] || setup.raceSelector[""]);
+};
+
window.nationalityToName = function nationalityToName(slave) {
const V = State.variables;
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index fd847619047832e2250b70cda5451d88c2f0b212..c8b619c4b280c4b2311ffa1cf1cc930d341db988 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -324,7 +324,7 @@
<<set $activeSlave.intelligenceImplant = 1>>
<<run nationalityToName($activeSlave)>>
<<run nationalityToAccent($activeSlave)>>
- <<NationalityToRace $activeSlave>>
+ <<run nationalityToRace($activeSlave)>>
<<set $activeSlave.slaveSurname = "Yamadera">>
<<set $activeSlave.birthSurname = "Yamadera">>
<<set $activeSlave.skin = "pale">>
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index cca5ef70bf305a851c2eeb73649c900ab48acfe9..37fc354db1a2e6fac9bc4912574c04eb045bfc14 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -1753,6 +1753,10 @@ if(eventSlave.fetish != "mindbroken") {
}
}
+ if (eventSlave.bellyPreg >= 300000) {
+ State.variables.RESSevent.push("hyperpreg stuck");
+ }
+
if(eventSlave.prestige == 0) {
if(eventSlave.devotion > 50) {
if(eventSlave.trust > 50) {
@@ -2899,6 +2903,10 @@ if(eventSlave.fetish != "mindbroken") {
}
}
+ if (eventSlave.bellyPreg >= 300000) {
+ State.variables.RESSevent.push("hyperpreg stuck");
+ }
+
if(eventSlave.relationship == 4) {
if(eventSlave.devotion > 20) {
if(eventSlave.trust > 20) {
diff --git a/src/js/slaveGenerationJS.tw b/src/js/slaveGenerationJS.tw
index 1b520f2ab5ac3b6c02f21b1f79f4752d62f63f8f..e672c692d1614bfc45942fc525edbe03e89c5706 100644
--- a/src/js/slaveGenerationJS.tw
+++ b/src/js/slaveGenerationJS.tw
@@ -44,6 +44,10 @@ window.generateAge = function generateAge(slave) {
slave.pubertyAgeXY = V.potencyAge;
};
+window.nationalityToRace = function nationalityToRace(slave) {
+ slave.race = hashChoice(setup.raceSelector[slave.nationality] || setup.raceSelector[""]);
+};
+
window.nationalityToName = function nationalityToName(slave) {
const V = State.variables;
diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
index 9d20cdf8bb34655927dc643ed2fd15e3ccde1118..f00ec3c0d075009f9f8e041091a7e12bacb9223f 100644
--- a/src/js/utilJS.tw
+++ b/src/js/utilJS.tw
@@ -5,8 +5,8 @@
* Height.mean(nationality, race, genes) - returns the mean adult height for the given combination
* Height.mean(slave) - returns the mean (expected) height for the given slave
*
- * Height.random(nationality, race, genes, age) - returns a random height for the given combination,
- * with Gaussian distribution (mean = 1, standard deviation = 0.05) around the mean height
+ * Height.random(nationality, race, genes, age) - returns a random height using the skew-normal distribution
+ * around the mean height for the given arguments
* Height.random(nationality, race, genes) - returns a random height for the given combination of an adult, as above
* Height.random(slave[, options]) - returns a random height for the given slave, as above.
* The additional options object can modify how the values are generated
@@ -45,9 +45,9 @@
*
*Skew, spread, limitMult: These are statistics things. BTW, a gaussian distribution is a normal distribution. Just a naming thing.
*
- *Skew: See https://brownmath.com/stat/shape.htm#Skewness. Basically a measure of how asymmetrical the curve is. It doesn't change the mean, and can't move the main mass of the distribution far from the mean! The normal distribution can't do that. You can, however, use it to fatten one or the other tail.
+ *Skew: The shape parameter of a skew-normal distribution. See http://azzalini.stat.unipd.it/SN/Intro/intro.html for more details. Basically a measure of how asymmetrical the curve is. It doesn't move the main mass of the distribution. Rather, it's more like it moves mass from one of the tails into the main mass of the distribution.
*
- *Spread: Changes the average distance from the mean, making the graph wider and shorter. Moves "mass" from the center to the tail. It's basically standard deviation, but named funny because FC codebase.
+ *Spread: Changes the average distance from the mean, making the graph wider and shorter. Moves "mass" from the center to the tail. It's basically standard deviation, but named funny because FC codebase. Changing this can have dramatic effects. It's advised to keep this at or below 0.1 for usual height generation.
*
*limitMult: A clamp, expressed in z-score. (z=1 is one standard dev above mean, for ex.) If it excludes too much of the distribution the other parameters describe, you're going to spend lots of CPU making and throwing away heights. Don't worry about this unless you run into it.
*
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 05bc25eb79e24726fa4a254d5810e23ff588ec3f..3270017d20082c76b09d42bde216d4732a739595 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -438,7 +438,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
<</if>>
<</if>>
<<set $activeSlave.relationship = -3>>
- <<if $PC.surname>>
+ <<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>>
<br><br><span id="surnaming">
<<link "Give $him your surname">>
<<replace "#surnaming">>
@@ -679,7 +679,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
<</if>>
<</if>>
<<set $activeSlave.relationship = -3>>
- <<if $PC.surname>>
+ <<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>>
<br><br><span id="surnaming">
<<link "Give $him your surname">>
<<replace "#surnaming">>
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 9b08b8cc2d6af1faf6e10085b9b56f747b419e8d..c506be3ec8fbc588baf8c7e6637aa89e3bf8637f 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -468,7 +468,7 @@ This decriptions can be expanded with more outcomes later. But it's not practica
<<if $slaves[$i].fetish != "mindbroken">>
<br><br>
<<if ($slaves[$i].fetish == "masochist")>>
- Since $he was a virgin, giving birth was a @@.red;terribly painful@@ experience.<<if $slaves[$i].fetishKnown == 0>>$He seems to have orgasmed several times during the experience, $he appears to @@.lightcoral;really like pain@@.<<set $slaves[$i].fetishKnown = 1>><<else>> However, due to $his masochistic streak, $he @@.hotpink;greatly enjoyed@@ said experience<</if>>.
+ Since $he was a virgin, giving birth was a @@.red;terribly painful@@ experience.<<if $slaves[$i].fetishKnown == 0>> $He seems to have orgasmed several times during the experience and appears to @@.lightcoral;really like pain@@.<<set $slaves[$i].fetishKnown = 1>><<else>> However, due to $his masochistic streak, $he @@.hotpink;greatly enjoyed@@ said experience<</if>>.
<<set $slaves[$i].health -= 10, $slaves[$i].devotion += 2>>
<<else>>
Since $he was a virgin, giving birth was a @@.red;terribly painful@@ experience. $He @@.mediumorchid;despises@@ you for taking $his virginity in such a @@.gold;horrifying@@ way.
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 53383d3a98827193becba08f9e6d1dc7c8af2c2f..ecdb6256915225b5c953870c3a764af84a57c02b 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -4148,6 +4148,75 @@ i<<s>> ni<<c>>e," she <<if $activeSlave.trust > 95>>allows<<else>>hurries to add
<</if>>
May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
+
+<<case "hyperpreg stuck">>
+You are alerted to an issue regarding your
+ <<if ($activeSlave.broodmother === 2) && ($activeSlave.preg >= 30)>>
+ hyperbroodmother,
+ <<elseif ($activeSlave.broodmother == 1) && ($activeSlave.preg >= 30)>>
+ broodmother,
+ <<else>>
+ debilitatingly pregnant slave,
+ <</if>>
+<<EventNameLink $activeSlave>>. It seems,
+ <<if $pregAccessibility == 1>>
+ despite updating your penthouse to accommodate bellies wider than a standard doorway,
+ <<else>>
+ since you have not yet updated your penthouse to accommodate bellies wider than standard doorways,
+ <</if>>
+the poor slave has gotten lodged in the doorway exiting
+
+ <<if ($activeSlave.livingRules == "luxurious")>>
+ her room.
+ <<elseif ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite == 1)>>
+ her suite.
+ <<else>>
+ the dormitory where she sleeps.
+ <</if>>
+The menials assigned to care for her have been struggling for several weeks to fit her through this particular doorway, but refrained from informing you, as their ward
+ <<if $activeSlave.devotion > 95>>
+ did not wish to worry you.
+ <<elseif $activeSlave.devotion > 50>>
+ was concerned you would worry.
+ <<elseif $activeSlave.devotion > 20>>
+ was concerned how you would react.
+ <<elseif ($activeSlave.trust < -20) && ($activeSlave.devotion > -10)>>
+ feared how you would react.
+ <<elseif ($activeSlave.trust < -50)>>
+ was terrified of how you might respond.
+ <<else>> argued you couldn’t be trusted.
+ <</if>>
+You make a mental note to punish her caretakers and then set out to see her predicament for yourself.
+<br><br>
+The sight that greets you when you arrive is equal parts incredible and amusing. En route to the baths, the slave attempted to exit
+ <<if ($activeSlave.livingRules == "luxurious")>>
+ her room
+ <<elseif ($activeSlave.ID == $HeadGirl.ID) && ($HGSuite == 1)>>
+ her suite
+ <<else>>
+ the dorm
+ <</if>>
+backwards and, as a result, you have a glorious view of her
+ <<if ($activeSlave.broodmother === 2) && ($activeSlave.preg >= 30)>>
+ mind boggling, room filling belly
+ <<elseif ($activeSlave.broodmother == 1) && ($activeSlave.preg >= 30)>>
+ massive, brood swollen belly
+ <<else>>
+ inhumanly pregnant belly
+ <</if>>
+squeezed painfully by the inadequate doorway and framing the attractive rear view of the rest of her body, including her
+ <<if $activeSlave.butt > 5>>
+ debilitatlingly huge ass cheeks.
+ <<elseif $activeSlave.butt > 2>>
+ plush ass.
+ <<else>>
+ cute little ass.
+ <</if>>
+<br><br>
+She cranes her neck, glancing over her shoulder to give you a pleading look.
+
+
+
<<default>>
<br>ERROR: bad RESS event $RESSevent
<</switch>>
@@ -19860,6 +19929,164 @@ You tell her kindly that you understand, and that she'll be trained to address t
<</replace>>
<</link>>
+
+<<case "hyperpreg stuck">>
+
+<<link "Abuse her">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+You lean against a wall and take a moment to enjoy your slave’s discomfort. Realizing that her <<Master>> is intent to do nothing, she blushes and begins pulling on her belly, attempting to free herself.
+ <<if ($activeSlave.broodmother === 2) && ($activeSlave.preg >= 30)>>
+ Her innumerable brood are awakened by her exertions and begin to move, testing the thin walls of the womb constraining them and causing her belly to wobble ominously. You count the number of infant feet distinctly outlined against your poor hyperbroodmother’s straining womb.
+ <<elseif ($activeSlave.broodmother == 1) && ($activeSlave.preg >= 30)>>
+ With a groan of effort, the broodmother manages to pull her belly slightly further out through the doorway, but, in the effort, only really manages to wedge it more firmly. It bulges ominously.
+ <<else>>
+ The massively pregnant slave’s belly clutches in a false contraction and she pulls several inches further out through the doorframe before it expands again, leaving her even more hopelessly stuck
+ <</if>>
+<br><br>
+ <<if !canTalk($activeSlave)>>
+ She moans and rubs up and down what little she can reach of her belly while looking back at you with more urgency. It’s clear she is in severe distress.
+ <<else>>
+ “<<Master>>,†she says through clenched teeth. “Please.â€
+ <</if>>
+<br><br>
+You judge that sufficient time has passed and move forward.
+ <<if $activeSlave.butt > 5>>
+ Wading in between her huge ass cheeks
+ <<elseif $activeSlave.butt > 2>>
+ Grabbing a handful of one generous ass cheek,
+ <<else>>
+ Slapping a pert ass cheek,
+ <</if>>
+you hilt yourself in her pregnant pussy and begin pounding. Her belly distorts back and forth under your vigorous ministrations before, with a “pop,†belly, slave, and owner go tumbling through the doorway. She yelps in @@.gold;shock@@ and @@.red;pain@@ as her belly smacks the ground and the sound of her voice, coupled with the feeling of jolting up and down on top of your slave’s abused gut, sends you over the edge. You ejaculate into her fertile, wanting pussy and then slide off of her to instruct your servants to widen the door before they carry her to her duties for the day.
+<br>
+<<set $activeSlave.health -= 20, $activeSlave.trust -= 20>>
+ <</replace>>
+ <</link>>
+<br>
+
+<<link "Fuck her">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+You can’t help but be aroused by the sight of your swollen, helpless slave, and you take off your pants, revealing your erection. The slave’s backward glance falls on your dick and she
+ <<if $activeSlave.devotion > 95>>
+ licks her lips,
+ <<if $activeSlave.amp == 1>>
+ wiggling the stumps of her legs and swiveling her hips to give you a clear angle at her hungry pussy.
+ <<else>>
+ spreading her legs and revealing more of her massive underbelly while angling her wanting pussy at the perfect angle for fucking.
+ <</if>>
+ <<elseif $activeSlave.devotion > 50>>
+ blushes, swiveling her hips to give you easy access to her pussy.
+ <<elseif $activeSlave.devotion > 20>>
+ blushes and leans into her belly, knowing what to expect.
+ <<elseif ($activeSlave.trust < -20) && ($activeSlave.devotion > -10)>>
+ moans nervously.
+ <<elseif ($activeSlave.trust < -50)>>
+ yelps, turning away from you and clenching her eyes shut as her
+ <<if $activeSlave.amp == 1>>
+ stumps push toward each other, clearly trying (and failing) to conceal her pussy.
+ <<else>>
+ legs instinctively clench together to hide her pussy.
+ <</if>>
+ <<else>>
+ snorts dersively despite her helplessness.
+ <</if>>
+<br><br>
+You step forward and run an appreciative hand over the surface of her belly. Her womb is packed so full that the outline of her squirming children is obvious under her stretched-thin flesh. She groans at your touch, clearly in some distress, and you promise her that you’ll free her once you’ve finished up.
+ <<if $activeSlave.devotion > 95>>
+ The slave is clearly too aroused by your touch to hear what you’re saying and leans back into you, stretching against her tortured belly to nibble at your ear.
+ <<elseif $activeSlave.devotion > 50>>
+ The slave says nothing, but wiggles her ass against your hips, making it clear she’s ready.
+ <<elseif $activeSlave.devotion > 20>>
+ You can see tears streaming down the slave’s face from the discomfort she’s experiencing, but she nods that she’s ready.
+ <<elseif ($activeSlave.trust < -20) && ($activeSlave.devotion > -10)>>
+ The slave cries and begs you to finish quickly and help her before she bursts.
+ <<elseif ($activeSlave.trust < -50)>>
+ The shock of contact with your body causes the terrified slave’s skin to contract, as if she’s trying to pull away despite her current reality, and her only response to your promise is sobbing.
+ <<else>>
+ The slave
+ <<if !canTalk($activeSlave)>>
+ motions for you to
+ <<else>>
+ responds by telling you to
+ <</if>>
+ just fuck her already and let her move on with her day.
+ <</if>>
+You let your hand wander downward and then push down on the base of her clit with finger and thumb, making her whimper, before removing your hand and burying your cock inside her. As you fuck her, her poor, tortured belly wobbles against the constraining door frame and the frame itself groans in protest.
+She grinds in rhythm to your pistoning until the back and forth movement of her sloshing tummy overpowers her efforts and sends her careening back and forth between its oceanic movements and your less than tender ministrations. The sensation of fucking a woman who is literally a slave to the motion of her own womb drives you over the edge and you pull out, ejaculating all over her
+ <<if $activeSlave.butt > 5>>
+ enveloping ass cleavage.
+ <<elseif $activeSlave.butt > 2>>
+ fat, waiting ass cheeks.
+ <<else>>
+ pert ass.
+ <</if>>
+<br><br>
+You step back, taking one last appreciatively look at your trapped slave, then call a team of menials to remove the door from its foundation to free her, instructing them to also continually widen the door as necessary to attempt to prevent future incidents. Though your slave is extracated uninjured, your decision to use her before saving her leaves the slave @@.gold;trusting you less@@.
+<br>
+<<set $activeSlave.health -= 10, $activeSlave.trust -= 10>>
+ <</replace>>
+
+ <</link>>
+<br>
+<<link "Try the “Butter Strategyâ€">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+You ponder her predicament for a moment before settling on a solution. You procure an industrial sized jar of curative laced moisturizing butter--specially formulated to ease the strain of hypermassive pregnancy--and explain to your slave that, to free her, you’re going to need to completely cover her in it so that she can squeeze through.
+ <<if $activeSlave.devotion > 95>>
+ She grins at you and then huffs, pretending to be put off by the idea.
+ <<elseif $activeSlave.devotion > 50>>
+ She quirks an eyebrow, then smiles, clearly intrigued.
+ <<elseif $activeSlave.devotion > 20>>
+ She nods, happy to hear you’ve considered a way to free her without causing her undue harm.
+ <<elseif ($activeSlave.trust < -20) && ($activeSlave.devotion > -10)>>
+ She had seemed uneasy when you first described your idea, but seems to resign herself to it once you finish your description.
+ <<elseif ($activeSlave.trust < -50)>>
+ The wide eyed slave nods as you describe your idea, clearly hoping you’ll free her as quickly as possible so that she can get away from you.
+ <<else>>
+ She laughs derisively at you after you describe your idea, then motions for you to get on with it.
+ <</if>>
+You move toward her and slather a generous helping of the stuff over her back and
+ <<if $activeSlave.butt > 5>>
+ couch smothering ass,
+ <<elseif $activeSlave.butt > 2>>
+ fat ass cheeks,
+ <<else>>
+ petite ass,
+ <</if>>
+for the sake of “being thorough.†You then move forward, covering the parts of her belly you can reach from behind and taking special care to
+ <<if ($activeSlave.boobs >= 20000)>>
+ massage the soft butter into every inch of her colossal tits, noting with satisfaction as her distant nipples,stuck on the other side of the doorway with the bulk of her room filling breasts, harden with arousal.
+ <<elseif ($activeSlave.boobs >= 12000)>>
+ massage the soft butter into her massive tits as they push up between the arch of the doorway and her bulging belly. You note with satisfaction as her nipples harden with arousal.
+ <<elseif ($activeSlave.boobs >= 7000)>>
+ massage the soft butter into her monstrous tits, enjoying the struggle it takes to heft each butterslick, glistening watermelon with both hands. You note with satisfaction as her nipples harden with arousal.
+ <<elseif ($activeSlave.boobs >= 3000)>>
+ massage the soft butter into each of her huge, headsized tits. Your slave cranes her head back a bit to avoid being smothered by her own breasts as you work the butter into them, but you can tell she’s aroused by what you’re doing--her nipples have turned hard as rocks.
+ <<elseif ($activeSlave.boobsImplant > 250)>>
+ massage the soft butter into her fat, fake titties, noting with satisfaction as her nipples harden with arousal.
+ <<elseif ($activeSlave.boobs >= 650)>>
+ massage the soft butter into her big tits, noting with satisfaction as her nipples harden with arousal.
+ <<elseif ($activeSlave.boobs >= 300)>>
+ massage the soft butter into her small, girlish chest, noting with satisfaction as her nipples harden with arousal.
+ <</if>>
+<br><br>
+Satisfied with your covering of your slave’s back half, you then resolve to work on her front. Getting down on your hands and knees, you crawl through the narrow triangle of space between the base of your slave’s massive belly, the floor, and the doorway. It’s a tight squeeze, and you take longer than you need to in order to enjoy the sound of your slave groaning as you squeeze up against her sweaty, buttered up belly, but you eventually make it through. Taking generous handfuls of butter, you slick up the front half of your slave’s stomach, starting at the flattened nub of her pressure obliterated belly button and slowly working your way up to the round oval of baby packed flesh being constricted by the doorway.
+<br><br>
+With your slave’s body dripping with the thick moisturizer, you call out to her to start pulling her belly through the doorway, pushing your body up against her stomach to help push. You didn’t bother to strip your clothes while buttering her body and, as you crush up against her and heave, again and again, against the sheer mass of her abdomen, you can’t help but get aroused by the way your greasy clothes rub between your body and hers with each motion. At first, her belly is so firmly lodged that it doesn’t move, but momentum eventually builds up and, with an audible “pop,†the poor baby laden breeder finally breaks free from her containment, falling onto her back and pulling you with her into an absurd, buttery mass of flailing limbs and giggles. You take some time to flip her into a position where she won’t be crushed by the weight of her own womb, and then take some more time to enjoy the fruits of your labors.
+<br><br>
+Once finished, you allow your servants to carry your @@.hotpink;thoroughly satisfied slave@@ to the baths and instruct them to continuously expand the doorway, as necessary, to attempt to prevent her getting stuck again.
+<br>
+<<set $activeSlave.devotion += 10>>
+
+
+ <</replace>>
+ <</link>>
+
+
+
+
<<default>>
<br>ERROR: bad RESS event $RESSevent
<</switch>>
diff --git a/src/uncategorized/bodyModificationReaction.tw b/src/uncategorized/bodyModificationReaction.tw
index ffd95f67514a66170876e966ee0af33cee8516d5..0599662834fa7bacb6b5252835093210686d52d5 100644
--- a/src/uncategorized/bodyModificationReaction.tw
+++ b/src/uncategorized/bodyModificationReaction.tw
@@ -1,9 +1,6 @@
-:: Body Modification Reaction
+:: Body Modification Reaction [nobr]
-<<nobr>>
-
-<<set $nextButton = "Continue">>
-<<set $nextLink = "Slave Interact">>
+<<set $nextButton = "Continue", $nextLink = "Slave Interact">>
As you cast off $his bindings<<if canSee($activeSlave)>> and <<if ($activeSlave.amp != 1)>>let $him stand<<else>>prop $him up<</if>>, $he catches sight of $himself in the floor length mirror at the foot of the body modification table<<else>>, and <<if ($activeSlave.amp != 1)>>let $him stand<<else>>prop $him up<</if>>, you vividly describe $his new appearance. $His mind hangs on every word that leaves your mouth<</if>>.
@@ -45,4 +42,3 @@ As you cast off $his bindings<<if canSee($activeSlave)>> and <<if ($activeSlave.
<</if>>
<<set $degradation = 0>>
-<</nobr>>\
diff --git a/src/uncategorized/changeLanguage.tw b/src/uncategorized/changeLanguage.tw
index 7b6dd3fd1b4bcf2141a148a14dd7d6603f9577e3..de8d8907d6884b3c6fd75e40a375bb7464d3d0be 100644
--- a/src/uncategorized/changeLanguage.tw
+++ b/src/uncategorized/changeLanguage.tw
@@ -1,6 +1,4 @@
-:: Change Language
-
-<<nobr>>
+:: Change Language [nobr]
<<set $nextButton = "Confirm changes", $nextLink = "Manage Arcology">>
@@ -37,10 +35,9 @@ The lingua franca of the arcology is ''$language''.
<br><br>
Select a custom language to be applied: <<textbox "$seed" $seed "Change Language">> //A single capitalized word is recommended.//
-<</nobr>>\
-\
+<br><br>
+
<span id="result">
-<<nobr>>
<<if $language != "English">>
<br><<link "English">>
@@ -197,5 +194,4 @@ Select a custom language to be applied: <<textbox "$seed" $seed "Change Language
<</link>> //Failing to take this step will retard adoption of Revivalism//
<</if>>
-<</nobr>>
</span>
diff --git a/src/uncategorized/clubAdvertisement.tw b/src/uncategorized/clubAdvertisement.tw
index f4fab05a2dea637259cc3a92cebbc1035f2153ed..888764ad5cdc617080061aa0e728cbf3912b1ba9 100644
--- a/src/uncategorized/clubAdvertisement.tw
+++ b/src/uncategorized/clubAdvertisement.tw
@@ -1,6 +1,4 @@
-:: Club Advertisement
-
-<<nobr>>
+:: Club Advertisement [nobr]
<<switch $clubDecoration>>
<<case "Roman Revivalist">>
@@ -119,9 +117,7 @@
$arcologies[0].name has a robust internal media that could be used to bring patrons into the club.
<</if>>
-<</nobr>>
-
-<<nobr>>
+<br><br>
You are spending <<print cashFormat($clubAdsSpending)>> each week to advertise $clubName.
@@ -136,10 +132,11 @@ You are spending <<print cashFormat($clubAdsSpending)>> each week to advertise $
Increase
<</if>>
-<</nobr>>
+<br><br>
__Design Club Ad Campaign__ //Will replace relevant variety bonuses//
-<<nobr>>
+
+<br><br>
Asset size:
<<if $clubAdsStacked != 1>><<link "Stacked">><<set $clubAdsStacked = 1>><<goto "Club Advertisement">><</link>> | <<else>>Stacked | <</if>>
@@ -186,5 +183,3 @@ Pregnancy:
<<if $clubAdsXX != 0>><<link "Variety">><<set $clubAdsXX = 0>><<goto "Club Advertisement">><</link>> <<else>>Variety<</if>>
<br>
<</if>>
-
-<</nobr>>
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
index 0cebdfeca1455edfd7197e25e5c2b7abd8c68389..18694ad202c0925e7c8c8ed8290edce709955021 100644
--- a/src/uncategorized/generateXXSlave.tw
+++ b/src/uncategorized/generateXXSlave.tw
@@ -101,7 +101,7 @@
<<set $activeSlave.nationality = $fixedNationality>>
<<set $fixedNationality = 0>>
<</if>>
- <<NationalityToRace $activeSlave>>
+ <<run nationalityToRace($activeSlave)>>
/* Corporate slavegen with race selection */
<<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>>
<<if $captureUpgradeRace == "mixed race">>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index 95c8903516ac7bfe1b9db8eb9fc4f3ab908df5de..30a4c243edaebdc86fa87025354ac37aa5c8a6d6 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -107,7 +107,7 @@
<<set $activeSlave.nationality = $fixedNationality>>
<<set $fixedNationality = 0>>
<</if>>
- <<NationalityToRace $activeSlave>>
+ <<run nationalityToRace($activeSlave)>>
/* Corporate slavegen with race selection */
<<if passage() == "Corporate Market" && ($captureUpgradeRace != "unselected") && ($captureUpgradeRace != "none")>>
<<if $captureUpgradeRace == "mixed race">>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 5df6b8da30560d7f4e9e00c9acd05d3f4d096ed4..d38bdd2b72fb703cc40be08440814ab7a01fe7a9 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -393,23 +393,23 @@ $He comes to you for an inspection
<</if>>
<<if ($activeSlave.oralCount + $activeSlave.vaginalCount + $activeSlave.analCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount) > 0>>
- and has been fucked about <<print ($activeSlave.oralCount + $activeSlave.vaginalCount + $activeSlave.analCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount)>> times, including
+ and has been fucked about <<print commaNum($activeSlave.oralCount + $activeSlave.vaginalCount + $activeSlave.analCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount)>> times, including
<<if $activeSlave.mammaryCount > 0>>
- $activeSlave.mammaryCount mammary,
+ <<print commaNum($activeSlave.mammaryCount)>> mammary,
<</if>>
<<if $activeSlave.vaginalCount > 0>>
- $activeSlave.vaginalCount vanilla,
+ <<print commaNum($activeSlave.vaginalCount)>> vanilla,
<</if>>
<<if $activeSlave.analCount > 0>>
- $activeSlave.analCount anal,
+ <<print commaNum($activeSlave.analCount)>> anal,
<</if>>
<<if $activeSlave.penetrativeCount > 0>>
- $activeSlave.penetrativeCount penetrating,
+ <<print commaNum($activeSlave.penetrativeCount)>> penetrating,
<</if>>
<<if ($activeSlave.penetrativeCount+$activeSlave.mammaryCount+$activeSlave.vaginalCount+$activeSlave.analCount) > 0>>
and
<</if>>
- $activeSlave.oralCount oral sexual encounters.
+ <<print commaNum($activeSlave.oralCount)>> oral sexual encounters.
<<else>>
<<if $week-$activeSlave.weekAcquired >= 1>>
and
@@ -471,15 +471,15 @@ $He comes to you for an inspection
$he's spent awake.
<</if>>
<<elseif _sortedCounts[0].type == "mammary">>
- <<if (_weeksOwned*112)/$activeSlave.oralCount < 4>>
+ <<if (_weeksOwned*112)/$activeSlave.mammaryCount < 4>>
Remarkably, this means that $he's put $his tits to work
- <<if (_weeksOwned*112)/$activeSlave.oralCount < 1>>
+ <<if (_weeksOwned*112)/$activeSlave.mammaryCount < 1>>
more than once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 1.5>>
+ <<elseif (_weeksOwned*112)/$activeSlave.mammaryCount < 1.5>>
about once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 2.5>>
+ <<elseif (_weeksOwned*112)/$activeSlave.mammaryCount < 2.5>>
about once every two hours
- <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 3.5>>
+ <<elseif (_weeksOwned*112)/$activeSlave.mammaryCount < 3.5>>
about once every three hours
<<else>>
about once every four hours
@@ -487,15 +487,15 @@ $He comes to you for an inspection
$he's spent awake.
<</if>>
<<elseif _sortedCounts[0].type == "penetrative">>
- <<if (_weeksOwned*112)/$activeSlave.oralCount < 4>>
+ <<if (_weeksOwned*112)/$activeSlave.penetrativeCount < 4>>
Remarkably, this means that $he's pounded a hole
- <<if (_weeksOwned*112)/$activeSlave.oralCount < 1>>
+ <<if (_weeksOwned*112)/$activeSlave.penetrativeCount < 1>>
more than once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 1.5>>
+ <<elseif (_weeksOwned*112)/$activeSlave.penetrativeCount < 1.5>>
about once every hour
- <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 2.5>>
+ <<elseif (_weeksOwned*112)/$activeSlave.penetrativeCount < 2.5>>
about once every two hours
- <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 3.5>>
+ <<elseif (_weeksOwned*112)/$activeSlave.penetrativeCount < 3.5>>
about once every three hours
<<else>>
about once every four hours
diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw
index 14b9d2617a771a981f5161e6f9f03176a3b10b29..669aa42f412eb6e4bf5d0a47c1c097711889a07e 100644
--- a/src/uncategorized/saTakeClasses.tw
+++ b/src/uncategorized/saTakeClasses.tw
@@ -9,6 +9,7 @@
<</if>>
<<elseif ($slaves[$i].assignment == "learn in the schoolroom")>>
<<if ($Schoolteacher != 0)>>
+ <<setLocalPronouns $Schoolteacher 2>>
<<set _seed = $Schoolteacher.intelligence+$Schoolteacher.intelligenceImplant>>
<<if ($Schoolteacher.visualAge > 35)>>
<<set _seed += 1>>
@@ -24,13 +25,13 @@
<</if>>
takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedial + $schoolroomUpgradeLanguage != 0>>, using $schoolroomName's improved educational materials, <</if>> under $Schoolteacher.slaveName's supervision;
<<if ($slaves[$i].devotion > 20)>>
- $he is such an obedient slave that she @@.hotpink;encourages $him@@ to be the best slave $he can.
+ $he is such an obedient slave that _he2 @@.hotpink;encourages $him@@ to be the best slave $he can.
<<set $slaves[$i].devotion += 2>>
<<elseif ($slaves[$i].trust < -20)>>
- $he obeys out of fear, so she @@.hotpink;encourages $him@@ to be a better slave.
+ $he obeys out of fear, so _he2 @@.hotpink;encourages $him@@ to be a better slave.
<<set $slaves[$i].devotion += 1>>
<<else>>
- $he is resistant, so she ends up mostly @@.gold;punishing $him,@@ increasing $his @@.mediumorchid;dislike for slavery.@@
+ $he is resistant, so _he2 ends up mostly @@.gold;punishing $him,@@ increasing $his @@.mediumorchid;dislike for slavery.@@
<<set $slaves[$i].devotion -= 2>>
<<set $slaves[$i].trust -= 4>>
<</if>>
diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw
index e03755e6dd41d0dbb1346b42da4cafb5344f845e..6e6e48ef8b6aa4ce1f78ae6892ec79399c44528f 100644
--- a/src/uncategorized/seWedding.tw
+++ b/src/uncategorized/seWedding.tw
@@ -377,7 +377,7 @@
<</if>>
There is no ring for you, since this marriage does not bind you.
<br>
- <<if $PC.surname>>
+ <<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>>
<br><br><span id="surnaming">
<<link "Give her your surname too">>
<<replace "#surnaming">>
@@ -549,7 +549,7 @@
Once the ceremony is complete, you scoop up your new slave wife to carry her back into the master bedroom. She rests her head against you, so tired that she’s grateful for the break from standing. By the time she’s home, she’s fast asleep. You set her gently down on the bed and curl up behind her, feeling the animal warmth of her body as the exhausted slave’s chest rises and falls with her breathing.
<</if>>
<br>
- <<if $PC.surname>>
+ <<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>>
<br><br><span id="surnaming">
<<link "Give her your surname as well">>
<<replace "#surnaming">>
@@ -741,7 +741,7 @@
<br><br>
When she's in front of you, <<if $activeSlave.amp == 1>>the slave carrying her limbless torso sets her down on the floor in front of you and props her up so her head is level with your crotch<<else>>she gets down on her knees so her head is level with your crotch<</if>>. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for her, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around her neck, since she lacks fingers to wear it on<<else>>on her finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br>
- <<if $PC.surname>>
+ <<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>>
<br><br><span id="surnaming">
<<link "Give her your surname">>
<<replace "#surnaming">>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 7c4b714933c767e41c86234df4b84048f3398abe..6086e044fde5cbf4607fa69270c3e0c9af2d3949 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -510,7 +510,7 @@
<<elseif (_Slave.indentureRestrictions > 1)>>
<br>//_Slave.slaveName's indenture forbids fighting.//
<<continue>>
- <<elseif (_Slave.breedingMark != 1 || $propOutcome == 0)>>
+ <<elseif _Slave.breedingMark == 1 && $propOutcome == 1>>
<br>//_Slave.slaveName may not participate in combat//
<<continue>>
<<else>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 1a96e077a7e9f084501949219155318100c36899..e24aa0e82b14da7b6b705b70d8395814de463ce3 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -778,66 +778,66 @@ $His
<<elseif $activeSlave.boobs < 500>><<print either("perky", "small")>> <<print either("tits", "breasts", "boobs", "bosoms")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill B cups.
<<elseif $activeSlave.boobs < 650>><<print either("healthy", "curved")>> <<print either("tits", "breasts", "boobs", "bosoms")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill C cups.
<<elseif $activeSlave.boobs < 800>><<print either("big", "sizable")>> <<print either("tits", "breasts", "boobs", "bosoms")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill D cups.
-<<elseif $activeSlave.boobs < 1000>><<print either("large", "big")>> <<print either("tits", "breasts", "boobs", "bosoms")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill DD cups.
-<<elseif $activeSlave.boobs < 1200>><<print either("proud", "hefty")>> <<print either("tits", "breasts", "mammaries", "udders", "boobs")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill F cups.
-<<elseif $activeSlave.boobs < 1400>><<print either("hefty", "huge")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill G cups.
-<<elseif $activeSlave.boobs < 1600>><<print either("massive", "huge")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill H cups.
-<<elseif $activeSlave.boobs < 1800>><<print either("enormous", "massive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill I cups.
-<<elseif $activeSlave.boobs < 2050>><<print either("titanic", "enormous")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill J cups.
-<<elseif $activeSlave.boobs < 2300>><<print either("stupendous", "titanic")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill K cups.
-<<elseif $activeSlave.boobs < 2600>><<print either("magnificent", "stupendous")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill L cups.
-<<elseif $activeSlave.boobs < 2900>><<print either("impressive", "magnificent")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill M cups.
-<<elseif $activeSlave.boobs < 3250>><<print either("awe-inspiring", "impressive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill N cups.
-<<elseif $activeSlave.boobs < 3600>><<print either("absurd", "awe-inspiring")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill O cups.
-<<elseif $activeSlave.boobs < 3950>><<print either("disproportionate", "attention-grabbing")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill P cups.
-<<elseif $activeSlave.boobs < 4300>><<print either("shocking", "massive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill Q cups.
-<<elseif $activeSlave.boobs < 4700>><<print either("striking", "jaw-dropping")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill R cups.
+<<elseif $activeSlave.boobs < 1000>><<print either("large", "big")>> <<print either("tits", "breasts", "boobs", "bosoms")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill DD cups.
+<<elseif $activeSlave.boobs < 1200>><<print either("proud", "hefty")>> <<print either("tits", "breasts", "mammaries", "udders", "boobs")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill F cups.
+<<elseif $activeSlave.boobs < 1400>><<print either("hefty", "huge")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill G cups.
+<<elseif $activeSlave.boobs < 1600>><<print either("massive", "huge")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill H cups.
+<<elseif $activeSlave.boobs < 1800>><<print either("enormous", "massive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill I cups.
+<<elseif $activeSlave.boobs < 2050>><<print either("titanic", "enormous")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill J cups.
+<<elseif $activeSlave.boobs < 2300>><<print either("stupendous", "titanic")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill K cups.
+<<elseif $activeSlave.boobs < 2600>><<print either("magnificent", "stupendous")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill L cups.
+<<elseif $activeSlave.boobs < 2900>><<print either("impressive", "magnificent")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill M cups.
+<<elseif $activeSlave.boobs < 3250>><<print either("awe-inspiring", "impressive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill N cups.
+<<elseif $activeSlave.boobs < 3600>><<print either("absurd", "awe-inspiring")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill O cups.
+<<elseif $activeSlave.boobs < 3950>><<print either("disproportionate", "attention-grabbing")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill P cups.
+<<elseif $activeSlave.boobs < 4300>><<print either("shocking", "massive")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill Q cups.
+<<elseif $activeSlave.boobs < 4700>><<print either("striking", "jaw-dropping")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill R cups.
<<elseif $activeSlave.boobs < 5000+($activeSlave.muscles*10) && $activeSlave.physicalAge <= 3>>
<<if ($activeSlave.amp == 1)>>
- <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill S cups and are so large that $he might not be able to walk, if $he still had legs.
+ <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill S cups and are so large that $he might not be able to walk, if $he still had legs.
<<elseif ($activeSlave.muscles > 5)>>
- <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill S cups and are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
- <<else>>
- <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill S cups and are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
- <</if>>
-<<elseif $activeSlave.boobs < 5100>><<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill S cups.
-<<elseif $activeSlave.boobs < 5500>><<print either("frightening", "unmissable")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill T cups.
-<<elseif $activeSlave.boobs < 6000>><<print either("unmissable", "attention-grabbing")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill U cups.
-<<elseif $activeSlave.boobs < 6500>><<print either("attention-grabbing", "spectacular")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill V cups.
-<<elseif $activeSlave.boobs < 7000>><<print either("spectacular", "obviously engineered")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill W cups.
-<<elseif $activeSlave.boobs < 7500>><<print either("obviously engineered", "disproportionate")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill X cups.
-<<elseif $activeSlave.boobs < 8000>><<print either("disproportionate", "nearly inhuman")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill Y cups.
-<<elseif $activeSlave.boobs < 8500>><<print either("nearly inhuman", "nearly alien")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> would fill Z cups.
+ <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill S cups and are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
+ <<else>>
+ <<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill S cups and are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
+ <</if>>
+<<elseif $activeSlave.boobs < 5100>><<print either("tremendous", "astounding")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill S cups.
+<<elseif $activeSlave.boobs < 5500>><<print either("frightening", "unmissable")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill T cups.
+<<elseif $activeSlave.boobs < 6000>><<print either("unmissable", "attention-grabbing")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill U cups.
+<<elseif $activeSlave.boobs < 6500>><<print either("attention-grabbing", "spectacular")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill V cups.
+<<elseif $activeSlave.boobs < 7000>><<print either("spectacular", "obviously engineered")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill W cups.
+<<elseif $activeSlave.boobs < 7500>><<print either("obviously engineered", "disproportionate")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill X cups.
+<<elseif $activeSlave.boobs < 8000>><<print either("disproportionate", "nearly inhuman")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill Y cups.
+<<elseif $activeSlave.boobs < 8500>><<print either("nearly inhuman", "nearly alien")>> <<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> would fill Z cups.
<<elseif $activeSlave.boobs < 10000+($activeSlave.muscles*20) && $activeSlave.physicalAge <= 12>>
<<if ($activeSlave.amp == 1)>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print $activeSlave.boobs>> CCs each, they<<else>> They<</if>> are so large that $he might not be able to walk, if $he still had legs.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he might not be able to walk, if $he still had legs.
<<elseif ($activeSlave.muscles >= 5)>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print $activeSlave.boobs>> CCs each, they<<else>> They<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
<<else>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print $activeSlave.boobs>> CCs each, they<<else>> They<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
<</if>>
<<elseif $activeSlave.boobs < 20000+($activeSlave.muscles*50) && $activeSlave.physicalAge < 18>>
<<if ($activeSlave.amp == 1)>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print $activeSlave.boobs>> CCs each, they<<else>> They<</if>> are so large that $he might not be able to walk, if $he still had legs.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he might not be able to walk, if $he still had legs.
<<elseif ($activeSlave.muscles >= 5)>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print $activeSlave.boobs>> CCs each, they<<else>> They<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
<<else>>
- <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print $activeSlave.boobs>> CCs each, they<<else>> They<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print commaNum($activeSlave.boobs)>> CCs each, they<<else>> They<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
<</if>>
-<<elseif $activeSlave.boobs < 20000>><<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.
+<<elseif $activeSlave.boobs < 20000>><<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.
<<elseif $activeSlave.boobs < 30000+($activeSlave.muscles*100) && $activeSlave.physicalAge >= 18>>
<<if $activeSlave.amp == 1>>
- <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> are so large that $he might not be able to walk, if $he still had legs.
+ <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> are so large that $he might not be able to walk, if $he still had legs.
<<elseif ($activeSlave.muscles > 5)>>
- <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
<<else>>
- <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
+ <<print either("boobs", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
<</if>>
<<else>>
<<if $activeSlave.amp == 1>>
- <<print either("tits", "boobs", "mammaries")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> are so immense it is safer to leave $him resting atop them. $His udders each weigh more than twice the rest of $his body, since $his body consists of nothing but $his head, torso, and breasts.
+ <<print either("tits", "boobs", "mammaries")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> are so immense it is safer to leave $him resting atop them. $His udders each weigh more than twice the rest of $his body, since $his body consists of nothing but $his head, torso, and breasts.
<<else>>
- <<print either("tits", "boobs", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> are so gargantuan that they effectively immobilize $him. $He's most comfortable lying down.
+ <<print either("tits", "boobs", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print commaNum($activeSlave.boobs)>> CCs each,<</if>> are so gargantuan that they effectively immobilize $him. $He's most comfortable lying down.
<</if>>
<</if>>
@@ -3970,11 +3970,11 @@ $He's got a
<</if>>
<<else>>
-
+
<<if $activeSlave.prostate > 2>>
The area above $his crotch has a slight swell to it from $his prostate implant.
<</if>>
-
+
<</if>>
<</if>> /* CLOSES DETAILED DICK DESCRIPTION */
diff --git a/src/utility/slaveGenerationWidgets.tw b/src/utility/slaveGenerationWidgets.tw
deleted file mode 100644
index fc13ba90c2195c996164561dcf07c3b29caac560..0000000000000000000000000000000000000000
--- a/src/utility/slaveGenerationWidgets.tw
+++ /dev/null
@@ -1,6 +0,0 @@
-:: slave generation widgets [nobr widget]
-
-<<widget "NationalityToRace">>
-<<set $args[0].race
- = hashChoice(setup.raceSelector[$args[0].nationality] || setup.raceSelector[""])>>
-<</widget>>