From 20448b1d6f1c6f7f8febb79ba93e2e275ac09ac5 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Fri, 30 Nov 2018 20:44:48 -0600
Subject: [PATCH] Marketings
---
.../brothel/brothelAssignmentScene.tw | 2 +-
src/facilities/farmyard/farmyard.tw | 14 +-
src/facilities/nursery/acDump.tw | 2 +-
src/facilities/nursery/childInteract.tw | 32 +-
.../nursery/longChildDescription.tw | 592 +++++++++---------
src/facilities/nursery/nextChildInLine.tw | 4 +-
src/facilities/nursery/previousChildInLine.tw | 4 +-
src/gui/Encyclopedia/encyclopedia.tw | 6 +-
src/js/storyJS.tw | 22 +-
src/npc/agent/agentCompany.tw | 6 +-
src/npc/descriptions/fButt.tw | 2 +-
src/npc/descriptions/fMaternitySwing.tw | 10 +-
src/npc/startingGirls/moreCustomOptions.tw | 2 +-
src/pregmod/criminalMarkets.tw | 7 +-
src/pregmod/manageEconomy.tw | 4 +-
src/pregmod/theCattleRanch.tw | 10 +-
src/pregmod/theHippolytaAcademy.tw | 10 +-
src/pregmod/wetwareCPUs.tw | 10 +-
src/uncategorized/arcadeReport.tw | 2 +-
src/uncategorized/arcmgmt.tw | 4 +-
src/uncategorized/arcologyOpinion.tw | 140 ++---
src/uncategorized/bodyModification.tw | 7 +-
src/uncategorized/bulkSlaveGenerate.tw | 4 +-
src/uncategorized/bulkSlaveIntro.tw | 2 +-
src/uncategorized/clubReport.tw | 4 +-
src/uncategorized/corporateMarket.tw | 5 +-
src/uncategorized/costsReport.tw | 2 +-
src/uncategorized/economics.tw | 4 +-
src/uncategorized/futureSociety.tw | 108 ++--
src/uncategorized/growthResearchInstitute.tw | 9 +-
src/uncategorized/lecoleDesEnculees.tw | 9 +-
src/uncategorized/main.tw | 4 +-
src/uncategorized/manageArcology.tw | 2 +-
src/uncategorized/masterSuite.tw | 4 +-
src/uncategorized/matchmaking.tw | 2 +-
src/uncategorized/saRules.tw | 6 +-
src/uncategorized/slaveInteract.tw | 24 +-
src/uncategorized/slaveMarkets.tw | 9 +-
src/uncategorized/slaveShelter.tw | 22 +-
src/uncategorized/slaveSummary.tw | 78 +--
src/uncategorized/spa.tw | 14 +-
src/uncategorized/stClaverPreparatory.tw | 9 +-
src/uncategorized/storyCaption.tw | 2 +-
src/uncategorized/theFutanariSisters.tw | 9 +-
src/uncategorized/theGymnasiumAcademy.tw | 9 +-
src/uncategorized/theSlavegirlSchool.tw | 12 +-
src/utility/slaveCreationWidgets.tw | 4 +-
47 files changed, 632 insertions(+), 617 deletions(-)
diff --git a/src/facilities/brothel/brothelAssignmentScene.tw b/src/facilities/brothel/brothelAssignmentScene.tw
index 679fdcdd135..317ce5184a7 100644
--- a/src/facilities/brothel/brothelAssignmentScene.tw
+++ b/src/facilities/brothel/brothelAssignmentScene.tw
@@ -214,7 +214,7 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately,
"Gro<<ss>>," $he <<say>>s curtly. "Well, no more hand<<s>>ome boy<<s>> for me, then. Fat pathetic guy<<s>> who patroni<<z>>e whore<<s>>, all the way down. Fuck."
<</switch>>
<<else>>
- $He tries to be brave. "<<Master>>, I will do my be<<s>>t to be a good whore." Then, half to $himself, $he adds in a small voice, "I can do thi<<s>>."
+ $He tries to be brave. "<<Master>>, I will do my be<<s>>t to be a good whore." Then, half to $himself, $he adds in a small voice, "I can do thi<<s>>."
<</if>>
<<else>>
<<if ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetish != "none")>>
diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index 69922242888..62fcc6137ca 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -14,19 +14,19 @@
$farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and concrete that is $arcologies[0].name. Animals are kept in pens, tended to by your slaves, while <<if $farmyardUpgrade.hydroponics == 1>>rows of hydroponics equipment<<else>>makeshift fields<</if>> grow crops.
<<switch $farmyardDecoration>>
<<case "Roman Revivalist">>
- Its red tiles and white stone walls are the very picture of a Roman farm villa's construction, as are the marble statues and reliefs. Saturn and Ceres look over the prosperity of the fields<<if $seeBestiality == 1>>, Mercury watches over the health of the animals, and Feronia ensures strong litters in your slaves.<<else>> and Mercury watches over the health of the animals.<</if>>. The slaves here are all looked after well, as they have one of the most important jobs in $arcologies[0].name.
+ Its red tiles and white stone walls are the very picture of a Roman farm villa's construction, as are the marble statues and reliefs. Saturn and Ceres look over the prosperity of the fields<<if $seeBestiality == 1>>, Mercury watches over the health of the animals, and Feronia ensures strong litters in your slaves.<<else>> and Mercury watches over the health of the animals.<</if>>. The slaves here are all looked after well, as they have one of the most important jobs in $arcologies[0].name.
<<case "Aztec Revivalist">>
- It can't completely recreate the floating farms in the ancient Aztec fashion, but it comes as close as it can, shallow pseudo-canals dividing each field into multiple sections. Smooth stone and colorful murals cover the walls, depicting bloody stories of gods and mortals alike.
+ It can't completely recreate the floating farms in the ancient Aztec fashion, but it comes as close as it can, shallow pseudo-canals dividing each field into multiple sections. Smooth stone and colorful murals cover the walls, depicting bloody stories of gods and mortals alike.
<<case "Egyptian Revivalist">>
It does its best to capture the wide open nature of ancient Egyptian farms, including mimicking the irrigation systems fed by the Nile. The stone walls are decorated with murals detailing its construction and your prowess in general, <<if $seeBestiality == 1>>with animal-bloated slaves featured prominently.<<else>>hieroglyphs spelling out a volumes of praise.<</if>>
<<case "Edo Revivalist">>
- It does its best to mimic the rice patties and thatch roofed buildings of the Edo period despite the wide variety of crops tended by various slaves. Not every crop can thrive in flooded fields, but the ones that can take advantage of your attention to detail.
+ It does its best to mimic the rice patties and thatch roofed buildings of the Edo period despite the wide variety of crops tended by various slaves. Not every crop can thrive in flooded fields, but the ones that can take advantage of your attention to detail.
<<case "Arabian Revivalist">>
- //This is a placeholder//
+ //This is a placeholder//
<<case "Chinese Revivalist">>
- It does its best to capture the terraces that covered the ancient Chinese hills and mountains, turning every floor into ribbons of fields following a slight incline. Slaves wade through crops that can handle flooding and splash through the irrigation of the others when they aren't tending <<if $seeBestiality == 1>>or breeding with<</if>> your animals.
+ It does its best to capture the terraces that covered the ancient Chinese hills and mountains, turning every floor into ribbons of fields following a slight incline. Slaves wade through crops that can handle flooding and splash through the irrigation of the others when they aren't tending <<if $seeBestiality == 1>>or breeding with<</if>> your animals.
<<case "Chattel Religionist">>
- It runs like a well oiled machine, slaves bent in humble service as they tend crops grown on the Prophet's command, or see to the animals' needs. Their clothing is tucked up and out of the way as they see to their tasks, keeping them clean as they work <<if $seeBestiality == 1>>around animal bloated bellies<</if>> as divine will dictates.
+ It runs like a well oiled machine, slaves bent in humble service as they tend crops grown on the Prophet's command, or see to the animals' needs. Their clothing is tucked up and out of the way as they see to their tasks, keeping them clean as they work <<if $seeBestiality == 1>>around animal bloated bellies<</if>> as divine will dictates.
<<case "Degradationist">>
It is constructed less as a converted warehouse and more as something to visit, allowing guests to enjoy the spectacle of slaves <<if $seeBestiality == 1>>being pounded by eager animals<<else>>elbow deep in scrubbing animal waste<</if>> to their satisfaction.
<<case "Repopulation Focus">>
@@ -72,7 +72,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
<<elseif $Farmer != 0>>
$Farmer.slaveName is alone in $farmyardName, and has nothing to do but look after the animals and crops.
<<else>> /* TODO: is there any way of cleaning up $animalsBought? I can't think of a good way */
- $farmyardNameCaps is empty and quiet. <<link "Decommission the Farmyard" "Main">><<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardSlaves = 0, $farmyardDecoration = "standard", $farmyardUpgrade = {pump: 0, fertilizer: 0, hydroponics: 0, machinery: 0, seeds: 0, lab: 0}, $farmyardLab = 0, $farmyardLabUpgrades = {animalOvaries: 0, animalTesticles: 0, animalMpreg: 0}, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0, $farmyardCages = 0, $activeCanine = -1, $activeHooved = -1, $activeFeline = -1, $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}, $pitAnimal = 0, $canines = [], $hooved = [], $felines = []>>
+ $farmyardNameCaps is empty and quiet. <<link "Decommission the Farmyard" "Main">><<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardSlaves = 0, $farmyardDecoration = "standard", $farmyardUpgrade = {pump: 0, fertilizer: 0, hydroponics: 0, machinery: 0, seeds: 0, lab: 0}, $farmyardLab = 0, $farmyardLabUpgrades = {animalOvaries: 0, animalTesticles: 0, animalMpreg: 0}, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0, $farmyardCages = 0, $activeCanine = -1, $activeHooved = -1, $activeFeline = -1, $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}, $pitAnimal = 0, $canines = [], $hooved = [], $felines = []>>
<<set _far = $sectors.findIndex(function(s) { return s.type == "Farmyard"; })>>
<<if _far != -1>>
<<set $sectors[_far].type = "Manufacturing">>
diff --git a/src/facilities/nursery/acDump.tw b/src/facilities/nursery/acDump.tw
index fe9358ac540..cecf52b3441 100644
--- a/src/facilities/nursery/acDump.tw
+++ b/src/facilities/nursery/acDump.tw
@@ -2,7 +2,7 @@
<<if (ndef $activeSlave) || ($activeSlave == 0)>>
- @@.red;ERROR:@@ AC Dump, activeSlave invalid, returnTo is '$returnTo', previous passage was '<<print previous()>>'. Please report this.
+ @@.red;ERROR:@@ AC Dump, activeSlave invalid, returnTo is '$returnTo', previous passage was '<<print previous()>>'. Please report this.
<<link "Continue">><<goto $returnTo>><</link>> | [[Go Back|previous()]]
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 04e62a95faa..8968b72930a 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -62,9 +62,9 @@
/*TODO: These will most likely need to be reworked*/
<<if $extremeUnderage == 1>>
- <br>
- <span id="miniscene">//Or use $him here://</span>
- <span id="sexoption">
+ <br>
+ <span id="miniscene">//Or use $him here://</span>
+ <span id="sexoption">
<<if ($activeSlave.vagina > -1)>>
<<if canDoVaginal($activeSlave)>>
<<link "Fuck $him">><<replace "#miniscene">><<include "FVagina">><br><</replace>><</link>>
@@ -348,11 +348,11 @@
| <<link "Marry $him" "FMarry">><</link>>
<</if>>
<</if>>
-
- <<set _activeSlaveRepSacrifice = repGainSacrifice()>>
- <<if _activeSlaveRepSacrifice > 0 && $arcologies[0].FSPaternalist == "unset" && ($activeSlave.breedingMark == 0 || $propOutcome == 0)>>
- | <<link "Sacrifice $him on the altar" "Aztec Slave Sacrifice">><<set $sacrificeType = "life">><</link>>//This will kill $him and gain you _activeSlaveRepSacrifice reputation//
- <</if>>
+
+ <<set _activeSlaveRepSacrifice = repGainSacrifice()>>
+ <<if _activeSlaveRepSacrifice > 0 && $arcologies[0].FSPaternalist == "unset" && ($activeSlave.breedingMark == 0 || $propOutcome == 0)>>
+ | <<link "Sacrifice $him on the altar" "Aztec Slave Sacrifice">><<set $sacrificeType = "life">><</link>>//This will kill $him and gain you _activeSlaveRepSacrifice reputation//
+ <</if>>
<</if>>
/* pregmod start */
@@ -382,14 +382,14 @@
<</if>>
<<if $extremeUnderage == 1>>
- <<if $universalRulesImpregnation == "HG" && $seePreg != 0>>
- <br><br>
- <<if $activeSlave.HGExclude == 0>>
- Will be bred by the head girl when fertile. <<link "Exempt $him" "Child Interact">><<set $activeSlave.HGExclude = 1>><</link>>
- <<else>>
- Will not be bred by the head girl when fertile. <<link "Include $him" "Child Interact">><<set $activeSlave.HGExclude = 0>><</link>>
- <</if>>
- <</if>>
+ <<if $universalRulesImpregnation == "HG" && $seePreg != 0>>
+ <br><br>
+ <<if $activeSlave.HGExclude == 0>>
+ Will be bred by the head girl when fertile. <<link "Exempt $him" "Child Interact">><<set $activeSlave.HGExclude = 1>><</link>>
+ <<else>>
+ Will not be bred by the head girl when fertile. <<link "Include $him" "Child Interact">><<set $activeSlave.HGExclude = 0>><</link>>
+ <</if>>
+ <</if>>
<</if>>
/* pregmod end */
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index f2a408aca9b..87530df9ba1 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -156,119 +156,119 @@ is
<</if>>
<<if $activeSlave.health < -90>>
- $He is nearly unresponsive. $He's obviously @@.red;dangerously sick,@@
+ $He is nearly unresponsive. $He's obviously @@.red;dangerously sick,@@
<<elseif $activeSlave.health < -50>>
- $He seems @@.red;very sick,@@
+ $He seems @@.red;very sick,@@
<<elseif $activeSlave.health < -20>>
- $He seems @@.red;ill,@@
+ $He seems @@.red;ill,@@
<<elseif $activeSlave.health <= 20>>
- $He seems reasonably @@.yellow;healthy,@@
+ $He seems reasonably @@.yellow;healthy,@@
<<elseif $activeSlave.health <= 50>>
- $He shines with @@.green;good health,@@
+ $He shines with @@.green;good health,@@
<<else>>
- $He almost gleams; $he's in the absolute @@.green;best of health,@@
+ $He almost gleams; $he's in the absolute @@.green;best of health,@@
<</if>>
and
<<set _age = $activeSlave.actualAge + 1>>
$he's
<<if $activeSlave.birthWeek >= 52 && $seeAge == 1>>
- going to turn _age this week,
+ going to turn _age this week,
<<elseif $activeSlave.actualAge < 3>>
- an infant,
- <<if $showAgeDetail == 1>>
- <<if $activeSlave.actualAge == 0>>
- <<print 0+$week-$activeSlave.weekAcquired>> weeks
- <<elseif $activeSlave.actualAge == 1>>
- $activeSlave.actualAge year
- <<else>>
- $activeSlave.actualAge years
- <</if>>
- old<<if ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
- <<else>>
- only
- <<if $activeSlave.actualAge == 0>>
- <<print 0+$week-$activeSlave.weekAcquired>> weeks
- <<elseif $activeSlave.actualAge == 1>>
- $activeSlave.actualAge year
- <<else>>
- $activeSlave.actualAge years
- <</if>>
- old.
- <</if>>
+ an infant,
+ <<if $showAgeDetail == 1>>
+ <<if $activeSlave.actualAge == 0>>
+ <<print 0+$week-$activeSlave.weekAcquired>> weeks
+ <<elseif $activeSlave.actualAge == 1>>
+ $activeSlave.actualAge year
+ <<else>>
+ $activeSlave.actualAge years
+ <</if>>
+ old<<if ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
+ <<else>>
+ only
+ <<if $activeSlave.actualAge == 0>>
+ <<print 0+$week-$activeSlave.weekAcquired>> weeks
+ <<elseif $activeSlave.actualAge == 1>>
+ $activeSlave.actualAge year
+ <<else>>
+ $activeSlave.actualAge years
+ <</if>>
+ old.
+ <</if>>
<<elseif $activeSlave.actualAge < 5>>
- a toddler,
- <<if $showAgeDetail == 1>>
- $activeSlave.actualAge years old<<if ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
- <<else>>
- only $activeSlave.actualAge years old.
- <</if>>
+ a toddler,
+ <<if $showAgeDetail == 1>>
+ $activeSlave.actualAge years old<<if ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
+ <<else>>
+ only $activeSlave.actualAge years old.
+ <</if>>
<<elseif $activeSlave.actualAge < 13>>
- a little $girl,
- <<if $showAgeDetail == 1>>
- $activeSlave.actualAge years old<<if ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
- <<else>>
- only $activeSlave.actualAge years old.
- <</if>>
+ a little $girl,
+ <<if $showAgeDetail == 1>>
+ $activeSlave.actualAge years old<<if ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
+ <<else>>
+ only $activeSlave.actualAge years old.
+ <</if>>
<<elseif $activeSlave.actualAge < 16>>
- almost a child,
- <<if $showAgeDetail == 1>>
- $activeSlave.actualAge years old<<if ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
- <<else>>
- less than 17 years old.
- <</if>>
+ almost a child,
+ <<if $showAgeDetail == 1>>
+ $activeSlave.actualAge years old<<if ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
+ <<else>>
+ less than 17 years old.
+ <</if>>
<<elseif $activeSlave.actualAge < 17>>
- young and fresh at $activeSlave.actualAge<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
+ young and fresh at $activeSlave.actualAge<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
<<elseif $activeSlave.actualAge < 18>>
- young, fresh, and nearly 18<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<if $seeAge == 1>> and people are already beginning to eye $him<</if>><<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
+ young, fresh, and nearly 18<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<if $seeAge == 1>> and people are already beginning to eye $him<</if>><<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
<<elseif $activeSlave.actualAge < 19>>
- <<if $activeSlave.birthWeek == 0 && $seeAge == 1>>
- just turned $activeSlave.actualAge this week, which many citizens find especially appealing.
- <<elseif $activeSlave.birthWeek < 4 && $seeAge == 1>>
- only turned $activeSlave.actualAge this month.
- <<else>>
- $activeSlave.actualAge years old<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
- <</if>>
+ <<if $activeSlave.birthWeek == 0 && $seeAge == 1>>
+ just turned $activeSlave.actualAge this week, which many citizens find especially appealing.
+ <<elseif $activeSlave.birthWeek < 4 && $seeAge == 1>>
+ only turned $activeSlave.actualAge this month.
+ <<else>>
+ $activeSlave.actualAge years old<<if $showAgeDetail == 1 && ($seeAge != 0)>>; <<if $activeSlave.birthWeek == 51>>$his birthday is next week<<else>>$his birthday is in <<print 52-$activeSlave.birthWeek>> weeks<</if>><</if>>.
+ <</if>>
<</if>>
<<if $activeSlave.actualAge != $activeSlave.physicalAge>>
- However, $he has the body of a <<print $activeSlave.physicalAge>>-year old;
- <<if $activeSlave.physicalAge < 18 && $activeSlave.actualAge >= 18>>
- a stark contrast given $his maturity.
- <<elseif $activeSlave.physicalAge < 18 && $activeSlave.actualAge < 18>>
- a noticeable difference thanks to $his immaturity.
- <<elseif $activeSlave.physicalAge <= $activeSlave.actualAge-20 || $activeSlave.physicalAge >= $activeSlave.actualAge+20>>
- a shocking difference from $his actual age.
- <<elseif $activeSlave.physicalAge <= $activeSlave.actualAge-10 || $activeSlave.physicalAge >= $activeSlave.actualAge+10>>
- a noticeable difference from $his actual age.
- <<elseif $activeSlave.physicalAge <= $activeSlave.actualAge-5 || $activeSlave.physicalAge >= $activeSlave.actualAge+5>>
- a barely noticeable difference from $his actual age.
- <<else>>
- though it is hard to tell the difference from $his actual age.
- <</if>>
+ However, $he has the body of a <<print $activeSlave.physicalAge>>-year old;
+ <<if $activeSlave.physicalAge < 18 && $activeSlave.actualAge >= 18>>
+ a stark contrast given $his maturity.
+ <<elseif $activeSlave.physicalAge < 18 && $activeSlave.actualAge < 18>>
+ a noticeable difference thanks to $his immaturity.
+ <<elseif $activeSlave.physicalAge <= $activeSlave.actualAge-20 || $activeSlave.physicalAge >= $activeSlave.actualAge+20>>
+ a shocking difference from $his actual age.
+ <<elseif $activeSlave.physicalAge <= $activeSlave.actualAge-10 || $activeSlave.physicalAge >= $activeSlave.actualAge+10>>
+ a noticeable difference from $his actual age.
+ <<elseif $activeSlave.physicalAge <= $activeSlave.actualAge-5 || $activeSlave.physicalAge >= $activeSlave.actualAge+5>>
+ a barely noticeable difference from $his actual age.
+ <<else>>
+ though it is hard to tell the difference from $his actual age.
+ <</if>>
<</if>>
/*
** NCS will not be enabled for children
*/
<<if $activeSlave.physicalAge != $activeSlave.visualAge>>
- <<if $activeSlave.visualAge <= $activeSlave.physicalAge-20 || $activeSlave.visualAge >= $activeSlave.physicalAge+20>>
- $He has undergone radical age therapy that makes $him look
- <<elseif $activeSlave.visualAge <= $activeSlave.physicalAge-10 || $activeSlave.visualAge >= $activeSlave.physicalAge+10>>
- $He has undergone drastic age therapy that makes $him look
- <<elseif $activeSlave.visualAge <= $activeSlave.physicalAge-5 || $activeSlave.visualAge >= $activeSlave.physicalAge+5>>
- $He has undergone noticeable age therapy that makes $him look
- <<else>>
- For various reasons, $he looks
- <</if>>
- <<if $activeSlave.physicalAge > $activeSlave.visualAge>>
- <<if $activeSlave.physicalAge < $activeSlave.visualAge+5>>
- a slightly younger <<print $activeSlave.visualAge>>.
- <<else>>
- a younger <<print $activeSlave.visualAge>>.
- <</if>>
- <<else>>
- <<if $activeSlave.physicalAge > $activeSlave.visualAge-5>>
- a slightly older <<print $activeSlave.visualAge>>.
- <</if>>
- <</if>>
+ <<if $activeSlave.visualAge <= $activeSlave.physicalAge-20 || $activeSlave.visualAge >= $activeSlave.physicalAge+20>>
+ $He has undergone radical age therapy that makes $him look
+ <<elseif $activeSlave.visualAge <= $activeSlave.physicalAge-10 || $activeSlave.visualAge >= $activeSlave.physicalAge+10>>
+ $He has undergone drastic age therapy that makes $him look
+ <<elseif $activeSlave.visualAge <= $activeSlave.physicalAge-5 || $activeSlave.visualAge >= $activeSlave.physicalAge+5>>
+ $He has undergone noticeable age therapy that makes $him look
+ <<else>>
+ For various reasons, $he looks
+ <</if>>
+ <<if $activeSlave.physicalAge > $activeSlave.visualAge>>
+ <<if $activeSlave.physicalAge < $activeSlave.visualAge+5>>
+ a slightly younger <<print $activeSlave.visualAge>>.
+ <<else>>
+ a younger <<print $activeSlave.visualAge>>.
+ <</if>>
+ <<else>>
+ <<if $activeSlave.physicalAge > $activeSlave.visualAge-5>>
+ a slightly older <<print $activeSlave.visualAge>>.
+ <</if>>
+ <</if>>
<</if>>
<<if $saleDescription != 1>>
@@ -280,7 +280,7 @@ $he's
<</if>>
<</if>>
- <<if $showSexualHistory == 1 && $ui != "start">>
+ <<if $showSexualHistory == 1 && $ui != "start">>
<<set _weeksOwned = $week-$activeSlave.weekAcquired>>
$He has been with you
<<if $activeSlave.weekAcquired == 0>>
@@ -320,7 +320,7 @@ $he's
has had little or no sexual experience <<if $activeSlave.weekAcquired != 0>>as your slave<<else>>in your new arcology<</if>> yet.
<</if>>
- <<set _sortedCounts = []>>
+ <<set _sortedCounts = []>>
<<set _sortedCounts.push({type: "anal", value: $activeSlave.analCount}), _sortedCounts.push({type: "vaginal", value: $activeSlave.vaginalCount}), _sortedCounts.push({type: "oral", value: $activeSlave.oralCount/2}), _sortedCounts.push({type: "mammary", value: $activeSlave.mammaryCount}), _sortedCounts.push({type: "penetrative", value: $activeSlave.penetrativeCount})>>
<<set _sortedCounts = _sortedCounts.sort(function(a, b){return b.value-a.value})>>
<<if _sortedCounts[0].type == "anal">>
@@ -405,7 +405,7 @@ $he's
<</if>>
<</if>>
- <<if ($activeSlave.lactation > 0) && ($activeSlave.milk < 20)>>
+ <<if ($activeSlave.lactation > 0) && ($activeSlave.milk < 20)>>
$He has given a small quantity of milk<<if ($activeSlave.cum > 0)>> and about <<print commaNum($activeSlave.cum)>> deciliters of cum<</if>>.
<<elseif ($activeSlave.milk > 1)>>
$He has given about <<print commaNum($activeSlave.milk)>> liters of milk<<if ($activeSlave.cum > 0)>> and about <<print commaNum($activeSlave.cum)>> deciliters of cum<</if>>.
@@ -1946,231 +1946,231 @@ $He is
/*
<span id="naming">
<<if $cribs[$i].mother > 0>>
- <<set _tempMom = getSlave($cribs[$i].mother)>>
+ <<set _tempMom = getSlave($cribs[$i].mother)>>
<</if>>
<<if $cribs[$i].father > 0>>
- <<set _tempDad = getSlave($cribs[$i].father)>>
+ <<set _tempDad = getSlave($cribs[$i].father)>>
<</if>>
<br>Choose a name for $him. <<textbox "$cribs[$i].slaveName" $cribs[$i].slaveName>>
- <<link "Commit name.">>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- <<replace "#naming">>
- You instruct $assistantName to register $him as "<<print $cribs[$i].slaveName>>" in the slave registry.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
+ <<link "Commit name.">>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ <<replace "#naming">>
+ You instruct $assistantName to register $him as "<<print $cribs[$i].slaveName>>" in the slave registry.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
<br><<link "Have your PA assign $him a random name">>
- <<replace "#naming">>
- <<NewChildName $cribs[$i]>>
- $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
+ <<replace "#naming">>
+ <<NewChildName $cribs[$i]>>
+ $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
<</link>>
<<if $arcologies[0].FSPastoralist != "unset">>
- <<if $cribs[$i].lactation > 0>>
- <br><<link "Have your PA assign $him a random cow name">>
- <<replace "#naming">>
- <<set $cribs[$i].slaveName = setup.cowSlaveNames.random()>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
- <</if>>
+ <<if $cribs[$i].lactation > 0>>
+ <br><<link "Have your PA assign $him a random cow name">>
+ <<replace "#naming">>
+ <<set $cribs[$i].slaveName = setup.cowSlaveNames.random()>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
+ <</if>>
<</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">>
- <br><<link "Have your PA assign $him a random devotional name">>
- <<replace "#naming">>
- <<set $cribs[$i].slaveName = setup.chattelReligionistSlaveNames.random()>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
+ <br><<link "Have your PA assign $him a random devotional name">>
+ <<replace "#naming">>
+ <<set $cribs[$i].slaveName = setup.chattelReligionistSlaveNames.random()>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
- <br><<link "Have your PA assign $him a random Roman name">>
- <<replace "#naming">>
- <<set $cribs[$i].slaveName = setup.romanSlaveNames.random()>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
+ <br><<link "Have your PA assign $him a random Roman name">>
+ <<replace "#naming">>
+ <<set $cribs[$i].slaveName = setup.romanSlaveNames.random()>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
<<elseif $arcologies[0].FSAztecRevivalist != "unset">>
- <br><<link "Have your PA assign $him a random Aztec name">>
- <<replace "#naming">>
- <<set $cribs[$i].slaveName = setup.aztecSlaveNames.random()>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
+ <br><<link "Have your PA assign $him a random Aztec name">>
+ <<replace "#naming">>
+ <<set $cribs[$i].slaveName = setup.aztecSlaveNames.random()>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
<<elseif $arcologies[0].FSEgyptianRevivalist != "unset">>
- <br><<link "Have your PA assign $him a random ancient Egyptian name">>
- <<replace "#naming">>
- <<set $cribs[$i].slaveName = setup.ancientEgyptianSlaveNames.random()>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
+ <br><<link "Have your PA assign $him a random ancient Egyptian name">>
+ <<replace "#naming">>
+ <<set $cribs[$i].slaveName = setup.ancientEgyptianSlaveNames.random()>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- <br><<link "Have your PA assign $him a random feudal Japanese name">>
- <<replace "#naming">>
- <<set $cribs[$i].slaveName = setup.edoSlaveNames.random()>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
+ <br><<link "Have your PA assign $him a random feudal Japanese name">>
+ <<replace "#naming">>
+ <<set $cribs[$i].slaveName = setup.edoSlaveNames.random()>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
<</if>>
<<if $arcologies[0].FSDegradationist != "unset">>
- <br><<link "Have your PA assign $him a degrading name">>
- <<replace "#naming">>
- <<run DegradingName($cribs[$i])>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
+ <br><<link "Have your PA assign $him a degrading name">>
+ <<replace "#naming">>
+ <<run DegradingName($cribs[$i])>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ $assistantName registers $him as "<<print $cribs[$i].slaveName>>" in your registry.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
<</if>>
<<if $cribs[$i].mother > 0>>
- <<setLocalPronouns _tempMom 2>>
- <<if _tempMom.ID == $Concubine.ID>>
- <br><<link "Permit your Concubine to name _his2 daughter">>
- <<replace "#naming">>
- <<ParentNames _tempMom $cribs[$i]>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- After some careful consideration, _tempMom.slaveName picks a name _he2 thinks you might find attractive; from now on _his2 daughter will be known as "<<print $cribs[$i].slaveName>>".
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
- <<elseif _tempMom.relationship == -3 && (_tempMom.devotion >= -20)>>
- <br><<link "Permit your wife to name _his2 daughter">>
- <<replace "#naming">>
- <<ParentNames _tempMom $cribs[$i]>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- After some careful consideration, _tempMom.slaveName picks a name suitable for your daughter; from now on _he2 will be known as "<<print $cribs[$i].slaveName>>".
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
- <<elseif _tempMom.ID == $Bodyguard.ID>>
- <br><<link "Permit your bodyguard to name _his2 daughter">>
- <<replace "#naming">>
- <<ParentNames _tempMom $cribs[$i]>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- After some careful consideration, _tempMom.slaveName decides on "<<print $cribs[$i].slaveName>>" for _his2 daughter. _He2 hopes you'll find it fitting $his station.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
- <<elseif _tempMom.ID == $HeadGirl.ID>>
- <br><<link "Permit your headgirl to name _his2 daughter">>
- <<replace "#naming">>
- <<ParentNames _tempMom $cribs[$i]>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- After some careful consideration, _tempMom.slaveName decides on "<<print $cribs[$i].slaveName>>" for _his2 daughter, and hopes it will be a name your other slaves will learn to respect.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
- <<elseif _tempMom.devotion > 50 && _tempMom.trust > 50>>
- <br><<link "Permit $his devoted mother to name _his2 daughter">>
- <<replace "#naming">>
- <<ParentNames _tempMom $cribs[$i]>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- After some careful consideration, _tempMom.slaveName picks a name _he2 hopes you'll like; from now on _his2 daughter will be known as "<<print $cribs[$i].slaveName>>".
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
- <</if>>
+ <<setLocalPronouns _tempMom 2>>
+ <<if _tempMom.ID == $Concubine.ID>>
+ <br><<link "Permit your Concubine to name _his2 daughter">>
+ <<replace "#naming">>
+ <<ParentNames _tempMom $cribs[$i]>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ After some careful consideration, _tempMom.slaveName picks a name _he2 thinks you might find attractive; from now on _his2 daughter will be known as "<<print $cribs[$i].slaveName>>".
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
+ <<elseif _tempMom.relationship == -3 && (_tempMom.devotion >= -20)>>
+ <br><<link "Permit your wife to name _his2 daughter">>
+ <<replace "#naming">>
+ <<ParentNames _tempMom $cribs[$i]>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ After some careful consideration, _tempMom.slaveName picks a name suitable for your daughter; from now on _he2 will be known as "<<print $cribs[$i].slaveName>>".
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
+ <<elseif _tempMom.ID == $Bodyguard.ID>>
+ <br><<link "Permit your bodyguard to name _his2 daughter">>
+ <<replace "#naming">>
+ <<ParentNames _tempMom $cribs[$i]>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ After some careful consideration, _tempMom.slaveName decides on "<<print $cribs[$i].slaveName>>" for _his2 daughter. _He2 hopes you'll find it fitting $his station.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
+ <<elseif _tempMom.ID == $HeadGirl.ID>>
+ <br><<link "Permit your headgirl to name _his2 daughter">>
+ <<replace "#naming">>
+ <<ParentNames _tempMom $cribs[$i]>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ After some careful consideration, _tempMom.slaveName decides on "<<print $cribs[$i].slaveName>>" for _his2 daughter, and hopes it will be a name your other slaves will learn to respect.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
+ <<elseif _tempMom.devotion > 50 && _tempMom.trust > 50>>
+ <br><<link "Permit $his devoted mother to name _his2 daughter">>
+ <<replace "#naming">>
+ <<ParentNames _tempMom $cribs[$i]>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ After some careful consideration, _tempMom.slaveName picks a name _he2 hopes you'll like; from now on _his2 daughter will be known as "<<print $cribs[$i].slaveName>>".
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
+ <</if>>
<</if>>
<<if $cribs[$i].father > 0 && $cribs[$i].father != $cribs[$i].mother>>
- <<setLocalPronouns _tempDad 2>>
- <<if _tempDad.ID == $Concubine.ID>>
- <br><<link "Permit your Concubine to name _his2 daughter">>
- <<replace "#naming">>
- <<ParentNames _tempDad $cribs[$i]>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- After some careful consideration, _tempDad.slaveName picks a name _he2 thinks you might find attractive; from now on _his2 daughter will be known as "<<print $cribs[$i].slaveName>>".
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
- <<elseif _tempDad.relationship == -3 && (_tempDad.devotion >= -20)>>
- <br><<link "Permit your wife to name _his2 daughter">>
- <<replace "#naming">>
- <<ParentNames _tempDad $cribs[$i]>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- After some careful consideration, _tempDad.slaveName picks a name suitable for your daughter; from now on $he will be known as "<<print $cribs[$i].slaveName>>".
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
- <<elseif _tempDad.ID == $Bodyguard.ID>>
- <br><<link "Permit your bodyguard to name _his2 daughter">>
- <<replace "#naming">>
- <<ParentNames _tempDad $cribs[$i]>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- After some careful consideration, _tempDad.slaveName decides on "<<print $cribs[$i].slaveName>>" for _his2 daughter. _He2 hopes you'll find it fitting $his station.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
- <<elseif _tempDad.ID == $HeadGirl.ID>>
- <br><<link "Permit your headgirl to name _his2 daughter">>
- <<replace "#naming">>
- <<ParentNames _tempDad $cribs[$i]>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- After some careful consideration, _tempDad.slaveName decides on "<<print $cribs[$i].slaveName>>" for _his2 daughter, and hopes it will be a name your other slaves will learn to respect.
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
- <<elseif _tempDad.devotion > 50 && _tempDad.trust > 50>>
- <br><<link "Permit $his devoted father to name _his2 daughter">>
- <<replace "#naming">>
- <<ParentNames _tempDad $cribs[$i]>>
- <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
- After some careful consideration, _tempDad.slaveName picks a name _he2 hopes you'll like; from now on _his2 daughter will be known as "<<print $cribs[$i].slaveName>>".
- <</replace>>
- <<replace "#childName">>
- ''__@@.pink;$cribs[$i].slaveName@@__''
- <</replace>>
- <</link>>
- <</if>>
+ <<setLocalPronouns _tempDad 2>>
+ <<if _tempDad.ID == $Concubine.ID>>
+ <br><<link "Permit your Concubine to name _his2 daughter">>
+ <<replace "#naming">>
+ <<ParentNames _tempDad $cribs[$i]>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ After some careful consideration, _tempDad.slaveName picks a name _he2 thinks you might find attractive; from now on _his2 daughter will be known as "<<print $cribs[$i].slaveName>>".
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
+ <<elseif _tempDad.relationship == -3 && (_tempDad.devotion >= -20)>>
+ <br><<link "Permit your wife to name _his2 daughter">>
+ <<replace "#naming">>
+ <<ParentNames _tempDad $cribs[$i]>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ After some careful consideration, _tempDad.slaveName picks a name suitable for your daughter; from now on $he will be known as "<<print $cribs[$i].slaveName>>".
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
+ <<elseif _tempDad.ID == $Bodyguard.ID>>
+ <br><<link "Permit your bodyguard to name _his2 daughter">>
+ <<replace "#naming">>
+ <<ParentNames _tempDad $cribs[$i]>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ After some careful consideration, _tempDad.slaveName decides on "<<print $cribs[$i].slaveName>>" for _his2 daughter. _He2 hopes you'll find it fitting $his station.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
+ <<elseif _tempDad.ID == $HeadGirl.ID>>
+ <br><<link "Permit your headgirl to name _his2 daughter">>
+ <<replace "#naming">>
+ <<ParentNames _tempDad $cribs[$i]>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ After some careful consideration, _tempDad.slaveName decides on "<<print $cribs[$i].slaveName>>" for _his2 daughter, and hopes it will be a name your other slaves will learn to respect.
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
+ <<elseif _tempDad.devotion > 50 && _tempDad.trust > 50>>
+ <br><<link "Permit $his devoted father to name _his2 daughter">>
+ <<replace "#naming">>
+ <<ParentNames _tempDad $cribs[$i]>>
+ <<set $cribs[$i].birthName = $cribs[$i].slaveName>>
+ After some careful consideration, _tempDad.slaveName picks a name _he2 hopes you'll like; from now on _his2 daughter will be known as "<<print $cribs[$i].slaveName>>".
+ <</replace>>
+ <<replace "#childName">>
+ ''__@@.pink;$cribs[$i].slaveName@@__''
+ <</replace>>
+ <</link>>
+ <</if>>
<</if>>
</span>
*/
\ No newline at end of file
diff --git a/src/facilities/nursery/nextChildInLine.tw b/src/facilities/nursery/nextChildInLine.tw
index b6550c4d703..161b976e119 100644
--- a/src/facilities/nursery/nextChildInLine.tw
+++ b/src/facilities/nursery/nextChildInLine.tw
@@ -5,9 +5,9 @@
<<set $i = $cribs.findIndex(function(s) { s.ID === $activeSlave.ID; })>>
<<set $cribs[$i] = $activeSlave>> /* save changes before switching */
<<if $i == $cribs.length - 1>>
- <<set $activeSlave = $cribs[0]>>
+ <<set $activeSlave = $cribs[0]>>
<<else>>
- <<set $activeSlave = $cribs[$i+1]>>
+ <<set $activeSlave = $cribs[$i+1]>>
<</if>>
<<goto "Child Interact">>
diff --git a/src/facilities/nursery/previousChildInLine.tw b/src/facilities/nursery/previousChildInLine.tw
index d534910dd27..dcd12c3d124 100644
--- a/src/facilities/nursery/previousChildInLine.tw
+++ b/src/facilities/nursery/previousChildInLine.tw
@@ -5,9 +5,9 @@
<<set $i = $cribs.findIndex(function(s) { s.ID === $activeSlave.ID; })>>
<<set $cribs[$i] = $activeSlave>> /* save changes before switching */
<<if $i == 0>>
- <<set $activeSlave = $cribs[$cribs.length - 1]>>
+ <<set $activeSlave = $cribs[$cribs.length - 1]>>
<<else>>
- <<set $activeSlave = $cribs[$i-1]>>
+ <<set $activeSlave = $cribs[$i-1]>>
<</if>>
<<goto "Child Interact">>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 89a8842bdc7..180a837ec6a 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -976,13 +976,13 @@ SLAVE BODY:
Slaves' ''musculature'' occurs in seven levels, and affects combat effectiveness, beauty, and the effects of breasts. For combat, the penultimate level is best. At game start, muscles are a minor detriment to beauty, though this can be changed through [[future society|Encyclopedia][$encyclopedia = "Future Societies"]] choices. Extremely large breasts can begin to hinder slaves, but the first level will allow them to carry their burdens.
<br><br>From the slave documentation;
- <br>96+ - extremely muscular
+ <br>96+ - extremely muscular
<br>31 - 95 - muscular
<br>6 - 30 - toned
<br>5 - -5 - none
<br>-30 - -6 - weak
<br>-95 - -31 - very weak
- <br>-96- - frail
+ <br>-96- - frail
<br><br>A standard [[bodyguard|Encyclopedia][$encyclopedia = "Bodyguard"]] is negatively impacted by being weak or extremely muscular and positively impacted by being muscular. A slave that is at the max of tall or very tall (>= 185) can handle being extremely muscular.
@@ -1051,7 +1051,7 @@ SLAVE BODY:
<br>10 - -10 - neither too fat nor too skinny
<br>-11 - -30 - thin
<br>-31 - -95 - very thin
- <br>-96- - emaciated
+ <br>-96- - emaciated
<br><br>The ideal range for a [[bodyguard|Encyclopedia][$encyclopedia = "Bodyguard"]] is 30 - -10, going either way negatively impacts them.
diff --git a/src/js/storyJS.tw b/src/js/storyJS.tw
index 658d6c155b8..3d648ed97dd 100644
--- a/src/js/storyJS.tw
+++ b/src/js/storyJS.tw
@@ -321,7 +321,7 @@ window.isFertile = function(slave) {
if (slave.womb.length > 0 && slave.geneticQuirks.superfetation < 2 && slave.ovaImplant < 1) { /* currently pregnant without superfetation */
return false;
} else if (slave.womb.length > 0) { /* temp failure condition to prevent current double preg bug */
- return false;
+ return false;
} else if (slave.broodmother > 0) { /* currently broodmother */
return false;
} else if (slave.preg < -1) { /* sterile */
@@ -985,14 +985,14 @@ window.SoftenSexualFlaw = function SoftenSexualFlaw(slave) {
};
window.genUUID = function() {
- var d = new Date().getTime();
- if(Date.now){
- d = Date.now(); //high-precision timer
- }
- var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
- var r = (d + Math.random()*16)%16 | 0;
- d = Math.floor(d/16);
- return (c=='x' ? r : (r&0x3|0x8)).toString(16);
- });
- return uuid;
+ var d = new Date().getTime();
+ if(Date.now){
+ d = Date.now(); //high-precision timer
+ }
+ var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+ var r = (d + Math.random()*16)%16 | 0;
+ d = Math.floor(d/16);
+ return (c=='x' ? r : (r&0x3|0x8)).toString(16);
+ });
+ return uuid;
};
diff --git a/src/npc/agent/agentCompany.tw b/src/npc/agent/agentCompany.tw
index 0bac9e041d3..e91e2c0452b 100644
--- a/src/npc/agent/agentCompany.tw
+++ b/src/npc/agent/agentCompany.tw
@@ -31,10 +31,10 @@ Working in $activeArcology.name's penthouse office, $subSlave.slaveName gets a v
_His2 question is answered when you bring $activeSlave.slaveName in close, putting $him in $subSlave.slaveName's view. $subSlave.slaveName's $subSlave.eyeColor eyes fly open with pleased surprise, but before _he2 can speak, $activeSlave.slaveName goes first.
<<if !canTalk($activeSlave)>>
- Unable to speak $himself, $he simply makes a heart shape with $his hands in view of the video call, and blows $his <<if $activeSlave.relationship == 4>>lover<<else>>wife<</if>> a kiss.
+ Unable to speak $himself, $he simply makes a heart shape with $his hands in view of the video call, and blows $his <<if $activeSlave.relationship == 4>>lover<<else>>wife<</if>> a kiss.
<<else>>
- <<run Enunciate($activeSlave)>>
- "Hi <<if $activeSlave.relationship == 4>>lover<<else>><<s>>weetheart<</if>>," $he <<say>>s in a syrupy tone. "Mi<<ss>> me?"
+ <<run Enunciate($activeSlave)>>
+ "Hi <<if $activeSlave.relationship == 4>>lover<<else>><<s>>weetheart<</if>>," $he <<say>>s in a syrupy tone. "Mi<<ss>> me?"
<</if>>
<br><br>
diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw
index 0d70f1824a5..5e63f71a274 100644
--- a/src/npc/descriptions/fButt.tw
+++ b/src/npc/descriptions/fButt.tw
@@ -91,7 +91,7 @@ $His anus is invitingly bleached,
$He accepts your orders without comment and presents $his virgin anus for defloration. You<<if ($PC.dick == 0)>> don a strap-on and<</if>> gently sodomize $him. You gently ease yourself into $his butthole and gradually speed up your thrusts while $he slowly learns to move $his hips along with you. Since $he is already well broken, this new connection with $his <<Master>> @@.hotpink;increases $his devotion to you.@@ @@.lime;$His tight little ass has been broken in.@@
<<set $activeSlave.devotion += 4>>
<<elseif ($activeSlave.devotion >= -20)>>
- $He is clearly unhappy at the idea of taking a dick up $his butt. $He obeys orders anyway, and lies there wincing and moaning as you<<if ($PC.dick == 0)>> don a strap-on and<</if>> fuck $his ass. @@.lime;$His tight little ass has been broken in,@@ and $he @@.gold;fears further anal pain.@@
+ $He is clearly unhappy at the idea of taking a dick up $his butt. $He obeys orders anyway, and lies there wincing and moaning as you<<if ($PC.dick == 0)>> don a strap-on and<</if>> fuck $his ass. @@.lime;$His tight little ass has been broken in,@@ and $he @@.gold;fears further anal pain.@@
<<else>>
$He is appalled at the idea of taking it up the ass<<if ($PC.dick == 0)>> and cries with fear as you don a strap-on<</if>>. $He does anyway though, sobbing into the cushions<<if $activeSlave.amp !== 1>> while you hold $his arms behind $his<</if>>. You force yourself into $his butthole. $He sobs and cries with disgust while you continue thrusting into $his ass. The painful anal rape @@.mediumorchid;decreases $his devotion to you.@@ @@.lime;$His tight little ass has been broken in,@@ and $he is @@.gold;terrified of further anal pain.@@
<<set $activeSlave.devotion -= 5>>
diff --git a/src/npc/descriptions/fMaternitySwing.tw b/src/npc/descriptions/fMaternitySwing.tw
index d6794f0413c..29d0bd9b1b3 100644
--- a/src/npc/descriptions/fMaternitySwing.tw
+++ b/src/npc/descriptions/fMaternitySwing.tw
@@ -25,11 +25,11 @@ and
<</if>>
hanging above the floor of your office, you turn your attention to molesting $his ripe protuberances. Running your tongue along the distended nub of $his belly button, you kiss your way up the fertile curve of $his belly, making your way to $his tits so that you can suck on $his $activeSlave.nipples nipples. $He squirms in $his restraints and
<<if $activeSlave.devotion > 95>>
- <<if !canTalk($activeSlave)>>
- begs you to fuck $him already
- <<else>>
- groans inchoately, obviously desperate for you to fuck $him
- <</if>>
+ <<if !canTalk($activeSlave)>>
+ begs you to fuck $him already
+ <<else>>
+ groans inchoately, obviously desperate for you to fuck $him
+ <</if>>
<<elseif ($activeSlave.trust < -20) && ($activeSlave.devotion > -10)>>
groans with barely restrained lust.
<<else>>
diff --git a/src/npc/startingGirls/moreCustomOptions.tw b/src/npc/startingGirls/moreCustomOptions.tw
index 1fd921215f3..b16e1a73292 100644
--- a/src/npc/startingGirls/moreCustomOptions.tw
+++ b/src/npc/startingGirls/moreCustomOptions.tw
@@ -23,7 +23,7 @@
<br>''Eye color:'' <<textbox "$activeSlave.eyeColor" $activeSlave.eyeColor "More customization options">>
<br>''Pupil shape:'' <<textbox "$activeSlave.pupil" $activeSlave.pupil "More customization options">>
<br>''Sclera color:'' <<textbox "$activeSlave.sclerae" $activeSlave.sclerae "More customization options">>
-<br>Custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "More customization options">> //Use complete, capitalized and punctuated sentences.//
+<br>Custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "More customization options">> //Use complete, capitalized and punctuated sentences.//
<br>Custom origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "More customization options">> //Use complete, capitalized and punctuated sentences.//
<br>
<<if $originOveride == 0>>
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index f9f3cacf5e8..501d04d3b32 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -51,12 +51,13 @@ You board the transport to
It will cost <<print cashFormat($slaveCost)>> to enslave $him.
+<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[[Enslave her and check out other available prisoners|Criminal Market][$cash -= $slaveCost, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Enslave " + $him + " and check out other available prisoners"|Criminal Market][$cash -= $slaveCost, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[[Enslave her|New Slave Intro][$cash -= $slaveCost,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
+ <br>[["Enslave " + $him|New Slave Intro][$cash -= $slaveCost,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
<<else>>
- <br>[[Enslave her and finish your inspection|Bulk Slave Intro][$cash -= $slaveCost, $newSlaves.push($activeSlave)]]
+ <br>[["Enslave " + $him + " and finish your inspection"|Bulk Slave Intro][$cash -= $slaveCost, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to enslave this criminal.//
diff --git a/src/pregmod/manageEconomy.tw b/src/pregmod/manageEconomy.tw
index 28186b76929..eb9ade45ae1 100644
--- a/src/pregmod/manageEconomy.tw
+++ b/src/pregmod/manageEconomy.tw
@@ -107,7 +107,7 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<<else>>
//Free// | [[Increase|Manage Economy][$UCRent = 90, $rentEffectU = 1.04]]
<</if>>
-<br>Millionaires | $topClass | <<print _percTopClass>>% | Rent @@.yellowgreen;<<print cashFormat($TCRent)>>@@
+<br>Millionaires | $topClass | <<print _percTopClass>>% | Rent @@.yellowgreen;<<print cashFormat($TCRent)>>@@
<<if $TCRent > 975>>
//Very High// | [[Decrease|Manage Economy][$TCRent = 975, $rentEffectT = 0.94]]
<<elseif $TCRent > 650>>
@@ -119,7 +119,7 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<<else>>
//Free// | [[Increase|Manage Economy][$TCRent = 325, $rentEffectT = 1.04]]
<</if>>
-<br>Slaves | $ASlaves | <<print _percASlaves>>% /*should probably include player owned slaves of all types*/
+<br>Slaves | $ASlaves | <<print _percASlaves>>% /*should probably include player owned slaves of all types*/
<<if $secExp == 0>>
<<if $weatherAwareness > 0>>
diff --git a/src/pregmod/theCattleRanch.tw b/src/pregmod/theCattleRanch.tw
index 3fe60099a5f..03044c1a8d5 100644
--- a/src/pregmod/theCattleRanch.tw
+++ b/src/pregmod/theCattleRanch.tw
@@ -20,20 +20,20 @@
<</if>>
<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += Math.trunc($slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
-
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
+<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[[Buy her and check out other cows to order|The Cattle Ranch][$cash -= $slaveCost, $TCR.schoolSale = 0, $TCR.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other cows to order"|The Cattle Ranch][$cash -= $slaveCost, $TCR.schoolSale = 0, $TCR.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $TCR.schoolSale = 0, $TCR.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
+ <br>[["Buy " + $him + " slave contract"|New Slave Intro][$cash -= $slaveCost, $TCR.schoolSale = 0, $TCR.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>
- <br>[[Buy her and Finish your order of cattle|Bulk Slave Intro][$cash -= $slaveCost, $TCR.schoolSale = 0, $TCR.studentsBought += 1, $newSlaves.push($activeSlave)]]
+ <br>[["Buy " + $his + " and Finish your order of cattle"|Bulk Slave Intro][$cash -= $slaveCost, $TCR.schoolSale = 0, $TCR.studentsBought += 1, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<br>[[Decline to purchase her and check out another cow|The Cattle Ranch][$slavesSeen += 1]]
+<br>[["Decline to purchase " + $him + " and check out another cow"|The Cattle Ranch][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
<br>[[Finish your order of cattle|Bulk Slave Intro]]
<</if>>
diff --git a/src/pregmod/theHippolytaAcademy.tw b/src/pregmod/theHippolytaAcademy.tw
index 8001f721a07..f672452c743 100644
--- a/src/pregmod/theHippolytaAcademy.tw
+++ b/src/pregmod/theHippolytaAcademy.tw
@@ -29,20 +29,20 @@ The Hippolyta Academy is one of the most famous slave bodyguarding schools in al
<</if>>
<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += Math.trunc($slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
-
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
+<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[[Buy her and check out other slaves to order|The Hippolyta Academy][$cash -= $slaveCost, $HA.schoolSale = 0, $HA.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other slaves to order"|The Hippolyta Academy][$cash -= $slaveCost, $HA.schoolSale = 0, $HA.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $HA.schoolSale = 0, $HA.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
+ <br>[["Buy " + $his + " slave contract"|New Slave Intro][$cash -= $slaveCost, $HA.schoolSale = 0, $HA.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>
- <br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $HA.schoolSale = 0, $HA.studentsBought += 1, $newSlaves.push($activeSlave)]]
+ <br>[["Buy " + $him + " and Finish your order of slaves"|Bulk Slave Intro][$cash -= $slaveCost, $HA.schoolSale = 0, $HA.studentsBought += 1, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<br>[[Decline to purchase her and check out another slave|The Hippolyta Academy][$slavesSeen += 1]]
+<br>[["Decline to purchase " + $him + " and check out another slave"|The Hippolyta Academy][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
diff --git a/src/pregmod/wetwareCPUs.tw b/src/pregmod/wetwareCPUs.tw
index de6987dfefe..3a6727008b4 100644
--- a/src/pregmod/wetwareCPUs.tw
+++ b/src/pregmod/wetwareCPUs.tw
@@ -15,20 +15,20 @@
<<slaveCost $activeSlave>>
<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += Math.trunc($slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
-
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
+<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[[Buy her and check out other slaves to order|Wetware CPUs][$cash -= $slaveCost, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other slaves to order"|Wetware CPUs][$cash -= $slaveCost, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
+ <br>[["Buy " + $his + " slave contract"|New Slave Intro][$cash -= $slaveCost, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>
- <br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $newSlaves.push($activeSlave)]]
+ <br>[["Buy " + $him + " and Finish your order of slaves"|Bulk Slave Intro][$cash -= $slaveCost, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<br>[[Decline to purchase her and check out another slave|Wetware CPUs][$slavesSeen += 1]]
+<br>[["Decline to purchase " + $him + " and check out another slave"|Wetware CPUs][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 34edfde6d53..369786421d7 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -108,7 +108,7 @@
<</if>>
<<if ($slaves[$i].geneMods.NCS == 1)>>
/*
- ** NCS will allow some growth for Arcade milking, but not as much as the Dairy.
+ ** NCS will allow some growth for Arcade milking, but not as much as the Dairy.
*/
<<set _growth = Math.trunc(_growth/3.5)>>
<</if>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 5dc2e0fbb5f..96be088c33e 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -865,8 +865,8 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<br>Lower Class Citizens | <<print $lowerClass>> | <<print _percLowerClass>>%
<br>Middle Class Citizens | <<print $middleClass>> | <<print _percMiddleClass>>%
<br>Upper Class Citizens | <<print $upperClass>> | <<print _percUpperClass>>%
-<br>Millionaires | <<print $topClass>> | <<print _percTopClass>>%
-<br>Slaves | <<print $ASlaves>> | <<print _percASlaves>>%
+<br>Millionaires | <<print $topClass>> | <<print _percTopClass>>%
+<br>Slaves | <<print $ASlaves>> | <<print _percASlaves>>%
<br>
<br><<if $arcologies[0].FSSupremacistLawME == 1>>The citizenry is entirely $arcologies[0].FSSupremacistRace.<</if>>
<<if $arcologies[0].FSRomanRevivalistLaw == 1>>The citizens take pride in their martial duties, preferring to wear utilitarian clothing even when off duty.<</if>>
diff --git a/src/uncategorized/arcologyOpinion.tw b/src/uncategorized/arcologyOpinion.tw
index 7495c6dba98..010b2780402 100644
--- a/src/uncategorized/arcologyOpinion.tw
+++ b/src/uncategorized/arcologyOpinion.tw
@@ -182,57 +182,57 @@
<<set $opinion -= $targetArcology.FSNull>>
<</if>>
<<elseif $activeArcology.FSNull != "unset">>
- <<if $targetArcology.FSNull != "unset">>
- <<set $opinion += $activeArcology.FSNull>>
- <<set $opinion += $targetArcology.FSNull>>
- <<elseif $targetArcology.FSChattelReligionist != "unset">>
- <<set $opinion -= $activeArcology.FSNull>>
- <<set $opinion -= $targetArcology.FSChattelReligionist>>
- <<else>>
- <<set $opinion += $activeArcology.FSNull>>
- <</if>>
+ <<if $targetArcology.FSNull != "unset">>
+ <<set $opinion += $activeArcology.FSNull>>
+ <<set $opinion += $targetArcology.FSNull>>
+ <<elseif $targetArcology.FSChattelReligionist != "unset">>
+ <<set $opinion -= $activeArcology.FSNull>>
+ <<set $opinion -= $targetArcology.FSChattelReligionist>>
+ <<else>>
+ <<set $opinion += $activeArcology.FSNull>>
+ <</if>>
<<elseif $targetArcology.FSNull != "unset">>
- <<set $opinion += $targetArcology.FSNull>>
+ <<set $opinion += $targetArcology.FSNull>>
<</if>>
<<if $activeArcology.FSRomanRevivalist != "unset">>
<<if $targetArcology.FSRomanRevivalist != "unset">>
- <<set $opinion += $activeArcology.FSRomanRevivalist>>
- <<set $opinion += $targetArcology.FSRomanRevivalist>>
+ <<set $opinion += $activeArcology.FSRomanRevivalist>>
+ <<set $opinion += $targetArcology.FSRomanRevivalist>>
<<elseif $targetArcology.FSAztecRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSRomanRevivalist>>
- <<set $opinion -= $targetArcology.FSAztecRevivalist>>
+ <<set $opinion -= $activeArcology.FSRomanRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSRomanRevivalist>>
- <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
+ <<set $opinion -= $activeArcology.FSRomanRevivalist>>
+ <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
<<elseif $targetArcology.FSEdoRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSRomanRevivalist>>
- <<set $opinion -= $targetArcology.FSEdoRevivalist>>
+ <<set $opinion -= $activeArcology.FSRomanRevivalist>>
+ <<set $opinion -= $targetArcology.FSEdoRevivalist>>
<<elseif $targetArcology.FSArabianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSRomanRevivalist>>
- <<set $opinion -= $targetArcology.FSArabianRevivalist>>
+ <<set $opinion -= $activeArcology.FSRomanRevivalist>>
+ <<set $opinion -= $targetArcology.FSArabianRevivalist>>
<<elseif $targetArcology.FSChineseRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSRomanRevivalist>>
- <<set $opinion -= $targetArcology.FSChineseRevivalist>>
+ <<set $opinion -= $activeArcology.FSRomanRevivalist>>
+ <<set $opinion -= $targetArcology.FSChineseRevivalist>>
<</if>>
<<elseif $activeArcology.FSAztecRevivalist != "unset">>
<<if $targetArcology.FSAztecRevivalist != "unset">>
- <<set $opinion += $activeArcology.FSAztecRevivalist>>
- <<set $opinion += $targetArcology.FSAztecRevivalist>>
+ <<set $opinion += $activeArcology.FSAztecRevivalist>>
+ <<set $opinion += $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSAztecRevivalist>>
- <<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSRomanRevivalist>>
<<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSAztecRevivalist>>
- <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
<<elseif $targetArcology.FSEdoRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSAztecRevivalist>>
- <<set $opinion -= $targetArcology.FSEdoRevivalist>>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSEdoRevivalist>>
<<elseif $targetArcology.FSArabianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSAztecRevivalist>>
- <<set $opinion -= $targetArcology.FSArabianRevivalist>>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSArabianRevivalist>>
<<elseif $targetArcology.FSChineseRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSAztecRevivalist>>
- <<set $opinion -= $targetArcology.FSChineseRevivalist>>
+ <<set $opinion -= $activeArcology.FSAztecRevivalist>>
+ <<set $opinion -= $targetArcology.FSChineseRevivalist>>
<</if>>
<<elseif $activeArcology.FSEgyptianRevivalist != "unset">>
<<if $targetArcology.FSEgyptianRevivalist != "unset">>
@@ -260,63 +260,63 @@
<</if>>
<<elseif $activeArcology.FSEdoRevivalist != "unset">>
<<if $targetArcology.FSEdoRevivalist != "unset">>
- <<set $opinion += $activeArcology.FSEdoRevivalist>>
- <<set $opinion += $targetArcology.FSEdoRevivalist>>
+ <<set $opinion += $activeArcology.FSEdoRevivalist>>
+ <<set $opinion += $targetArcology.FSEdoRevivalist>>
<<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSEdoRevivalist>>
- <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
+ <<set $opinion -= $activeArcology.FSEdoRevivalist>>
+ <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSEdoRevivalist>>
- <<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<set $opinion -= $activeArcology.FSEdoRevivalist>>
+ <<set $opinion -= $targetArcology.FSRomanRevivalist>>
<<elseif $targetArcology.FSAztecRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSEdoRevivalist>>
- <<set $opinion -= $targetArcology.FSAztecRevivalist>>
+ <<set $opinion -= $activeArcology.FSEdoRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSArabianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSEdoRevivalist>>
- <<set $opinion -= $targetArcology.FSArabianRevivalist>>
+ <<set $opinion -= $activeArcology.FSEdoRevivalist>>
+ <<set $opinion -= $targetArcology.FSArabianRevivalist>>
<<elseif $targetArcology.FSChineseRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSEdoRevivalist>>
- <<set $opinion -= $targetArcology.FSChineseRevivalist>>
+ <<set $opinion -= $activeArcology.FSEdoRevivalist>>
+ <<set $opinion -= $targetArcology.FSChineseRevivalist>>
<</if>>
<<elseif $activeArcology.FSArabianRevivalist != "unset">>
<<if $targetArcology.FSArabianRevivalist != "unset">>
- <<set $opinion += $activeArcology.FSArabianRevivalist>>
- <<set $opinion += $targetArcology.FSArabianRevivalist>>
+ <<set $opinion += $activeArcology.FSArabianRevivalist>>
+ <<set $opinion += $targetArcology.FSArabianRevivalist>>
<<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSArabianRevivalist>>
- <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
+ <<set $opinion -= $activeArcology.FSArabianRevivalist>>
+ <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
<<elseif $targetArcology.FSEdoRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSArabianRevivalist>>
- <<set $opinion -= $targetArcology.FSEdoRevivalist>>
+ <<set $opinion -= $activeArcology.FSArabianRevivalist>>
+ <<set $opinion -= $targetArcology.FSEdoRevivalist>>
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSArabianRevivalist>>
- <<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<set $opinion -= $activeArcology.FSArabianRevivalist>>
+ <<set $opinion -= $targetArcology.FSRomanRevivalist>>
<<elseif $targetArcology.FSAztecRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSArabianRevivalist>>
- <<set $opinion -= $targetArcology.FSAztecRevivalist>>
+ <<set $opinion -= $activeArcology.FSArabianRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<<elseif $targetArcology.FSChineseRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSArabianRevivalist>>
- <<set $opinion -= $targetArcology.FSChineseRevivalist>>
+ <<set $opinion -= $activeArcology.FSArabianRevivalist>>
+ <<set $opinion -= $targetArcology.FSChineseRevivalist>>
<</if>>
<<elseif $activeArcology.FSChineseRevivalist != "unset">>
<<if $targetArcology.FSChineseRevivalist != "unset">>
- <<set $opinion += $activeArcology.FSChineseRevivalist>>
- <<set $opinion += $targetArcology.FSChineseRevivalist>>
+ <<set $opinion += $activeArcology.FSChineseRevivalist>>
+ <<set $opinion += $targetArcology.FSChineseRevivalist>>
<<elseif $targetArcology.FSEgyptianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSChineseRevivalist>>
- <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
+ <<set $opinion -= $activeArcology.FSChineseRevivalist>>
+ <<set $opinion -= $targetArcology.FSEgyptianRevivalist>>
<<elseif $targetArcology.FSEdoRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSChineseRevivalist>>
- <<set $opinion -= $targetArcology.FSEdoRevivalist>>
+ <<set $opinion -= $activeArcology.FSChineseRevivalist>>
+ <<set $opinion -= $targetArcology.FSEdoRevivalist>>
<<elseif $targetArcology.FSArabianRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSChineseRevivalist>>
- <<set $opinion -= $targetArcology.FSArabianRevivalist>>
+ <<set $opinion -= $activeArcology.FSChineseRevivalist>>
+ <<set $opinion -= $targetArcology.FSArabianRevivalist>>
<<elseif $targetArcology.FSRomanRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSChineseRevivalist>>
- <<set $opinion -= $targetArcology.FSRomanRevivalist>>
+ <<set $opinion -= $activeArcology.FSChineseRevivalist>>
+ <<set $opinion -= $targetArcology.FSRomanRevivalist>>
<<elseif $targetArcology.FSAztecRevivalist != "unset">>
- <<set $opinion -= $activeArcology.FSChineseRevivalist>>
- <<set $opinion -= $targetArcology.FSAztecRevivalist>>
+ <<set $opinion -= $activeArcology.FSChineseRevivalist>>
+ <<set $opinion -= $targetArcology.FSAztecRevivalist>>
<</if>>
<</if>>
<<if $activeArcology.FSIncestFetishist != "unset">>
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index d1ce18648a0..ae101e8ba2d 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -966,15 +966,16 @@ Choose a site for branding:
<<set $degradation += 10>>
<<goto "Body Modification">>
<</link>>
- $brandTarget, the
+ $brandTarget, the
<<link "right">>
<<set $brandApplied = 1>>
<<set $activeSlave.brand = $brandDesign>>
- <<set $activeSlave.brandLocation = ("right " + $brandTarget)>>
+ <<set $activeSlave.brandLocation = ("right " + $brandTarget)>>
<<set $cash -= $modCost>>
<<set $degradation += 10>>
<<goto "Body Modification">>
- <</link>> $brandTarget, or
+ <</link>>
+ $brandTarget, or
<<link "both">>
<<set $brandApplied = 1>>
<<set $activeSlave.brand = $brandDesign>>
diff --git a/src/uncategorized/bulkSlaveGenerate.tw b/src/uncategorized/bulkSlaveGenerate.tw
index 3463cd1777f..d5d08caff83 100644
--- a/src/uncategorized/bulkSlaveGenerate.tw
+++ b/src/uncategorized/bulkSlaveGenerate.tw
@@ -9,7 +9,7 @@
<<set $numArcology = 1>>
<</if>>
-/* Discount calculation. Gives 5% on top of slave school discount */
+/* Discount calculation. Gives 5% on top of slave school discount */
<<set $discount = 475>>
<<switch $slaveMarket>>
<<case "TSS">>
@@ -78,7 +78,7 @@
/* Determine if Law Compliance effects must be applied to this transaction */
<<switch $slaveMarket>>
-<<case "indentures" "neighbor" "heap" "TSS" "GRI" "SCP" "LDE" "TGA" "HA" "TCR" "TFS" "wetware" "low tier criminals" "gangs and smugglers" "white collar" "military prison">> /* these markets are exempt from law compliance */
+<<case "indentures" "neighbor" "heap" "TSS" "GRI" "SCP" "LDE" "TGA" "HA" "TCR" "TFS" "wetware" "low tier criminals" "gangs and smugglers" "white collar" "military prison">> /* these markets are exempt from law compliance */
<<set $applyLaw = 0>>
<<default>> /* all other markets are not exempt: corporate, hunters, kidnappers, raiders, trainers */
<<set $applyLaw = 1>>
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
index 5674cb4fa0a..136adbac48a 100644
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ b/src/uncategorized/bulkSlaveIntro.tw
@@ -18,7 +18,7 @@
<</if>>
<<case "bulk">>
- Your delivery of $newSlaves.length slaves arrives from <<MarketNamePeriod $slaveMarket $numArcology>>
+ Your delivery of $newSlaves.length slaves arrives from <<MarketNamePeriod $slaveMarket $numArcology>>
<<if $newSlaves.length != $numSlaves>>
You were going to order $numSlaves, but $assistantName lowered it on financial grounds.
<</if>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index f59e5d9fc85..c261005b100 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -325,7 +325,7 @@
<<if ($arcologies[0].FSAssetExpansionist != "unset") && ($arcologies[0].FSAssetExpansionist >= 80)>>
Most customers prefer stacked girls.
<<set _pref = 1>>
- <<elseif ($arcologies[0].FSSlimnessEnthusiast != "unset") && ($arcologies[0].FSSlimnessEnthusiast >= 80) >>
+ <<elseif ($arcologies[0].FSSlimnessEnthusiast != "unset") && ($arcologies[0].FSSlimnessEnthusiast >= 80) >>
Most customers prefer slim girls.
<<set _pref = -1>>
<<else>>
@@ -668,7 +668,7 @@
<<if ($arcologies[0].FSRepopulationFocus != "unset") && ($arcologies[0].FSRepopulationFocus >= 80)>>
Most customers prefer their girls rounded with child.
<<set _pref = 1>>
- <<elseif ($arcologies[0].FSRestart != "unset") && ($arcologies[0].FSRestart >= 80) >>
+ <<elseif ($arcologies[0].FSRestart != "unset") && ($arcologies[0].FSRestart >= 80) >>
Most customers prefer girls that aren't gravid.
<<set _pref = -1>>
<<else>>
diff --git a/src/uncategorized/corporateMarket.tw b/src/uncategorized/corporateMarket.tw
index 57faca6f375..1f5d4f75015 100644
--- a/src/uncategorized/corporateMarket.tw
+++ b/src/uncategorized/corporateMarket.tw
@@ -82,16 +82,17 @@ while you browse.
<<set $slaveCost *= 0.9>>
<</if>>
+<<setLocalPronouns $activeSlave>>
<<set $slaveCost = 500*Math.trunc($slaveCost/500)>>
The offered price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
<br>
<<if $cash >= $slaveCost>>
- [[Buy her slave contract|New Slave Intro][$cash -= $slaveCost,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
+ [["Buy " + $his + " slave contract"|New Slave Intro][$cash -= $slaveCost,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
<br>
-[[Decline to purchase her and check out another slave|Corporate Market][$slavesSeen += 1]]
+[["Decline to purchase " + $him + " and check out another slave"|Corporate Market][$slavesSeen += 1]]
<br><br>
<<set $saleDescription = 1, $applyLaw = 1>><<include "Long Slave Description">>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index 82d1ee5bab8..e3863127926 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -310,7 +310,7 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 ||
<<set _archologyCosts += 1000>>
<</if>>
<<if $TCR.subsidize != 0>>
- <br>__The Cattle Ranch__ local pasture influence: <<print cashFormat(1000)>>
+ <br>__The Cattle Ranch__ local pasture influence: <<print cashFormat(1000)>>
<<set _archologyCosts += 1000>>
<</if>>
<<if $TFS.subsidize != 0>>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 787dfb05c51..3b0057f1c6a 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -88,8 +88,8 @@
</div>
<div id="Arcologies" class="tabcontent">
- <div class="content">
- <<include "Neighbors Development">>
+ <div class="content">
+ <<include "Neighbors Development">>
</div>
</div>
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index 74172aa7932..7b0754bfa27 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -203,23 +203,23 @@
<</if>>
<<if $arcologies[0].FSRepopulationFocus >= $FSLockinLevel>>
- $arcologies[0].name believes implicitly that all women should be pregnant.
+ $arcologies[0].name believes implicitly that all women should be pregnant.
<<elseif $arcologies[0].FSRepopulationFocus >= $FSLockinLevel*0.6>>
- $arcologies[0].name agrees strongly that all women should be pregnant.
+ $arcologies[0].name agrees strongly that all women should be pregnant.
<<elseif $arcologies[0].FSRepopulationFocus >= $FSLockinLevel*0.3>>
- $arcologies[0].name is sympathetic to the idea that all women should be pregnant.
+ $arcologies[0].name is sympathetic to the idea that all women should be pregnant.
<<elseif $arcologies[0].FSRepopulationFocus != "unset">>
- $arcologies[0].name is unconvinced that all women should be pregnant.
+ $arcologies[0].name is unconvinced that all women should be pregnant.
<</if>>
<<if $arcologies[0].FSRestart >= $FSLockinLevel>>
- $arcologies[0].name believes implicitly that only the elite should reproduce.
+ $arcologies[0].name believes implicitly that only the elite should reproduce.
<<elseif $arcologies[0].FSRestart >= $FSLockinLevel*0.6>>
- $arcologies[0].name agrees strongly that only the elite should reproduce.
+ $arcologies[0].name agrees strongly that only the elite should reproduce.
<<elseif $arcologies[0].FSRestart >= $FSLockinLevel*0.3>>
- $arcologies[0].name is sympathetic to the idea only the elite should reproduce.
+ $arcologies[0].name is sympathetic to the idea only the elite should reproduce.
<<elseif $arcologies[0].FSRestart != "unset">>
- $arcologies[0].name is unconvinced that only the elite should reproduce.
+ $arcologies[0].name is unconvinced that only the elite should reproduce.
<</if>>
<<if $arcologies[0].FSGenderRadicalist >= $FSLockinLevel>>
@@ -651,56 +651,56 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
<</if>>
<<if $seePreg != 0>>
-<<if $arcologies[0].FSRestart == "unset">>
-<<if $arcologies[0].FSRepopulationFocus != "unset">>
- <br>''You are pursuing'' the belief that mass breeding will save humanity.
- //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRepopulationFocus = "unset", $arcologies[0].FSRepopulationFocusDecoration = 20, $arcologies[0].FSRepopulationFocusSMR = 0, $arcologies[0].FSRepopulationFocusLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "repopulation focus">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
- <<FSChangeDecoration "FSRepopulationFocus" "clothesBoughtMaternityLingerie" "clothesBoughtMaternityDress" "clothesBoughtBelly">>
- <<if $PAPublic == 1>>
- <<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
- //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
- <</if>>
- <</if>>
-<<else>>
- <<if ($FSCredits > 0)>>
- <br>''''[[Repopulation Efforts|Future Society][$arcologies[0].FSRepopulationFocus = 4, $FSCredits -= 1]]: focus on mass breeding in order to repopulate the future world.
- <<else>>
- /*//''Repopulation Efforts'': societal fetishization of pregnancy.//*/
- <</if>>
-<</if>>
-<</if>>
-
-<<if $arcologies[0].FSRepopulationFocus == "unset">>
-<<if $arcologies[0].FSRestart != "unset">>
-<<if $arcologies[0].FSRestartDecoration != 100>>
- <br>''You are pursuing'' Eugenics.
- //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 20, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
- <<FSChangeDecoration "FSRestart">>
-<<else>>
- <br>''You have established'' Eugenics.
- <<if $eugenicsFullControl != 1>>
- The Societal Elite will not permit you to abandon Eugenics.
- <<else>>
- //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 2, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $propOutcome = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//
+ <<if $arcologies[0].FSRestart == "unset">>
+ <<if $arcologies[0].FSRepopulationFocus != "unset">>
+ <br>''You are pursuing'' the belief that mass breeding will save humanity.
+ //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRepopulationFocus = "unset", $arcologies[0].FSRepopulationFocusDecoration = 20, $arcologies[0].FSRepopulationFocusSMR = 0, $arcologies[0].FSRepopulationFocusLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "repopulation focus">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
+ <<FSChangeDecoration "FSRepopulationFocus" "clothesBoughtMaternityLingerie" "clothesBoughtMaternityDress" "clothesBoughtBelly">>
+ <<if $PAPublic == 1>>
+ <<if ($assistantAppearance == "goddess") || ($assistantAppearance == "hypergoddess") || ($assistantAppearance == "preggololi") || ($assistantAppearance == "pregnant fairy") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch")>>
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if ($FSCredits > 0)>>
+ <br>''''[[Repopulation Efforts|Future Society][$arcologies[0].FSRepopulationFocus = 4, $FSCredits -= 1]]: focus on mass breeding in order to repopulate the future world.
+ <<else>>
+ /*//''Repopulation Efforts'': societal fetishization of pregnancy.//*/
+ <</if>>
+ <</if>>
<</if>>
- <br>
- <<FSChangeDecoration "FSRestart">>
- The Societal Elite exist as the highest class, allowing you access to all manner of benefits
- <<if $PAPublic == 1>>
- <<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "incubus") || ($assistantAppearance == "angel")>>
- //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
+
+ <<if $arcologies[0].FSRepopulationFocus == "unset">>
+ <<if $arcologies[0].FSRestart != "unset">>
+ <<if $arcologies[0].FSRestartDecoration != 100>>
+ <br>''You are pursuing'' Eugenics.
+ //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 20, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//<br>
+ <<FSChangeDecoration "FSRestart">>
+ <<else>>
+ <br>''You have established'' Eugenics.
+ <<if $eugenicsFullControl != 1>>
+ The Societal Elite will not permit you to abandon Eugenics.
+ <<else>>
+ //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSRestart = "unset", $arcologies[0].FSRestartDecoration = 2, $arcologies[0].FSRestartSMR = 0, $arcologies[0].FSRestartLaw = 0, $propOutcome = 0, $FSCredits += 1>><<if $assistantFSAppearance == "eugenics">><<set $assistantFSAppearance = "default">><</if>><<ClearFacilityDecorations>><</link>>//
+ <</if>>
+ <br>
+ <<FSChangeDecoration "FSRestart">>
+ The Societal Elite exist as the highest class, allowing you access to all manner of benefits
+ <<if $PAPublic == 1>>
+ <<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "schoolgirl") || ($assistantAppearance == "goddess") || ($assistantAppearance == "loli") || ($assistantAppearance == "succubus") || ($assistantAppearance == "witch") || ($assistantAppearance == "incubus") || ($assistantAppearance == "angel")>>
+ //With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.//
+ <</if>>
+ <</if>>
+ <</if>>
+ <<else>>
+ <<if ($FSCredits > 0)>>
+ <br>''''[[Eugenics|Future Society][$arcologies[0].FSRestart = 4, $FSCredits -= 1]]: rebuilding society using restrictive breeding programs reserved solely for society's finest.
+ <<else>>
+ /*//''Complete Societal Reconstruction'': rebuilding society based off the elite.//*/
+ <</if>>
<</if>>
<</if>>
<</if>>
-<<else>>
- <<if ($FSCredits > 0)>>
- <br>''''[[Eugenics|Future Society][$arcologies[0].FSRestart = 4, $FSCredits -= 1]]: rebuilding society using restrictive breeding programs reserved solely for society's finest.
- <<else>>
- /*//''Complete Societal Reconstruction'': rebuilding society based off the elite.//*/
- <</if>>
-<</if>>
-<</if>>
-<</if>>
<<if $seeDicks != 0 || $makeDicks == 1>>
<<if $arcologies[0].FSGenderFundamentalist == "unset">>
diff --git a/src/uncategorized/growthResearchInstitute.tw b/src/uncategorized/growthResearchInstitute.tw
index 1450bc2ab09..4a3e652f1d0 100644
--- a/src/uncategorized/growthResearchInstitute.tw
+++ b/src/uncategorized/growthResearchInstitute.tw
@@ -23,17 +23,18 @@
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
+<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[["Buy "+$his+" and check out other slaves to order"|Growth Research Institute][$cash -= $slaveCost, $GRI.schoolSale = 0, $GRI.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other slaves to order"|Growth Research Institute][$cash -= $slaveCost, $GRI.schoolSale = 0, $GRI.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[["Buy "+$his+" slave contract"|New Slave Intro][$cash -= $slaveCost, $GRI.schoolSale = 0, $GRI.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
+ <br>[["Buy " + $his + " slave contract"|New Slave Intro][$cash -= $slaveCost, $GRI.schoolSale = 0, $GRI.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>
- <br>[[["Buy "+$his+" and Finish your order of slaves"|Bulk Slave Intro][$cash -= $slaveCost, $GRI.schoolSale = 0, $GRI.studentsBought += 1, $newSlaves.push($activeSlave)]]
+ <br>[[["Buy " + $him + " and Finish your order of slaves"|Bulk Slave Intro][$cash -= $slaveCost, $GRI.schoolSale = 0, $GRI.studentsBought += 1, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<br>[["Decline to purchase "+$his+" and check out another slave"|Growth Research Institute][$slavesSeen += 1]]
+<br>[["Decline to purchase " + $him + " and check out another slave"|Growth Research Institute][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
diff --git a/src/uncategorized/lecoleDesEnculees.tw b/src/uncategorized/lecoleDesEnculees.tw
index 21594b9e6f5..8bc796ade27 100644
--- a/src/uncategorized/lecoleDesEnculees.tw
+++ b/src/uncategorized/lecoleDesEnculees.tw
@@ -22,17 +22,18 @@
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
+<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[[Buy her and check out other slaves to order|L'école des Enculées][$cash -= $slaveCost, $LDE.schoolSale = 0, $LDE.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other slaves to order"|L'école des Enculées][$cash -= $slaveCost, $LDE.schoolSale = 0, $LDE.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $LDE.schoolSale = 0, $LDE.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
+ <br>[["Buy " + $his + " slave contract"|New Slave Intro][$cash -= $slaveCost, $LDE.schoolSale = 0, $LDE.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>
- <br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $LDE.schoolSale = 0, $LDE.studentsBought += 1, $newSlaves.push($activeSlave)]]
+ <br>[["Buy " + $him + " and Finish your order of slaves"|Bulk Slave Intro][$cash -= $slaveCost, $LDE.schoolSale = 0, $LDE.studentsBought += 1, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<br>[[Decline to purchase her and check out another slave|L'école des Enculées][$slavesSeen += 1]]
+<br>[["Decline to purchase " + $him + " and check out another slave"|L'école des Enculées][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index 89ba378badb..c9651f87c3a 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -145,7 +145,7 @@ __''MAIN MENU''__ //[[Summary Options]]//
<<else>>
as a Sexual
<<if $arcologies[0].influenceTarget == -1>>
- Ambassador, but @@.red;she has no target to influence.@@
+ Ambassador, but @@.red;she has no target to influence.@@
<<else>>
Ambassador to <<for $i = 0; $i < $arcologies.length; $i++>><<if $arcologies[$i].direction == $arcologies[0].influenceTarget>>$arcologies[$i].name<<break>><</if>><</for>>.
<</if>>
@@ -424,7 +424,7 @@ __''MAIN MENU''__ //[[Summary Options]]//
<br><<MainLinks>>
<</if>>
-<<else>> /*Display traditionally, without tabs*/
+<<else>> /*Display traditionally, without tabs*/
//<<if $sortSlavesMain != 0>>
<br>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 70617d1892a..c917d77bea8 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -285,7 +285,7 @@ Your slaves have participated in approximately <<print commaNum($oralTotal+$vagi
<<if $SF.Toggle === 0||$SF.Active === 0>>
Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers.
<<elseif $SF.Toggle && $SF.Active >= 1>>
- Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $SFUnit.Troops)>> total soldiers of which <<print commaNum($SFUnit.Troops)>> under the special force command and the rest under your direct control.
+ Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $SFUnit.Troops)>> total soldiers of which <<print commaNum($SFUnit.Troops)>> under the special force command and the rest under your direct control.
<</if>>
<<if $hasFoughtOnce == 1>>
Your troops were involved in <<print commaNum($battlesCount)>> battles of which <<print commaNum($majorBattlesCount)>> were major engagements. You won
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index 234f7c72c83..1f04918db43 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -87,7 +87,7 @@ $masterSuiteNameCaps is furnished
<<case "Transformation Fetishist">>
comfortably, with lots of easy-to-clean leather and plentiful tools, toys, and lubricants to make sex with bimbo slaves as fun as possible. There's a huge bed in the middle of the suite, heavily reinforced.
<<case "Gender Radicalist">>
- comfortably, with lots of easy-to-clean leather and plentiful tools, toys, and lubricants to make fucking slave girls in the butt lots of fun. There's a huge bed in the middle of the suite, with straps to restrain slave girls who don't want to be fucked in the butt, but they're concealed for now.
+ comfortably, with lots of easy-to-clean leather and plentiful tools, toys, and lubricants to make fucking slave girls in the butt lots of fun. There's a huge bed in the middle of the suite, with straps to restrain slave girls who don't want to be fucked in the butt, but they're concealed for now.
<<case "Gender Fundamentalist">>
comfortably, with lots of easy-to-clean leather and plentiful tools, toys, and lubricants to make fucking slave girls nice and enjoyable. There's a huge bed in the middle of the suite, with straps to restrain slave girls who don't want to be fucked, but they're concealed for now.
<<case "Physical Idealist">>
@@ -324,7 +324,7 @@ $masterSuiteNameCaps is furnished
<<if $masterSuitePregnancySlaveLuxuries == 1>>
Pregnant slaves are being ''given some luxuries'' to reduce stress. [[End the special treatment of pregnant slaves|Master Suite][$masterSuitePregnancySlaveLuxuries = 0]]<br>
<<else>>
- Pregnant slaves ''have no extra luxuries'' to reduce stress. [[Give pregnant slaves lighter duties|Master Suite][$masterSuitePregnancySlaveLuxuries = 1]] //Costs <<print cashFormat(500)>>/week//<br>
+ Pregnant slaves ''have no extra luxuries'' to reduce stress. [[Give pregnant slaves lighter duties|Master Suite][$masterSuitePregnancySlaveLuxuries = 1]] //Costs <<print cashFormat(500)>>/week//<br>
<</if>>
<<if $masterSuitePregnancyFertilityDrugs == 1 || $masterSuiteHyperPregnancy == 1>>
Fertile slaves ''are being given'' <<if $masterSuiteHyperPregnancy == 1>>super fertility drugs<<else>>fertility drugs<</if>>, encouraging impregnation and multiple pregnancy.<<if $masterSuiteHyperPregnancy == 1>> [[End the drug regime|Master Suite][$masterSuiteHyperPregnancy = 0, $masterSuitePregnancyFertilitySupplements = 0]]<<else>> [[End the drug regime|Master Suite][$masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0]]<</if>><br>
diff --git a/src/uncategorized/matchmaking.tw b/src/uncategorized/matchmaking.tw
index 85cd4599622..6e9379ea886 100644
--- a/src/uncategorized/matchmaking.tw
+++ b/src/uncategorized/matchmaking.tw
@@ -273,7 +273,7 @@ Despite her devotion and trust, she is still a slave, and probably knows that he
<<elseif $assistantAppearance == "loli">>
"To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cock<<if $PC.vagina == 1>>and lick their cunny.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunny<</if>>." The slave complies eagerly. $assistantName's avatar sneaks a hand down her dress, blushing furiously.
<<elseif $assistantAppearance == "preggololi">>
- "To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s lovely cock<<if $PC.vagina == 1>>and eat out their cunt.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunt<</if>>." The slave complies eagerly. $assistantName's avatar attempts to sneak a hand down her dress, but is thwarted by her belly. She instead openly rubs her crotch through the front of her dress, blushing furiously.
+ "To consummate the marriage," $assistantName concludes, "$eventSlave.slaveName, you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s lovely cock<<if $PC.vagina == 1>>and eat out their cunt.<</if>><<else>>lick the <<if $PC.title == 1>>groom<<else>>the bride<</if>>'s cunt<</if>>." The slave complies eagerly. $assistantName's avatar attempts to sneak a hand down her dress, but is thwarted by her belly. She instead openly rubs her crotch through the front of her dress, blushing furiously.
<<elseif $assistantAppearance == "schoolgirl">>
"To get this marriage started," $assistantName concludes, "$eventSlave.slaveName, the rules say you should now <<if $PC.dick == 1>>suck the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s dick<<if $PC.vagina == 1>> and eat <<if $PC.title == 1>>his<<else>>her<</if>> pussy<</if>><<else>>eat the <<if $PC.title == 1>>groom<<else>>bride<</if>>'s pussy<</if>>." The slave complies eagerly. Pleased by the sight, $assistantName's avatar starts to jill off.
<<elseif $assistantAppearance == "angel">>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 981d850ef0b..bea82fc2bfb 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -2486,11 +2486,11 @@
<<switch $slaves[$i].standardReward>>
<<case "relaxation">>
$He's given free time, which $he
- <<if $spa != 0>>
- usually spends in $spaName<<if $Attendant != 0>> enjoying $Attendant.slaveName's care<</if>>.
+ <<if $spa != 0>>
+ usually spends in $spaName<<if $Attendant != 0>> enjoying $Attendant.slaveName's care<</if>>.
<<else>>
usually spends relaxing in the penthouse slave quarters.
- <</if>>
+ <</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>>.
<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 874cfecfc11..9101b7a0c66 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -500,21 +500,21 @@
/* CAN BE REASSIGNED */
Assignment: <strong><span id="assign">$activeSlave.assignment<<if $activeSlave.sentence>> ($activeSlave.sentence weeks)<</if>></span>.</strong>
- <<link "Rest">> <<= assignJob($activeSlave, "rest")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ <<link "Rest">> <<= assignJob($activeSlave, "rest")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<if ["be confined in the arcade", "work in the brothel", "serve in the club", "work in the dairy", "work as a farmhand", "serve in the master suite", "work as a servant", "work as a nanny"].includes($activeSlave.assignment)>>
| <<link "Remove From Facility">> <<= removeJob($activeSlave, $activeSlave.assignment)>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<</if>>
- | <<link "Fucktoy">> <<= assignJob($activeSlave, "please you")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Fucktoy">> <<= assignJob($activeSlave, "please you")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<if ($activeSlave.indentureRestrictions <= 0) && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
- | <<link "Gloryhole">> <<= assignJob($activeSlave, "work a glory hole")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Gloryhole">> <<= assignJob($activeSlave, "work a glory hole")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<</if>>
<<if $activeSlave.fuckdoll == 0>> /* NON-FUCKDOLL ASSIGNMENTS */
<<if ($activeSlave.devotion >= -20) || (($activeSlave.devotion >= -50) && ($activeSlave.trust < -20)) || ($activeSlave.trust < -50)>>
<<if $activeSlave.intelligenceImplant < 15 && $activeSlave.fetish != "mindbroken">>
- | <<link "Classes">> <<= assignJob($activeSlave, "take classes")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Classes">> <<= assignJob($activeSlave, "take classes")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<else>>
| Classes
<</if>>
@@ -523,9 +523,9 @@
<</if>>
<<if (($activeSlave.devotion >= -20) || (($activeSlave.trust < -20) && ($activeSlave.devotion >= -50)) || ($activeSlave.trust < -50))>>
- | <<link "Subordinate Slave" "Subordinate Targeting">> <<= assignJob($activeSlave, "be a subordinate slave")>><</link>>
+ | <<link "Subordinate Slave" "Subordinate Targeting">> <<= assignJob($activeSlave, "be a subordinate slave")>><</link>>
<<if canSee($activeSlave) && canWalk($activeSlave)>>
- | <<link "House Servant">> <<= assignJob($activeSlave, "be a servant")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "House Servant">> <<= assignJob($activeSlave, "be a servant")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<else>>
/*| //Blind or immobile slaves cannot be servants// */
<</if>>
@@ -534,29 +534,29 @@
<</if>>
<<if ($activeSlave.devotion > 20 || $activeSlave.trust > 20 || $activeSlave.fetish == "mindbroken")>>
- | <<link "Nanny">> <<= assignJob($activeSlave, "work as a nanny")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Nanny">> <<= assignJob($activeSlave, "work as a nanny")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<else>>
/*| //Too resistant to be a nanny// */
<</if>>
<<if ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
- | <<link "Whore">> <<= assignJob($activeSlave, "whore")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
- | <<link "Public Servant">> <<= assignJob($activeSlave, "serve the public")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Whore">> <<= assignJob($activeSlave, "whore")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Public Servant">> <<= assignJob($activeSlave, "serve the public")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<</if>>
<<if ($activeSlave.lactation > 0) || ($activeSlave.balls > 0 && $activeSlave.ballType == "human")>>
- | <<link "Milked">> <<= assignJob($activeSlave, "get milked")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Milked">> <<= assignJob($activeSlave, "get milked")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<else>>
/*| //Not lactating// */
<</if>>
<<if $farmyard && (canSee($activeSlave) && canWalk($activeSlave))>> /*These requirement will most likely need to be expanded*/
- | <<link "Farmhand">> <<= assignJob($activeSlave, "work as a farmhand")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Farmhand">> <<= assignJob($activeSlave, "work as a farmhand")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
<<else>>
/*| //Blind or immobile slaves cannot be farmhands// */
<</if>>
- | <<link "Confinement">> <<= assignJob($activeSlave, "stay confined")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
+ | <<link "Confinement">> <<= assignJob($activeSlave, "stay confined")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
| <<link "Let $him choose">> <<= assignJob($activeSlave, "choose her own job")>><<replace "#assign">>$activeSlave.assignment<</replace>><<SlaveInteractFucktoy>><</link>>
| <<link "Stay on this assignment for another month">><<if $activeSlave.assignment != "choose her own job">><<set $activeSlave.sentence += 4>><<replace "#assign">>$activeSlave.assignment ($activeSlave.sentence weeks)<</replace>><</if>><</link>>
diff --git a/src/uncategorized/slaveMarkets.tw b/src/uncategorized/slaveMarkets.tw
index e47fbac5374..d4665025f5a 100644
--- a/src/uncategorized/slaveMarkets.tw
+++ b/src/uncategorized/slaveMarkets.tw
@@ -194,17 +194,18 @@ You visit the slave markets off the arcology plaza. It's always preferable to ex
<<set $slaveCost = 500*Math.trunc($slaveCost/500)>>
The offered price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
+<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[[Buy her and check out other slaves to order|Slave Markets][$cash -= $slaveCost, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other slaves to order"|Slave Markets][$cash -= $slaveCost, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
+ <br>[["Buy " + $his + " slave contract"|New Slave Intro][$cash -= $slaveCost,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]]
<<else>>
- <br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $newSlaves.push($activeSlave)]]
+ <br>[["Buy " + $him + " and Finish your order of slaves"|Bulk Slave Intro][$cash -= $slaveCost, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<br>[[Decline to purchase her and check out another slave|Slave Markets][$slavesSeen += 1]]
+<br>[["Decline to purchase " + $him + " and check out another slave"|Slave Markets][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index 8a417b169ce..3a6d04413db 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -142,7 +142,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her previous owner forced her to cut off her dick and balls and cook them.">>
<<set $shelterSlave.career = "a slave">>
- <<set $shelterSlave.devotion = random(-100,-80)>>
+ <<set $shelterSlave.devotion = random(-100,-80)>>
<<set $shelterSlave.trust = random(-100,-90)>>
<<set $shelterSlave.health = random(-75,-50)>>
<<set $shelterSlave.dick = 0>>
@@ -166,7 +166,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her previous owner forced her to cut off her breasts and cook them.">>
<<set $shelterSlave.career = "a slave">>
- <<set $shelterSlave.devotion = random(-100,-80)>>
+ <<set $shelterSlave.devotion = random(-100,-80)>>
<<set $shelterSlave.trust = random(-100,-90)>>
<<set $shelterSlave.health = random(-75,-50)>>
<<set $shelterSlave.boobs = 0>>
@@ -184,7 +184,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "She is an enslaved Daughter of Liberty, caught some weeks after the failed coup. Her previous owner used her as a punching bag and dart board, then when he was bored of her tattooed obscenities all over her body and threw her away.">>
<<set $shelterSlave.career = "a slave">>
- <<set $shelterSlave.devotion = random(-100,-90)>>
+ <<set $shelterSlave.devotion = random(-100,-90)>>
<<set $shelterSlave.trust = random(-100,-90)>>
<<set $shelterSlave.health = random(-90,-70)>>
<<set $shelterSlave.slaveName = either("Cumbitch", "Cumbucket", "Cumdoll", "Cumgulper", "Fuckhole", "Fuckmeat", "Fuckpuppet", "Fuckslut", "Fucktoy", "Rapemeat", "Sluttypig", "Spunkbucket", "Spunkswallow", "Whorelips")>>
@@ -229,7 +229,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her previous owner gelded her and used her for anal abuse.">>
<<set $shelterSlave.career = "a slave">>
- <<set $shelterSlave.devotion = random(-75,-60)>>
+ <<set $shelterSlave.devotion = random(-75,-60)>>
<<set $shelterSlave.trust = random(-100,-75)>>
<<set $shelterSlave.health = random(-50,-30)>>
<<set $shelterSlave.face = random(-60,-20)>>
@@ -252,7 +252,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her background is obscure, but seems to have involved terrible abuse of her huge cock and balls.">>
<<set $shelterSlave.career = "a slave">>
- <<set $shelterSlave.devotion = random(-75,-60)>>
+ <<set $shelterSlave.devotion = random(-75,-60)>>
<<set $shelterSlave.trust = random(-100,-75)>>
<<set $shelterSlave.health = random(-50,-30)>>
<<set $shelterSlave.face = random(-60,-20)>>
@@ -276,7 +276,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her holes were cruelly stretched by constant plug use.">>
<<set $shelterSlave.career = "a slave">>
- <<set $shelterSlave.devotion = random(-75,-60)>>
+ <<set $shelterSlave.devotion = random(-75,-60)>>
<<set $shelterSlave.trust = random(-100,-75)>>
<<set $shelterSlave.health = random(-50,-30)>>
<<set $shelterSlave.vagina = 4>>
@@ -302,7 +302,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her previous owner discarded her after many pregnancies.">>
<<set $shelterSlave.career = "a breeder">>
- <<set $shelterSlave.devotion = random(-75,-60)>>
+ <<set $shelterSlave.devotion = random(-75,-60)>>
<<set $shelterSlave.trust = random(-100,-75)>>
<<set $shelterSlave.health = random(-50,-30)>>
<<set $shelterSlave.preg = -2>>
@@ -327,7 +327,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "She was worn out by twenty years of brothel service.">>
<<set $shelterSlave.career = "a prostitute">>
- <<set $shelterSlave.devotion = random(-75,-60)>>
+ <<set $shelterSlave.devotion = random(-75,-60)>>
<<set $shelterSlave.trust = random(-100,-75)>>
<<set $shelterSlave.health = random(-80,-60)>>
<<set $shelterSlave.face = random(-60,-20)>>
@@ -348,7 +348,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "She was discarded after suffering a terrible reaction to growth hormone treatment.">>
<<set $shelterSlave.career = "a slave">>
- <<set $shelterSlave.devotion = random(-75,-60)>>
+ <<set $shelterSlave.devotion = random(-75,-60)>>
<<set $shelterSlave.trust = random(-100,-75)>>
<<set $shelterSlave.health = random(-80,-60)>>
<<set $shelterSlave.chem = 1000>>
@@ -371,6 +371,8 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<</if>>
<<set $slaveCost = 1000>>
+<<setLocalPronouns $shelterSlave>>
+
The placement fee is <<print cashFormat($slaveCost)>>.
<br><br>
@@ -386,7 +388,7 @@ The placement fee is <<print cashFormat($slaveCost)>>.
<span id="result">
<<if $cash >= $slaveCost>>
- <<link "Buy her slave contract">>
+ <<link "Buy $his slave contract">>
<<replace "#result">>
<<set $cash -= $slaveCost, $shelterSlaveBought = 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main">>
<<include "New Slave Intro">>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 2205707d331..033ca6e7018 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -1,84 +1,84 @@
:: Slave Summary [nobr]
<<set setup.passagePreFilters = setup.passagePreFilters || {
- "Main": s => (s.assignmentVisible == 1),
+ "Main": s => (s.assignmentVisible == 1),
"Personal Attention Select": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0),
- "Agent Select": s => (s.fuckdoll == 0 && s.devotion > 20 && s.intelligence+s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark != 1 || $propOutcome == 0)),
- "BG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "guard you" && canWalk(s) && canSee(s) && (s.breedingMark != 1 || $propOutcome == 0)),
- "Recruiter Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "recruit girls" && canWalk(s) && canSee(s) && canTalk(s)),
- "HG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "be your Head Girl" && canWalk(s) && canSee(s) && canTalk(s)),
- "Head Girl Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
+ "Agent Select": s => (s.fuckdoll == 0 && s.devotion > 20 && s.intelligence+s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark != 1 || $propOutcome == 0)),
+ "BG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "guard you" && canWalk(s) && canSee(s) && (s.breedingMark != 1 || $propOutcome == 0)),
+ "Recruiter Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "recruit girls" && canWalk(s) && canSee(s) && canTalk(s)),
+ "HG Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.assignment != "be your Head Girl" && canWalk(s) && canSee(s) && canTalk(s)),
+ "Head Girl Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "be your Head Girl" && s.indentureRestrictions <= 0 && (s.breedingMark != 1 || $propOutcome == 0))
|| ($Flag != 0 && s.assignment == "live with your Head Girl"))),
- "Subordinate Targeting": s => (s.devotion >= -20 && s.fuckdoll == 0 && $activeSlave.ID != s.ID && ($activeSlave.amp != 1 || s.amp != 1)),
- "Spa": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
+ "Subordinate Targeting": s => (s.devotion >= -20 && s.fuckdoll == 0 && $activeSlave.ID != s.ID && ($activeSlave.amp != 1 || s.amp != 1)),
+ "Spa": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "rest in the spa")
|| ($Flag == 1 && s.assignment == "rest in the spa")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Attendant.ID))),
- "Attendant Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s)),
- "Nursery": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (s.devotion > 20 || s.trust > 20) && (
+ "Attendant Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s)),
+ "Nursery": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (s.devotion > 20 || s.trust > 20) && (
($Flag == 0 && s.assignment != "work as a nanny")
|| ($Flag == 1 && s.assignment == "work as a nanny")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Matron.ID))),
- "Matron Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s)) && s.fetish != "mindbroken",
- "Brothel": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
+ "Matron Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s)) && s.fetish != "mindbroken",
+ "Brothel": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "work in the brothel")
|| ($Flag == 1 && s.assignment == "work in the brothel")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Madam.ID))),
- "Madam Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && (s.breedingMark != 1 || $propOutcome == 0)),
- "Club": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
+ "Madam Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && (s.breedingMark != 1 || $propOutcome == 0)),
+ "Club": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "serve in the club")
|| ($Flag == 1 && s.assignment == "serve in the club")
|| ($Flag != 0 && $Flag != 1 && s.ID == $DJ.ID))),
- "DJ Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canTalk(s) && canWalk(s) && (s.breedingMark != 1 || $propOutcome == 0)),
- "Clinic": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
+ "DJ Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canTalk(s) && canWalk(s) && (s.breedingMark != 1 || $propOutcome == 0)),
+ "Clinic": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "get treatment in the clinic")
|| ($Flag == 1 && s.assignment == "get treatment in the clinic")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Nurse.ID))),
- "Nurse Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s)),
- "Schoolroom": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && s.fetish != "mindbroken" && (
+ "Nurse Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s)),
+ "Schoolroom": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && s.fetish != "mindbroken" && (
($Flag == 0 && s.assignment != "learn in the schoolroom")
|| ($Flag == 1 && s.assignment == "learn in the schoolroom")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Schoolteacher.ID))),
- "Schoolteacher Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canTalk(s) && canWalk(s) && canSee(s)),
- "Dairy": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
+ "Schoolteacher Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canTalk(s) && canWalk(s) && canSee(s)),
+ "Dairy": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "work in the dairy")
|| ($Flag == 1 && s.assignment == "work in the dairy")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Milkmaid.ID))),
- "Milkmaid Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 20 && canWalk(s) && canSee(s)),
- "Farmyard": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && canWalk(s) && (
+ "Milkmaid Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 20 && canWalk(s) && canSee(s)),
+ "Farmyard": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && canWalk(s) && (
($Flag == 0 && s.assignment != "work as a farmhand")
|| ($Flag == 1 && s.assignment == "work as a farmhand")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Farmer.ID))),
- "Farmer Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s)),
- "Servants' Quarters": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
+ "Farmer Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) && canSee(s)),
+ "Servants' Quarters": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "work as a servant")
|| ($Flag == 1 && s.assignment == "work as a servant")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Stewardess.ID))),
- "Stewardess Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s)),
- "Master Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
+ "Stewardess Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.intelligence+s.intelligenceImplant >= -50 && canWalk(s) && canSee(s)),
+ "Master Suite": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && (
($Flag == 0 && s.assignment != "serve in the master suite")
|| ($Flag == 1 && s.assignment == "serve in the master suite")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Concubine.ID))),
- "Concubine Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.amp != 1),
- "Cellblock": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && s.fetish != "mindbroken" && (
+ "Concubine Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && s.amp != 1),
+ "Cellblock": s => (s.assignmentVisible == 1 && s.fuckdoll <= 0 && s.fetish != "mindbroken" && (
($Flag == 0 && s.assignment != "be confined in the cellblock")
|| ($Flag == 1 && s.assignment == "be confined in the cellblock")
|| ($Flag != 0 && $Flag != 1 && s.ID == $Wardeness.ID))),
- "Wardeness Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) & canSee(s)),
- "Arcade": s => (s.assignmentVisible == 1 && ($arcade >= $arcadeSlaves || $arcadeUpgradeFuckdolls == 1) && (
+ "Wardeness Select": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && s.devotion > 50 && canWalk(s) & canSee(s)),
+ "Arcade": s => (s.assignmentVisible == 1 && ($arcade >= $arcadeSlaves || $arcadeUpgradeFuckdolls == 1) && (
($Flag == 0 && s.assignment != "be confined in the arcade")
|| ($Flag != 0 && s.assignment == "be confined in the arcade"))),
- "Pit": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && (
+ "Pit": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && (
($Flag == 0 && !$fighterIDs.includes(s.ID) && canWalk(s) && (s.assignment != "guard you") && (s.assignment != "work in the dairy" || $dairyRestraintsSetting < 2))
|| ($Flag != 0 && $fighterIDs.includes(s.ID)))),
- "Coursing Association": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && (
+ "Coursing Association": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && (
($Flag == 0 && canWalk(s) && $Lurcher.ID != s.ID)
|| ($Flag != 0 && $Lurcher.ID == s.ID))),
- "New Game Plus": s => (($Flag == 0 && s.assignment != "be imported") || ($Flag != 0 && s.assignment == "be imported")),
- "Rules Slave Select": s => (($Flag == 0 && !ruleSlaveSelected(s, $currentRule)) || ($Flag != 0 && ruleSlaveSelected(s, $currentRule))),
- "Rules Slave Exclude": s => (($Flag == 0 && !ruleSlaveExcluded(s, $currentRule)) || ($Flag != 0 && ruleSlaveExcluded(s, $currentRule))),
- "Matchmaking": s => (s.devotion >= 100 && s.relationship == $activeSlave.relationship && s.ID != $activeSlave.ID),
+ "New Game Plus": s => (($Flag == 0 && s.assignment != "be imported") || ($Flag != 0 && s.assignment == "be imported")),
+ "Rules Slave Select": s => (($Flag == 0 && !ruleSlaveSelected(s, $currentRule)) || ($Flag != 0 && ruleSlaveSelected(s, $currentRule))),
+ "Rules Slave Exclude": s => (($Flag == 0 && !ruleSlaveExcluded(s, $currentRule)) || ($Flag != 0 && ruleSlaveExcluded(s, $currentRule))),
+ "Matchmaking": s => (s.devotion >= 100 && s.relationship == $activeSlave.relationship && s.ID != $activeSlave.ID),
"Dinner Party Preperations": s => (s.assignmentVisible == 1 && s.fuckdoll == 0),
}>>
<<set _Pass = passage(), _SL = $slaves.length, $assignTo = _Pass, _indexed = 0,
@@ -105,12 +105,12 @@
<<set _tableCount = _tableCount || 0>>
<<set _tableCount++>>
/*
- * we want <button data-quick-index="<<= _tableCount>>"> ...
+ * we want <button data-quick-index="<<= _tableCount>>"> ...
*/
<<set _buttonAttributes = { 'data-quick-index': _tableCount }>>
<<htag _buttonAttributes 'button'>>Quick Index<</htag>>
/*
- * we want <div id="list_index3" class=" hidden">...
+ * we want <div id="list_index3" class=" hidden">...
*/
<<set _divAttributes = { id: 'list_index' + _tableCount, class: 'hidden'}>>
<<htag _divAttributes>>
@@ -319,7 +319,7 @@
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<<else>>
<<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
- [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
+ [[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
<</if>>
<<case "Madam Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index fb1932f9d80..9b65a6e4240 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -2,6 +2,10 @@
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Spa", $showEncyclopedia = 1, $encyclopedia = "Spa", $spaSlaves = $SpaiIDs.length>>
+<<if $Attendant != 0>>
+ <<setLocalPronouns $Attendant>>
+<</if>>
+
<<if $spaName != "the Spa">>
<<set $spaNameCaps = $spaName.replace("the ", "The ")>>
<</if>>
@@ -55,7 +59,7 @@ $spaNameCaps
<<case "Slimness Enthusiast">>
is comfortable, with waterproof cushions lining the pools. Everything is designed for the slaves' comfort; there are even special mud baths to perfect skin clarity.
<<case "Hedonistic">>
- is comfortable, with waterproof cushions lining the pools. It is equipped with all sorts of devices to aid hefty slaves, including lifts to help them in and out of the water, specialized moisturizers to keep their skin healthy and smooth, and all around showers to help clean difficult to reach spots and between folds. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food and treats are readily available around the tubs so that relaxing slaves never have to strain to grab a bite to eat<<else>>Feeders connected to the slave food reserves line the pools so that so that relaxing slaves never have to strain to suck down their fill of food<</if>>.
+ is comfortable, with waterproof cushions lining the pools. It is equipped with all sorts of devices to aid hefty slaves, including lifts to help them in and out of the water, specialized moisturizers to keep their skin healthy and smooth, and all around showers to help clean difficult to reach spots and between folds. <<if $arcologies[0].FSHedonisticDecadenceResearch == 1>>Platters of food and treats are readily available around the tubs so that relaxing slaves never have to strain to grab a bite to eat<<else>>Feeders connected to the slave food reserves line the pools so that so that relaxing slaves never have to strain to suck down their fill of food<</if>>.
<<default>>
is well-appointed, with massage tables, hot tubs, and a cold pool.
<</switch>>
@@ -65,7 +69,7 @@ $spaNameCaps
<<elseif $spaSlaves > 0>>
It's sparsely populated; though the few slaves here have little company they like having the water to themselves.
<<elseif $Attendant != 0>>
- $Attendant.slaveName is alone here, and has nothing to do but keep the place (and her own soft, wet body) spotlessly clean.
+ $Attendant.slaveName is alone here, and has nothing to do but keep the place (and $his own soft, wet body) spotlessly clean.
<<else>>
It's empty and quiet. [[Decommission the Spa|Main][$spa = 0, $spaDecoration = "standard", $spaUpgrade = 0, $spaFix = 0]]
<</if>>
@@ -101,15 +105,15 @@ $spaNameCaps
<<if $Attendant != 0>>
<br>
<<if $spaFix == 2>>
- $Attendant.slaveName is focusing only on the health and wellness of the slaves under her care, obeying your orders to avoid attempting to right mental flaws.
+ $Attendant.slaveName is focusing only on the health and wellness of the slaves under $his care, obeying your orders to avoid attempting to right mental flaws.
[[Order her to only fix mindbroken slaves|Spa][$spaFix = 1]] |
[[Let her tend as she sees fit|Spa][$spaFix = 0]]
<<elseif $spaFix == 1>>
- $Attendant.slaveName is focusing on the health and wellness of the slaves under her care, as well as trying to bring mindbroken slaves back, while ignoring any mental hangups a slave may have.
+ $Attendant.slaveName is focusing on the health and wellness of the slaves under $his care, as well as trying to bring mindbroken slaves back, while ignoring any mental hangups a slave may have.
[[Order her to not fix flaws|Spa][$spaFix = 2]] |
[[Let her tend as she sees fit|Spa][$spaFix = 0]]
<<else>>
- $Attendant.slaveName is not following any special orders and is tending to your slaves as she sees fit.
+ $Attendant.slaveName is not following any special orders and is tending to your slaves as $he sees fit.
[[Order her to not fix any flaws|Spa][$spaFix = 2]] |
[[Order her to only fix mindbroken slaves|Spa][$spaFix = 1]]
<</if>>
diff --git a/src/uncategorized/stClaverPreparatory.tw b/src/uncategorized/stClaverPreparatory.tw
index 9577ec08342..09d7178d9fb 100644
--- a/src/uncategorized/stClaverPreparatory.tw
+++ b/src/uncategorized/stClaverPreparatory.tw
@@ -22,17 +22,18 @@
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
+<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[[Buy her and check out other slaves to order|St. Claver Preparatory][$cash -= $slaveCost, $SCP.schoolSale = 0, $SCP.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other slaves to order"|St. Claver Preparatory][$cash -= $slaveCost, $SCP.schoolSale = 0, $SCP.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $SCP.schoolSale = 0, $SCP.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
+ <br>[["Buy " + $his + " slave contract"|New Slave Intro][$cash -= $slaveCost, $SCP.schoolSale = 0, $SCP.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>
- <br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $SCP.schoolSale = 0, $SCP.studentsBought += 1, $newSlaves.push($activeSlave)]]
+ <br>[["Buy " + $him + " and Finish your order of slaves"|Bulk Slave Intro][$cash -= $slaveCost, $SCP.schoolSale = 0, $SCP.studentsBought += 1, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<br>[[Decline to purchase her and check out another slave|St. Claver Preparatory][$slavesSeen += 1]]
+<br>[["Decline to purchase " + $him + " and check out another slave"|St. Claver Preparatory][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 40bf66e814e..279c8fa6265 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -666,7 +666,7 @@
<br>[[Summary Options]]
<br>[[Description Options]]
<br>
-<<elseif _Pass == "propagandaHub" || _Pass == "securityHQ" || _Pass == "secBarracks" || _Pass == "riotControlCenter">>
+<<elseif _Pass == "propagandaHub" || _Pass == "securityHQ" || _Pass == "secBarracks" || _Pass == "riotControlCenter">>
<br>
<<if $propHub == 1>>
<br><span id="propHub"><<link "Manage PR">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "propagandaHub">><</link>></span> @@.cyan;[Shift+H]@@
diff --git a/src/uncategorized/theFutanariSisters.tw b/src/uncategorized/theFutanariSisters.tw
index f55d8058a7d..74d12311e7d 100644
--- a/src/uncategorized/theFutanariSisters.tw
+++ b/src/uncategorized/theFutanariSisters.tw
@@ -117,17 +117,18 @@ The Sisters offer a member selected for sale into slavery for inspection via vid
The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
+<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[[Buy her and check out other slaves to order|The Futanari Sisters][$cash -= $slaveCost, $TFS.schoolSale = 0, $TFS.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other slaves to order"|The Futanari Sisters][$cash -= $slaveCost, $TFS.schoolSale = 0, $TFS.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $TFS.schoolSale = 0, $TFS.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
+ <br>[["Buy " + $his + " slave contract"|New Slave Intro][$cash -= $slaveCost, $TFS.schoolSale = 0, $TFS.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>
- <br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $TFS.schoolSale = 0, $TFS.studentsBought += 1, $newSlaves.push($activeSlave)]]
+ <br>[["Buy " + $him + " and Finish your order of slaves"|Bulk Slave Intro][$cash -= $slaveCost, $TFS.schoolSale = 0, $TFS.studentsBought += 1, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<br>[[Decline to purchase her and check out another slave|The Futanari Sisters][$slavesSeen += 1]]
+<br>[["Decline to purchase " + $him + " and check out another slave"|The Futanari Sisters][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
diff --git a/src/uncategorized/theGymnasiumAcademy.tw b/src/uncategorized/theGymnasiumAcademy.tw
index 5910c32cc52..66a726510d8 100644
--- a/src/uncategorized/theGymnasiumAcademy.tw
+++ b/src/uncategorized/theGymnasiumAcademy.tw
@@ -22,17 +22,18 @@
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
+<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[[Buy her and check out other slaves to order|The Gymnasium-Academy][$cash -= $slaveCost, $TGA.schoolSale = 0, $TGA.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other slaves to order"|The Gymnasium-Academy][$cash -= $slaveCost, $TGA.schoolSale = 0, $TGA.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $TGA.schoolSale = 0, $TGA.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
+ <br>[["Buy " + $his + " slave contract"|New Slave Intro][$cash -= $slaveCost, $TGA.schoolSale = 0, $TGA.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>
- <br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $TGA.schoolSale = 0, $TGA.studentsBought += 1, $newSlaves.push($activeSlave)]]
+ <br>[["Buy " + $him + " and Finish your order of slaves"|Bulk Slave Intro][$cash -= $slaveCost, $TGA.schoolSale = 0, $TGA.studentsBought += 1, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<br>[[Decline to purchase her and check out another slave|The Gymnasium-Academy][$slavesSeen += 1]]
+<br>[["Decline to purchase " + $him + " and check out another slave"|The Gymnasium-Academy][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
diff --git a/src/uncategorized/theSlavegirlSchool.tw b/src/uncategorized/theSlavegirlSchool.tw
index 05e39de1f6e..9180622fb74 100644
--- a/src/uncategorized/theSlavegirlSchool.tw
+++ b/src/uncategorized/theSlavegirlSchool.tw
@@ -20,22 +20,22 @@
<</if>>
<<if $slavesSeen > $slaveMarketLimit>><<set $slaveCost += Math.trunc($slaveCost*(($slavesSeen-$slaveMarketLimit)*0.1))>><</if>>
-
<br><br>The price is <<print cashFormat($slaveCost)>>.<<if $slavesSeen > $slaveMarketLimit>> You have cast such a wide net for slaves this week that it is becoming more expensive to find more for sale. Your reputation helps determine your reach within the slave market.<</if>>
+<<setLocalPronouns $activeSlave>>
<<if $cash >= $slaveCost>>
- <br>[[Buy her and check out other slaves to order|The Slavegirl School][$cash -= $slaveCost, $TSS.schoolSale = 0, $TSS.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
+ <br>[["Buy " + $him + " and check out other slaves to order"|The Slavegirl School][$cash -= $slaveCost, $TSS.schoolSale = 0, $TSS.studentsBought += 1, $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]]
<<if $newSlaves.length == 0>>
- <br>[[Buy her slave contract|New Slave Intro][$cash -= $slaveCost, $TSS.schoolSale = 0, $TSS.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
+ <br>[["Buy " + $his + " slave contract"|New Slave Intro][$cash -= $slaveCost, $TSS.schoolSale = 0, $TSS.studentsBought += 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main"]]
<<else>>
- <br>[[Buy her and Finish your order of slaves|Bulk Slave Intro][$cash -= $slaveCost, $TSS.schoolSale = 0, $TSS.studentsBought += 1, $newSlaves.push($activeSlave)]]
+ <br>[["Buy " + $him + " and Finish your order of slaves"|Bulk Slave Intro][$cash -= $slaveCost, $TSS.schoolSale = 0, $TSS.studentsBought += 1, $newSlaves.push($activeSlave)]]
<</if>>
<<else>>
//You lack the necessary funds to buy this slave.//
<</if>>
-<br>[[Decline to purchase her and check out another slave|The Slavegirl School][$slavesSeen += 1]]
+<br>[["Decline to purchase " + $him + " and check out another slave|The Slavegirl School][$slavesSeen += 1]]
<<if $newSlaves.length > 0>>
- <br>[[Finish your order of slaves|Bulk Slave Intro]]
+ <br>[[Finish your order of slaves"|Bulk Slave Intro]]
<</if>>
<br><br>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 0fc7cc8fa16..dc0855b51da 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -4674,7 +4674,7 @@
<<switch $Role>>
/* Opens security */
<<case "Lieutenant Colonel">>
- <<set $activeSlave.devotion = random(96,100), $activeSlave.trust = random(96, 100), $activeSlave.energy = random(96,100), $activeSlave.intelligence = 70, $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.devotion = random(96,100), $activeSlave.trust = random(96, 100), $activeSlave.energy = random(96,100), $activeSlave.intelligence = 70, $activeSlave.combatSkill = 1>>
<<set $activeSlave.career = either("a bodyguard", "a law enforcement officer", "a revolutionary", "a soldier", "a transporter", "an assassin", "in a militia", "a bouncer", "a bounty hunter", "a gang member", "a mercenary", "a prison guard", "a private detective", "a security guard", "a street thug", "an enforcer")>>
<<case "Bodyguard">>
<<set $activeSlave.devotion = 90, $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.weight = random(-10,10), $activeSlave.teeth = either("pointy", "normal"), $activeSlave.amp = either(-4, -4, 0, 0, 0, 0), $activeSlave.combatSkill = 1>>
@@ -4708,7 +4708,7 @@
<<set $activeSlave.vagina = random(3,4)>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
<<case "Nurse">>
- <<set $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.muscles = random(6,50), $activeSlave.face = random(41,90), $activeSlave.sexualQuirk = "caring", $activeSlave.career = either("a doctor", "a medic", "a medical student", "a nurse", "a paramedic"), $activeSlave.intelligence = random(40,90)>>
+ <<set $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.muscles = random(6,50), $activeSlave.face = random(41,90), $activeSlave.sexualQuirk = "caring", $activeSlave.career = either("a doctor", "a medic", "a medical student", "a nurse", "a paramedic"), $activeSlave.intelligence = random(40,90)>>
<<set $activeSlave.actualAge = random(36,$retirementAge-3)>>
<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
<<case "Motherly Attendant">>
--
GitLab