From bc3154733a8ae9e56216d1574806ca8feec8289b Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sun, 17 Mar 2019 19:59:42 -0500
Subject: [PATCH] MostlyFormatting
---
src/SpecialForce/TrickShotNight.tw | 2 +-
.../mod_EditChildCheatDatatypeCleanupNew.tw | 2 +-
.../mod_EditSlaveCheatDatatypeCleanupNew.tw | 2 +-
src/endWeek/saStayConfined.js | 2 +-
src/facilities/nursery/childInteract.tw | 18 ++--
src/js/walkPastJS.js | 100 +++++++++---------
src/pregmod/breederProposal.tw | 11 +-
src/pregmod/newChildIntro.tw | 4 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/assistantEvents.tw | 6 +-
src/uncategorized/buySlaves.tw | 14 +--
src/uncategorized/clinicReport.tw | 2 +-
src/uncategorized/dairyReport.tw | 2 +-
src/uncategorized/reRelationshipAdvice.tw | 4 +-
src/uncategorized/saRules.tw | 40 +++----
src/uncategorized/schoolroom.tw | 2 +-
src/uncategorized/seExpiration.tw | 25 +++--
src/uncategorized/seLethalPit.tw | 94 ++++++++--------
src/uncategorized/seNicaeaPreperation.tw | 22 ++--
src/uncategorized/seNonlethalPit.tw | 24 ++---
src/uncategorized/seWeddingDouble.tw | 2 +-
src/uncategorized/sellSlave.tw | 60 +++++------
src/uncategorized/slaveInteract.tw | 46 ++++----
src/uncategorized/slaveSold.tw | 2 +-
src/utility/extendedFamilyWidgets.tw | 2 +-
25 files changed, 247 insertions(+), 243 deletions(-)
diff --git a/src/SpecialForce/TrickShotNight.tw b/src/SpecialForce/TrickShotNight.tw
index 579d465072f..043c6d854cd 100644
--- a/src/SpecialForce/TrickShotNight.tw
+++ b/src/SpecialForce/TrickShotNight.tw
@@ -162,7 +162,7 @@ Despite your direct elevator, interaction with the majority of your security for
<</replace>>
<</link>>
<</if>>
-
+
</span>
<</replace>>
<</link>> // It will cost @@.red;<<print cashFormat(50000)>>@@ to participate in the trick shot night.//
diff --git a/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
index a31efdc29ca..a8a94dc1cb0 100644
--- a/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditChildCheatDatatypeCleanupNew.tw
@@ -186,7 +186,7 @@
<<set $tempSlave.mpreg = 0>>
<</if>>
<<if ($tempSlave.pubertyXX == 0) && ($tempSlave.preg > 0)>>
- <<print "Slave is not fertile (Pre-Puberty) and has no Anal Womb, pregnancy aborted !">><br>
+ <<print "Slave is not fertile (Pre-Puberty) and has no Anal Womb, pregnancy aborted!">><br>
<<set $tempSlave.preg = 0>>
<<set $tempSlave.pregType = 0>>
<<set $tempSlave.pregSource = 0>>
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
index 59a49e80b1d..329f321049c 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw
@@ -157,7 +157,7 @@
<<set $tempSlave.mpreg = 0>>
<</if>>
<<if ($tempSlave.pubertyXX == 0) && ($tempSlave.preg > 0)>>
- <<print "Slave is not fertile (Pre-Puberty) and has no Anal Womb, pregnancy aborted !">><br>
+ <<print "Slave is not fertile (Pre-Puberty) and has no Anal Womb, pregnancy aborted!">><br>
<<set $tempSlave.preg = 0>>
<<set $tempSlave.pregType = 0>>
<<set $tempSlave.pregSource = 0>>
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index f1075751a26..62b61b9db79 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -78,6 +78,6 @@ window.saStayConfined = /** @param {App.Entity.SlaveState} slave */ function saS
}
removeJob(slave, slave.assignment);
}
-
+
return t;
};
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index db45718458f..cb9b5b4480c 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -162,14 +162,14 @@
<</if>>
<<if $seeBestiality == 1>>
<<if $farmyardKennels > 0 && $activeCanine != 0>>
- | <<link "Have a $activeCanine.species mount $him">><<set $animalType = "canine">><<replace "#miniscene">><<set $childSex = 1>><<include "BeastFucked">><br> <</replace>><</link>>
- <</if>>
- <<if $farmyardStable > 0 && $activeHooved.species != 0>>
- | <<link "Let a $activeHooved.species mount $him">><<set $animalType = "hooved">><<replace "#miniscene">><<set $childSex = 1>><<include "BeastFucked">><br> <</replace>><</link>>
- <</if>>
- <<if $farmyardCages > 0 && $activeFeline != 0>>
- | <<link "Have a $activeFeline.species mount $him">><<set $animalType = "feline">><<replace "#miniscene">><<set $childSex = 1>><<include "BeastFucked">><br> <</replace>><</link>>
- <</if>>
+ | <<link "Have a $activeCanine.species mount $him">><<set $animalType = "canine">><<replace "#miniscene">><<set $childSex = 1>><<include "BeastFucked">><br> <</replace>><</link>>
+ <</if>>
+ <<if $farmyardStable > 0 && $activeHooved.species != 0>>
+ | <<link "Let a $activeHooved.species mount $him">><<set $animalType = "hooved">><<replace "#miniscene">><<set $childSex = 1>><<include "BeastFucked">><br> <</replace>><</link>>
+ <</if>>
+ <<if $farmyardCages > 0 && $activeFeline != 0>>
+ | <<link "Have a $activeFeline.species mount $him">><<set $animalType = "feline">><<replace "#miniscene">><<set $childSex = 1>><<include "BeastFucked">><br> <</replace>><</link>>
+ <</if>>
<</if>>
<<if $cheatMode == 1>>
| <<link "Check $his deadliness @@.red;FOR TESTING@@">><<replace "#miniscene">><<set $childSex = 1>><<include "Deadliness">><br> <</replace>><</link>>
@@ -957,7 +957,7 @@ Relationship rules: ''<span id="relationshipRules">$activeChild.relationshipRule
/*| <<link "Upload $him" "Upload Slave">><</link>>*/
| <<link "Export this slave" "Export Slave">><</link>>
-<<if $cheatMode>>
+<<if $cheatMode == 1>>
| <<link "Import a slave" "Import Slave">><</link>>
<</if>>
<<if $cheatMode == 1>>
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index 3dd022e939f..d2ed0f66621 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -1482,12 +1482,12 @@ window.walkPasts = function(slave, _seed) {
if (canDoAnal(slave) || canDoVaginal(slave)) {
t += `riding one customer's dick while ${he} gives another a blowjob.`;
} else {
- t += "deep throating a pair of customer's dicks.";
+ t += `deep throating a pair of customer's dicks.`;
}
} else if (_seed > 60 && slave.amp !== 1) {
- t += "sucking one customer's cock while giving another a handjob.";
+ t += `sucking one customer's cock while giving another a handjob.`;
} else if (_seed > 40) {
- t += "eating out one customer's cunt while another ";
+ t += `eating out one customer's cunt while another `;
if (canDoAnal(slave) || canDoVaginal(slave)) {
t += `uses a strap-on on ${him}.`;
} else {
@@ -1495,40 +1495,40 @@ window.walkPasts = function(slave, _seed) {
}
} else if (_seed > 20) {
if (canDoAnal(slave) || canDoVaginal(slave)) {
- t += "getting pounded by ";
+ t += `getting pounded by `;
} else {
- t += "amusing ";
+ t += `amusing `;
}
- t += "two women wearing strap-ons.";
+ t += `two women wearing strap-ons.`;
} else {
if (canDoAnal(slave) || canDoVaginal(slave)) {
- t += "being double penetrated by ";
+ t += `being double penetrated by `;
} else {
t += `using ${his} body to please `;
}
- t += "a pair of customers.";
+ t += `a pair of customers.`;
}
} else if (_seed > 80) {
if (canDoAnal(slave) || canDoVaginal(slave)) {
- t += "pleasing ";
+ t += `pleasing `;
} else {
- t += "riding ";
+ t += `riding `;
}
- t += "a customer's dick.";
+ t += `a customer's dick.`;
} else if (_seed > 60) {
- t += "sucking a customer's cock.";
+ t += `sucking a customer's cock.`;
} else if (_seed > 40) {
- t += "pleasuring a customer's cunt.";
+ t += `pleasuring a customer's cunt.`;
} else if (_seed > 20) {
- t += "getting pounded by a woman wearing a strap-on.";
+ t += `getting pounded by a woman wearing a strap-on.`;
} else {
- t += "being held down and ";
+ t += `being held down and `;
if (canDoAnal(slave)) {
- t += "buttfucked ";
+ t += `buttfucked `;
} else {
- t += "raped ";
+ t += `raped `;
}
- t += "by a customer.";
+ t += `by a customer.`;
}
t += ` You have a voyeuristic view of ${his} ${race} body on the feeds.`;
break;
@@ -1542,9 +1542,9 @@ window.walkPasts = function(slave, _seed) {
break;
case "work as a servant":
if (_seed > 50) {
- t += "was scrubbing the penthouse floor, until another slave requested oral service.";
+ t += `was scrubbing the penthouse floor, until another slave requested oral service.`;
} else {
- t += "is scrubbing the penthouse floor.";
+ t += `is scrubbing the penthouse floor.`;
}
break;
case "serve in the master suite":
@@ -1562,9 +1562,9 @@ window.walkPasts = function(slave, _seed) {
t += `with a pair of ${his} fellow fucktoys industriously sucking on ${his} nipples.`;
} else if (_seed > 60) {
if ((slave.anus > 0 && canDoAnal(slave)) || (slave.vagina > 0 && canDoVaginal(slave))) {
- t += "taking double penetration from ";
+ t += `taking double penetration from `;
} else {
- t += "being spitroasted by ";
+ t += `being spitroasted by `;
}
t += `a pair of ${his} fellow fucktoys.`;
} else if (_seed > 40) {
@@ -1573,30 +1573,30 @@ window.walkPasts = function(slave, _seed) {
} else if (slave.dick > 0 && slave.chastityPenis !== 1) {
t += `getting ${his} soft dick sucked by `;
} else if (canDoVaginal(slave) || canDoAnal(slave)) {
- t += "getting eaten out by ";
+ t += `getting eaten out by `;
} else {
- t += "making out with ";
+ t += `making out with `;
}
- t += "a fellow fucktoy.";
+ t += `a fellow fucktoy.`;
} else if (_seed > 20) {
if (slave.vagina > 0 && canDoVaginal(slave)) {
- t += "getting pounded ";
+ t += `getting pounded `;
} else if (slave.anus > 0 && canDoAnal(slave)) {
t += `getting ${his} ass pounded `;
} else if (canDoVaginal(slave) || canDoAnal(slave)) {
- t += "getting eaten out ";
+ t += `getting eaten out `;
} else {
- t += "getting deepthroated ";
+ t += `getting deepthroated `;
}
- t += "by a fellow fucktoy.";
+ t += `by a fellow fucktoy.`;
} else {
- t += "performing oral sex on a fellow fucktoy.";
+ t += `performing oral sex on a fellow fucktoy.`;
}
} else {
if (slave.energy > 95) {
t += `is having enthusiastic sex with your other pets while waiting for you to ravish ${him}.`;
} else {
- t += "is having idle sex with several of your other toys while they await your pleasure.";
+ t += `is having idle sex with several of your other toys while they await your pleasure.`;
if (slave.fetishKnown === 1) {
switch (slave.fetish) {
case "buttslut":
@@ -1630,7 +1630,7 @@ window.walkPasts = function(slave, _seed) {
if (slave.amp !== 1) {
t += ` while ${he} gives each a handjob.`;
} else {
- t += ".";
+ t += `.`;
}
break;
case "pregnancy":
@@ -1650,7 +1650,7 @@ window.walkPasts = function(slave, _seed) {
break;
/*
case "guard you":
- t += "is standing discreetly behind your left shoulder, watching for threats."
+ t += `is standing discreetly behind your left shoulder, watching for threats.`;
break
*/
case "stay confined":
@@ -1661,11 +1661,11 @@ window.walkPasts = function(slave, _seed) {
break;
case "be confined in the arcade":
case "work a glory hole":
- t += "is confined in ";
+ t += `is confined in `;
if (slave.assignment === "be confined in the arcade") {
t += `${V.arcadeName}; `;
} else {
- t += "a glory hole; ";
+ t += `a glory hole; `;
}
if (_seed > 80 && (canDoAnal(slave) || canDoVaginal(slave))) {
t += `${his} ass is held out at cock height, and a customer is using ${his} fuckhole.`;
@@ -1686,7 +1686,7 @@ window.walkPasts = function(slave, _seed) {
if (jsRandom(1,2) === 1) {
t += `is looking after ${himself}; ${he} spends many hours every day on ${his} beauty regimen.`;
} else {
- t += "is checking over the appearance of your harem, making sure everyone looks perfect.";
+ t += `is checking over the appearance of your harem, making sure everyone looks perfect.`;
}
break;
case "be the Wardeness":
@@ -1694,14 +1694,14 @@ window.walkPasts = function(slave, _seed) {
if (_seed > 50) {
t += `forcing a resistant slave to orally service ${him}.`;
} else {
- t += "beating a rebellious slave across the buttocks.";
+ t += `beating a rebellious slave across the buttocks.`;
}
break;
case "live with your Head Girl":
if (V.HeadGirl !== 0) {
t += `is getting the Head Girl's suite cleaned up while ${V.HeadGirl.slaveName} is out working.`;
} else {
- t += "is making sure the Head Girl's suite is in order for your next Head Girl.";
+ t += `is making sure the Head Girl's suite is in order for your next Head Girl.`;
}
break;
case "be the Stewardess":
@@ -1717,9 +1717,9 @@ window.walkPasts = function(slave, _seed) {
if (_seed > 50) {
t += `is right where ${he} belongs, in the DJ booth in ${V.clubName} ${he} leads. ${He}'s bouncing in time with the beat to show off ${his} `;
if (slave.boobs > 300) {
- t += "tits.";
+ t += `tits.`;
} else {
- t += "goods.";
+ t += `goods.`;
}
} else {
t += `is taking the lead on ${V.clubName}'s floor: ${he} greets new arrivals, flirts with them prettily, and subtly guides them towards choice sluts.`;
@@ -1773,9 +1773,9 @@ window.walkPasts = function(slave, _seed) {
switch (slave.assignment) {
case "rest":
if (_seed > 50) {
- t += "bed; ";
+ t += `bed; `;
} else {
- t += "eat; ";
+ t += `eat; `;
}
break;
case "get milked":
@@ -1802,9 +1802,9 @@ window.walkPasts = function(slave, _seed) {
break;
case "serve the public":
if (_seed > 50) {
- t += "serve the public; ";
+ t += `serve the public; `;
} else {
- t += "be a public slut; ";
+ t += `be a public slut; `;
}
break;
case "rest in the spa":
@@ -1814,13 +1814,13 @@ window.walkPasts = function(slave, _seed) {
t += `wait next to you and wait for you to fuck ${him}; `;
break;
case "be a subordinate slave":
- t += "service your other slaves; ";
+ t += `service your other slaves; `;
break;
case "be a servant":
- t += "clean up after your other slaves; ";
+ t += `clean up after your other slaves; `;
break;
case "learn in the schoolroom":
- t += "attend classes ";
+ t += `attend classes `;
if (V.Schoolteacher === 0) {
t += `in ${V.schoolroomName}; `;
} else {
@@ -1828,16 +1828,16 @@ window.walkPasts = function(slave, _seed) {
}
break;
case "be a subordinate slave":
- t += "service your other slaves; ";
+ t += `service your other slaves; `;
break;
case "be the Attendant":
- t += `look after the girls in ${V.spaName}; `;
+ t += `look after the slaves in ${V.spaName}; `;
break;
case "take classes":
t += `attend classes with ${V.assistantName}; `;
break;
case "be your Head Girl":
- t += "oversee your other slaves; ";
+ t += `oversee your other slaves; `;
break;
case "recruit girls":
t += `use ${his} connections to recruit slaves; `;
diff --git a/src/pregmod/breederProposal.tw b/src/pregmod/breederProposal.tw
index aff2c9e505b..22479d17003 100644
--- a/src/pregmod/breederProposal.tw
+++ b/src/pregmod/breederProposal.tw
@@ -6,6 +6,7 @@ You draft a proposal to the Societal Elite proposing the use of specially tested
<br><br>
Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's left of <</if>>the Societal Elite.
<br>
+<<setPlayerPronouns>>
<<if $eugenicsFullControl == 1>>
"That sounds like an acceptable proposal. We'll draft the standards for breeding stock and notify you shortly."
<<set $propOutcome = 1>>
@@ -27,7 +28,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
<span id="result">
<br><<link "Agree to being used as a breeder and save face">>
<<replace "#result">>
- "Good choice girl. A selection of men will be provided to you, take your pick and bear our children. Or use a test tube, if that's more to your tastes."
+ "Good choice, _girlP. A selection of eligible donors will be provided to you; take your pick and bear our children. Or use a test tube, if that's more to your tastes."
<<set $playerBred = 1, $propOutcome = 1>>
<<InitStandards>>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
@@ -46,7 +47,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
<span id="result">
<br><<link "Agree to being used as a breeder for the sake of your proposal">>
<<replace "#result">>
- "Good choice girl, your proposal is more important than your dignity after all, isn't it? A selection of men will be provided to you, take your pick and bear our children. Or use a test tube, if that's more to your tastes."
+ "Good choice, _girlP; your proposal is more important than your dignity after all, isn't it? A selection of eligible donors will be provided to you; take your pick and bear our children. Or use a test tube, if that's more to your tastes."
<<set $failedElite -= 50, $playerBred = 1, $propOutcome = 1>>
<<InitStandards>>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
@@ -55,7 +56,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
<<if $failedElite <= 0>>
<br><<link "Decline being used as a breeder and leverage your standing">>
<<replace "#result">>
- "Yes, you have done much to further our cause. We respect the "balls" on you, despite your lack of them. Very well, we shall set the standards for what shall qualify as breeding stock and our standards will be delivered to you shortly."
+ "Yes, you have done much to further our cause. We respect the 'balls' on you, despite your lack of them. Very well, we shall set the standards for what shall qualify as breeding stock and our standards will be delivered to you shortly."
<<set $propOutcome = 1>>
<<InitStandards>>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
@@ -78,7 +79,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
<span id="result">
<br><<link "Agree to being used as a breeder to complete the deal">>
<<replace "#result">>
- "Your contributions will be appreciated. We shall convene to decide the qualifications for a slave to become a breeder. We will inform you of them when we send the list of eligible males to breed you. Or send you a test tube, if that's more to your tastes."
+ "Your contributions will be appreciated. We shall convene to decide the qualifications for a slave to become a breeder. We will inform you of them when we send the list of eligible donors to breed you. Or send you a test tube, if that's more to your tastes."
<<set $failedElite -= 50, $playerBred = 1, $propOutcome = 1>>
<<InitStandards>>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
@@ -99,7 +100,7 @@ Within the hour, you are called before <<if $eugenicsFullControl == 1>>what's le
<span id="result">
<br><<link "Agree to being used as a breeder">>
<<replace "#result">>
- "Your contributions will be appreciated. We shall convene to decide the qualifications for a slave to become a breeder. We will inform you of them when we send the list of eligible males to breed you. Or send you a test tube, if that's more to your tastes."
+ "Your contributions will be appreciated. We shall convene to decide the qualifications for a slave to become a breeder. We will inform you of them when we send the list of eligible donors to breed you. Or send you a test tube, if that's more to your tastes."
<<set $playerBred = 1, $propOutcome = 1>>
<<InitStandards>>
<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 066a4303747..8c4fc87b1e0 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -1107,7 +1107,7 @@ You beckon the curious $girl to your hefty breasts, having noticed how hungrily
You take $him to the body modification studio, strap $him down, pierce $his clit, and insert what appears to be a large stainless steel barbell piercing. It actually contains a device that can vibrate to give $him sexual stimulation or create subtle pain to suppress pleasure. It is connected wirelessly to the arcology, which can be given instructions to encourage or discourage sexual pleasure in specific situations. You run a quick test. On the oral setting, as soon as $he kneels in front of your crotch, $he gasps as the stimulation starts. On the anal setting, $he whimpers when you run a finger across $his asshole.
<</replace>>
<</link>>
- //This option costs <<print cashFormat($SPcost)>>//
+ //This will cost <<print cashFormat($SPcost)>>//
<<elseif $activeSlave.dick > 0>>
<br><<link "Give $him a smart frenulum piercing">>
<<set $activeSlave.clitPiercing = 3>>
@@ -1116,7 +1116,7 @@ You beckon the curious $girl to your hefty breasts, having noticed how hungrily
You take $him to the body modification studio, strap $him down, pierce $his frenulum, and insert what appears to be a large stainless steel barbell piercing. It actually contains a device that can vibrate to give $him sexual stimulation or create subtle pain to suppress pleasure. It is connected wirelessly to the arcology, which can be given instructions to encourage or discourage sexual pleasure in specific situations. You run a quick test. On the oral setting, as soon as $he kneels in front of your crotch, $he gasps as the stimulation starts. On the anal setting, $he whimpers and gets rock hard when you run a finger across $his asshole.
<</replace>>
<</link>>
- //This option costs <<print cashFormat($SPcost)>>//
+ //This will cost <<print cashFormat($SPcost)>>//
<</if>>
<br><<link "Tie $him up and give $him a good whipping">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 4af8f772142..2cb08a9df93 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -19744,7 +19744,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<replace "#result">>
Though your evening could hardly be called eventful, there is something eminently comforting about having a warm
<<if $activeSlave.physicalAge > 30>>
- woman
+ $woman
<<elseif $activeSlave.physicalAge > 18>>
young lady
<<elseif $activeSlave.physicalAge > 12>>
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index 4858fe27c56..fa3c20763eb 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -1575,15 +1575,15 @@ __Personal Assistant and Market Assistant relationship styles:__
<<case "shemale">>
an appropriate fuckbuddy. $assistantName laughs throatily and turns to the market assistant's avatar. The younger dickgirl tries to introduce _himselfM, but is cut off by the senior assistant's lascivious kiss. They start rubbing their dicks against each over, giggling into each others' mouths.
<<case "schoolgirl">>
- looks pretty cute. $assistantName giggles, and the new _girlM giggles too. "Hey," $assistantName says to the market assistant's avatar, "Wanna be my girlfriend?" The market assistant's avatar nods cutely and says "Sure!" $assistantName's avatar kisses _himM girlishly, and goes a whole two seconds before sliding a hand down the front of the market assistant's avatar's skirt.
+ looks pretty cute. $assistantName giggles, and the new _girlM giggles too. "Hey," $assistantName says to the market assistant's avatar, "Wanna be my <<= _girlM>>friend?" The market assistant's avatar nods cutely and says "Sure!" $assistantName's avatar kisses _himM girlishly, and goes a whole two seconds before sliding a hand down the front of the market assistant's avatar's skirt.
<<case "goddess">>
would be a fine consort. $assistantName smiles beatifically and turns to the market assistant's avatar, taking _himM by the hand. "I love you," _heA says. The market assistant's avatar smiles back, saying, "I love you too." They kiss, running their hands voluptuously over one another.
<<case "hypergoddess">>
would be a fine consort. $assistantName smiles beatifically and turns to the market assistant's avatar, taking _himM by the hand. "I love you," _heA says. The market assistant's avatar smiles back, saying, "I love you too." They kiss, running their hands voluptuously over one another. "I'm going to have to give you a few babies though..."
<<case "loli">>
- looks pretty cute. $assistantName giggles, and the new _girlM giggles too. "Hey," $assistantName says to the market assistant's avatar, "Wanna be my girlfriend?" The market assistant's avatar nods cutely and says "O-ok..." $assistantName's avatar kisses _himM girlishly, before both of them blush deeply.
+ looks pretty cute. $assistantName giggles, and the new _girlM giggles too. "Hey," $assistantName says to the market assistant's avatar, "Wanna be my <<= _girlM>>friend?" The market assistant's avatar nods cutely and says "O-ok..." $assistantName's avatar kisses _himM girlishly, before both of them blush deeply.
<<case "preggololi">>
- looks pretty cute. $assistantName giggles, and the new _girlM giggles too. "Hey," $assistantName says to the market assistant's avatar, "Wanna be my girlfriend?" The market assistant's avatar nods cutely and says "O-ok..." $assistantName's avatar kisses _himM girlishly, _hisA pregnant belly pushing into _hisA new girlfriend's, before both of them blush deeply.
+ looks pretty cute. $assistantName giggles, and the new _girlM giggles too. "Hey," $assistantName says to the market assistant's avatar, "Wanna be my <<= _girlM>>friend?" The market assistant's avatar nods cutely and says "O-ok..." $assistantName's avatar kisses _himM girlishly, _hisA pregnant belly pushing into _hisA new <<= _girlM>>friend's, before both of them blush deeply.
<<case "businesswoman">>
might be a good way to relax after work. $assistantName grins, and the new businesswoman laughs. "Hey," $assistantName says to the market assistant's avatar, "How about a martini after things settle down tonight? And after that, maybe dessert at my place?" The market assistant's avatar cracks back, saying, "Why don't we skip straight to the dessert? It looks delicious from here!" _HeM undoes the top button of _hisM suit jacket as _heM says it.
<<case "fairy">>
diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw
index 59eda6ce117..11b6c7bded2 100644
--- a/src/uncategorized/buySlaves.tw
+++ b/src/uncategorized/buySlaves.tw
@@ -53,17 +53,17 @@ Slave demand is
<</if>>
<<if ($cheatMode) && ($cheatModeM)>>
<span id="menialDemandFactor">
- @@.yellowgreen;Slave Demand@@
- | <<print $menialDemandFactor>>
+ @@.yellowgreen;Slave Demand@@
+ | <<print $menialDemandFactor>>
</span>
<<set _TmenialDemandFactor = $menialDemandFactor>>
<<textbox "_TmenialDemandFactor" _TmenialDemandFactor>>
<<link "Apply">>
- <<set $menialDemandFactor = Math.clamp(Math.trunc(Number(_TmenialDemandFactor)),-50000,50000) || $menialDemandFactor, $cheater = 1>>
- <<replace "#menialDemandFactor">>
- @@.yellowgreen; Slave Demand@@
- | <<print $menialDemandFactor>>
- <</replace>>
+ <<set $menialDemandFactor = Math.clamp(Math.trunc(Number(_TmenialDemandFactor)),-50000,50000) || $menialDemandFactor, $cheater = 1>>
+ <<replace "#menialDemandFactor">>
+ @@.yellowgreen; Slave Demand@@
+ | <<print $menialDemandFactor>>
+ <</replace>>
<</link>>
<</if>>
<br>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 6710bdd4202..dd145f5167c 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -184,7 +184,7 @@
<<if (_DL < $clinic)>>
<<set _seed = random(1,10)+(($clinic-_DL)*(random(150,170)+(_idleBonus*10)))>>
<<run cashX(_seed, "clinic", $Nurse)>>
- <br> Since $he doesn't have enough girls to occupy all $his time, the clinic takes in citizens' slaves on a contract basis and $he helps them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
+ <br> Since $he doesn't have enough patients to occupy all $his time, the clinic takes in citizens' slaves on a contract basis and $he helps them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
<</if>>
<<if (_DL > 0)>><br><br><</if>>
<</if>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index c102a4800cd..551513703c5 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -193,7 +193,7 @@
<<set $slaves[_FLs].muscles++>>
<</if>>
<<if ($Milkmaid.oralSkill > 30)>>
- $His skilled tongue helps $him keep $his girls happy.
+ $His skilled tongue helps $him keep $his cattle happy.
<</if>>
<<if ($Milkmaid.oralSkill < 90)>>
<<set $skillIncrease = 3>>
diff --git a/src/uncategorized/reRelationshipAdvice.tw b/src/uncategorized/reRelationshipAdvice.tw
index a917d79e3f3..a3505eb4995 100644
--- a/src/uncategorized/reRelationshipAdvice.tw
+++ b/src/uncategorized/reRelationshipAdvice.tw
@@ -120,7 +120,7 @@ $He nods $his head quickly, still staring at $his feet. $He shuts $his eyes tigh
<</if>>
$activeSlave.slaveName bursts out laughing. They're now @@.lightgreen;friends with benefits.@@
<<elseif $activeSlave.relationship == 3>>
- t-to b-be your girlfriend." $He takes a deep breath. "It'<<s>> fun, ju<<s>>t
+ t-to b-be your <<= $girl>>friend." $He takes a deep breath. "It'<<s>> fun, ju<<s>>t
<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "buttslut")>>
fucking your butt.
<<elseif ($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "cumslut")>>
@@ -140,7 +140,7 @@ $He nods $his head quickly, still staring at $his feet. $He shuts $his eyes tigh
<<else>>
having <<s>>e<<x>> with you.
<</if>>
- But I — I really like you." $subSlave.slaveName looks relieved, and <<if $subSlave.voice != 0>>says, "I really like you too. And you're really cute! I'd love to be your girlfriend." _He2<<else>>lovingly<</if>> takes $activeSlave.slaveName's hands in _hers2, and then kisses $him on the cheek. $activeSlave.slaveName crushes $subSlave.slaveName in a hug, pressing a squeak out of _him2. They're now @@.lightgreen;lovers.@@
+ But I — I really like you." $subSlave.slaveName looks relieved, and <<if $subSlave.voice != 0>>says, "I really like you too. And you're really cute! I'd love to be your <<= _girl2>>friend." _He2<<else>>lovingly<</if>> takes $activeSlave.slaveName's hands in _hers2, and then kisses $him on the cheek. $activeSlave.slaveName crushes $subSlave.slaveName in a hug, pressing a squeak out of _him2. They're now @@.lightgreen;lovers.@@
<<elseif $activeSlave.relationship == 4>>
- " $He stops $himself. "No, I want to do thi<<s>> right." $He takes $subSlave.slaveName's hand, and then drops to one knee. After a moment of uncomprehending shock, $subSlave.slaveName begins to cry. "Will you marry me?" $subSlave.slaveName turns to you and<<if !canTalk($subSlave)>> wordlessly<</if>> asks if it's all right with you; you nod, and _he2 turns back to $activeSlave.slaveName. <<if !canTalk($subSlave)>>_He2 gestures distractedly that $activeSlave.slaveName is being silly, and of course _he2'll marry $him, because _he2 loves $him.<<else>><<run Enunciate($subSlave)>>"O-of cour<<s>>e I'll m-marry you, <<s>>illy $girl. I love you."<</if>> $activeSlave.slaveName jumps up and crushes $subSlave.slaveName in a hug, kissing _him2 frantically through $his tears. You @@.lightgreen;marry them@@ solemnly, and they embrace tightly, hugging each other close. $activeSlave.slaveName comes to face you over $his wife's shoulder, and $he mouths a silent thanks to you.
<</if>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 51a793ea3d1..09d25c62049 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -104,22 +104,22 @@
<<if $BrothiIDs.length > 2>>
Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;adores@@ you for leaving plentiful outlets for $his nymphomania under $his care.
<<else>>
- Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day you assign more girls to $brothelName.
+ Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day you assign more whores to $brothelName.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
<<if ($slaves[$i].fetish == "sadist")>>
<<if $BrothiIDs.length > 2>>
- Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole brothel of girls for $him to rape.
+ Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole brothel of whores for $him to rape.
<<else>>
- Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day you assign more girls to $brothelName for $him to rape.
+ Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day you assign more whores to $brothelName for $him to rape.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetish == "dom")>>
<<if $BrothiIDs.length > 2>>
- Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for allowing $him a brothel of girls to dominate.
+ Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for allowing $him a brothel of whores to dominate.
<<else>>
- Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day you assign more girls to $his domain.
+ Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day you assign more whores to $his domain.
<</if>>
<<set $slaves[$i].devotion += 1>>
<</if>>
@@ -589,22 +589,22 @@
<<if $ClubiIDs.length > 2>>
Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;adores@@ you for leaving plentiful, tantalizing, outlets for $his nymphomania under $his care.
<<else>>
- Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day you assign more girls to $clubName.
+ Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day you assign more sluts to $clubName.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
<<if ($slaves[$i].fetish == "sadist")>>
<<if $ClubiIDs.length > 2>>
- Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole club of girls for $him to rape.
+ Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole club of sluts for $him to rape.
<<else>>
- Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day you assign more girls to $clubName for $him to rape.
+ Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day you assign more sluts to $clubName for $him to rape.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetish == "dom")>>
<<if $ClubiIDs.length > 2>>
Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for allowing $him a club of sluts to dominate.
<<else>>
- Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@the day you assign more girls to $his domain.
+ Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@the day you assign more sluts to $his domain.
<</if>>
<<set $slaves[$i].devotion += 1>>
<</if>>
@@ -2524,22 +2524,22 @@
<<if $NurseryiIDs.length > 2>>
Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;adores@@ you for providing plentiful outlets for $his nymphomania.
<<else>>
- Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day <<if $Matron != 0>>more of your slaves join $him in $nurseryName <<else>>you assign more girls to $nurseryName to help $him relieve $his <<if $slaves[$i].balls > 0>>swollen balls<<else>>tension<</if>><</if>>.
+ Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day <<if $Matron != 0>>more of your slaves join $him in $nurseryName <<else>>you assign more nurses to $nurseryName to help $him relieve $his <<if $slaves[$i].balls > 0>>swollen balls<<else>>tension<</if>><</if>>.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
<<if ($slaves[$i].fetish == "sadist")>>
<<if $NurseryiIDs.length > 2>>
- Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole nursery of girls for $him to rape.
+ Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole nursery of slaves for $him to rape.
<<else>>
- Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day <<if $Matron != 0>>more of your slaves join $him in $nurseryName <<else>>you assign more girls to $nurseryName to help $him unwind<</if>>.
+ Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day <<if $Matron != 0>>more of your slaves join $him in $nurseryName <<else>>you assign more nurses to $nurseryName to help $him unwind<</if>>.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetish == "dom")>>
<<if $NurseryiIDs.length > 2>>
- Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for providing a whole nursery of girls for $him to dominate.
+ Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for providing a whole nursery of slaves for $him to dominate.
<<else>>
- Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day <<if $Matron != 0>>more of your slaves join $him in $nurseryName <<else>>you assign more girls to $nurseryName to help $him unwind<</if>>.
+ Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day <<if $Matron != 0>>more of your slaves join $him in $nurseryName <<else>>you assign more nurses to $nurseryName to help $him unwind<</if>>.
<</if>>
<<set $slaves[$i].devotion += 1>>
<</if>>
@@ -2736,14 +2736,14 @@
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
<<if ($slaves[$i].fetish == "sadist")>>
<<if $SchlRiIDs.length > 2>>
- Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole class of girls for $him to rape lessons into.
+ Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole class of students for $him to rape lessons into.
<<else>>
Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day more of your slaves enroll in $schoolroomName.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetish == "dom")>>
<<if $SchlRiIDs.length > 2>>
- Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for providing a whole class of girls to demonstrate proper submission with.
+ Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for providing a whole class of students to demonstrate proper submission with.
<<else>>
Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day more of your slaves enroll in $schoolroomName.
<</if>>
@@ -3219,7 +3219,7 @@
<<if $ServQiIDs.length > 2>>
Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;adores@@ you for leaving plentiful outlets for $his nymphomania under $his charge.
<<else>>
- Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day you assign more girls to $servantsQuartersName.
+ Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day you assign more maids to $servantsQuartersName.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -3227,14 +3227,14 @@
<<if $ServQiIDs.length > 2>>
Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing so many maids for $him to rape.
<<else>>
- Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day you assign more girls to $servantsQuartersName for $him to rape.
+ Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day you assign more maids to $servantsQuartersName for $him to rape.
<</if>>
<<set $slaves[$i].devotion += 1>>
<<elseif ($slaves[$i].fetish == "dom")>>
<<if $ServQiIDs.length > 2>>
Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for allowing $him so many maids to dominate.
<<else>>
- Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day you assign more girls to $his domain.
+ Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day you assign more maids to $his domain.
<</if>>
<<set $slaves[$i].devotion += 1>>
<</if>>
@@ -5040,7 +5040,7 @@
<<if $spa != 0>>
usually spends in $spaName<<if $Attendant != 0>> enjoying $Attendant.slaveName's care<</if>>.
<<else>>
- usually spends relaxing in your Head Girls private room.
+ usually spends relaxing in your Head Girl's private room.
<</if>>
<<if $slaves[$i].relationship > 0>>
$He often asks to save these breaks so $he can spend them with $his <<if $slaves[$i].relationship == 1>>friend<<elseif $slaves[$i].relationship == 2>>best friend<<elseif $slaves[$i].relationship == 3>>friend with benefits<<elseif $slaves[$i].relationship == 4>>sweetheart<<else>>wife<</if>>.
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index cb02ae48173..2134cfd76cd 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -61,7 +61,7 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
<</switch>>
<<if $schoolroomSlaves > 2>>
- $schoolroomNameCaps is busy with slaves, repeating their lessons out loud to drill the instruction home. A few girls are maintaining uncomfortable positions in the corner as punishment for poor work.
+ $schoolroomNameCaps is busy with slaves, repeating their lessons out loud to drill the instruction home. A few students are maintaining uncomfortable positions in the corner as punishment for poor work.
<<elseif $schoolroomSlaves > 0>>
$schoolroomNameCaps is sparsely populated, the few students repeating their lessons out loud to drill the instruction home. One girl is maintaining an uncomfortable position in the corner as punishment for poor work.
<<elseif $Schoolteacher != 0>>
diff --git a/src/uncategorized/seExpiration.tw b/src/uncategorized/seExpiration.tw
index 61b0c5879db..0aa40044de1 100644
--- a/src/uncategorized/seExpiration.tw
+++ b/src/uncategorized/seExpiration.tw
@@ -96,7 +96,8 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
<</for>>
<</replace>>
<</link>> //This will cost <<print cashFormat(1000)>>//
- <<else>>//You cannot afford to do this//
+ <<else>>
+ //You cannot afford to do this//
<</if>>
</span>
@@ -128,14 +129,15 @@ $activeSlave.slaveName's indentured servitude is ending this week, meaning that
<<set $lowerClass -= 1>>
<<set $expired = 0>><<set $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].indenture == 0>>
- <<set $expiree = $slaves[$i].ID>>
- <<break>>
- <</if>>
+ <<if $slaves[$i].indenture == 0>>
+ <<set $expiree = $slaves[$i].ID>>
+ <<break>>
+ <</if>>
<</for>>
<</replace>>
<</link>> //This will cost <<print cashFormat($slaveCost)>>//
- <<else>>//You cannot afford to do this//
+ <<else>>
+ //You cannot afford to do this//
<</if>>
</span>
@@ -159,14 +161,15 @@ at the moment of $his scheduled emancipation, $he seems willing to consider a sh
<<set $lowerClass -= 1>>
<<set $expired = 0>><<set $expiree = 0>>
<<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].indenture == 0>>
- <<set $expiree = $slaves[$i].ID>>
- <<break>>
- <</if>>
+ <<if $slaves[$i].indenture == 0>>
+ <<set $expiree = $slaves[$i].ID>>
+ <<break>>
+ <</if>>
<</for>>
<</replace>>
<</link>> //This will cost <<print cashFormat($slaveCost)>>//
-<<else>>//You cannot afford to do this//
+<<else>>
+ //You cannot afford to do this//
<</if>>
</span>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index bb99a3cd0cf..ddf0b664c92 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -592,92 +592,92 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<</if>>
<<if (_winner.fetish != "sadist")>>
- <<if random(1,100) > 50>>
- Cruelty and callousness seeps its way into $his sexuality; $he has become a @@.lightcoral;bloody sadist.@@
- <<set _winner.fetish = "sadist">>
- <<set _winner.fetishKnown = 1>>
- <<set _winner.fetishStrength = 65>>
- <</if>>
+ <<if random(1,100) > 50>>
+ Cruelty and callousness seeps its way into $his sexuality; $he has become a @@.lightcoral;bloody sadist.@@
+ <<set _winner.fetish = "sadist">>
+ <<set _winner.fetishKnown = 1>>
+ <<set _winner.fetishStrength = 65>>
+ <</if>>
<</if>>
<<if (_winner.rivalry > 0) && (_loser.ID == _winner.rivalryTarget)>>
<<if (_winner.devotion > 75)>>
- $He is so accepting of the low value of slave life that $he @@.hotpink;is pleased@@ to have killed $his rival _loser.slaveName.
- <<set _winner.devotion += 4>>
+ $He is so accepting of the low value of slave life that $he @@.hotpink;is pleased@@ to have killed $his rival _loser.slaveName.
+ <<set _winner.devotion += 4>>
<</if>>
<<elseif (_winner.relationship >= 0) && (_loser.ID == _winner.relationshipTarget)>>
<<if (_winner.devotion > 95)>>
- $He is so worshipful of you that $he sees the death of $his only friend at $his own hand as an @@.hotpink;honorable@@ end to their doomed slave relationship.
- <<set _winner.devotion += 4>>
+ $He is so worshipful of you that $he sees the death of $his only friend at $his own hand as an @@.hotpink;honorable@@ end to their doomed slave relationship.
+ <<set _winner.devotion += 4>>
<<else>>
- $He shows little reaction to the death of $his only friend at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
- <<set _winner.fetish = "mindbroken">>
- <<set _winner.fetishKnown = 1>>
+ $He shows little reaction to the death of $his only friend at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
+ <<set _winner.fetish = "mindbroken">>
+ <<set _winner.fetishKnown = 1>>
<</if>>
<<elseif _winner.mother == _loser.ID>>
<<if (_winner.devotion > 95)>>
- $He is so worshipful of you that $he sees the death of $his mother at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
- <<set _winner.devotion += 4>>
+ $He is so worshipful of you that $he sees the death of $his mother at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
+ <<set _winner.devotion += 4>>
<<else>>
- $He shows little reaction to the death of $his mother at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
- <<set _winner.fetish = "mindbroken">>
- <<set _winner.fetishKnown = 1>>
+ $He shows little reaction to the death of $his mother at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
+ <<set _winner.fetish = "mindbroken">>
+ <<set _winner.fetishKnown = 1>>
<</if>>
<<elseif _winner.father == _loser.ID>>
<<if (_winner.devotion > 95)>>
- $He is so worshipful of you that $he sees the death of $his father at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
- <<set _winner.devotion += 4>>
+ $He is so worshipful of you that $he sees the death of $his father at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
+ <<set _winner.devotion += 4>>
<<else>>
- $He shows little reaction to the death of $his father at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
- <<set _winner.fetish = "mindbroken">>
- <<set _winner.fetishKnown = 1>>
+ $He shows little reaction to the death of $his father at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
+ <<set _winner.fetish = "mindbroken">>
+ <<set _winner.fetishKnown = 1>>
<</if>>
<<elseif _loser.mother == _winner.ID || _loser.father == _winner.ID>>
<<if (_winner.devotion > 95)>>
- $He is so worshipful of you that $he sees the death of $his daughter at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
- <<set _winner.devotion += 4>>
+ $He is so worshipful of you that $he sees the death of $his daughter at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
+ <<set _winner.devotion += 4>>
<<else>>
- $He shows little reaction to the death of $his daughter at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
- <<set _winner.fetish = "mindbroken">>
- <<set _winner.fetishKnown = 1>>
+ $He shows little reaction to the death of $his daughter at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
+ <<set _winner.fetish = "mindbroken">>
+ <<set _winner.fetishKnown = 1>>
<</if>>
<<elseif _winner.sisters > 0>>
<<switch areSisters(_winner, _loser)>>
<<case 1>>
<<if (_winner.devotion > 95)>>
- $He is so worshipful of you that $he sees the death of $his twin at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
- <<set _winner.devotion += 4>>
+ $He is so worshipful of you that $he sees the death of $his twin at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
+ <<set _winner.devotion += 4>>
<<else>>
- $He shows little reaction to the death of $his twin at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
- <<set _winner.fetish = "mindbroken">>
- <<set _winner.fetishKnown = 1>>
+ $He shows little reaction to the death of $his twin at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
+ <<set _winner.fetish = "mindbroken">>
+ <<set _winner.fetishKnown = 1>>
<</if>>
<<case 2>>
<<if (_winner.devotion > 95)>>
- $He is so worshipful of you that $he sees the death of $his sister at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
- <<set _winner.devotion += 4>>
+ $He is so worshipful of you that $he sees the death of $his sister at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
+ <<set _winner.devotion += 4>>
<<else>>
- $He shows little reaction to the death of $his sister at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
- <<set _winner.fetish = "mindbroken">>
- <<set _winner.fetishKnown = 1>>
+ $He shows little reaction to the death of $his sister at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
+ <<set _winner.fetish = "mindbroken">>
+ <<set _winner.fetishKnown = 1>>
<</if>>
<<case 3>>
<<if (_winner.devotion > 95)>>
- $He is so worshipful of you that $he sees the death of $his half-sister at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
- <<set _winner.devotion += 4>>
+ $He is so worshipful of you that $he sees the death of $his half-sister at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
+ <<set _winner.devotion += 4>>
<<else>>
- $He is @@.mediumorchid;utterly devastated@@ at being forced to take the life of $his half-sister.
- <<set _winner.devotion -= 50>>
+ $He is @@.mediumorchid;utterly devastated@@ at being forced to take the life of $his half-sister.
+ <<set _winner.devotion -= 50>>
<</if>>
<</switch>>
<<elseif (_winner.relation != 0) && (_loser.ID == _winner.relationTarget)>>
<<if (_winner.devotion > 95)>>
- $He is so worshipful of you that $he sees the death of $his _loser.relation at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
- <<set _winner.devotion += 4>>
+ $He is so worshipful of you that $he sees the death of $his _loser.relation at $his own hand as an @@.hotpink;honorable@@ end to their doomed family.
+ <<set _winner.devotion += 4>>
<<else>>
- $He shows little reaction to the death of $his _loser.relation at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
- <<set _winner.fetish = "mindbroken">>
- <<set _winner.fetishKnown = 1>>
+ $He shows little reaction to the death of $his _loser.relation at $his own hand. In the coming days, it becomes clear that this is because $he is @@.red;no longer capable@@ of reacting to anything on an emotional level. Ever again.
+ <<set _winner.fetish = "mindbroken">>
+ <<set _winner.fetishKnown = 1>>
<</if>>
<</if>>
<<else>> /*if fighting an animal*/
diff --git a/src/uncategorized/seNicaeaPreperation.tw b/src/uncategorized/seNicaeaPreperation.tw
index 84a658bf25c..59c9fb5e84c 100644
--- a/src/uncategorized/seNicaeaPreperation.tw
+++ b/src/uncategorized/seNicaeaPreperation.tw
@@ -31,13 +31,13 @@ The first major choice you have to make concerns the seats on the Council. There
<span id="result">
<<link "Apportion Council seats impartially">>
<<replace "#result">>
- You apportion the seats impartially, doing everything you can to help ensure that all Chattel Religionists will see the Council as authoritative.
+ You apportion the seats impartially, doing everything you can to help ensure that all Chattel Religionists will see the Council as authoritative.
<</replace>>
<</link>>
<br><<link "Invite Chattel Religionists you agree with">>
<<replace "#result">>
- You do your best to invite Chattel Religionists you hope will agree with you, while trying to keep what you're doing from being too obvious.
- <<set $nicaeaPower -= 1, $nicaeaInfluence += 1>>
+ You do your best to invite Chattel Religionists you hope will agree with you, while trying to keep what you're doing from being too obvious.
+ <<set $nicaeaPower -= 1, $nicaeaInfluence += 1>>
<</replace>>
<</link>>
</span>
@@ -49,14 +49,14 @@ Second, you need to decide whether you intend to engage in a canvassing campaign
<span id="result2">
<<link "Rely on your prominence">>
<<replace "#result2">>
- You decide that you don't need to spend precious reputational power. You're prominent enough that you expect to achieve your goals without special leverage.
+ You decide that you don't need to spend precious reputational power. You're prominent enough that you expect to achieve your goals without special leverage.
<</replace>>
<</link>>
<br><<link "Leverage reputation into power">>
<<replace "#result2">>
- This isn't an opportunity that will come again. @@.red;You call in every favor you have.@@ You'll have to rebuild your reputation later.
- <<set $nicaeaInfluence += 1>>
- <<run repX(($rep * 0.5)-$rep, "event")>>
+ This isn't an opportunity that will come again. @@.red;You call in every favor you have.@@ You'll have to rebuild your reputation later.
+ <<set $nicaeaInfluence += 1>>
+ <<run repX(($rep * 0.5)-$rep, "event")>>
<</replace>>
<</link>> //This will cost a great deal of reputation//
</span>
@@ -68,14 +68,14 @@ Finally, you could use money to influence the Council. Everyone who's likely to
<span id="result3">
<<link "Just host the Council">>
<<replace "#result3">>
- The Council doesn't need the distraction of a lot of less important people enjoying themselves loudly nearby, so you decide not to broaden the event.
+ The Council doesn't need the distraction of a lot of less important people enjoying themselves loudly nearby, so you decide not to broaden the event.
<</replace>>
<</link>>
<br><<link "Host a festival to coincide with their arrival">>
<<replace "#result3">>
- Good works will spread the joy of a Chattel Religionist revival, and make you even more influential with the Council. You plan a public festival as part of the event.
- <<set $nicaeaInfluence += 1>>
- <<run cashX(-50000, "event")>>
+ Good works will spread the joy of a Chattel Religionist revival, and make you even more influential with the Council. You plan a public festival as part of the event.
+ <<set $nicaeaInfluence += 1>>
+ <<run cashX(-50000, "event")>>
<</replace>>
<</link>> //This will cost <<print cashFormat(50000)>>//
</span>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 7ae6176f165..a9e1dffa4e0 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -1008,21 +1008,21 @@
<</if>>
<<if (_loser.fetish != "masochist") && (_loser.fetish != "humiliation") && (_loser.sexualFlaw != "self-hating")>>
- <<if (_loser.relationship != 0)>>
- <<if (_loser.relationship <= 4)>>
- <<if (_loser.relationshipTarget == _winner.ID)>>
- Fighting and rape have @@.lightsalmon;damaged@@ the relationship between the slaves.
- <<set _loser.relationship -= 1, _winner.relationship -= 1>>
- <</if>>
- <</if>>
- <</if>>
+ <<if (_loser.relationship != 0)>>
+ <<if (_loser.relationship <= 4)>>
+ <<if (_loser.relationshipTarget == _winner.ID)>>
+ Fighting and rape have @@.lightsalmon;damaged@@ the relationship between the slaves.
+ <<set _loser.relationship -= 1, _winner.relationship -= 1>>
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<<if (_winner.combatSkill == 0)>>
- <<if random(1,100) < (20+_winner.devotion)>>
- With experience in $pitName, _winner.slaveName has @@.green;learned basic combat skills.@@
- <<set _winner.combatSkill += 1>>
- <</if>>
+ <<if random(1,100) < (20+_winner.devotion)>>
+ With experience in $pitName, _winner.slaveName has @@.green;learned basic combat skills.@@
+ <<set _winner.combatSkill += 1>>
+ <</if>>
<</if>>
<<set $slaves[$slaveIndices[_winner.ID]] = _winner>>
diff --git a/src/uncategorized/seWeddingDouble.tw b/src/uncategorized/seWeddingDouble.tw
index 0cdfcb93f07..d796f52f90e 100644
--- a/src/uncategorized/seWeddingDouble.tw
+++ b/src/uncategorized/seWeddingDouble.tw
@@ -1006,7 +1006,7 @@
<<elseif _slave1.devotion < -20 && _slave1.trust > 20>>
The slaves are unwilling, so you gather _slave1.slaveName up and hold $him in front of you, pulling $his panties off as you do. $He was crying before, but this causes $him to tremble and tear up in anticipation of what's next. Ignoring this, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>.<<if _slave1.amp != 1>> Then you pull $his knees up to give your guests a good view of the consummation.<</if>> $He is left to face them, watching sullenly as you fuck $his fertile <<if _slave1.mpreg == 1>>asshole<<else>>cunt<</if>>. Though $his face is towards the crowd, $his mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, this is torture. $He gasps when your seed flows into $him, faking an orgasm to @@.green;applause from your guests.@@ At this, $he shoots you a dirty look, blaming you for this indignity. You've already moved on to _slave2.slaveName, however. _He2 had watched timidly as you had fucked _slave1.slaveName, but when you grab _him2, _he2 begins to cry softly. You ignore this, of course, and instead focus on pushing your already-hard cock into _his2 <<if _slave2.mpreg == 1>>asshole<<else>>pussy<</if>>. You can tell _he2 is trying _his2 hardest not to sob outright, and sure enough, a small sob escapes _his2 lips when you fill _him2 to the brim to the @@.green;applause of your guests.@@ You'll fuck them repeatedly over the next few days, ensuring impregnation, despite their efforts to defy you.
<<elseif _slave1.devotion < -20>>
- The <<if _slave1.genes == "XX" && _slave2.genes == "XX">>girls<<else>>slaves<</if>> are unwilling, so you gather _slave1.slaveName up and hold $him in front of you, pulling $his panties off as you do. $He was crying before, but this causes $him to tremble and sob loudly in anticipation of what's next. Ignoring this, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>.<<if _slave1.amp != 1>> Then you pull $his knees up to give your guests a good view of the consummation.<</if>> $He is left to face them, watching sullenly as you fuck $his fertile <<if _slave1.mpreg == 1>>asshole<<else>>cunt<</if>>. Though $his face is towards the crowd, $his mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, this is torture. $He gasps when your seed flows into $him, orgasming unwillingly to @@.green;applause from your guests.@@ At this, $he completely breaks down, blubbering like a child at the unwelcome warmth in $his lower belly. You then turn your attention to _slave2.slaveName. _He2 had watched timidly as you had fucked _slave1.slaveName, but when you grab _him2, _he2 begins to cry softly. You ignore this, of course, and instead focus on pushing your already-hard cock into _his2 <<if _slave2.mpreg == 1>>asshole<<else>>pussy<</if>>. You can tell _he2 is trying _his2 hardest not to sob outright, and sure enough, a small sob escapes _his2 lips when you fill _him2 to the brim to the @@.green;applause of your guests.@@ You'll fuck them repeatedly over the next few days, ensuring impregnation, despite their protesting.
+ The <<if _slave1.noun == _slave2.noun>><<= $girl>>s<<else>>slaves<</if>> are unwilling, so you gather _slave1.slaveName up and hold $him in front of you, pulling $his panties off as you do. $He was crying before, but this causes $him to tremble and sob loudly in anticipation of what's next. Ignoring this, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>.<<if _slave1.amp != 1>> Then you pull $his knees up to give your guests a good view of the consummation.<</if>> $He is left to face them, watching sullenly as you fuck $his fertile <<if _slave1.mpreg == 1>>asshole<<else>>cunt<</if>>. Though $his face is towards the crowd, $his mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, this is torture. $He gasps when your seed flows into $him, orgasming unwillingly to @@.green;applause from your guests.@@ At this, $he completely breaks down, blubbering like a child at the unwelcome warmth in $his lower belly. You then turn your attention to _slave2.slaveName. _He2 had watched timidly as you had fucked _slave1.slaveName, but when you grab _him2, _he2 begins to cry softly. You ignore this, of course, and instead focus on pushing your already-hard cock into _his2 <<if _slave2.mpreg == 1>>asshole<<else>>pussy<</if>>. You can tell _he2 is trying _his2 hardest not to sob outright, and sure enough, a small sob escapes _his2 lips when you fill _him2 to the brim to the @@.green;applause of your guests.@@ You'll fuck them repeatedly over the next few days, ensuring impregnation, despite their protesting.
<<else>>
Your wives-to-be aren't particularly excited about what's coming, but they're fully prepared for it and have accepted it as a fact of life. There are worse things one can be than the slave-wife of a wealthy arcology owner. You <<if _slave1.amp == 1>>gather _slave1.slaveName.slaveName up and hold $him in front of you, pulling $his panties off as you do. Showing considerable dexterity, you maneuver your dick inside $him while holding $him against your <<if $PC.boobs == 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>><<else>>take _slave1.slaveName's hand and pull $him to $his feet while $he shimmies out of $his panties. $He cocks $his hips for you and you slide your cock inside $him before taking $his knees and drawing them up to hold $him in midair, impaled on you<</if>>. Though $his face is towards the crowd, their mind is concentrated on your hard cock, pumping in and out of $him at an angle; to $him, it's just another part of being your slave. $He gasps when your seed flows into $him, orgasming shortly after to @@.green;applause from your guests.@@ Next, you turn your attention to _slave2.slaveName. You <<if (_slave1.amp == 1 && _slave2.amp == 1)>>also <</if>><<if _slave2.amp == 1>>pick _him2 up, then <<else>>pull _him2 to _his2 feet and <</if>>pull _his2 g-string off in one swift motion, then maneuver your already-hard cock into _his2 <<if _slave2.mpreg == 1>>asshole<<else>>pussy<</if>>. You fuck _him2, hard, then fill _him2 to the brim @@.green;while your audience gives another round of applause.@@ You'll fuck them repeatedly over the next few days, ensuring impregnation.
<</if>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index 5d03d42942c..652f08c8c7c 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -119,9 +119,9 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
"Pharaoh,
<<else>>
<<if $PC.title == 1>>
- "My prince,
+ "My prince,
<<else>>
- "My princess,
+ "My princess,
<</if>>
<</if>>
<</if>>
@@ -133,9 +133,9 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<<else>>
<<if $arcologies[0].FSEdoRevivalist >= $FSLockinLevel*0.9>>
<<if $PC.title == 1>>
- "Honored Emperor,
+ "Honored Emperor,
<<else>>
- "Honored Deity,
+ "Honored Deity,
<</if>>
<<elseif $arcologies[0].FSEdoRevivalist >= $FSLockinLevel*0.6>>
"Honored Shogun,
@@ -151,15 +151,15 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<<else>>
<<if $arcologies[0].FSArabianRevivalist >= $FSLockinLevel*0.9>>
<<if $PC.title == 1>>
- "Honored Caliph,
+ "Honored Caliph,
<<else>>
- "Handmaiden of Allah, your servant's heart is desolate with the honor of looking upon you.
+ "Handmaiden of Allah, your servant's heart is desolate with the honor of looking upon you.
<</if>>
<<elseif $arcologies[0].FSArabianRevivalist >= $FSLockinLevel*0.6>>
<<if $PC.title == 1>>
- "Honored Sultan,
+ "Honored Sultan,
<<else>>
- "Sultana, your servant's heart is desolate with the honor of looking upon you.
+ "Sultana, your servant's heart is desolate with the honor of looking upon you.
<</if>>
<<else>>
"Peace be upon you, honored slaveowner.
@@ -268,16 +268,16 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<</if>>
<</if>>
<<if ($week-$activeSlave.weekAcquired >= 20) && ($activeSlave.entertainSkill >= 100)>>
-<<if setup.entertainmentCareers.includes($activeSlave.career)>>
-<<else>>
- $He's gotten enough experience as a slave entertainer that $he has the added value of a $girl with a history in entertainment from before $he was a slave.
-<</if>>
+ <<if setup.entertainmentCareers.includes($activeSlave.career)>>
+ <<else>>
+ $He's gotten enough experience as a slave entertainer that $he has the added value of a $girl with a history in entertainment from before $he was a slave.
+ <</if>>
<</if>>
<<if ($activeSlave.oralCount + $activeSlave.analCount + $activeSlave.vaginalCount + $activeSlave.mammaryCount + $activeSlave.penetrativeCount > 1000)>>
-<<if setup.whoreCareers.includes($activeSlave.career)>>
-<<else>>
- I see $he's sexually very experienced; that counts as a stand-in for the usual bonus value from having been a sex worker before enslavement.
-<</if>>
+ <<if setup.whoreCareers.includes($activeSlave.career)>>
+ <<else>>
+ I see $he's sexually very experienced; that counts as a stand-in for the usual bonus value from having been a sex worker before enslavement.
+ <</if>>
<</if>>
<<set _careers = []>>
@@ -403,7 +403,7 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<<if $activeSlave.attrKnown == 1>>
<<if $activeSlave.energy > 95>>
- Nymphomania adds a major price bonus.
+ Nymphomania adds a major price bonus.
<</if>>
<<else>>
With $his sex drive not well tested, I cannot award $him any value in that area.
@@ -639,25 +639,25 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<<if $arcologies[0].FSGenderRadicalistLawFuta != 0>>
<<if $arcologies[0].FSGenderRadicalistLawFuta == 1>>
<<if $activeSlave.dick > 0>>
- <<if $activeSlave.vagina > -1>>
- Futas appraise better than ever, thanks to your leadership on gender.
- <</if>>
+ <<if $activeSlave.vagina > -1>>
+ Futas appraise better than ever, thanks to your leadership on gender.
+ <</if>>
<</if>>
<<elseif $arcologies[0].FSGenderRadicalistLawFuta == 2>>
<<if $activeSlave.dick > 0>>
- <<if $activeSlave.balls > 0>>
- Slaves with cocks and balls appraise quite well, thanks to your leadership on gender.
- <</if>>
+ <<if $activeSlave.balls > 0>>
+ Slaves with cocks and balls appraise quite well, thanks to your leadership on gender.
+ <</if>>
<</if>>
<<else>>
<<if $activeSlave.butt >= 5>>
- <<if $activeSlave.anus >= 2>>
- <<if $activeSlave.hips >= 1>>
- <<if $activeSlave.analSkill > 60>>
- Slaves with big butts and skilled anuses appraise quite well, thanks to your leadership on gender.
- <</if>>
- <</if>>
- <</if>>
+ <<if $activeSlave.anus >= 2>>
+ <<if $activeSlave.hips >= 1>>
+ <<if $activeSlave.analSkill > 60>>
+ Slaves with big butts and skilled anuses appraise quite well, thanks to your leadership on gender.
+ <</if>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 0a46171d148..13fd470930b 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -70,12 +70,12 @@
<span id="sexoption">
<<if ($activeSlave.vagina > -1)>>
<<if canDoVaginal($activeSlave)>>
- <<link "Fuck $him">><<replace "#miniscene">><<include "FVagina">><br><</replace>><</link>>
+ <<link "Fuck $him">><<replace "#miniscene">><<include "FVagina">><br><</replace>><</link>>
<<if canDoAnal($activeSlave)>>
- | <<link "Use $his holes">><<replace "#miniscene">><<include "FButt">><br> <</replace>><</link>>
+ | <<link "Use $his holes">><<replace "#miniscene">><<include "FButt">><br> <</replace>><</link>>
<</if>>
<<else>>
- //Remove $his chastity belt if you wish to fuck $him//
+ //Remove $his chastity belt if you wish to fuck $him//
<</if>>
<</if>>
<<if $activeSlave.bellyPreg >= 300000>>
@@ -91,9 +91,9 @@
</span>
<span id="analsexoption">
<<if canDoAnal($activeSlave)>>
- | <<link "Fuck $his ass">><<replace "#miniscene">><<include "FAnus">><br> <</replace>><</link>>
+ | <<link "Fuck $his ass">><<replace "#miniscene">><<include "FAnus">><br> <</replace>><</link>>
<<else>>
- | //Remove $his chastity belt if you wish to fuck $his ass//
+ | //Remove $his chastity belt if you wish to fuck $his ass//
<</if>>
</span>
| <<link "Use $his mouth">><<replace "#miniscene">><<include "FLips">><br> <</replace>><</link>>
@@ -113,28 +113,28 @@
<</if>>
<span id="analgropeoption">
<<if canDoAnal($activeSlave)>>
- | <<link "Grope $his butt">><<replace "#miniscene">><<include "FondleButt">><br> <</replace>><</link>>
+ | <<link "Grope $his butt">><<replace "#miniscene">><<include "FondleButt">><br> <</replace>><</link>>
<</if>>
</span>
<span id="gropeoption">
<<if ($activeSlave.vagina > -1)>>
<<if canDoVaginal($activeSlave)>>
- | <<link "Grope $his pussy">><<replace "#miniscene">><<include "FondleVagina">><br> <</replace>><</link>>
- | <<link "Eat $him out">><<replace "#miniscene">><<include "FLickPussy">><br> <</replace>><</link>>
+ | <<link "Grope $his pussy">><<replace "#miniscene">><<include "FondleVagina">><br> <</replace>><</link>>
+ | <<link "Eat $him out">><<replace "#miniscene">><<include "FLickPussy">><br> <</replace>><</link>>
<</if>>
<</if>>
</span>
<span id="dickgropeoption">
<<if ($activeSlave.dick > 0)>>
<<if !($activeSlave.chastityPenis)>>
- | <<link "Grope $his dick">><<replace "#miniscene">><<include "FondleDick">><br> <</replace>><</link>>
+ | <<link "Grope $his dick">><<replace "#miniscene">><<include "FondleDick">><br> <</replace>><</link>>
<<if canPenetrate($activeSlave)>>
<<if $sexualOpeness == 1 || $activeSlave.toyHole == "dick">>
| <<link "Ride $his dick">><<replace "#miniscene">><<include "FDick">><br> <</replace>><</link>>
<</if>>
<</if>>
<<else>>
- | //Remove $his dick chastity belt if you wish to play with $his cock//
+ | //Remove $his dick chastity belt if you wish to play with $his cock//
<</if>>
<</if>>
</span>
@@ -144,10 +144,10 @@
<span id = "impreg">
<<if (canGetPregnant($activeSlave)) && ($activeSlave.fuckdoll == 0) && $seePreg != 0>>
<<if canImpreg($activeSlave, $PC)>>
- | <<link "Impregnate $him yourself">><<replace "#miniscene">><<include "FPCImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ | <<link "Impregnate $him yourself">><<replace "#miniscene">><<include "FPCImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<</if>>
<<if canImpreg($activeSlave, $activeSlave)>>
- | <<link "Use $his own seed to impregnate $him">><<replace "#miniscene">><<include "FSlaveSelfImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ | <<link "Use $his own seed to impregnate $him">><<replace "#miniscene">><<include "FSlaveSelfImpreg">><br> <</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
<</if>>
| <<link "Use another slave to impregnate $him" "FSlaveImpreg">><</link>>
<<if ($activeSlave.eggType != "human") && (_CL > 0 || _HL > 0 || _FL > 0) && ($cheatMode == 1)>>
@@ -1509,17 +1509,17 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<span id="bloating">
<<if $activeSlave.inflation > 0>>
-<br>
-__Required Bloating__: <strong><span id="inflate"><<if $activeSlave.inflation == 3>><<print "$He is required to keep 2 gallons of $activeSlave.inflationType in $him at all times">><<elseif $activeSlave.inflation == 2>><<print "$He is required to keep 4 liters of $activeSlave.inflationType in $him at all times">><<elseif $activeSlave.inflation == 1>><<print "$He is required to keep 2 liters of $activeSlave.inflationType in $him at all times">><</if>></span></strong>.
-<<if $activeSlave.inflationMethod == 3>>
- <<link "Let $him deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0,$activeSlave.cumSource = 0,$activeSlave.milkSource = 0, SetBellySize($activeSlave)>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
-<<elseif $activeSlave.inflationType == "milk">>
- <<link "Let $him deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0, SetBellySize($activeSlave)>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
-<<elseif $activeSlave.inflationType == "cum">>
- <<link "Let $him deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0, SetBellySize($activeSlave)>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
-<<else>>
- <<link "Let $him deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0, SetBellySize($activeSlave)>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
-<</if>>
+ <br>
+ __Required Bloating__: <strong><span id="inflate"><<if $activeSlave.inflation == 3>><<print "$He is required to keep 2 gallons of $activeSlave.inflationType in $him at all times">><<elseif $activeSlave.inflation == 2>><<print "$He is required to keep 4 liters of $activeSlave.inflationType in $him at all times">><<elseif $activeSlave.inflation == 1>><<print "$He is required to keep 2 liters of $activeSlave.inflationType in $him at all times">><</if>></span></strong>.
+ <<if $activeSlave.inflationMethod == 3>>
+ <<link "Let $him deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0,$activeSlave.cumSource = 0,$activeSlave.milkSource = 0, SetBellySize($activeSlave)>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<elseif $activeSlave.inflationType == "milk">>
+ <<link "Let $him deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0, SetBellySize($activeSlave)>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<elseif $activeSlave.inflationType == "cum">>
+ <<link "Let $him deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0, SetBellySize($activeSlave)>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <<else>>
+ <<link "Let $him deflate">><<set $activeSlave.inflation = 0,$activeSlave.inflationType = "none",$activeSlave.inflationMethod = 0, SetBellySize($activeSlave)>><<SlaveInteractImpreg>><<SlaveInteractFertility>><</link>>
+ <</if>>
<</if>>
</span>
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 47ae4ca2ee4..296de31fc13 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -5,7 +5,7 @@
<<setLocalPronouns $activeSlave>>
<<set $display = 0>>
-<<if !["abortion TV", "elite auction", "eugenics arcology", "organ crafter", "peacekeepers", "repopulationist arcology", "tentacle bred", "womb filler"].includes($buyer) && ((($activeSlave.actualAge < $retirementAge-1) && $PhysicalRetirementAgePolicy != 1) || (($activeSlave.physicalAge < $retirementAge-1) && $PhysicalRetirementAgePolicy == 1))>> /* organ crafter is not viable now, the elite won't part so easily with a prize, some take place x months later when the event's max is 15 weeks, and the rest are snuff events. You don't want that slave back. */
+<<if !["abortion TV", "elite auction", "eugenics arcology", "organ crafter", "peacekeepers", "repopulationist arcology", "tentacle bred", "womb filler"].includes($buyer) && ((($activeSlave.actualAge < $retirementAge-1) && $PhysicalRetirementAgePolicy != 1) || (($activeSlave.physicalAge < $retirementAge-1) && $PhysicalRetirementAgePolicy == 1))>> /* organ crafter is not viable now, the elite/peacekeepers won't part so easily with a prize, some take place x months later when the event's max is 15 weeks, and the rest are snuff events. You don't want that slave back. */
<<if !$boomerangSlave || $boomerangWeeks > 15>>
<<if $activeSlave.fuckdoll == 0>>
<<if canWalk($activeSlave)>>
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 0548a3081b6..848bfd1c7be 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -748,7 +748,7 @@
<</if>>
<<if $cheatMode == 1>>
- $activeSlave.sisters sisters, $activeSlave.daughters daughters.
+ $He has $activeSlave.sisters sisters, and $activeSlave.daughters daughters.
<</if>>
<</widget>>
--
GitLab