From c68f32c047e27560dd8e1c9999b5205561025405 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sat, 1 Jun 2019 23:17:12 -0500
Subject: [PATCH] CallThisName
---
src/Mods/DinnerParty/dinnerPartyExecution.tw | 2 +-
src/js/descriptionWidgets.js | 3 +--
src/js/pregJS.js | 4 ++--
src/js/utilJS.js | 19 +++++++++----------
src/npc/descriptions/fAssistedSex.tw | 4 ++--
src/npc/descriptions/fLips.tw | 2 +-
src/npc/descriptions/fVagina.tw | 2 +-
src/npc/fFeelings.tw | 6 ++++--
src/player/actions/fondleBoobs.tw | 4 ++--
src/player/actions/fondleDick.tw | 2 +-
src/pregmod/FSuckle.tw | 2 +-
src/pregmod/analyzePlayerPregnancy.tw | 2 +-
src/pregmod/analyzePregnancy.tw | 2 +-
src/pregmod/artificialInsemination.tw | 4 ++--
src/pregmod/cloningWorkaround.tw | 2 +-
src/pregmod/electiveSurgery.tw | 14 +++++++-------
src/pregmod/newChildIntro.tw | 2 +-
src/pregmod/ovaTransplantWorkaround.tw | 2 +-
src/pregmod/surrogacyWorkaround.tw | 2 +-
.../widgets/playerDescriptionWidgets.tw | 4 ++--
src/uncategorized/RESS.tw | 8 ++++----
src/uncategorized/newSlaveIntro.tw | 2 +-
22 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index 460200a1b3b..221ef3abb8e 100644
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ b/src/Mods/DinnerParty/dinnerPartyExecution.tw
@@ -434,7 +434,7 @@
<</if>>
as you shake your head, so $he closes $his mouth and resigns $himself to $his fate.
<br>
- Your Head Girl is placed across the corner of the dining hall table face-down, $his hands and legs held open by 4 men. $He finds a hand on $his ass, groping roughly. Then another hand on the other cheek, roughly parting $his globes to get better access.
+ Your Head Girl is placed across the corner of the dining hall table face-down, $his hands and legs held open by four men. $He finds a hand on $his ass, groping roughly. Then another hand on the other cheek, roughly parting $his globes to get better access.
/% Pussy Check %/
<<if ($HeadGirl.vagina >= 0) && canDoVaginal($HeadGirl)>>
A finger traces along $his slit, finding the source of that moisture and pressing its way in. Another finger was added and the hand began to finger fuck $him roughly. After a few seconds a third finger was added and then a fourth, stretching $his pussy.
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 7e069a3bc0c..6778ce47104 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -277,7 +277,6 @@ App.Desc.ageAndHealth = function(slave) {
let his = pronouns.his;
let hers = pronouns.hers;
let himself = pronouns.himself;
- let boy = pronouns.boy;
let He = pronouns.He;
let His = pronouns.His;
let girl = pronouns.girl;
@@ -292,7 +291,7 @@ App.Desc.ageAndHealth = function(slave) {
}
}
- woman = (boy === "girl" ? "woman" : "man");
+ woman = (girl === "girl" ? "woman" : "man");
if (!slave.fuckdoll) {
if (slave.health < -90) {
diff --git a/src/js/pregJS.js b/src/js/pregJS.js
index b9d43c50ef6..7277bd981bc 100644
--- a/src/js/pregJS.js
+++ b/src/js/pregJS.js
@@ -386,7 +386,7 @@ window.setPregType = function(actor) {
let ftvol = FetusGetPrediction(actor, actor.pregData.normalBirth);
let cmvol = ftvol * actor.womb.length;
let maxvol = actor.pregAdaptation*2000;
- if (State.variables.seeHyperPreg == 0)
+ if (State.variables.seeHyperPreg == 0)
maxvol /= 10; //without hyperpreg enabled it's limited to be roughly ten times smaller.
let freevol = maxvol - cmvol;
let coeff = ((maxvol/actor.womb.length) / (freevol/ftvol)) / 2; // more divide to 2 is to balance for ensured 1 ova even if overlimit.
@@ -394,7 +394,7 @@ window.setPregType = function(actor) {
if (ovum > coeff)
ovum = coeff;
/* for future, if mounthly cycle will be a thing to implement, this will be useful.
- if (ovum < 0)
+ if (ovum < 0)
ovum = jsRandom(coeff/fertilityStack, 1);
*/
if (ovum < 1)
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index fcffa6fae6d..5d2673152b9 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1761,9 +1761,6 @@ window.pronounReplacer = function(slavetext) {
case "Many people remember her from the slavegirl races where she slammed her cock into countless runners' pussies after catching them.":
slavetext = "Many people remember $him from the slavegirl races where $he slammed $his cock into countless runners' pussies after catching them.";
break;
- case "She asked to be enslaved in the hope you'd treat a fellow woman well.":
- slavetext = "$He asked to be enslaved in the hope you'd treat a fellow woman well.";
- break;
case "She came to you to escape being sold to a cruel master after her producer informed her of her debt.":
slavetext = "$He came to you to escape being sold to a cruel master after $his producer informed $him of $his debt.";
break;
@@ -2173,21 +2170,23 @@ window.pronounReplacer = function(slavetext) {
default:
if ((slavetext.includes("was serving the public")) || (slavetext.includes("You bought her from"))) {
slavetext = slavetext.replace(/\bher\b/g, "$him");
- } else if ((slavetext.includes("Your lurcher")) || (slavetext.includes("while raiding"))) {
+ } else if (((slavetext.includes("Your lurcher")) && (slavetext.includes("coursing"))) || ((slavetext.includes("Your")) && (slavetext.includes("while raiding")))) {
slavetext = slavetext.replace(/\bher\b/g, "$him");
slavetext = slavetext.replace(/\bshe\b/g, "$he");
- } else if (slavetext.includes("young trophy husband")) {
+ } else if (slavetext.includes("was once the young trophy husband of a powerful woman in the old world, but she sold")) {
slavetext = "$He was once the young trophy husband of a powerful woman in the old world, but she sold $him into slavery in revenge for $his infidelities.";
- } else if (slavetext.includes("gargantuan dick")) {
+ } else if (slavetext.includes("gargantuan dick to be a truly unique slave")) {
slavetext = "$He was raised as a girl despite $his gargantuan dick to be a truly unique slave.";
- } else if (slavetext.includes("attempted rape of a free woman")) {
+ } else if (slavetext.includes("to enslavement for the attempted rape of a free woman")) {
slavetext = "You sentenced $him to enslavement for the attempted rape of a free woman.";
- } else if (slavetext.includes("rape of a free woman")) {
+ } else if (slavetext.includes("to enslavement as a punishment for the rape of a free woman")) {
slavetext = "You sentenced $him to enslavement as a punishment for the rape of a free woman.";
- } else if (slavetext.includes("obtain surgery to transform")) {
+ } else if (slavetext.includes("only way to obtain surgery to transform $him into a woman")) {
slavetext = "$He submitted to enslavement as $his only way to obtain surgery to transform $him into a woman.";
- } else if (slavetext.includes("spousal maintenance")) {
+ } else if (slavetext.includes("was sold as a slave to satisfy her spousal maintenance after divorce")) {
slavetext = "Once $he was an arcology security officer, lured to aphrodisiacs addiction and feminized by $his boss (and former wife), to whom $he was sold as a slave to satisfy her spousal maintenance after divorce.";
+ } else if (slavetext.includes("asked to be enslaved in the hope you'd treat a fellow woman well":
+ slavetext = "$He asked to be enslaved in the hope you'd treat a fellow woman well.";
} else {
slavetext = slavetext.replace(/\bherself\b/g, "$himself");
slavetext = slavetext.replace(/\bHerself\b/g, "$Himself");
diff --git a/src/npc/descriptions/fAssistedSex.tw b/src/npc/descriptions/fAssistedSex.tw
index dbafd0ce25d..bbb57886470 100644
--- a/src/npc/descriptions/fAssistedSex.tw
+++ b/src/npc/descriptions/fAssistedSex.tw
@@ -24,13 +24,13 @@ You order $his servants forward so that $he can tease you with $his enormously s
<<if $activeSlave.amp < 1>>
$he covers $his eyes with $his hands,
<<else>>
- Two slender arms snake around from behind $him, almost making it look like $he has limbs once more. They cover $his quivering eyes
+ Two slender arms snake around from behind $him, almost making it look like $he has limbs once more. They cover $his quivering <<if canSee($activeSlave)>>eyes<<else>>expression<</if>>
<</if>>
as a gaggle of $his trained menials slide underneath $his belly, lifting the monolithic organ off the ground and setting the tightly packed orb to wobbling.
<<if $activeSlave.amp < 1>>
Two more servants take hold of $his arms, forcing $him to lift them above $his head.
<<else>>
- The hands covering $his eyes draw away, revealing $his crying face, then lift above $his head in a deliberately provocative pose.
+ The hands covering $his <<if canSee($activeSlave)>>eyes<<else>>head<</if>> draw away, revealing $his crying face, then lift above $his head in a deliberately provocative pose.
<</if>>
$He tenses in a moment of instinctive resistance, then surrenders $his body to $his aids' total control, clearly afraid of punishment.
<</if>>
diff --git a/src/npc/descriptions/fLips.tw b/src/npc/descriptions/fLips.tw
index a40d774e8b2..4cc6cba7f0e 100644
--- a/src/npc/descriptions/fLips.tw
+++ b/src/npc/descriptions/fLips.tw
@@ -131,7 +131,7 @@ You tell $activeSlave.slaveName to
<<if $PC.vagina == 1>>$He has a mere moment to get $his breath back before you press your pussy against $his unwilling mouth.<</if>>
<</if>>
<<else>>
- seize $him and throw $him onto the couch face up, and then kneel on $him with your legs on either side of $his crying body, so your pussylips are hard against $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth. $He desperately eats you out, trying to get you off as fast as possible so $he can get a bit more air, but you grind down without mercy, taking your pleasure.
+ seize $him and throw $him onto the couch face-up, and then kneel on $him with your legs on either side of $his crying body, so your pussylips are hard against $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth. $He desperately eats you out, trying to get you off as fast as possible so $he can get a bit more air, but you grind down without mercy, taking your pleasure.
<</if>>
<<elseif $activeSlave.devotion <= 20>>
$He comes over reluctantly and begins to
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index 67cf42a32e0..9aaa3962635 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -210,7 +210,7 @@ You call $him over so you can
<<elseif tooBigBreasts($activeSlave)>>
You tell $him to get situated on the couch, face-down. This position pins $him down by the massive weight of $his tits, pushing $his face in amongst the cushions. $His tits serve as an anchor, allowing you to take $him doggy style without any real contribution from $him. The position muffles $his reaction entirely, other than the rhythmic jiggling of the breastflesh that sticks out to either side of $his torso as you <<if _fSpeed > 75>>pound $him hard and fast<<elseif _fSpeed > 50>>pound $him firmly and vigorously<<elseif _fSpeed > 25>>fuck $him steadily<<else>>fuck $him slowly and tenderly<</if>>.
<<elseif tooBigButt($activeSlave)>>
- You tell $him to get situated on the couch, face up. This position pins $him down by the massive weight of $his rear, causing $him to sink into the cushions. $His ass serves as an anchor, allowing you to take $him in the missionary position without any real contribution from $him. This lets you clearly see $his reaction, as well as the rhythmic jiggling of the buttflesh that sticks out to either side of $his hips as you <<if _fSpeed > 75>>pound $him hard and fast<<elseif _fSpeed > 50>>pound $him firmly and vigorously<<elseif _fSpeed > 25>>fuck $him steadily<<else>>fuck $him slowly and tenderly<</if>>.
+ You tell $him to get situated on the couch, face-up. This position pins $him down by the massive weight of $his rear, causing $him to sink into the cushions. $His ass serves as an anchor, allowing you to take $him in the missionary position without any real contribution from $him. This lets you clearly see $his reaction, as well as the rhythmic jiggling of the buttflesh that sticks out to either side of $his hips as you <<if _fSpeed > 75>>pound $him hard and fast<<elseif _fSpeed > 50>>pound $him firmly and vigorously<<elseif _fSpeed > 25>>fuck $him steadily<<else>>fuck $him slowly and tenderly<</if>>.
<<elseif tooBigBalls($activeSlave)>>
You tell $him to get situated on the couch, doggy style. This position pins $him down by the massive weight of $his balls. $His testicles serve as an anchor, allowing you to take $him doggy style without any real concern of getting struck by $his massive nuts. The position keeps $his balls completely still where they rest on the couch, so you don't have to worry about them getting in the way as you <<if _fSpeed > 75>>pound $him hard and fast<<elseif _fSpeed > 50>>pound $him firmly and vigorously<<elseif _fSpeed > 25>>fuck $him steadily<<else>>fuck $him slowly and tenderly<</if>>.
<<elseif ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($PC.dick != 0)>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index db116604ff0..3f10306a37b 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -417,10 +417,12 @@ My favorite part of my body i<<s>>
<<set _Amp = "rub mythelf againtht thtuff,">>
<</if>>
<</if>>
- <<if ($activeSlave.releaseRules == "permissive") || $activeSlave.releaseRules == "masturbation">>
+ <<if ($activeSlave.releaseRules == "permissive") || ($activeSlave.releaseRules == "masturbation")>>
Thank you for letting me
<<if ($activeSlave.fetishKnown == 1)>>
- <<if ($activeSlave.energy > 95)>>
+ <<if ($activeSlave.energy > 95) && (!canSee($activeSlave))>>
+ _Amp <<Master>>. It'<<s>> a good thing I can't get any more blind from it.
+ <<elseif ($activeSlave.energy > 95)>>
_Amp <<Master>>. It'<<s>> a good thing I can't actually go blind from it.
<<elseif ($activeSlave.fetish == "humiliation") && ($activeSlave.fetishStrength > 60)>>
_Amp <<Master>>. I love doing it where people can <<s>>ee me.
diff --git a/src/player/actions/fondleBoobs.tw b/src/player/actions/fondleBoobs.tw
index 2b82aeb92e1..a1d57e43bbd 100644
--- a/src/player/actions/fondleBoobs.tw
+++ b/src/player/actions/fondleBoobs.tw
@@ -164,7 +164,7 @@ You call $him over so you can fondle $his
$He smiles at you.
<</if>>
<<elseif ($activeSlave.fetish == "submissive") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
- $He eagerly comes over to you, to stand between you and your desk. You lean over while $he submissively lies down upon it, face up, with $his breasts pointed to the air. You place your hands on $his
+ $He eagerly comes over to you, to stand between you and your desk. You lean over while $he submissively lies down upon it, face-up, with $his breasts pointed to the air. You place your hands on $his
<<if ($activeSlave.boobs >= 20000)>>
colossal tits, before sinking your body into their immense softness,
<<elseif ($activeSlave.boobs >= 10000)>>
@@ -213,7 +213,7 @@ You call $him over so you can fondle $his
<</if>>
$He <<if canSee($activeSlave)>>looks<<else>>gazes<</if>> at you longingly, eager for more.
<<elseif ($activeSlave.fetish == "masochist") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
- $He hurriedly comes over to you, to stand between you and your desk. You lean over while $he lies down upon it, face up, with $his breasts pointed to the air. $He gasps as you slap your hands on $his
+ $He hurriedly comes over to you, to stand between you and your desk. You lean over while $he lies down upon it, face-up, with $his breasts pointed to the air. $He gasps as you slap your hands on $his
<<if ($activeSlave.boobs >= 20000)>>
colossal tits, before sinking your body into their immense softness before pulling back and struggling to grasp both nipples at once,
<<elseif ($activeSlave.boobs >= 10000)>>
diff --git a/src/player/actions/fondleDick.tw b/src/player/actions/fondleDick.tw
index 85a389d6537..4f46acc931a 100644
--- a/src/player/actions/fondleDick.tw
+++ b/src/player/actions/fondleDick.tw
@@ -266,7 +266,7 @@ You call $him over so you can fondle $his
$His prick stiffens like a rod in your hand and you continue your expert strokes along the erect shaft.
<</if>> $He grabs your wrist with $his hands and tries to stop it from moving but is unable to and despite $his resistant pulling against you. $He bites $his lip but $he cannot help but moan. Soon $he shudders and leaks $his cockmilk as $he orgasms in your hands. $He looks at you shamefully as you stop moving your hands and get cleaned up.
<<elseif ($activeSlave.fetish == "masochist") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>>
- $He hurriedly comes over to you, to stand between you and your desk. You lean over while $he lies down upon it, face up, with $his dick pointed towards you. $He gasps when you slap $his
+ $He hurriedly comes over to you, to stand between you and your desk. You lean over while $he lies down upon it, face-up, with $his dick pointed towards you. $He gasps when you slap $his
<<if $activeSlave.dick == 1>>
tiny dick
<<elseif $activeSlave.dick == 2>>
diff --git a/src/pregmod/FSuckle.tw b/src/pregmod/FSuckle.tw
index 1cbca946d44..f241eaffef5 100644
--- a/src/pregmod/FSuckle.tw
+++ b/src/pregmod/FSuckle.tw
@@ -155,7 +155,7 @@ You <<if _mood == 2>>demand<<else>>beckon<</if>> $activeSlave.slaveName to
<<elseif $activeSlave.devotion >= -20>>
This proves unnecessary as, before you finish speaking, $he <<if $PC.dick == 1>>wraps $his fingers around your needy cock<<else>><<if canSmell($activeSlave)>>smells<<else>>recognizes<</if>> your arousal<</if>> and begins to apply $his ministrations to take care of you<<if $activeSlave.nipples == "inverted" || $activeSlave.nipples == "partially inverted">>, as the sensations to $his nipple add so much more to the already surrounding breastflesh<</if>>. You buck to $his touch, forcing $him to try and steady $his breasts as your baby bump jumps with life.
<<elseif $activeSlave.trust < -20>>
- $He begins to question your order, but quickly realizes that was a mistake as you grab $his hand and force it yo your crotch. Hastily, $he begins to stroke <<if $PC.dick == 1>>your dick<<else>>your pussy<</if>> until reassured that $he is pleasing you from your lusty moans and thrusting. $He does $his best, hoping to not anger you further as $he presses <<if $PC.dick == 1>>the head<<else>>your lower lips<</if>> against $his nearby nipple.
+ $He begins to question your order, but quickly realizes that was a mistake as you grab $his hand and force it to your crotch. Hastily, $he begins to stroke <<if $PC.dick == 1>>your dick<<else>>your pussy<</if>> until reassured that $he is pleasing you from your lusty moans and thrusting. $He does $his best, hoping to not anger you further as $he presses <<if $PC.dick == 1>>the head<<else>>your lower lips<</if>> against $his nearby nipple.
<<else>>
Though $he furrows $his brow, $he decides it's better to get it over with quickly and in $his hand before $he is pinned in a much more compromising position by your pregnancy. $activeSlave.slaveName begins to <<if $PC.dick == 1>>tug at your penis, pressing the head against $his nearby nipple, hoping this doesn't<<else>>finger your quivering pussy, rubbing $his thumb against your clit, hoping this won't<</if>> take too long.
<</if>>
diff --git a/src/pregmod/analyzePlayerPregnancy.tw b/src/pregmod/analyzePlayerPregnancy.tw
index 2effd81e333..de9be5d6759 100644
--- a/src/pregmod/analyzePlayerPregnancy.tw
+++ b/src/pregmod/analyzePlayerPregnancy.tw
@@ -270,7 +270,7 @@
There is not enough free space to keep this child in $nurseryName.
<</if>>
<</if>>
- <<else>>
+ <<else>>
<br>
Unindefined ova found, no detailed data available.<br>
Age: too early for scan.
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 42ea3adf4ff..63c4b643234 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -281,7 +281,7 @@
There is not enough free space to keep this child in $nurseryName.
<</if>>
<</if>>
- <<else>>
+ <<else>>
<br>
Unindefined ova found, no detailed data available.<br>
Age: too early for scan.
diff --git a/src/pregmod/artificialInsemination.tw b/src/pregmod/artificialInsemination.tw
index cb10538f7e4..369775e9757 100644
--- a/src/pregmod/artificialInsemination.tw
+++ b/src/pregmod/artificialInsemination.tw
@@ -14,7 +14,7 @@ __Select an eligible slave to serve as the semen donatrix:__
<<capture _ai>>
<<if $slaves[_ai].balls > 0 && $slaves[_ai].pubertyXY == 1 && canBreed($activeSlave, $slaves[_ai])>>
<<set _name = SlaveFullName($slaves[_ai])>>
- <br>[[_name|Surgery Degradation][$impregnatrix = $slaves[_ai], cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = 'insemination']]
+ <br>[[_name|Surgery Degradation][$impregnatrix = $slaves[_ai], cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "insemination"]]
<<set _eligibility = 1>>
<</if>>
<</capture>>
@@ -32,7 +32,7 @@ __Select an eligible slave to serve as the semen donatrix:__
<<for _ai = 0; _ai < $tanks.length; _ai++>>
<<capture _ai>>
<<if $tanks[_ai].balls > 0 && $tanks[_ai].dick > 0 && canBreed($activeSlave, $tanks[_ai])>>
- <br>[[$tanks[_ai].slaveName|Surgery Degradation][$impregnatrix = $tanks[_ai], cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = 'insemination']]
+ <br>[[$tanks[_ai].slaveName|Surgery Degradation][$impregnatrix = $tanks[_ai], cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "insemination"]]
<<set _eligibilityI = 1>>
<</if>>
<</capture>>
diff --git a/src/pregmod/cloningWorkaround.tw b/src/pregmod/cloningWorkaround.tw
index 1bd2d2975ef..d7518c2aab0 100644
--- a/src/pregmod/cloningWorkaround.tw
+++ b/src/pregmod/cloningWorkaround.tw
@@ -43,5 +43,5 @@ __Chosen surrogate: _receive __
_impreg will be cloned and _receive shall act as the incubator.
<<if _impreg != "Undecided" && _receive != "Undecided">>
- [[Implant clone ovum|Surrogacy][cashX(forceNeg($surgeryCost*2), "slaveSurgery"), $surgeryType = 'clone']]
+ [[Implant clone ovum|Surrogacy][cashX(forceNeg($surgeryCost*2), "slaveSurgery"), $surgeryType = "clone"]]
<</if>>
\ No newline at end of file
diff --git a/src/pregmod/electiveSurgery.tw b/src/pregmod/electiveSurgery.tw
index 9034d75ae3b..54699042d0b 100644
--- a/src/pregmod/electiveSurgery.tw
+++ b/src/pregmod/electiveSurgery.tw
@@ -187,43 +187,43 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<br><br>She darts for your middle.
<<if $PC.belly >= 120000>>
"My god! What happened to you? You might now want to hit the fertility drugs so hard next time. Then again, I don't think you'll see us complaining when you come in for a tummy tuck to get everything back where it used to be." She says with a wink as she uses both hands to massage your
- <<if $PC.preg > 40>>overdue octuplet-bursting belly, enjoying the kicks from your children within. "If you go into labor, we have everything you'll need, so don't worry."
+ <<if $PC.preg > 40>>overdue octuplet-bursting belly, enjoying the kicks from your child<<if $PC.pregType > 1>>ren<</if>> within. "If you go into labor, we have everything you'll need, so don't worry."
<<else>>over-crowded belly.
<</if>>
<br>
<<elseif $PC.belly >= 110000>>
"My god! What happened to you? You might now want to hit the fertility drugs so hard next time. Then again, I don't think you'll see us complaining when you come in for a tummy tuck to get everything back where it used to be." She says with a wink as she uses both hands to massage your
- <<if $PC.preg > 40>>overdue septuplet-stuffed belly, enjoying the kicks from your children within. "If you go into labor, we have everything you'll need, so don't worry."
+ <<if $PC.preg > 40>>overdue septuplet-stuffed belly, enjoying the kicks from your child<<if $PC.pregType > 1>>ren<</if>> within. "If you go into labor, we have everything you'll need, so don't worry."
<<else>>over-crowded belly.
<</if>>
<br>
<<elseif $PC.belly >= 95000>>
Oh wow! It's like a party in there!" She says as she uses both hands to massage your
- <<if $PC.preg > 40>>overdue sextuplet-stuffed belly, enjoying the kicks from your children within. "If you go into labor, we have everything you'll need, so don't worry."
+ <<if $PC.preg > 40>>overdue sextuplet-stuffed belly, enjoying the kicks from your child<<if $PC.pregType > 1>>ren<</if>> within. "If you go into labor, we have everything you'll need, so don't worry."
<<else>>crowded belly.
<</if>>
<br>
<<elseif $PC.belly >= 80000>>
You must feel so full, like all the time. What's it feel like? Do they every calm down?" She says as she uses both hands to massage your
- <<if $PC.preg > 40>>overdue quadruplet-filled belly, enjoying the kicks from your children within. "If you go into labor, we have everything you'll need, so don't worry."
+ <<if $PC.preg > 40>>overdue quadruplet-filled belly, enjoying the kicks from your child<<if $PC.pregType > 1>>ren<</if>> within. "If you go into labor, we have everything you'll need, so don't worry."
<<else>>crowded belly.
<</if>>
<br>
<<elseif $PC.belly >= 64000>>
Oh wow! You're immense! I almost can't wrap my arms around it!" She says as she uses both hands to massage your
- <<if $PC.preg > 40>>overdue quadruplet-filled belly, enjoying the kicks from your children within. "If you go into labor, we have everything you'll need, so don't worry."
+ <<if $PC.preg > 40>>overdue quadruplet-filled belly, enjoying the kicks from your child<<if $PC.pregType > 1>>ren<</if>> within. "If you go into labor, we have everything you'll need, so don't worry."
<<else>>crowded belly.
<</if>>
<br>
<<elseif $PC.belly >= 48000>>
"Oh wow! You're gigantic! Are you sure you want to have surgery in this state? Things start to get complicated when you're this pregnant." She says as she uses both hands to massage your
- <<if $PC.preg > 40>>overdue triplet-filled belly, enjoying the kicks from your children within. "If you go into labor, we have everything you'll need, so don't worry."
+ <<if $PC.preg > 40>>overdue triplet-filled belly, enjoying the kicks from your child<<if $PC.pregType > 1>>ren<</if>> within. "If you go into labor, we have everything you'll need, so don't worry."
<<else>>crowded belly.
<</if>>
<br>
<<elseif $PC.belly >= 32000>>
"My word, are you sure you want to have surgery in this state? You're gigantic! Plus things start to get complicated when you're this pregnant." She says as she uses both hands to massage your
- <<if $PC.preg > 40>>overdue twin-filled belly, enjoying the kicks from your children within. "If you go into labor, we have everything you'll need, so don't worry."
+ <<if $PC.preg > 40>>overdue twin-filled belly, enjoying the kicks from your child<<if $PC.pregType > 1>>ren<</if>> within. "If you go into labor, we have everything you'll need, so don't worry."
<<else>>crowded belly.
<</if>>
<br>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 0b1611149a0..7c166cfde08 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -1046,7 +1046,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<<set $activeSlave.health -= 10>>
<<set $activeSlave.trust -= 100>>
<<replace "#result">>
- You escort $him to the remote surgery and strap $his face up with $his stomach bare. $He doesn't understand what's coming for a while, even giggling as $his belly is carefully cleaned and disinfected. $He begins to panic at the sight of the approaching surgical manipulators, screaming out as they cut into $his abdomen. $He squeals in horror as $his womb and ovaries are extracted before $his eyes. $He will never bear children, and will @@.mediumorchid;remember $his status@@ with every fucking $he receives. Your absolute power is rightfully @@.gold;terrifying@@ to $his undeveloped mind.
+ You escort $him to the remote surgery and strap $him face-up with $his stomach bare. $He doesn't understand what's coming for a while, even giggling as $his belly is carefully cleaned and disinfected. $He begins to panic at the sight of the approaching surgical manipulators, screaming out as they cut into $his abdomen. $He squeals in horror as $his womb and ovaries are extracted before $his eyes. $He will never bear children, and will @@.mediumorchid;remember $his status@@ with every fucking $he receives. Your absolute power is rightfully @@.gold;terrifying@@ to $his undeveloped mind.
<</replace>>
<</link>>
<</if>>
diff --git a/src/pregmod/ovaTransplantWorkaround.tw b/src/pregmod/ovaTransplantWorkaround.tw
index ea018605d48..2114402620e 100644
--- a/src/pregmod/ovaTransplantWorkaround.tw
+++ b/src/pregmod/ovaTransplantWorkaround.tw
@@ -25,5 +25,5 @@ __Select a slave to serve as the host__
<<if $PC.vagina == 1 && $donatrix.ID != -1 && $PC.preg >= 0 && $PC.preg < 4 && $PC.pregType < 8 && $PC.physicalAge < 70>>
<br>
- [[Use your own womb|Surrogacy][$receptrix = $PC, cashX(forceNeg($surgeryCost*2), "slaveSurgery"), $surgeryType = 'transplant']]
+ [[Use your own womb|Surrogacy][$receptrix = $PC, cashX(forceNeg($surgeryCost*2), "slaveSurgery"), $surgeryType = "transplant"]]
<</if>>
diff --git a/src/pregmod/surrogacyWorkaround.tw b/src/pregmod/surrogacyWorkaround.tw
index f1e78efd4df..906ac733e3c 100644
--- a/src/pregmod/surrogacyWorkaround.tw
+++ b/src/pregmod/surrogacyWorkaround.tw
@@ -16,7 +16,7 @@
_impreg will provide the seed and _receive shall carry it.
<<if _impreg != "Undecided" && _receive != "Undecided">>
- [[Implant fertilized ovum|Surrogacy][cashX(forceNeg($surgeryCost*2), "slaveSurgery"), $surgeryType = 'surrogacy']]
+ [[Implant fertilized ovum|Surrogacy][cashX(forceNeg($surgeryCost*2), "slaveSurgery"), $surgeryType = "surrogacy"]]
<</if>>
<br><br>
diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw
index 453a982c848..02683ca166c 100644
--- a/src/pregmod/widgets/playerDescriptionWidgets.tw
+++ b/src/pregmod/widgets/playerDescriptionWidgets.tw
@@ -469,7 +469,7 @@
<<if $PC.belly >= 120000>>
You don't know how much more you can take. You feel so full and your children never calm down. You swear they take shifts tormenting your poor bladder. Even worse, your pregnancy juts out over a half-<<if $showInches == 2>>yard<<else>>meter<</if>> from your front and has soundly defeated your maternity suit<<if $PC.dick == 1>>. Occasionally one of the bottoms manages to land a series of hits to your prostate, not that you mind as much, save for when they keep at it and you a can't restrain your orgasm. The last thing you want to do in a meeting is spontaneously orgasm and cum your in clothes<</if>>.
<<elseif $PC.belly >= 105000>>
- You can barely function any more. You're so big and heavy that even the simplest of actions requires both intense effort and thought just to get it done. Your suit buttons keep popping, and much to your annoyance, your children will not stay still enough to let you redo them.
+ You can barely function any more. You're so big and heavy that even the simplest of actions requires both intense effort and thought just to get it done. Your suit buttons keep popping, and much to your annoyance, your child<<if $PC.pregType > 1>>ren<</if>> will not stay still enough to let you redo them.
<<elseif $PC.belly >= 90000>>
<<set _toSearch = $PC.refreshment.toLowerCase(), _fertRefresh = 0>>
<<if _toSearch.indexOf("fertility") != -1>>
@@ -540,7 +540,7 @@
<</if>>
<<elseif _passage == "Analyze PC Pregnancy">>
<<if $PC.belly >= 120000>>
- You shudder at the cool touch of the sensor running along the curve of your sensitive pregnancy. While you've devised a way to scan the distant peak of your navel and the depths of your underbelly, you failed to take into account just how excited your children would get over the attention. Every pass is a battle against your kicking brood.
+ You shudder at the cool touch of the sensor running along the curve of your sensitive pregnancy. While you've devised a way to scan the distant peak of your navel and the depths of your underbelly, you failed to take into account just how excited your child<<if $PC.pregType > 1>>ren<</if>> would get over the attention. Every pass is a battle against your kicking brood.
<<elseif $PC.belly >= 90000>>
You shudder at the cool touch of the sensor running along the curve of your pregnancy. It takes some stretching, but you can just barely scan yourself without assistance. If you grow much larger, you'll have to call in help for those places that elude your reach.
<<elseif $PC.belly >= 45000>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index ad228739cc0..ca05801b495 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -698,7 +698,7 @@ The walk-in cooling unit is designed for the refrigeration of food for you and g
<<case "spa boobs">>
-The steamy air and hot water of the spa aren't only for slaves assigned to rest there full-time. When you head in to soak the day's stress away one evening, you see the back of <<EventNameLink>>'s head resting against the edge of the warm pool; $he's clearly come in after work. <<if canHear($activeSlave)>>$He doesn't hear you come in and stays fully relaxed.<<else>>$He's relaxed enough to exit the state of "high alert" $his deafness usually forces $him to be in.<</if>> By the time you've showered<<if $Attendant != 0>>, fucked the compliant $Attendant.slaveName,<</if>> and gotten ready to enter the pool, $he's reached such a state of blissful relaxation that $he slides $his body off the ledge around the side of the pool and floats faceup with $his eyes closed.
+The steamy air and hot water of the spa aren't only for slaves assigned to rest there full-time. When you head in to soak the day's stress away one evening, you see the back of <<EventNameLink>>'s head resting against the edge of the warm pool; $he's clearly come in after work. <<if canHear($activeSlave)>>$He doesn't hear you come in and stays fully relaxed.<<else>>$He's relaxed enough to exit the state of "high alert" $his deafness usually forces $him to be in.<</if>> By the time you've showered<<if $Attendant != 0>>, fucked the compliant $Attendant.slaveName,<</if>> and gotten ready to enter the pool, $he's reached such a state of blissful relaxation that $he slides $his body off the ledge around the side of the pool and floats face-up with $his eyes closed.
<br><br>
The sight is comical. <<if $activeSlave.belly >= 5000>>Four<<else>>Three<</if>> things break the surface of the water: $his $activeSlave.skin face,
<<if $activeSlave.belly >= 5000>>
@@ -4647,7 +4647,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
"What doe<<s>> that mean, <<Master>>?"
<</if>>
- You quickly approach and catch $him, forcing $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid <<else>>distended <</if>><</if>>body face up onto the couch. $He <<if canSee($activeSlave)>>watches you carefully<<elseif canHear($activeSlave)>>listens to your movements<<else>>waits with trepidation<</if>> as you size up $his fully erect
+ You quickly approach and catch $him, forcing $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid <<else>>distended <</if>><</if>>body face-up onto the couch. $He <<if canSee($activeSlave)>>watches you carefully<<elseif canHear($activeSlave)>>listens to your movements<<else>>waits with trepidation<</if>> as you size up $his fully erect
<<if $activeSlave.dick == 1>>
tiny dick.
<<elseif $activeSlave.dick == 2>>
@@ -4748,7 +4748,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
"What'<<s>> that mean, <<Master>>?"
<</if>>
- You quickly approach and catch $him, forcing $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid <<else>>distended <</if>><</if>>body face up onto the couch. $He <<if canSee($activeSlave)>>watches you carefully<<elseif canHear($activeSlave)>>listens to your movements<<else>>waits with trepidation<</if>> as you size up $his fully erect
+ You quickly approach and catch $him, forcing $his <<if $activeSlave.belly >= 1500>><<if $activeSlave.bellyPreg >= 1500>>gravid <<else>>distended <</if>><</if>>body face-up onto the couch. $He <<if canSee($activeSlave)>>watches you carefully<<elseif canHear($activeSlave)>>listens to your movements<<else>>waits with trepidation<</if>> as you size up $his fully erect
<<if $activeSlave.dick == 1>>
tiny dick.
<<elseif $activeSlave.dick == 2>>
@@ -15651,7 +15651,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</replace>>
<</link>>
<<if $activeSlave.belly >= 5000 || $activeSlave.weight > 30>>
- <br><<link "Rub $his Belly">>
+ <br><<link "Rub $his belly">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
<<if $activeSlave.bellyPreg >= 5000>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index a0ed655c7a8..32896511690 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -1173,7 +1173,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Sterilize $him">>
<<replace "#introResult">>
- You drag $him to the remote surgery and strap $his face up with $his<<if $activeSlave.bellyPreg >= 1500>> pregnant<</if>> stomach bare. $He doesn't understand what's coming for a while, even as $his belly is carefully cleaned and disinfected. $He begins to panic at the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sound<<else>>touch<</if>> of the approaching surgical manipulators, cringing as they cut into $his<<if $activeSlave.bellyPreg >= 1500>> rounded<</if>> abdomen. $He squeals in horror as $his<<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.33>> swollen womb, still moving with life,<<elseif $activeSlave.bellyPreg >= 1500>> pregnant womb<<else>> womb<</if>> and ovaries are extracted before $his eyes.
+ You drag $him to the remote surgery and strap $him face-up with $his<<if $activeSlave.bellyPreg >= 1500>> pregnant<</if>> stomach bare. $He doesn't understand what's coming for a while, even as $his belly is carefully cleaned and disinfected. $He begins to panic at the <<if canSee($activeSlave)>>sight<<elseif canHear($activeSlave)>>sound<<else>>touch<</if>> of the approaching surgical manipulators, cringing as they cut into $his<<if $activeSlave.bellyPreg >= 1500>> rounded<</if>> abdomen. $He squeals in horror as $his<<if $activeSlave.preg > $activeSlave.pregData.normalBirth/1.33>> swollen womb, still moving with life,<<elseif $activeSlave.bellyPreg >= 1500>> pregnant womb<<else>> womb<</if>> and ovaries are extracted before $his eyes.
<<if $activeSlave.fetish == "pregnancy" && $activeSlave.pregKnown == 1>>
<<if ($activeSlave.preg > $activeSlave.pregData.normalBirth/1.6) && (canSee($activeSlave))>>
$He watches $his exposed womb with absolute terror in $his eyes. A small handprint bulges against the organ; $he sobs once before $his mind @@.red;shatters at the sight.@@
--
GitLab