diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 7e79b731835b436696ca7099fb305b91e6125831..5e9978dc9bd0727507a1934a026f2db2bd472e78 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -86,6 +86,8 @@ window.saWhore = (function saWhore() {
* @param {App.Entity.SlaveState} slave
*/
function updateNonSlaveVariables(slave) {
+ let BL = V.BrothiIDs.length;
+
// FResult setting
FuckResult = FResult(slave);
// slave needs release
@@ -127,8 +129,8 @@ window.saWhore = (function saWhore() {
beauty = Math.trunc(beauty * 1.1);
}
if (slave.assignment === "be the Madam") {
- if (V.brothelSlaves + V.slavesGettingHelp > 0) {
- beauty = Math.trunc(beauty * ((10 - V.brothelSlaves - V.slavesGettingHelp) / 10));
+ if (BL + V.slavesGettingHelp > 0) {
+ beauty = Math.trunc(beauty * ((10 - BL - V.slavesGettingHelp) / 10));
}
}
if (slave.minorInjury !== 0) {
diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index a731363f184b18d0dc96099b8448bfa1509020b6..20f483fd166670ce1aee9be7c98b5ebe22f4c7b4 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -9,7 +9,7 @@
<<set $farmyardNameCaps = $farmyardName.replace("the ", "The ")>>
<</if>>
-<<set _CL = $canines.length, _HL = $hooved.length, _FL = $felines.length>>
+<<set _CL = $canines.length, _HL = $hooved.length, _FL = $felines.length, _FyL = $FarmyardiIDs.length>>
$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>>
@@ -65,9 +65,9 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
It is very much a converted warehouse still, sectioned off in various 'departments'<<if $farmyardUpgrade.machinery == 1>> with machinery placed where it can be<<if $farmyardUpgrade.hydroponics > 0>> and plumbing for the hydroponics system running every which way<</if>><</if>>.
<</switch>>
-<<if $farmyardSlaves > 2>>
+<<if _FyL > 2>>
$farmyardNameCaps is bustling with activity. Farmhands are hurrying about, on their way to feed animals and maintain farming equipment.
-<<elseif $farmyardSlaves > 0>>
+<<elseif _FyL > 0>>
$farmyardNameCaps is working steadily. Farmhands are moving about, looking after the animals and crops.
<<elseif $Farmer != 0>>
$Farmer.slaveName is alone in $farmyardName, and has nothing to do but look after the animals and crops.
@@ -76,7 +76,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
<<if $farmMenials > 0>>
<<set $menials += $farmMenials>>
<</if>>
- <<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardSlaves = 0, $farmyardDecoration = "standard", $farmMenials = 0, $farmMenialsSpace = 0, $farmyardShows = 0, $farmyardBreeding = 0, $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 = 0, $activeHooved = 0, $activeFeline = 0, $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, bulls: 0, pigs: 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, $pitAnimalType = 0, $canines = [], $hooved = [], $felines = []>>
+ <<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardDecoration = "standard", $farmMenials = 0, $farmMenialsSpace = 0, $farmyardShows = 0, $farmyardBreeding = 0, $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 = 0, $activeHooved = 0, $activeFeline = 0, $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, bulls: 0, pigs: 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, $pitAnimalType = 0, $canines = [], $hooved = [], $felines = []>>
<<set _far = $sectors.findIndex(function(s) { return s.type == "Farmyard"; })>>
<<if _far != -1>>
<<set $sectors[_far].type = "Manufacturing">>
@@ -84,14 +84,14 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
<</link>>
<</if>>
-<<if $farmyardSlaves > 0>>
+<<if _FyL > 0>>
<<if $Farmer != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $farmyardSlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = _FyL+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Farmyard">>
<<if $Farmer != 0>>
<<= assignJob($Farmer, "rest")>>
<</if>>
- <<for $farmyardSlaves > 0>>
+ <<for _FyL > 0>>
<<= assignJob($slaves[$slaveIndices[$FarmyardiIDs[0]]], "rest")>>
<</for>>
<</link>>
@@ -101,7 +101,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
<</if>>
<<set _Tmult0 = Math.trunc($farmyard*1000*$upgradeMultiplierArcology)>>
-<br>It can support $farmyard farmhands. Currently there <<if $farmyardSlaves == 1>>is<<else>>are<</if>> $farmyardSlaves farmhand<<if $farmyardSlaves != 1>>s<</if>> at $farmyardName.
+<br>It can support $farmyard farmhands. Currently there <<if _FyL == 1>>is<<else>>are<</if>> _FyL farmhand<<if _FyL != 1>>s<</if>> at $farmyardName.
[[Expand the farmyard|Farmyard][cashX(forceNeg(_Tmult0), "capEx"), $farmyard += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
<span id="menials">
@@ -190,7 +190,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
</span>
<span id="rules">
-<<if $farmyardSlaves > 0>>
+<<if _FyL > 0>>
<br><br>
<<if $farmyardShows == 1 && (_CL > 0 || _HL > 0 || _FL > 0)>>
Slaves ''are'' putting on shows with animals.
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index adca04eea17966e179120ba7910feb7df43008e2..346cf6d65894a6bf542fbd6d67d6018e95fd4544 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -4,7 +4,7 @@
</span>
<<SlaveIDSort $FarmyardiIDs>>
-<<set _DL = $FarmyardiIDs.length, $farmyardSlaves = _DL, _SL = $slaves.length, $FarmerCashBonus = 0, _FLsFetish = 0, _profits = 0, _foodWeek = 0>>
+<<set _DL = $FarmyardiIDs.length, _SL = $slaves.length, $FarmerCashBonus = 0, _FLsFetish = 0, _profits = 0, _foodWeek = 0>>
<<set $FarmerDevotionBonus = 1, $FarmerDevotionThreshold = 45, $FarmerTrustBonus = 1, $FarmerTrustThreshold = 35, $FarmerHealthBonus = 0>>
/*<<set $legendaryWombID = 0>> TODO: will the Farmyard have a legendary womb system? */
@@ -282,7 +282,7 @@
<span id="foodProduction">
/* TODO: is this right? */
- <<if $farmyardSlaves > 0>>
+ <<if _DL > 0>>
<<set _foodWeek = _incomeStats.food>>
<</if>>
<<if $farmMenials > 0>>
diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 58f3a8510f303606f681ad6bc30debc40e100bf7..b8ee37387efbb6013e6dea07983aa822973e645f 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -1,6 +1,6 @@
:: Nursery [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Nursery", $showEncyclopedia = 1, $encyclopedia = "Nursery", $nurserySlaves = $NurseryiIDs.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Nursery", $showEncyclopedia = 1, $encyclopedia = "Nursery">>
<<set $targetAgeNursery = Number($targetAgeNursery) || $minimumSlaveAge>>
<<set $targetAgeNursery = Math.clamp($targetAgeNursery, $minimumSlaveAge, 42)>>
@@ -8,7 +8,7 @@
<<set $nurseryNameCaps = $nurseryName.replace("the ", "The ")>>
<</if>>
-<<set $readyChildren = 0, $nurseryBabies = $cribs.length, $freeCribs = $nursery - $nurseryBabies, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
+<<set $readyChildren = 0, $nurseryBabies = $cribs.length, $freeCribs = $nursery - $nurseryBabies, _NL = $NurseryiIDs.length, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
$nurseryNameCaps
<<switch $nurseryDecoration>>
@@ -76,26 +76,26 @@ $nurseryNameCaps
<<setLocalPronouns $Matron 2>>
<</if>>
-<<if $nurserySlaves > 2>>
+<<if _NL > 2>>
$nurseryNameCaps is bustling with activity. Nannies are busily moving about, feeding babies and changing diapers.
-<<elseif $nurserySlaves > 0>>
+<<elseif _NL > 0>>
$nurseryNameCaps is working steadily. Nannies are moving about, cleaning up and feeding hungry children.
<<set $nannyInfluence = 1>>
<<elseif $Matron>>
$Matron.slaveName is alone in $nurseryName, and keeps the place clean and looks after the children $herself2.
<<set $MatronInfluence = 1>>
-<<elseif ($nurserySlaves <= 0) && ($nurseryBabies <= 0)>>
+<<elseif (_NL <= 0) && ($nurseryBabies <= 0)>>
$nurseryNameCaps is empty and quiet. <<link "Decommission the Nursery" "Main">><<set $nursery = 0, $nurseryNannies = 0, $nannyInfluence = 0, $nurseryDecoration = "standard", $cribs = [], $reservedChildrenNursery = 0>><<for _i = 0; _i < $slaves.length; _i++>><<run WombCleanGenericReserve($slaves[_i], "nursery", 9999)>><</for>><</link>>
<</if>>
-<<if $nurserySlaves > 0>>
+<<if _NL > 0>>
<<if $Matron>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $nurserySlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = _NL+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Nursery">>
<<if $Matron>>
<<= assignJob($Matron, "rest")>>
<</if>>
- <<for $nurserySlaves > 0>>
+ <<for _NL > 0>>
<<= assignJob($slaves[$slaveIndices[$NurseryiIDs[0]]], "rest")>>
<</for>>
<</link>>
@@ -105,8 +105,8 @@ $nurseryNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($nurseryNannies*1000*$upgradeMultiplierArcology)>>
-<br>It can support $nurseryNannies nann<<if $nurseryNannies != 1>>ies<<else>>y<</if>>. There <<if $nurserySlaves == 1>>is<<else>>are<</if>> $nurserySlaves nann<<if $nurserySlaves != 1>>ies<<else>>y<</if>> in $nurseryName.
-<<if $nurseryBabies > 0 && ($nurserySlaves < 1 && !$Matron)>>
+<br>It can support $nurseryNannies nann<<if $nurseryNannies != 1>>ies<<else>>y<</if>>. There <<if _NL == 1>>is<<else>>are<</if>> _NL nann<<if _NL != 1>>ies<<else>>y<</if>> in $nurseryName.
+<<if $nurseryBabies > 0 && _NL < 1 && (!$Matron)>>
//You must have a Matron or at least one nanny to be able to influence the children's upbringing//
<br>
<</if>>
diff --git a/src/facilities/nursery/nurseryDiscardWorkaround.tw b/src/facilities/nursery/nurseryDiscardWorkaround.tw
index cd9e3dd993c56157965e3d1b766eb670c4e28540..d47ae544780be86b5a04c6ec79ab409f94f83e38 100644
--- a/src/facilities/nursery/nurseryDiscardWorkaround.tw
+++ b/src/facilities/nursery/nurseryDiscardWorkaround.tw
@@ -4,5 +4,4 @@ $activeSlave.slaveName has been given away to another arcology to be raised, nev
<br><br>
-<<set $nurserySlaves-->>
<<set $returnTo = "Main">>
\ No newline at end of file
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index 16dfd870589e5d5cbbf5d0a548ec1430fbae3791..2ff911ca526844d2d975dabb4fd087af684ea7cc 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -1825,8 +1825,10 @@ App.Facilities.Nursery.LongInfantDescription = function(child) {
r = ``,
age,
title,
- father,
- mother;
+ father = 0,
+ fatherPC = 0,
+ mother = 0,
+ motherPC = 0;
const
{
@@ -1835,17 +1837,29 @@ App.Facilities.Nursery.LongInfantDescription = function(child) {
if (child.father === -1 && child.mother === -1) {
father = PC;
+ fatherPC = 1;
mother = PC;
+ motherPC = 1;
} else {
if (child.father === -1) {
father = PC;
+ fatherPC = 1;
mother = getSlave(child.mother);
} else if (child.mother === -1) {
father = getSlave(child.father);
mother = PC;
+ motherPC = 1;
} else {
- father = getSlave(child.father);
- mother = getSlave(child.mother);
+ if (child.father > 0) { /* Fathered by a current slave */
+ father = getSlave(child.father);
+ } else if (child.father < 0) { /* Fathered by a missing slave */
+ father = -1;
+ }
+ if (child.father > 0) { /* Mothered by a current slave */
+ mother = getSlave(child.mother);
+ } else if (child.mother < 0) { /* Mothered by a missing slave */
+ mother = -1;
+ }
}
}
@@ -2027,31 +2041,35 @@ App.Facilities.Nursery.LongInfantDescription = function(child) {
/* OPEN FAMILY */
- if (father === PC && mother === PC) {
+ if (fatherPC && motherPC) {
r += `${He} is <span class="lightgreen">your child;</span> you knocked yourself up with ${him}. `;
- } else if (father === mother) {
- r += `He was <span class="lightgreen">both fathered and mothered by ${father.slaveName}.</span> `;
+ } else if (child.father === child.mother) {
+ r += `${He} was <span class="lightgreen">both fathered and mothered by ${father.slaveName}.</span> `;
} else {
- if (father === PC) {
+ if (fatherPC) {
r += `${He} is <span class="lightgreen">your child;</span> you knocked up ${his} mother, ${SlaveFullName(mother)}. `;
- } else if (mother === PC) {
+ } else if (motherPC) {
r += `${He} is <span class="lightgreen">your child;</span> you gave birth to ${him}. `;
} else {
let pName;
- if (father > 0) {
- if (child.father in V.missingTable && V.showMissingSlaves) {
- pName = V.slaves[V.slaveIndices[child.father]].slaveName;
- } else {
+ if (child.father !== 0) {
+ if (V.showMissingSlaves && child.father in V.missingTable) {
pName = `your former slave ${V.missingTable[child.father].slaveName}`;
+ } else if (child.father in V.slaveIndices) {
+ pName = V.slaves[V.slaveIndices[child.father]].slaveName;
}
- r += `${He} was <span class="lightgreen">fathered by ${pName}'s</span> virile dick. `;
- } else if (mother > 0) {
- if (child.mother in V.missingTable && V.showMissingSlaves) {
- pName = V.slaves[V.slaveIndices[child.mother]].slaveName;
- } else {
+ if (pName) {
+ r += `${He} was <span class="lightgreen">fathered by ${pName}'s</span> virile dick. `;
+ }
+ } else if (child.mother !== 0) {
+ if (V.showMissingSlaves && child.mother in V.missingTable) {
pName = `your former slave ${V.missingTable[child.mother].slaveName}`;
+ } else if (child.mother in V.slaveIndices){
+ pName = V.slaves[V.slaveIndices[child.mother]].slaveName;
+ }
+ if (pName) {
+ r += `${He} was born from ${pName}'s fertile womb. `;
}
- r += `${He} was born from ${pName}'s fertile womb. `;
}
}
}
@@ -2082,7 +2100,7 @@ App.Facilities.Nursery.LongInfantDescription = function(child) {
if (jsDef(fi)) {
mfi = father.mother;
ffi = father.father;
- } else if (father === PC) {
+ } else if (fatherPC) {
mfi = PC.mother;
ffi = PC.father;
}
@@ -2384,17 +2402,19 @@ App.Facilities.Nursery.LongInfantDescription = function(child) {
/* CLOSE FAMILY */
- if (father === PC) {
+ if (father && fatherPC) {
if (child.eyeColor === PC.eyeColor) {
r += `${He} has your ${child.eyeColor} eyes, `;
- } else {
+ } else if (mother) {
r += `${He} has ${his} mother ${mother.slaveName}'s ${child.eyeColor} eyes, `;
}
} else {
- if (child.eyeColor === father.eyeColor) {
+ if (father && child.eyeColor === father.eyeColor) {
r += `${He} has ${his} father ${father.slaveName}'s ${child.eyeColor} eyes, `;
- } else {
+ } else if (mother) {
r += `${He} has ${his} mother ${mother.slaveName}'s ${child.eyeColor} eyes, `;
+ } else {
+ r += `${He} has ${child.eyeColor} eyes, `;
}
}
r += ` and ${he} will most likely have ${child.hColor} hair when ${he}'s older. `;
@@ -2504,7 +2524,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
shortLips(child);
shortTeeth(child);
shortMuscles(child);
- shortLimbs(child);
+ r += App.Desc.shortLimbs(child);
shortVoice(child);
shortTitsAss(child);
shortHips(child);
@@ -2521,7 +2541,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
longLips(child);
longTeeth(child);
longMuscles(child);
- longLimbs(child);
+ r += App.Desc.longLimbs(child);
longVoice(child);
longTitsAss(child);
longHips(child);
@@ -2674,7 +2694,7 @@ App.Facilities.Nursery.ChildSummary = function(child) {
longClothes(child);
longCollar(child);
longBelly(child);
- if (child.amp !== 1) {
+ if (hasAnyLegs(child)) {
longLegs(child);
}
if (canWalk(child)) {
@@ -4562,34 +4582,6 @@ App.Facilities.Nursery.ChildSummary = function(child) {
}
}
- /**
- * @param {App.Entity.SlaveState} child
- */
- function shortLimbs(child) {
- if (child.amp !== 0) {
- if (child.amp === -1) {
- r += `P-Limbs`;
- } else if (child.amp === -2) {
- r += `Sex P-Limbs`;
- } else if (child.amp === -3) {
- r += `Beauty P-Limbs`;
- } else if (child.amp === -4) {
- r += `Combat P-Limbs`;
- } else if (child.amp === -5) {
- r += `Cyber P-Limbs`;
- } else {
- r += `Amp`;
- }
- }
- if (!canWalk(child)) {
- r += ` Immob `;
- }
- if (child.heels === 1) {
- r += ` Heel `;
- }
- r += `</span> `;
- }
-
/**
* @param {App.Entity.SlaveState} child
*/
@@ -4915,34 +4907,6 @@ App.Facilities.Nursery.ChildSummary = function(child) {
}
}
- /**
- * @param {App.Entity.SlaveState} child
- */
- function longLimbs(child) {
- if (child.amp !== 0) {
- if (child.amp === -1) {
- r += `Prosthetic limbs. `;
- } else if (child.amp === -2) {
- r += `Sexy prosthetic limbs. `;
- } else if (child.amp === -3) {
- r += `Beautiful prosthetic limbs. `;
- } else if (child.amp === -4) {
- r += `Deadly prosthetic limbs. `;
- } else if (child.amp === -5) {
- r += `Cyber prosthetic limbs. `;
- } else {
- r += `Amputee. `;
- }
- }
- if (!canWalk(child)) {
- r += `Immobile. `;
- }
- if (child.heels === 1) {
- r += `Heeled. `;
- }
- r += `</span> `;
- }
-
/**
* @param {App.Entity.SlaveState} child
*/
@@ -8228,9 +8192,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `${His} poor scrotum is so overfilled, every little vein is visible. ${He} must be in constant discomfort. `;
} else if (scrotalFullness === 0) {
- r += `${His} comfortable scrotum allows them to hang massively ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${His} comfortable scrotum allows them to hang massively ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
} else {
- r += `Their weight and size has stretched ${his} scrotum downward, so that they ${child.amp !== 1 ? `drag along the floor` : `hang far from ${his} limbless torso`}. `;
+ r += `Their weight and size has stretched ${his} scrotum downward, so that they ${hasBothLegs(child) ? `drag along the floor` : `hang far from ${his} legless torso`}. `;
}
} else if (child.balls >= 20) {
if (scrotalFullness < -1) {
@@ -8238,9 +8202,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `${His} poor scrotum is so overfilled, every little vein is visible. ${He} must be in constant discomfort. `;
} else if (scrotalFullness === 0) {
- r += `${His} comfortable scrotum allows them to hang massively ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${His} comfortable scrotum allows them to hang massively ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
} else {
- r += `Their weight and size has stretched ${his} scrotum downward, so that they dangle ${child.amp !== 1 ? `to ${his} knees` : `quite the distance from ${his} limbless torso`}. `;
+ r += `Their weight and size has stretched ${his} scrotum downward, so that they dangle ${hasBothLegs(child) ? `to ${his} knees` : `quite the distance from ${his} legless torso`}. `;
}
} else if (child.balls > 5) {
if (scrotalFullness < -1) {
@@ -8248,9 +8212,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `They're held against ${his} base by a tight scrotum that permits them little movement. `;
} else if (scrotalFullness === 0) {
- r += `${His} comfortable scrotum allows them to hang massively ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${His} comfortable scrotum allows them to hang massively ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
} else {
- r += `Their weight has stretched ${his} scrotum downward, so that they dangle ${child.amp !== 1 ? `halfway to ${his} knees` : `some distance from ${his} limbless torso`}. `;
+ r += `Their weight has stretched ${his} scrotum downward, so that they dangle ${hasBothLegs(child) ? `halfway to ${his} knees` : `some distance from ${his} legless torso`}. `;
}
} else if (child.balls > 3) {
if (scrotalFullness < -1) {
@@ -8258,9 +8222,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `They're held against ${his} base by a tight scrotum that permits them little movement. `;
} else if (scrotalFullness === 0) {
- r += `${His} soft scrotum allows them to rest comfortably ${child.amp !== 1 ? `between ${his} legs` : `beneath ${his} limbless torso`}. `;
+ r += `${His} soft scrotum allows them to rest comfortably ${hasBothLegs(child) ? `between ${his} legs` : `beneath ${his} legless torso`}. `;
} else {
- r += `${He} has a loose, dangling scrotum that allows them to swing ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${He} has a loose, dangling scrotum that allows them to swing ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
}
} else if (child.balls > 1) {
if (scrotalFullness === -1) {
@@ -8294,7 +8258,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
r += `${He}'s painfully erect. `;
} else if (child.dick > 8) {
r += `${He}'s too huge for ${his} cardiovascular system to create even the beginnings of an erection. ${His} cock is a soft, sensitive monolith${child.dick * 6 > child.height ? ` bigger than ${his} body` : child.dick * 6 > child.height / 2 ? ` the size of one of ${his} legs` : ` the size of one of ${his} arms`}, `;
- if (child.amp && child.dick * 6 > child.height) {
+ if (hasAnyArms(child) && hasAnyLegs(child) && child.dick * 6 > child.height) {
r += `or would be if ${he} had any of those. `;
} else {
r += `hanging with its head ${child.dick > 9 ? `below` : `between`} ${his} knees. `;
@@ -8656,7 +8620,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
}
} else if (child.vagina === -1) {
if (!child.scrotum) {
- r += `${He} has ${V.seeDicks > 0 ? `no penis and ` : ``}no vagina, nothing but a tiny hole in the smooth ${child.skin} skin ${child.amp !== 1 ? `between ${his} legs` : `at the base of ${his} hips`}. `;
+ r += `${He} has ${V.seeDicks > 0 ? `no penis and ` : ``}no vagina, nothing but a tiny hole in the smooth ${child.skin} skin ${hasBothLegs(child) ? `between ${his} legs` : `at the base of ${his} hips`}. `;
} else {
r += `${He} has ${V.seeDicks > 0 ? `no penis and ` : ``}no vagina, just a tiny hole above `;
@@ -8695,9 +8659,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `${His} poor scrotum is so overfilled, every little vein is visible. ${He} must be in constant discomfort. `;
} else if (scrotalFullness === 0) {
- r += `${His} comfortable scrotum allows them to hang massively ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${His} comfortable scrotum allows them to hang massively ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
} else {
- r += `Their weight and size has stretched ${his} scrotum downward, so that they ${child.amp !== 1 ? `drag along the floor` : `hang far from ${his} limbless torso`}. `;
+ r += `Their weight and size has stretched ${his} scrotum downward, so that they ${hasBothLegs(child) ? `drag along the floor` : `hang far from ${his} legless torso`}. `;
}
} else if (child.balls > 20) {
if (scrotalFullness < -1) {
@@ -8705,9 +8669,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `${His} poor scrotum is so overfilled, every little vein is visible. ${He} must be in constant discomfort. `;
} else if (scrotalFullness === 0) {
- r += `${His} comfortable scrotum allows them to hang massively ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${His} comfortable scrotum allows them to hang massively ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
} else {
- r += `Their weight and size has stretched ${his} scrotum downward, so that they dangle ${child.amp !== 1 ? `to ${his} knees` : `quite the distance from ${his} limbless torso`}. `;
+ r += `Their weight and size has stretched ${his} scrotum downward, so that they dangle ${hasBothLegs(child) ? `to ${his} knees` : `quite the distance from ${his} legless torso`}. `;
}
} else if (child.balls > 5) {
if (scrotalFullness < -1) {
@@ -8715,9 +8679,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `They're held against ${his} base by a tight scrotum that permits them little movement. `;
} else if (scrotalFullness === 0) {
- r += `${His} comfortable scrotum allows them to hang massively ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${His} comfortable scrotum allows them to hang massively ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
} else {
- r += `Their weight has stretched ${his} scrotum downward, so that they dangle ${child.amp !== 1 ? `halfway to ${his} knees` : `some distance from ${his} limbless torso`}. `;
+ r += `Their weight has stretched ${his} scrotum downward, so that they dangle ${hasBothLegs(child) ? `halfway to ${his} knees` : `some distance from ${his} legless torso`}. `;
}
} else if (child.balls > 3) {
if (scrotalFullness < -1) {
@@ -8725,9 +8689,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `They're held against ${his} base by a tight scrotum that permits them little movement. `;
} else if (scrotalFullness === 0) {
- r += `${His} soft scrotum allows them to rest comfortably ${child.amp !== 1 ? `between ${his} legs` : `beneath ${his} limbless torso`}. `;
+ r += `${His} soft scrotum allows them to rest comfortably ${hasBothLegs(child) ? `between ${his} legs` : `beneath ${his} legless torso`}. `;
} else {
- r += `${He} has a loose, dangling scrotum that allows them to swing ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${He} has a loose, dangling scrotum that allows them to swing ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
}
} else if (child.balls > 1) {
if (scrotalFullness === -1) {
@@ -8941,9 +8905,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `${His} poor scrotum is so overfilled, every little vein is visible. ${He} must be in constant discomfort. `;
} else if (scrotalFullness === 0) {
- r += `${His} comfortable scrotum allows them to hang massively ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${His} comfortable scrotum allows them to hang massively ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
} else {
- r += `Their weight and size has stretched ${his} scrotum downward, so that they ${child.amp !== 1 ? `drag along the floor` : `hang far from ${his} limbless torso`}. `;
+ r += `Their weight and size has stretched ${his} scrotum downward, so that they ${hasBothLegs(child) ? `drag along the floor` : `hang far from ${his} legless torso`}. `;
}
} else if (child.balls >= 20) {
if (scrotalFullness < -1) {
@@ -8951,9 +8915,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `${His} poor scrotum is so overfilled, every little vein is visible. ${He} must be in constant discomfort. `;
} else if (scrotalFullness === 0) {
- r += `${His} comfortable scrotum allows them to hang massively ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${His} comfortable scrotum allows them to hang massively ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
} else {
- r += `Their weight and size has stretched ${his} scrotum downward, so that they dangle ${child.amp !== 1 ? `to ${his} knees` : `quite the distance from ${his} limbless torso`}. `;
+ r += `Their weight and size has stretched ${his} scrotum downward, so that they dangle ${hasBothLegs(child) ? `to ${his} knees` : `quite the distance from ${his} legless torso`}. `;
}
} else if (child.balls > 5) {
if (scrotalFullness < -1) {
@@ -8961,9 +8925,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `They're held against ${his} base by a tight scrotum that permits them little movement. `;
} else if (scrotalFullness === 0) {
- r += `${His} comfortable scrotum allows them to hang massively ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${His} comfortable scrotum allows them to hang massively ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
} else {
- r += `Their weight has stretched ${his} scrotum downward, so that they dangle ${child.amp !== 1 ? `halfway to ${his} knees` : `some distance from ${his} limbless torso`}. `;
+ r += `Their weight has stretched ${his} scrotum downward, so that they dangle ${hasBothLegs(child) ? `halfway to ${his} knees` : `some distance from ${his} legless torso`}. `;
}
} else if (child.balls > 3) {
if (scrotalFullness < -1) {
@@ -8971,9 +8935,9 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
} else if (scrotalFullness === -1) {
r += `They're held against ${his} base by a tight scrotum that permits them little movement. `;
} else if (scrotalFullness === 0) {
- r += `${His} soft scrotum allows them to rest comfortably ${child.amp !== 1 ? `between ${his} legs` : `beneath ${his} limbless torso`}. `;
+ r += `${His} soft scrotum allows them to rest comfortably ${hasBothLegs(child) ? `between ${his} legs` : `beneath ${his} legless torso`}. `;
} else {
- r += `${He} has a loose, dangling scrotum that allows them to swing ${child.amp !== 1 ? `between ${his} legs` : `from ${his} limbless torso`}. `;
+ r += `${He} has a loose, dangling scrotum that allows them to swing ${hasBothLegs(child) ? `between ${his} legs` : `from ${his} legless torso`}. `;
}
} else if (child.balls > 1) {
if (scrotalFullness === -1) {
@@ -9506,7 +9470,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
let
r = ``;
- if (child.amp !== 1) {
+ if (hasAnyLegs(child)) {
switch (child.clothes) {
case "a slave gown":
switch (child.shoes) {
@@ -10635,7 +10599,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
}
if (V.showClothing && !V.saleDescription) {
- if (child.amp !== 1) {
+ if (hasAnyLegs(child)) {
if (child.shoes !== "none" && child.shoes !== "flats") {
r += `${He} is, so ${he} can walk reasonably well. `;
} else {
@@ -10921,7 +10885,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
let
r = ``;
- if (child.amp) {
+ if (!hasAnyArms(child)) {
r += `${He} has no hands, and thus, no nails. `;
} else {
switch (child.nails) {
@@ -12723,11 +12687,11 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
if (child.releaseRules === "permissive" || child.releaseRules === "masturbation") {
if ((child.aphrodisiacs > 0 || child.inflationType === "aphrodisiac") && child.drugs !== "priapism agent") {
if (child.aphrodisiacs > 1 || (child.inflationType === "aphrodisiac" && child.inflation > 1)) {
- if (child.dick !== 0 && child.hormoneBalance >= 100 && child.amp) {
+ if (child.dick !== 0 && child.hormoneBalance >= 100 && !hasAnyArms(child)) {
r += `The extreme dose of aphrodisiacs combined with the hormones that keep ${him} flaccid have ${him} in a state of extreme sexual frustration; ${he}'s${(child.fetish === "buttslut" || child.sexualFlaw !== "hates anal") && child.counter.anal > 9 ? ` unconsciously humping ${his} ass against whatever's next to ${him} for anal stimulation and` : ``} humping ${his} dick against whatever ${he} can manage to mount without limbs. ${child.inflationType === "aphrodisiac" ? `${His} efforts force ${his} distended middle to jiggle around, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more. ` : ``}`;
- } else if (child.dick !== 0 && child.balls > 0 && child.ballType === "sterile" && child.amp) {
+ } else if (child.dick !== 0 && child.balls > 0 && child.ballType === "sterile" && !hasAnyArms(child)) {
r += `The extreme dose of aphrodisiacs combined with the chemical castration that keeps ${him} flaccid have ${him} in a state of extreme sexual frustration; ${he}'s${(child.fetish === "buttslut" || child.sexualFlaw !== "hates anal") && child.counter.anal > 9 ? ` unconsciously humping ${his} ass against whatever's next to ${him} for anal stimulation and` : ``} humping ${his} limp dick against whatever ${he} can manage to mount without limbs. ${child.inflationType === "aphrodisiac" ? `${His} efforts force ${his} distended middle to jiggle around, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more. ` : ``}`;
- } else if (child.dick !== 0 && !child.balls && child.amp) {
+ } else if (child.dick !== 0 && !child.balls && !hasAnyArms(child)) {
r += `The extreme dose of aphrodisiacs combined with the lack of balls that keeps ${him} flaccid have ${him} in a state of extreme sexual frustration; ${he}'s ${(child.fetish === "buttslut" || child.sexualFlaw !== "hates anal") && child.counter.anal > 9 ? ` unconsciously humping ${his} ass against whatever's next to ${him} for anal stimulation and` : ``} humping ${his} limp dick against whatever ${he} can manage to mount without limbs. ${child.inflationType === "aphrodisiac" ? `${His} efforts force ${his} distended middle to jiggle around, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more. ` : ``}`;
} else if (child.dick !== 0 && child.hormoneBalance >= 100) {
r += `The extreme dose of aphrodisiacs combined with the hormones that keep ${him} flaccid have ${him} in a state of extreme sexual frustration; ${he}'s rubbing ${his} limp dick distractedly${(child.fetish === "buttslut" || child.sexualFlaw !== "hates anal") && child.counter.anal > 9 ? ` and unconsciously humping ${his} ass against whatever's next to ${him} for anal stimulation` : ``}. ${child.inflationType === "aphrodisiac" ? `${His} efforts force ${his} distended middle to jiggle around, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more. ` : ``}`;
@@ -12739,11 +12703,11 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
r += `The extreme dose of aphrodisiacs has ${his} cock painfully erect and precum drips from its head. `;
}
} else {
- if (child.dick !== 0 && child.hormoneBalance >= 100 && child.amp) {
+ if (child.dick !== 0 && child.hormoneBalance >= 100 && isAmputee(child)) {
r += `The aphrodisiacs combined with the hormones that keep ${him} flaccid have ${him} sexually frustrated; ${he}'s ${(child.fetish === "buttslut" || child.sexualFlaw !== "hates anal") && child.counter.anal > 9 ? ` unconsciously humping ${his} ass against whatever's next to ${him} for anal stimulation and` : ``} humping ${his} dick against whatever ${he} can manage to mount without limbs. ${child.inflationType === "aphrodisiac" ? `${His} efforts force ${his} distended middle to jiggle around, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more. ` : ``}`;
- } else if (child.dick !== 0 && child.balls > 0 && child.ballType === "sterile" && child.amp) {
+ } else if (child.dick !== 0 && child.balls > 0 && child.ballType === "sterile" && isAmputee(child)) {
r += `The aphrodisiacs combined with the chemical castration that keeps ${him} flaccid have ${him} sexually frustrated; ${he}'s ${(child.fetish === "buttslut" || child.sexualFlaw !== "hates anal") && child.counter.anal > 9 ? ` unconsciously humping ${his} ass against whatever's next to ${him} for anal stimulation and` : ``} humping ${his} dick against whatever ${he} can manage to mount without limbs. ${child.inflationType === "aphrodisiac" ? `${His} efforts force ${his} distended middle to jiggle around, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more. ` : ``}`;
- } else if (child.dick !== 0 && !child.balls && child.amp) {
+ } else if (child.dick !== 0 && !child.balls && isAmputee(child)) {
r += `The aphrodisiacs combined with the lack of balls that keeps ${him} flaccid have ${him} sexually frustrated; ${he}'s ${(child.fetish === "buttslut" || child.sexualFlaw !== "hates anal") && child.counter.anal > 9 ? ` unconsciously humping ${his} ass against whatever's next to ${him} for anal stimulation and` : ``} humping ${his} dick against whatever ${he} can manage to mount without limbs. ${child.inflationType === "aphrodisiac" ? `${His} efforts force ${his} distended middle to jiggle around, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more. ` : ``}`;
} else if (child.dick !== 0 && child.hormoneBalance >= 100) {
r += `The aphrodisiacs combined with the hormones that keep ${him} flaccid have ${him} sexually frustrated; ${he}'s touching ${his} limp dick distractedly${(child.fetish === "buttslut" || child.sexualFlaw !== "hates anal") && child.counter.anal > 9 ? ` and unconsciously rubbing ${his} ass against whatever's next to ${him}` : ``}. ${child.inflationType === "aphrodisiac" ? `${His} efforts force ${his} distended middle to jiggle around, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more. ` : ``}`;
@@ -14756,9 +14720,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
r += `<br> `;
- if (child.amp) {
- r += App.Desc.amputee(child);
- }
+ r += App.Desc.limbs(child);
if (V.showClothing && !V.saleDescription) {
r += `${child.slaveName} is `;
@@ -14770,25 +14732,25 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
switch (child.clothes) {
case "a slave gown":
- r += `a gorgeous affair ${child.amp ? `cleavage and a short skirt. ` : `with cuts that offer tantalizing glimpses of delicate flesh and ${footwear(child)}`}`;
+ r += `a gorgeous affair ${!hasAnyLegs(child) ? `cleavage and a short skirt. ` : `with cuts that offer tantalizing glimpses of delicate flesh and ${footwear(child)}`}`;
break;
case "a ball gown":
- r += `a majestically grand silken dress for formal ${child.amp ? `back. ` : `occasions, stockings, and ${footwear(child)}`}`;
+ r += `a majestically grand silken dress for formal ${!hasAnyLegs(child) ? `back. ` : `occasions, stockings, and ${footwear(child)}`}`;
break;
case "a mini dress":
- r += `a body hugging strapless number that shows as much skin as it ${child.amp ? `everything. ` : `covers, paired with ${footwear(child)}`}`;
+ r += `a body hugging strapless number that shows as much skin as it ${!hasAnyLegs(child) ? `everything. ` : `covers, paired with ${footwear(child)}`}`;
break;
case "a schoolgirl outfit":
- r += `which includes a tight white ${child.amp ? `pattern. ` : `blouse, a short plaid skirt, and ${footwear(child)}`}`;
+ r += `which includes a tight white ${!hasAnyLegs(child) ? `pattern. ` : `blouse, a short plaid skirt, and ${footwear(child)}`}`;
break;
case "a sweater":
case "a t-shirt":
case "a tank-top":
case "an oversized t-shirt":
- r += `which only covers ${his} ${child.amp ? `breasts. ` : `torso, and ${footwear(child)}`}`;
+ r += `which only covers ${his} ${!hasAnyLegs(child) ? `breasts. ` : `torso, and ${footwear(child)}`}`;
break;
default:
- r += `so ${his} nude body is on display. ${child.amp ? `In fact, ${he}'s devoid of even limbs. ` : `${He} is wearing ${footwear(child)}`}`;
+ r += `so ${his} nude body is on display. ${!hasAnyLegs(child) ? `In fact, ${he}'s devoid of even legs. ` : `${He} is wearing ${footwear(child)}`}`;
break;
}
}
@@ -15028,47 +14990,53 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
}
}
- if (!child.amp) {
+ if (hasAnyArms(child)) {
+ let s = "s";
+ let a = "";
+ if (!hasBothArms(child)) {
+ s = "";
+ a = "a "
+ }
if (child.weight > 190) {
- r += `${He} has hugely thick arms with sagging fat rolls and `;
+ r += `${He} has ${a}hugely thick arm${s} with sagging fat rolls and `;
} else if (child.weight > 160) {
- r += `${He} has thick arms with drooping fat folds and `;
+ r += `${He} has ${a}thick arm${s} with drooping fat folds and `;
} else if (child.weight > 130) {
- r += `${He} has plump arms with `;
+ r += `${He} has ${a}plump arm${s} with `;
} else if (child.weight > 97) {
- r += `${He} has chubby arms with `;
+ r += `${He} has ${a}chubby arm${s} with `;
} else {
- r += `${He} has normal arms with `;
+ r += `${He} has ${a}normal arm${s} with `;
}
- }
if (child.muscles > 95) {
r += `huge muscles`;
if (child.weight > 95) {
- r += ` hidden beneath ${his} soft flesh `;
+ r += ` hidden beneath ${his} soft flesh`;
}
r += `. `;
} else if (child.muscles > 30) {
r += `obvious muscles`;
if (child.weight > 95) {
- r += ` hidden beneath ${his} soft flesh `;
+ r += ` hidden beneath ${his} soft flesh`;
}
r += `. `;
} else if (child.muscles > 5) {
r += `toned muscles`;
if (child.weight > 30) {
- r += ` hidden beneath ${his} soft flesh `;
+ r += ` hidden beneath ${his} soft flesh`;
+ }
+ r += `. `;
+ } else {
+ r += `little muscle to them. `;
}
- r += `. `;
- } else {
- r += `little muscle to them. `;
}
if (child.skill.combat > 0) {
- r += `${He} is <span class="aquamarine"skilled at combat:</span> ${he} is comfortable with the use of modern firearms and edges weapons, and ${his} hands `;
- if (child.amp === -4) {
+ r += `${He} is <span class="aquamarine"skilled at combat:</span> ${he} is comfortable with the use of modern firearms and edges weapons, and ${his} limbs `;
+ if (getLimbCount(child, 105) > 1) {
r += `would be deadly weapons even if they weren't full of deadly weapons already`;
- } else if (child.amp > 0) {
+ } else if (!isAmputee(child)) {
r += `would be deadly weapons if ${he} had any`;
} else {
r += `are deadly weapons`;
@@ -15084,19 +15052,26 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
r += piercings.corset(child);
}
- if (!child.amp) {
+ if (hasAnyLegs(child)) {
+ let s = "s";
+ let a = "";
+ if (!hasBothLegs(child)) {
+ s = "";
+ a = "a ";
+ }
+
if (child.weight > 190) {
- r += `${He} has extremely fat legs with immense soft, rather uneven thighs and `;
+ r += `${He} has ${hasBothLegs(child) ? `` : `an `}extremely fat leg${s} with ${hasBothLegs(child) ? `` : `an `}immense soft, rather uneven thigh${s} and `;
} else if (child.weight > 160) {
- r += `${He} has very fat legs with massively thick, soft, somewhat uneven thighs and `;
+ r += `${He} has ${a}very fat leg${s} with ${a}massively thick, soft, somewhat uneven thigh${s} and `;
} else if (child.weight > 130) {
- r += `${He} has fat legs with hugely thick, soft thighs and `;
+ r += `${He} has ${a}fat leg${s} with ${a}hugely thick, soft thigh${s} and `;
} else if (child.weight > 97) {
- r += `${He} has fat legs with thick, soft thighs and `;
+ r += `${He} has ${a}fat leg${s} with ${a}thick, soft thigh${s} and `;
} else if (child.weight > 95) {
- r += `${He} has normal legs with thick, soft thighs and `;
+ r += `${He} has ${a}normal leg${s} with ${a}thick, soft thigh${s} and `;
} else {
- r += `${He} has relatively normal legs and thighs with `;
+ r += `${He} has ${a}relatively normal leg${s} and thigh${s} with `;
}
if (child.muscles > 95) {
@@ -15112,7 +15087,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
}
r += `. `;
} else if (child.muscles > 5) {
- r += `tones muscles`;
+ r += `toned muscles`;
if (child.weight > 30) {
r += ` hidden beneath ${his} soft flab`;
}
@@ -15212,7 +15187,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
r += `${His} armpits appear hairless, but closer inspection reveals light, ${child.underArmHColor} stubble. `;
} else if (child.underArmHStyle === "neat") {
r += `${His} armpit hair is neatly trimmed `;
- if (child.amp) {
+ if (!hasAnyArms(child)) {
r += `since it is always in full view`;
} else {
r += ` to not be visible unless ${he} lifts ${his} arms`;
@@ -15220,7 +15195,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
r += `. `;
} else if (child.underArmHStyle === "bushy") {
r += `${His} ${child.underArmHColor} armpit hair has been allowed to grow freely`;
- if (child.amp) {
+ if (!hasAnyArms(child)) {
r += ` creating two bushy patches under where ${his} arms used to be`;
} else {
r += ` and can be seen poking out from under ${his} arms at all times`;
@@ -15259,14 +15234,18 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
if (V.showClothing && !V.saleDescription) {
r += collar(child);
if (child.relationship > 4) { // TODO: will children be able to get married?
- if (child.amp !== 1) {
+ if (hasLeftArm(child)) {
r += `${He} has a simple gold band on the little finger of ${his} left hand. `;
+ } else if (hasRightArm(child)) {
+ r += `${He} has a simple gold band on the little finger of ${his} right hand. `;
} else {
r += `${He} has a simple gold band on a length of chain around ${his} neck. `;
}
} else if (child.relationship === -3) {
- if (child.amp !== 1) {
+ if (hasLeftArm(child)) {
r += `${He} has a simple steel band on the little finger of ${his} left hand. `;
+ } else if (hasRightArm(child)) {
+ r += `${He} has a simple steel band on the little finger of ${his} right hand. `;
} else {
r += `${He} has a simple steel band on a length of cord around ${his} neck. `;
}
@@ -15336,19 +15315,19 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
break;
case "intensive breast injections":
case "hyper breast injections":
- r += `${He} ${child.amp !== 1 ? `massages ${his} tits uncomfortably` : `squirms under the unfamiliar weight on ${his} chest`}. The ${child.drugs === "hyper breast injections" ? `HA-HGH` : `A-HGH`} must be having an effect, painfully stretching ${his} breasts as the mammary and adipose tissue underneath grows explosively. `;
+ r += `${He} ${hasAnyArms(child) ? `massages ${his} tits uncomfortably` : `squirms under the unfamiliar weight on ${his} chest`}. The ${child.drugs === "hyper breast injections" ? `HA-HGH` : `A-HGH`} must be having an effect, painfully stretching ${his} breasts as the mammary and adipose tissue underneath grows explosively. `;
break;
case "intensive butt injections":
case "hyper butt injections":
- r += `${He} ${child.amp !== 1 ? `massages ${his} butt uncomfortably` : `squirms under the unfamiliar weight on ${his} backside`}. The ${child.drugs === "hyper butt injections" ? `HA-HGH` : `A-HGH`} must be having an effect, painfully stretching ${his} buttocks as the muscular and adipose tissue underneath grows explosively. `;
+ r += `${He} ${hasAnyArms(child) ? `massages ${his} butt uncomfortably` : `squirms under the unfamiliar weight on ${his} backside`}. The ${child.drugs === "hyper butt injections" ? `HA-HGH` : `A-HGH`} must be having an effect, painfully stretching ${his} buttocks as the muscular and adipose tissue underneath grows explosively. `;
break;
case "intensive penis enhancement":
case "hyper penis enhancement":
- `${He} ${child.amp !== 1 ? `massages ${his} ${child.dick > 0 ? `dick` : `clit`} uncomfortably` : `squirms under the unfamiliar weight in ${his} ${child.dick > 0 ? `dick` : `clit`}`}. The ${child.drugs === "hyper penis enhancement" ? `HA-HGH` : `A-HGH`} must be having an effect, painfully lengthening and thickening ${his} ${child.dick > 0 ? `dick` : `clit`}. `;
+ `${He} ${hasAnyArms(child) ? `massages ${his} ${child.dick > 0 ? `dick` : `clit`} uncomfortably` : `squirms under the unfamiliar weight in ${his} ${child.dick > 0 ? `dick` : `clit`}`}. The ${child.drugs === "hyper penis enhancement" ? `HA-HGH` : `A-HGH`} must be having an effect, painfully lengthening and thickening ${his} ${child.dick > 0 ? `dick` : `clit`}. `;
break;
case "intensive testicle enhancement":
case "hyper testicle enhancement":
- r += `${He} ${child.amp !== 1 ? `${He} massages ${his} balls uncomfortably` : `${He} squirms under the unfamiliar pressure in ${his} balls`} as `;
+ r += `${He} ${hasAnyArms(child) ? `${He} massages ${his} balls uncomfortably` : `${He} squirms under the unfamiliar pressure in ${his} balls`} as `;
if (child.drugs === "hyper testicle enhancement") {
if (child.balls < 20) {
r += ` as cum drools from the tip of ${his} dick. `;
@@ -15372,26 +15351,26 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
r += `Despite how little ${he} has been eating lately, ${his} stomach barely growls at all. `;
break;
case "penis atrophiers":
- r += `${He} ${child.amp !== 1 ? `massages ${his} dick uncomfortably` : `squirms in respose to the discomfort in ${his} dick`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} dick. `;
+ r += `${He} ${hasAnyArms(child) ? `massages ${his} dick uncomfortably` : `squirms in respose to the discomfort in ${his} dick`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} dick. `;
break;
case "testicle atropiers":
- r += `${He} ${child.amp !== 1 ? `massages ${his} balls uncomfortably` : `squirms in respose to the discomfort in ${his} balls`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} balls. `;
+ r += `${He} ${hasAnyArms(child) ? `massages ${his} balls uncomfortably` : `squirms in respose to the discomfort in ${his} balls`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} balls. `;
break;
case "clitoris atrophiers":
- r += `${He} ${child.amp !== 1 ? `massages ${his} clit uncomfortably` : `squirms in respose to the discomfort in ${his} clit`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} clit. `;
+ r += `${He} ${hasAnyArms(child) ? `massages ${his} clit uncomfortably` : `squirms in respose to the discomfort in ${his} clit`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} clit. `;
break;
case "labia atrophiers":
- r += `${He} ${child.amp !== 1 ? `massages ${his} pussy uncomfortably` : `squirms in respose to the discomfort in ${his} pussy`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} pussy. `;
+ r += `${He} ${hasAnyArms(child) ? `massages ${his} pussy uncomfortably` : `squirms in respose to the discomfort in ${his} pussy`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} pussy. `;
break;
case "nipple atrophiers":
- r += `${He} ${child.amp !== 1 ? `massages ${his} nipples uncomfortably` : `squirms in respose to the discomfort in ${his} nipples`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} nipples. `;
+ r += `${He} ${hasAnyArms(child) ? `massages ${his} nipples uncomfortably` : `squirms in respose to the discomfort in ${his} nipples`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} nipples. `;
break;
case "lip atrophiers":
- r += `${He} ${child.amp !== 1 ? `massages ${his} lips uncomfortably` : `licks ${his} lips uncomfortably`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} lips. `;
+ r += `${He} ${hasAnyArms(child) ? `massages ${his} lips uncomfortably` : `licks ${his} lips uncomfortably`}. The A-TRPH must be having an effect, painfully causing ${his} body to atrophy ${his} lips. `;
break;
case "breast redistributors":
case "butt redistributors":
- r += `${He} ${child.amp !== 1 ? `pinches at the fat building on ${his} belly and lets off a sigh` : `squirms under the added weight building on ${his} belly`}. The RDST-D must be having an effect, encouraging ${his} body to redistribute ${his} ${child.drugs === "breast redistributors" ? `breasts'` : `buttocks'`} adipose tissue to ${his} middle. `;
+ r += `${He} ${hasAnyArms(child) ? `pinches at the fat building on ${his} belly and lets off a sigh` : `squirms under the added weight building on ${his} belly`}. The RDST-D must be having an effect, encouraging ${his} body to redistribute ${his} ${child.drugs === "breast redistributors" ? `breasts'` : `buttocks'`} adipose tissue to ${his} middle. `;
break;
case "sag-B-gone":
r += `${His} breasts are shiny from the layer of anti-sag cream rubbed onto them. They might be a little perkier, or not. `;
@@ -15401,7 +15380,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
if (child.aphrodisiacs > 0 || child.inflationType === "aphrodisiacs") {
if (child.inflationType === "aphrodisiacs") {
r += `${He}'s literally full of`;
- if (child.amp) {
+ if (isAmputee(child)) {
r += `aphrodisiacs, but is an amputee, so ${he} cannot touch ${himself}. ${He} writhes with extreme sexual frustration, desperately trying to relieve ${himself}, but only managing to stir up the aphrodisiacs contained in ${his} gut, strengthening their effects even more. `;
} else if (child.chastityVagina) {
r += `aphrodisiacs, but is wearing a chastity belt and cannot touch ${himself}. ${He} writhes with extreme sexual frustration, desperately trying to relieve ${himself}, but only managing to stir up the aphrodisiacs contained in ${his} gut, strengthening their effects even more. `;
@@ -15435,7 +15414,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
}
} else if (child.aphrodisiacs > 1) {
r += `${He}'s swimming in`;
- if (child.amp) {
+ if (isAmputee(child)) {
r += `aphrodisiacs, but is an amputee, so ${he} cannot touch ${himself}. ${He} writhes with extreme sexual frustration, desperately trying to relieve ${himself}. `;
} else if (child.chastityVagina) {
r += `aphrodisiacs, but is wearing a chastity belt and cannot touch ${himself}. ${He} writhes with extreme sexual frustration, desperately trying to relieve ${himself}. `;
@@ -15468,7 +15447,7 @@ App.Facilities.Nursery.LongChildDescription = function(child) {
r += `aphrodisiacs and is not allowed to masturbate, so as ${he} stands before you ${he} desperately presents ${his} open mouth, ${his} breasts, ${his} pussy, and ${his} anus in turn, hoping that something will entice you to give ${him} relief. `;
}
} else {
- if (child.amp) {
+ if (isAmputee(child)) {
r += `${He}'s on aphrodisiacs, but is an amputee, so ${he} cannot touch ${himself}. ${He} writhes with sexual frustration. `;
} else if (child.chastityVagina) {
r += `${He}'s on aphrodisiacs, but is wearing a chastity belt and cannot touch ${himself}. ${He} writhes with sexual frustration. `;
@@ -18702,7 +18681,7 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
const
V = State.variables,
Matron = V.Matron,
- NL = V.nurserySlaves.length,
+ NL = V.NurseryiIDs.length,
CL = V.cribs.length;
let
@@ -18752,7 +18731,7 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
// TODO: add Matron and nanny effects
if (child.actualAge >= 3) {
- if (Matron || V.nurserySlaves) {
+ if (Matron || NL) {
let
chance = jsRandom(1, 100);
@@ -18834,7 +18813,7 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
}
if (NL > 0) {
- for (let j = 0; j < V.nurserySlaves; j++) {
+ for (let j = 0; j < NL; j++) {
const
slave = getSlave(V.NurseryiIDs[j]);
@@ -18942,24 +18921,24 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
averageIntelligenceImplant;
for (let j = 0; j < NL; j++) {
- averageIntelligence += V.nurserySlaves[j].intelligence;
- averageIntelligenceImplant += V.nurserySlaves[j].intelligenceImplant;
+ averageIntelligence += V.slaves[V.slaveIndices[NurseryiIDs[j]]].intelligence;
+ averageIntelligenceImplant += V.slaves[V.slaveIndices[NurseryiIDs[j]]].intelligenceImplant;
}
averageIntelligence = averageIntelligence / NL;
averageIntelligenceImplant = averageIntelligenceImplant / NL;
if (averageIntelligence + averageIntelligenceImplant > 65) {
- r += `${NL > 1 ? `The nannies are mostly` : `${V.nurserySlaves[0].slaveName} is`} very intelligent and well educated and are able to teach ${CL > 1 ? `the children` : child.slaveName} very effectively. `;
+ r += `${NL > 1 ? `The nannies are mostly` : `${V.slaves[V.slaveIndices[NurseryiIDs[j]]].slaveName} is`} very intelligent and well educated and are able to teach ${CL > 1 ? `the children` : child.slaveName} very effectively. `;
child.intelligenceImplant += 3;
} else if (averageIntelligence > 50) {
- r += `${NL > 1 ? `The nannies are mostly` : `${V.nurserySlaves[0].slaveName} is`} very intelligent and able to teach ${CL > 1 ? `the children` : child.slaveName} quite effectively. `;
+ r += `${NL > 1 ? `The nannies are mostly` : `${V.slaves[V.slaveIndices[NurseryiIDs[j]]].slaveName} is`} very intelligent and able to teach ${CL > 1 ? `the children` : child.slaveName} quite effectively. `;
child.intelligenceImplant += 2;
} else if (averageIntelligenceImplant > 25) {
- r += `${NL > 1 ? `The nannies are mostly` : `${V.nurserySlaves[0].slaveName} is`} very well educated and able to teach ${CL > 1 ? `the children` : child.slaveName} quite effectively. `;
+ r += `${NL > 1 ? `The nannies are mostly` : `${V.slaves[V.slaveIndices[NurseryiIDs[j]]].slaveName} is`} very well educated and able to teach ${CL > 1 ? `the children` : child.slaveName} quite effectively. `;
child.intelligenceImplant += 2;
} else if (averageIntelligenceImplant > 15) {
- r += `${NL > 1 ? `The nannies are mostly` : `${V.nurserySlaves[0].slaveName} is`} well educated and able to teach ${CL > 1 ? `the children` : child.slaveName} fairly effectively. `;
+ r += `${NL > 1 ? `The nannies are mostly` : `${V.slaves[V.slaveIndices[NurseryiIDs[j]]].slaveName} is`} well educated and able to teach ${CL > 1 ? `the children` : child.slaveName} fairly effectively. `;
child.intelligenceImplant++;
}
}
@@ -19039,7 +19018,7 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
}
// TODO: rework these entirely
- if (Matron || V.nurserySlaves) {
+ if (Matron || NL) {
if (V.nurseryWeight) {
r += `<br>`;
if (V.nurseryWeightSetting === 1) {
@@ -19050,10 +19029,10 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
} else if (V.nurseryWeightSetting === 2) {
if (child.weight > 10) {
child.weight--;
- r += `${Matron ? Matron.slaveName : NL > 1 ? `A nanny` : V.nurserySlaves[0].slaveName} notices ${he} is overweight and <span class="green">decreases the amount of food ${he} eats.</span> `;
+ r += `${Matron ? Matron.slaveName : NL > 1 ? `A nanny` : V.slaves[V.slaveIndices[NurseryiIDs[j]]].slaveName} notices ${he} is overweight and <span class="green">decreases the amount of food ${he} eats.</span> `;
} else if (child.weight <= -10) {
child.weight++;
- r += `${Matron ? Matron.slaveName : NL > 1 ? `A nanny` : V.nurserySlaves[0].slaveName} notices ${he} is underweight and <span class="green">increases the amount of food ${he} eats.</span> `;
+ r += `${Matron ? Matron.slaveName : NL > 1 ? `A nanny` : V.slaves[V.slaveIndices[NurseryiIDs[j]]].slaveName} notices ${he} is underweight and <span class="green">increases the amount of food ${he} eats.</span> `;
} else {
r += `${He} is <span class="lime">currently a healthy weight;</span> efforts will be made to maintain it. `;
}
@@ -19077,11 +19056,11 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
if (child.muscles < 100) {
child.muscles += 5;
}
- r += `${Matron ? Matron : NL > 1 ? `A nanny` : V.nurserySlaves[0].slaveName} notices ${he} is overly muscular and <span class="green">decreases ${his} steroid dosage.</span> `;
+ r += `${Matron ? Matron : NL > 1 ? `A nanny` : V.slaves[V.slaveIndices[NurseryiIDs[j]]].slaveName} notices ${he} is overly muscular and <span class="green">decreases ${his} steroid dosage.</span> `;
} else if (V.nurseryMusclesSetting === 1) {
if (child.muscles > 10) {
child.muscles--;
- r += `${Matron ? Matron : NL > 1 ? `A nanny` : V.nurserySlaves[0].slaveName} notices ${he} is weak and <span class="green">increases ${his} steroid dosage.</span> `;
+ r += `${Matron ? Matron : NL > 1 ? `A nanny` : V.slaves[V.slaveIndices[NurseryiIDs[j]]].slaveName} notices ${he} is weak and <span class="green">increases ${his} steroid dosage.</span> `;
} else if (child.muscles < -10) {
child.muscles++;
r += `${He} has <span class="lime">a healthy musculature;</span> efforts will be made to maintain it. `;
@@ -19358,7 +19337,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
function choosesOwnJob(slave) {
let r = ``;
- if (V.universalRulesAssignsSelfFacility && slave.devotion > 50 && canWalk(slave) && canSee(slave) && slave.sexualQuirk === "caring" && V.nurseryNannies > V.nurserySlaves) {
+ if (V.universalRulesAssignsSelfFacility && slave.devotion > 50 && canWalk(slave) && canSee(slave) && slave.sexualQuirk === "caring" && V.nurseryNannies > NL) {
slave.choosesOwnAssignmentText += ` enjoys taking care of children, so ${he} decides to work in ${V.nurseryName}. `;
r = slave.choosesOwnAssignmentText;
assignJob(slave, "work as a nanny");
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 7beaa3e22a141b70b9c53b49970ccdc9eddb2f4b..f347d871d253ea90b9c9e6d9389c094b5bb374e6 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -482,7 +482,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $rooms = 5>>
<<set $roomsPopulation = 0>>
-<<set $brothelSlaves = 0>>
<<set $brothelDecoration = "standard">>
<<set $brothelUpgradeDrugs = 0>>
<<set $brothelAdsSpending = 0>>
@@ -495,7 +494,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $brothelName = "the Brothel">>
<<set $brothelNameCaps = "The Brothel">>
<<set $brothel = 0>>
-<<set $dairySlaves = 0>>
<<set $dairyDecoration = "standard">>
<<set $dairyPrepUpgrade = 0>>
<<set $dairyStimulatorsUpgrade = 0>>
@@ -525,7 +523,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $dairyNameCaps = "The Dairy">>
<<set $dairy = 0>>
<<set $cumSlaves = 0>>
-<<set $clubSlaves = 0>>
<<set $clubDecoration = "standard">>
<<set $clubUpgradePDAs = 0>>
<<set $clubAdsSpending = 0>>
@@ -538,13 +535,11 @@ You should have received a copy of the GNU General Public License along with thi
<<set $clubName = "the Club">>
<<set $clubNameCaps = "The Club">>
<<set $club = 0>>
-<<set $servantsQuartersSlaves = 0>>
<<set $servantsQuartersDecoration = "standard">>
<<set $servantsQuartersUpgradeMonitoring = 0>>
<<set $servantsQuarters = 0>>
<<set $servantsQuartersName = "the Servants' Quarters">>
<<set $servantsQuartersNameCaps = "The Servants' Quarters">>
-<<set $schoolroomSlaves = 0>>
<<set $schoolroomDecoration = "standard">>
<<set $schoolroomUpgradeSkills = 0>>
<<set $schoolroomUpgradeLanguage = 0>>
@@ -552,7 +547,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $schoolroom = 0>>
<<set $schoolroomName = "the Schoolroom">>
<<set $schoolroomNameCaps = "The Schoolroom">>
-<<set $spaSlaves = 0>>
<<set $spaDecoration = "standard">>
<<set $spa = 0>>
<<set $spaUpgrade = 0>>
@@ -582,7 +576,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $reservedChildren = 0>>
<<set $tanks = []>>
-<<set $clinicSlaves = 0>>
<<set $clinicDecoration = "standard">>
<<set $clinic = 0>>
<<set $clinicUpgradeFilters = 0>>
@@ -590,7 +583,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $clinicUpgradePurge = 0>>
<<set $clinicName = "the Clinic">>
<<set $clinicNameCaps = "The Clinic">>
-<<set $arcadeSlaves = 0>>
<<set $arcadeDecoration = "standard">>
<<set $arcadeUpgradeInjectors = 0>>
<<set $arcadeUpgradeFuckdolls = 0>>
@@ -600,14 +592,12 @@ You should have received a copy of the GNU General Public License along with thi
<<set $arcadeNameCaps = "The Arcade">>
<<set $arcade = 0>>
<<set $fuckdollsSold = 0>>
-<<set $cellblockSlaves = 0>>
<<set $cellblockDecoration = "standard">>
<<set $cellblockUpgrade = 0>>
<<set $cellblock = 0>>
<<set $cellblockName = "the Cellblock">>
<<set $cellblockNameCaps = "The Cellblock">>
<<set $cellblockWardenCumsInside = 1>>
-<<set $masterSuiteSlaves = 0>>
<<set $masterSuiteDecoration = "standard">>
<<set $masterSuiteUpgradeLuxury = 0>>
<<set $masterSuiteUpgradePregnancy = 0>> /* Is the upgrade active? */
@@ -624,7 +614,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $nursery = 0>> /* counts the number of children the nursery can support */
<<set $nurseryNannies = 0>> /* counts the number of nannies the nursery can support */
<<set $nurseryBabies = 0>> /* counts the number of children currently in the nursery */
-<<set $nurserySlaves = 0>> /* counts the number of nannies currently assigned to the nursery */
<<set $MatronInfluence = 0>> /* check for whether the children are influenced by the Matron */
<<set $nannyInfluence = 0>> /* check for whether the children are influenced by the nannies */
<<set $nurseryDecoration = "standard">>
@@ -650,7 +639,6 @@ You should have received a copy of the GNU General Public License along with thi
/% Farmyard Subsection %/
<<set $farmyard = 0>>
-<<set $farmyardSlaves = 0>>
<<set $farmyardShowgirls = []>> /* array of farmhands putting on shows */
<<set $farmyardFarmers = []>> /* array of farmhands farming */
<<set $farmMenials = 0>>
@@ -674,7 +662,6 @@ You should have received a copy of the GNU General Public License along with thi
<<set $farmyardNameCaps = "The Farmyard">>
<<set $HGSuite = 0>>
-<<set $HGSuiteSlaves = 0>>
<<set $HGSuiteSurgery = 1>>
<<set $HGSuiteDrugs = 1>>
<<set $HGSuiteHormones = 1>>
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index ef2d9bbd836c155a9bd713b2e1e4923fb0d67bee..a23990c28cd05e7e899a9015e7abce176776bdd1 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -108,7 +108,7 @@ window.DefaultRules = (function() {
break;
case "live with your Head Girl":
- if ((V.HGSuiteSlaves < 1 && slave.indentureRestrictions <= 0)) {
+ if ((V.HGSuiteiIDs.length < 1 && slave.indentureRestrictions <= 0)) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -117,7 +117,7 @@ window.DefaultRules = (function() {
break;
case "be confined in the arcade":
- if ((V.arcadeSlaves < V.arcade && slave.indentureRestrictions <= 0 && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset"))) {
+ if ((V.ArcadeiIDs.length < V.arcade && slave.indentureRestrictions <= 0 && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset"))) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -126,7 +126,7 @@ window.DefaultRules = (function() {
break;
case "serve in the master suite":
- if ((V.masterSuiteSlaves < V.masterSuite && (slave.devotion > 20 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)))) {
+ if ((V.MastSiIDs.length < V.masterSuite && (slave.devotion > 20 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)))) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -135,7 +135,7 @@ window.DefaultRules = (function() {
break;
case "get treatment in the clinic":
- if ((V.clinicSlaves < V.clinic && (slave.health < 20 || (slave.chem > 15 && V.Nurse !== 0 && V.clinicUpgradeFilters === 1)) || ((slave.bellyImplant > -1) && (V.bellyImplants === 1)) || slave.preg > 1)) {
+ if ((V.CliniciIDs.length < V.clinic && (slave.health < 20 || (slave.chem > 15 && V.Nurse !== 0 && V.clinicUpgradeFilters === 1)) || ((slave.bellyImplant > -1) && (V.bellyImplants === 1)) || slave.preg > 1)) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -144,7 +144,7 @@ window.DefaultRules = (function() {
break;
case "rest in the spa":
- if ((V.spaSlaves < V.spa) && (slave.health < 20) || (slave.trust < 60) || (slave.devotion <= 60) || (slave.fetish === "mindbroken") && (slave.devotion >= -20)) {
+ if ((V.SpaiIDs.length < V.spa) && (slave.health < 20) || (slave.trust < 60) || (slave.devotion <= 60) || (slave.fetish === "mindbroken") && (slave.devotion >= -20)) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -153,7 +153,7 @@ window.DefaultRules = (function() {
break;
case "work as a nanny":
- if ((V.nurserySlaves < V.nursery) && !slave.fuckdoll && (slave.devotion > 20 || slave.trust > 20)) {
+ if ((V.NurseryiIDs.length < V.nursery) && !slave.fuckdoll && (slave.devotion > 20 || slave.trust > 20)) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -162,7 +162,7 @@ window.DefaultRules = (function() {
break;
case "work in the brothel":
- if ((V.brothelSlaves < V.brothel && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset"))) {
+ if ((V.BrothiIDs.length < V.brothel && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset"))) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -171,7 +171,7 @@ window.DefaultRules = (function() {
break;
case "serve in the club":
- if ((V.clubSlaves < V.club && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset"))) {
+ if ((V.ClubiIDs.length < V.club && (slave.devotion > 50 || slave.trust > 50 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)) && (slave.breedingMark !== 1 || V.propOutcome === 0 || V.eugenicsFullControl === 1 || V.arcologies[0].FSRestart === "unset"))) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -180,7 +180,7 @@ window.DefaultRules = (function() {
break;
case "work in the dairy":
- if ((V.dairy > V.dairySlaves + V.bioreactorsXY + V.bioreactorsXX + V.bioreactorsHerm + V.bioreactorsBarren)) {
+ if ((V.dairy > V.DairyiIDs.length + V.bioreactorsXY + V.bioreactorsXX + V.bioreactorsHerm + V.bioreactorsBarren)) {
if ((slave.indentureRestrictions > 0) && (V.dairyRestraintsSetting > 1)) {
break;
} else if (((slave.indentureRestrictions > 1) && (V.dairyRestraintsSetting > 0)) || (slave.breedingMark === 1 && V.propOutcome === 1 && V.eugenicsFullControl !== 1 && V.arcologies[0].FSRestart !== "unset" && V.dairyRestraintsSetting > 0) || ((V.dairyPregSetting > 0) && ((slave.bellyImplant !== -1) || (slave.broodmother !== 0)))) {
@@ -212,7 +212,7 @@ window.DefaultRules = (function() {
break;
case "work as a farmhand":
- if ((V.farmyardSlaves < V.farmyard && !slave.fuckdoll)) { // TODO: rework these requirements
+ if ((V.FarmyardiIDs.length < V.farmyard && !slave.fuckdoll)) { // TODO: rework these requirements
break;
} else {
RAFacilityRemove(slave, rule);
@@ -221,7 +221,7 @@ window.DefaultRules = (function() {
break;
case "work as a servant":
- if ((V.servantsQuartersSlaves < V.servantsQuarters && canSee(slave) && canWalk(slave) && (slave.devotion >= -20 || slave.trust < -20 || (slave.devotion >= -50 && slave.trust <= 20)))) {
+ if ((V.ServQiIDs.length < V.servantsQuarters && canSee(slave) && canWalk(slave) && (slave.devotion >= -20 || slave.trust < -20 || (slave.devotion >= -50 && slave.trust <= 20)))) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
@@ -230,7 +230,7 @@ window.DefaultRules = (function() {
break;
case "learn in the schoolroom":
- if ((V.schoolroomSlaves < V.schoolroom && slave.fetish !== "mindbroken" && (slave.devotion >= -20 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)))) {
+ if ((V.SchlRiIDs.length < V.schoolroom && slave.fetish !== "mindbroken" && (slave.devotion >= -20 || slave.trust < -50 || (slave.devotion >= -50 && slave.trust < -20)))) {
if ((slave.intelligenceImplant < 30) || (slave.voice !== 0 && slave.accent + V.schoolroomUpgradeLanguage > 2) || (slave.skill.oral <= 10 + V.schoolroomUpgradeSkills * 20) || (slave.skill.whoring <= 10 + V.schoolroomUpgradeSkills * 20) || (slave.skill.entertainment <= 10 + V.schoolroomUpgradeSkills * 20) || (slave.skill.anal < 10 + V.schoolroomUpgradeSkills * 20) || ((slave.vagina >= 0) && (slave.skill.vaginal < 10 + V.schoolroomUpgradeSkills * 20))) {
break;
} else {
@@ -244,7 +244,7 @@ window.DefaultRules = (function() {
break;
case "be confined in the cellblock":
- if ((V.cellblockSlaves < V.cellblock && ((slave.devotion < -20 && slave.trust >= -20) || (slave.devotion < -50 && slave.trust >= -50)))) {
+ if ((V.CellBiIDs.length < V.cellblock && ((slave.devotion < -20 && slave.trust >= -20) || (slave.devotion < -50 && slave.trust >= -50)))) {
break;
} else {
RAFacilityRemove(slave, rule); // before deleting rule.setAssignment
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index ad44b9a7a4dec3834c58f4018187a20521b650fc..8a0a9a2d57fc018972ea226f418fffeb21548a6b 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -15,7 +15,6 @@ window.assignJob = function assignJob(slave, job) {
case "arcade":
slave.assignment = "be confined in the arcade";
slave.assignmentVisible = 0;
- V.arcadeSlaves++;
V.ArcadeiIDs.push(slave.ID);
slave.clothes = "no clothing";
slave.shoes = "none";
@@ -27,7 +26,6 @@ window.assignJob = function assignJob(slave, job) {
case "brothel":
slave.assignment = "work in the brothel";
slave.assignmentVisible = 0;
- V.brothelSlaves++;
V.BrothiIDs.push(slave.ID);
switch (V.brothelDecoration) {
case "Degradationist":
@@ -44,7 +42,6 @@ window.assignJob = function assignJob(slave, job) {
case "cellblock":
slave.assignment = "be confined in the cellblock";
slave.assignmentVisible = 0;
- V.cellblockSlaves++;
V.CellBiIDs.push(slave.ID);
switch (V.cellblockDecoration) {
case "Paternalist":
@@ -60,7 +57,6 @@ window.assignJob = function assignJob(slave, job) {
case "clinic":
slave.assignment = "get treatment in the clinic";
slave.assignmentVisible = 0;
- V.clinicSlaves++;
V.CliniciIDs.push(slave.ID);
switch (V.clinicDecoration) {
case "Repopulation Focus":
@@ -98,7 +94,6 @@ window.assignJob = function assignJob(slave, job) {
case "club":
slave.assignment = "serve in the club";
slave.assignmentVisible = 0;
- V.clubSlaves++;
V.ClubiIDs.push(slave.ID);
slave.livingRules = "normal";
break;
@@ -107,7 +102,6 @@ window.assignJob = function assignJob(slave, job) {
case "dairy":
slave.assignment = "work in the dairy";
slave.assignmentVisible = 0;
- V.dairySlaves++;
V.DairyiIDs.push(slave.ID);
switch (V.dairyDecoration) {
case "Roman Revivalist":
@@ -132,7 +126,6 @@ window.assignJob = function assignJob(slave, job) {
case "farmyard":
slave.assignment = "work as a farmhand";
slave.assignmentVisible = 0;
- V.farmyardSlaves++;
V.FarmyardiIDs.push(slave.ID);
switch (V.farmyardDecoration) {
case "Aztec Revivalist":
@@ -160,7 +153,6 @@ window.assignJob = function assignJob(slave, job) {
case "hgsuite":
slave.assignment = "live with your Head Girl";
slave.assignmentVisible = 0;
- V.HGSuiteSlaves++;
V.HGSuiteiIDs.push(slave.ID);
slave.livingRules = "luxurious";
break;
@@ -170,7 +162,6 @@ window.assignJob = function assignJob(slave, job) {
case "mastersuite":
slave.assignment = "serve in the master suite";
slave.assignmentVisible = 0;
- V.masterSuiteSlaves++;
V.MastSiIDs.push(slave.ID);
if (V.masterSuiteUpgradeLuxury > 0) {
slave.livingRules = "luxurious";
@@ -183,7 +174,6 @@ window.assignJob = function assignJob(slave, job) {
case "schoolroom":
slave.assignment = "learn in the schoolroom";
slave.assignmentVisible = 0;
- V.schoolroomSlaves++;
V.SchlRiIDs.push(slave.ID);
slave.livingRules = "normal";
break;
@@ -193,7 +183,6 @@ window.assignJob = function assignJob(slave, job) {
case "servantsquarters":
slave.assignment = "work as a servant";
slave.assignmentVisible = 0;
- V.servantsQuartersSlaves++;
V.ServQiIDs.push(slave.ID);
switch (V.servantsQuartersDecoration) {
case "Roman Revivalist":
@@ -239,7 +228,6 @@ window.assignJob = function assignJob(slave, job) {
case "spa":
slave.assignment = "rest in the spa";
slave.assignmentVisible = 0;
- V.spaSlaves++;
V.SpaiIDs.push(slave.ID);
switch (V.spaDecoration) {
case "Chattel Religionist":
@@ -259,7 +247,6 @@ window.assignJob = function assignJob(slave, job) {
case "nursery":
slave.assignment = "work as a nanny";
slave.assignmentVisible = 0;
- V.nurserySlaves++;
V.NurseryiIDs.push(slave.ID);
slave.livingRules = "normal";
break;
@@ -400,14 +387,12 @@ window.removeJob = function removeJob(slave, assignment) {
case "arcade":
slave.assignment = "work a glory hole";
V.ArcadeiIDs.delete(slave.ID);
- V.arcadeSlaves--;
break;
case "work in the brothel":
case "brothel":
slave.assignment = "whore";
V.BrothiIDs.delete(slave.ID);
- V.brothelSlaves--;
break;
case "be confined in the cellblock":
@@ -420,49 +405,42 @@ window.removeJob = function removeJob(slave, assignment) {
SetBellySize(slave);
}
V.CellBiIDs.delete(slave.ID);
- V.cellblockSlaves--;
break;
case "get treatment in the clinic":
case "clinic":
slave.assignment = "rest";
V.CliniciIDs.delete(slave.ID);
- V.clinicSlaves--;
break;
case "serve in the club":
case "club":
slave.assignment = "serve the public";
V.ClubiIDs.delete(slave.ID);
- V.clubSlaves--;
break;
case "work in the dairy":
case "dairy":
slave.assignment = "get milked";
V.DairyiIDs.delete(slave.ID);
- V.dairySlaves--;
break;
case "work as a farmhand":
case "farmyard":
slave.assignment = "rest";
V.FarmyardiIDs.delete(slave.ID);
- V.farmyardSlaves--;
break;
case "learn in the schoolroom":
case "schoolroom":
slave.assignment = "rest";
V.SchlRiIDs.delete(slave.ID);
- V.schoolroomSlaves--;
break;
case "rest in the spa":
case "spa":
slave.assignment = "rest";
V.SpaiIDs.delete(slave.ID);
- V.spaSlaves--;
break;
case "work as a servant":
@@ -470,7 +448,6 @@ window.removeJob = function removeJob(slave, assignment) {
case "servantsquarters":
slave.assignment = "be a servant";
V.ServQiIDs.delete(slave.ID);
- V.servantsQuartersSlaves--;
break;
case "serve in the master suite":
@@ -478,7 +455,6 @@ window.removeJob = function removeJob(slave, assignment) {
case "mastersuite":
slave.assignment = "please you";
V.MastSiIDs.delete(slave.ID);
- V.masterSuiteSlaves--;
break;
case "live with your head girl":
@@ -486,14 +462,12 @@ window.removeJob = function removeJob(slave, assignment) {
case "hgsuite":
slave.assignment = "rest";
V.HGSuiteiIDs.delete(slave.ID);
- V.HGSuiteSlaves--;
break;
case "work as a nanny":
case "nursery":
slave.assignment = "rest";
V.NurseryiIDs.delete(slave.ID);
- V.nurserySlaves--;
break;
case "be your head girl":
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 8f3e63461df1b13749cfc68b1f2291c0af96e742..96a70c4e4f05b51e68bf9191b51358015dacaf28 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -1193,3 +1193,175 @@ App.Desc.extraMarks = function(slave, markType) {
}
return extras;
};
+
+
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string} short description of the slaves limbs.
+ */
+App.Desc.shortLimbs = function(slave) {
+ let r = "";
+ function desc(id, limb) {
+ switch (id) {
+ case 0:
+ return limb + "Amp ";
+ case 1:
+ return "";
+ case 2:
+ return limb + "P-Limb ";
+ case 3:
+ return limb + "Sex P-Limb ";
+ case 4:
+ return limb + "Beauty P-Limb ";
+ case 5:
+ return limb + "Combat P-Limb ";
+ case 6:
+ return limb + "Cyber P-Limb ";
+ default:
+ return "unknown ID: " + id;
+ }
+ }
+
+ if (getLeftArmID(slave) === getRightArmID(slave) &&
+ getLeftArmID(slave) === getLeftLegID(slave) &&
+ getLeftArmID(slave) === getRightLegID(slave)) {
+ r += desc(getLeftArmID(slave), "");
+ } else {
+ if (getLeftArmID(slave) === getRightArmID(slave)) {
+ r += desc(getLeftArmID(slave), "Arms:");
+ } else {
+ r += desc(getLeftArmID(slave), "LArm:");
+ r += desc(getRightArmID(slave), "RArm:");
+ }
+
+ if (getLeftLegID(slave) === getRightLegID(slave)) {
+ r += desc(getLeftLegID(slave), "Legs:");
+ } else {
+ r += desc(getLeftLegID(slave), "LLeg:");
+ r += desc(getRightLegID(slave), "RLeg:");
+ }
+ }
+
+ r += " ";
+ if (!canWalk(slave)) {
+ r += " Immob ";
+ }
+ if (slave.heels === 1) {
+ r += " Heel ";
+ }
+
+ return r;
+};
+
+/**
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string} long description of the slaves limbs.
+ */
+App.Desc.longLimbs = function(slave) {
+ let r = "";
+ switch (getLimbCount(slave, 0)) {
+ case 1:
+ r += "Amputee. ";
+ break;
+ case 2:
+ r += "Double Amputee. ";
+ break;
+ case 3:
+ r += "Triple Amputee. ";
+ break;
+ case 4:
+ r += "Quadruple Amputee. ";
+ break;
+ }
+
+ if (hasAnyProstheticLimbs(slave)) {
+ // count limbs
+ switch (getLimbCount(slave, 102)) {
+ case 1:
+ r = "One ";
+ break;
+ case 2:
+ r = "Two ";
+ break;
+ case 3:
+ r = "Three ";
+ break;
+ case 4:
+ r = "Four ";
+ break;
+ }
+
+ // find out if all prosthetics are the same:
+ let id;
+ let count = 0;
+
+ if (getLeftArmID(slave) >= 2) {
+ id = getLeftArmID(slave);
+ count++;
+ }
+ if (getRightArmID(slave) >= 2) {
+ if (id) {
+ if (id === getRightArmID(slave)) {
+ count++;
+ }
+ } else {
+ id = getRightArmID(slave);
+ count++;
+ }
+ }
+ if (getLeftLegID(slave) >= 2) {
+ if (id) {
+ if (id === getLeftLegID(slave)) {
+ count++;
+ }
+ } else {
+ id = getLeftLegID(slave);
+ count++;
+ }
+ }
+ if (getRightLegID(slave) >= 2) {
+ if (id) {
+ if (id === getRightLegID(slave)) {
+ count++;
+ }
+ } else {
+ id = getRightLegID(slave);
+ count++;
+ }
+ }
+
+ if (count === getLimbCount(slave, 102)) { // all prosthetics are the same
+ switch (id) {
+ case 3:
+ r += "sexy ";
+ break;
+ case 4:
+ r += "beautiful ";
+ break;
+ case 5:
+ r += "deadly ";
+ break;
+ case 6:
+ r += "cyber ";
+ break;
+ }
+ if (count > 1) {
+ r += "prosthetic limbs. ";
+ } else {
+ r += "prosthetic limb. ";
+ }
+ } else {
+ // only reachable with count > 1
+ r += "mixed prosthetic limbs. ";
+ }
+ }
+
+ if (!canWalk(slave)) {
+ r += "Immobile. ";
+ }
+ if (slave.heels === 1) {
+ r += "Heeled. ";
+ }
+
+ return r;
+};
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index c88be58da6c5b34fcfc68ac4f3b84a53de57a573..2dce41bbaa0e4c1ba91cd6a9e992d287e57f6684 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -902,12 +902,14 @@ window.NPCSexSupply = function(LC) {
window.slaveJobValues = function() {
const V = State.variables;
const slaveJobValues = {arcade: 0, club: 0, clubSP: 0}; let clubSpots = 0; const toTheClubTotal = 0;
+ const AL = V.ArcadeiIDs.length;
+ const CL = V.ClubiIDs.length;
V.slavesGettingHelp = 0;
// This section is for specific slaves or non-unique slaves adding their values to the whole
// Accounting for Fuckdolls
if (V.fuckdolls > 0) {
- slaveJobValues.arcade += (V.fuckdolls - (V.arcade - V.arcadeSlaves)) * 140 + (V.arcade - V.arcadeSlaves) * (175 + 35 * V.arcadeUpgradeInjectors);
+ slaveJobValues.arcade += (V.fuckdolls - (V.arcade - AL)) * 140 + (V.arcade - AL) * (175 + 35 * V.arcadeUpgradeInjectors);
}
// Accounting for the DJ.
@@ -986,8 +988,8 @@ window.slaveJobValues = function() {
}
// Checking for space in the club
- if (V.club > 0 && V.ClubiIDs.length < V.club) {
- clubSpots = V.club - V.ClubiIDs.length;
+ if (V.club > 0 && CL < V.club) {
+ clubSpots = V.club - CL;
}
// Glory hole slaves adding to 'arcade'
@@ -1137,11 +1139,11 @@ window.slaveJobValues = function() {
let canA = canDoAnal(s);
let canV = canDoVaginal(s);
let skilltarget = (100 + ((s.skill.anal - 100)*canA*(1.5 - .5*canV) + (s.skill.vaginal - 100)*canV*(1.5 - .5*canA) + (s.skill.oral - 100)*(3 - 1.5*canA - 1.5*canV + canA*canV))*3/10);
- //Complicated, I know - but it should automatically account for what acts are possible to scale the injury risk smoothly between 90% when totally unskilled
- //and 0% when perfectly skilled in the relevant method or methods.
+ // Complicated, I know - but it should automatically account for what acts are possible to scale the injury risk smoothly between 90% when totally unskilled
+ // and 0% when perfectly skilled in the relevant method or methods.
if (jsRandom(1,100) > skilltarget) {
- s.health -= 10 - 7*canA*canV; //Any limitations means an injury inflicts the harsher 10 instead of 3
+ s.health -= 10 - 7*canA*canV; // Any limitations means an injury inflicts the harsher 10 instead of 3
s.minorInjury = 1;
}
}
@@ -1172,8 +1174,8 @@ window.slaveJobValues = function() {
s.sexAmount = Beauty(s) / 2 + 100;
if (s.assignment === "be the DJ") {
- if ((V.clubSlaves + toTheClubTotal > 0) && (V.clubSlaves + toTheClubTotal < 10)) {
- s.sexAmount *= (10 - V.clubSlaves - toTheClubTotal) / 10;
+ if ((CL + toTheClubTotal > 0) && (CL + toTheClubTotal < 10)) {
+ s.sexAmount *= (10 - CL - toTheClubTotal) / 10;
}
}
s.sexAmount = Math.trunc(s.sexAmount * beautyMultiplier);
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 05948e1af709e653b8ee944a0aaac1b7a82dc926..2ba5061c4c3caf22efef4070d514ed8d92a6139f 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -750,7 +750,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.fetish === "sadist") {
if (eventSlave.fetishStrength > 20) {
- if (State.variables.arcadeSlaves > 0) {
+ if (State.variables.ArcadeiIDs.length > 0) {
if (eventSlave.trust >= -20) {
if (eventSlave.devotion > 50) {
if (eventSlave.belly < 300000) {
@@ -2245,7 +2245,7 @@ window.generateRandomEventPoolServant = function(eventSlave) {
if (eventSlave.fetish === "sadist") {
if (eventSlave.fetishStrength > 20) {
- if (State.variables.arcadeSlaves > 0) {
+ if (State.variables.ArcadeiIDs.length > 0) {
if (eventSlave.trust >= -20) {
if (eventSlave.devotion > 50) {
if (eventSlave.belly < 300000) {
diff --git a/src/js/playerJS.js b/src/js/playerJS.js
index d1eca8a8582d66929f61d692983d22f82f7254e5..3a1b7d2dcc24adede2aa9dc80312cd0c1d50017a 100644
--- a/src/js/playerJS.js
+++ b/src/js/playerJS.js
@@ -456,7 +456,7 @@ window.PCTitle = function PCTitle() {
}
}
- if (V.brothelSlaves >= 15) {
+ if (V.BrothiIDs.length >= 15) {
if (V.PC.title === 1) {
titles.push("Procurator of the Brothel");
} else {
@@ -464,10 +464,10 @@ window.PCTitle = function PCTitle() {
}
}
- if (V.clubSlaves >= 15) {
+ if (V.ClubiIDs.length >= 15) {
titles.push("First on the Club");
}
- if (V.dairySlaves >= 15) {
+ if (V.DairyiIDs.length >= 15) {
titles.push("Keeper of the Cattle");
}
if (V.cumSlaves >= 15) {
@@ -477,24 +477,24 @@ window.PCTitle = function PCTitle() {
titles.push("Extractrix of the Ejaculate");
}
}
- if (V.servantsQuartersSlaves >= 15) {
+ if (V.ServQiIDs.length >= 15) {
if (V.PC.title === 1) {
titles.push("Director of the Servants");
} else {
titles.push("Directrix of the Servants");
}
}
- if (V.schoolroomSlaves >= 10) {
+ if (V.SchlRiIDs.length >= 10) {
if (V.PC.title === 1) {
titles.push("Educator of the Slaves");
} else {
titles.push("Educatrix of the Slaves");
}
}
- if (V.spaSlaves >= 10) {
+ if (V.SpaiIDs.length >= 10) {
titles.push("Order of the Bath");
}
- if (V.arcadeSlaves >= 15) {
+ if (V.ArcadeiIDs.length >= 15) {
titles.push("Comptroller of the Arcade");
}
if (V.nurseryBabies >= 10) {
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index ff9afef1c20f4fe1277d68a97ce9ae18d38dc3b6..cc3d22948426d0927d760b9f0a2761d94f591723 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -105,7 +105,7 @@ window.SlaveSummaryUncached = (function() {
short_lips(slave, para);
short_teeth(slave, para);
short_muscles(slave, para);
- short_limbs(slave, para);
+ addText(para, App.Desc.shortLimbs(slave));
short_voice(slave, para);
short_tits_ass(slave, para);
short_hips(slave, para);
@@ -121,7 +121,7 @@ window.SlaveSummaryUncached = (function() {
long_lips(slave, para);
long_teeth(slave, para);
long_muscles(slave, para);
- long_limbs(slave, para);
+ makeSpan(para, App.Desc.longLimbs(slave));
long_voice(slave, para);
long_tits_ass(slave, para);
long_hips(slave, para);
@@ -1948,36 +1948,6 @@ window.SlaveSummaryUncached = (function() {
}
}
- /**
- * @param {App.Entity.SlaveState} slave
- * @param {Node} c
- * @returns {void}
- */
- function short_limbs(slave, c) {
- if (slave.amp !== 0) {
- if (slave.amp === -1) {
- addText(c, "P-Limbs");
- } else if (slave.amp === -2) {
- addText(c, "Sex P-Limbs");
- } else if (slave.amp === -3) {
- addText(c, "Beauty P-Limbs");
- } else if (slave.amp === -4) {
- addText(c, "Combat P-Limbs");
- } else if (slave.amp === -5) {
- addText(c, "Cyber P-Limbs");
- } else {
- addText(c, "Amp");
- }
- }
- addText(c, " ");
- if (!canWalk(slave)) {
- addText(c, " Immob ");
- }
- if (slave.heels === 1) {
- addText(c, " Heel ");
- }
- }
-
/**
* @param {App.Entity.SlaveState} slave
* @param {Node} c
@@ -2330,35 +2300,6 @@ window.SlaveSummaryUncached = (function() {
}
}
- /**
- * @param {App.Entity.SlaveState} slave
- * @param {Node} c
- * @returns {void}
- */
- function long_limbs(slave, c) {
- if (slave.amp !== 0) {
- if (slave.amp === -1) {
- makeSpan(c, `Prosthetic limbs.`);
- } else if (slave.amp === -2) {
- makeSpan(c, `Sexy prosthetic limbs.`);
- } else if (slave.amp === -3) {
- makeSpan(c, `Beautiful prosthetic limbs.`);
- } else if (slave.amp === -4) {
- makeSpan(c, `Deadly prosthetic limbs.`);
- } else if (slave.amp === -5) {
- makeSpan(c, `Cyber prosthetic limbs.`);
- } else {
- makeSpan(c, `Amputee.`);
- }
- }
- if (!canWalk(slave)) {
- makeSpan(c, "Immobile.");
- }
- if (slave.heels === 1) {
- makeSpan(c, "Heeled.");
- }
- }
-
/**
* @param {App.Entity.SlaveState} slave
* @param {Node} c
@@ -4638,4 +4579,4 @@ window.SlaveSummaryUncached = (function() {
}
return SlaveSummaryUncached;
-})();
\ No newline at end of file
+})();
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index dbad2c4d628abaf6ee2f0a39e630dfd076c63e21..424de9135545753ba4320076da15214a99fd7b90 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -1063,7 +1063,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<</link>>
<<if ($activeSlave.lactation > 0 || (($dairySlimMaintainUpgrade == 0 || $dairySlimMaintain == 0) && ($activeSlave.boobs > 300 || $activeSlave.dick == 0 || $dairyImplantsSetting == 1) && $dairyImplantsSetting != 2)) || ($activeSlave.balls > 0)>>
<<if $dairyPrepUpgrade == 1>>
- <<if $dairy > $dairySlaves+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
+ <<if $dairy > $DairyiIDs.length+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
<br><<link "Send $him straight to the Industrial Dairy">>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<set $activeSlave.anus = Math.clamp($activeSlave.anus, 3, 4)>>
@@ -1076,7 +1076,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<</link>>
<</if>>
<</if>>
- <<if $dairy > $dairySlaves+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
+ <<if $dairy > $DairyiIDs.length+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
<br><<link "Break $him in for the Industrial Dairy">>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<set $activeSlave.anus = Math.clamp($activeSlave.anus, 3, 4)>>
@@ -1103,14 +1103,14 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
You tell $him that it's in $his interests to be a good $girl. $He smiles happily, taking it as a compliment. You point behind $him; $he turns, and beholds a live feed from $arcadeName. $He gazes at the row of butts sticking out of the wall at dick height, not quite realizing what $he's seeing<<if canAchieveErection($activeSlave)>>, but becoming stiff at the sight of all the holes<</if>>. Then $he notices that there are citizens pumping away in front of two of the butts, and $he understands. As $he watches, aroused, first one citizen and then the other finishes and steps away. The first arcade inmate's <<if $seeDicks != 100>>pussy<<else>>butt<</if>> is left looking sore until $arcadeName's systems cover _himU for a quick cleaning, and the second inmate's asshole <<if $seeDicks != 0>>has obviously seen severe use, since the poor _girlU doesn't have a pussy to spread the load<<else>>is loose enough that the machines have to clean up the cum it drools onto the floor<</if>>. $activeSlave.slaveName lets out a cheer and turns to you, @@.hotpink;eagerly awaiting the day $he gets to go to $arcadeName and play with the holes.@@ It seems $he missed the point.
<</replace>>
<</link>>
- <<if ($arcade > $arcadeSlaves) || ($arcadeUpgradeFuckdolls == 2)>>
+ <<if ($arcade > $ArcadeiIDs.length) || ($arcadeUpgradeFuckdolls == 2)>>
<br><<link "Send $him straight to the Arcade">>
<<= assignJob($activeSlave, "be confined in the arcade")>>
<<set $activeSlave.assignmentVisible = 0>>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<replace "#result">>
You order <<if $HeadGirl == 0>>another slave<<else>>$HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $arcadeName. The new slave does not know what $arcadeName is, not really, and $he doesn't know what being set up there means, either. $He'll be confined inside a small space, not too different from the tube $he was grown in. It's only when the restraints lock into place that $he'll understand $his doom. $His mouth will be forced open and presented at one wall of $arcadeName, and $his ass will protrude from its other side, $his holes available for public relief at both ends. $He'll probably refuse to believe the truth, until the first cockhead enters $his mouth<<if $activeSlave.vagina > -1>>, parts $his pussylips,<</if>> or presses against $his poor anus.
- <<if ($arcade <= $arcadeSlaves)>>Mere <<if $showInches == 2>>yards<<else>>meters<</if>> away, preparations to convert the least appealing Arcade slave into a Fuckdoll begin. As $activeSlave.slaveName is broken in by $his first customers, $he's blissfully unaware that $he's $arcade new slaves away from the same fate.<</if>>
+ <<if ($arcade <= $ArcadeiIDs.length)>>Mere <<if $showInches == 2>>yards<<else>>meters<</if>> away, preparations to convert the least appealing Arcade slave into a Fuckdoll begin. As $activeSlave.slaveName is broken in by $his first customers, $he's blissfully unaware that $he's $arcade new slaves away from the same fate.<</if>>
<</replace>>
<</link>>
<</if>>
diff --git a/src/pregmod/organFarm.tw b/src/pregmod/organFarm.tw
index cb6e1bee501426e7c32e403181730e37ae93d06d..b30db63ba7026d67d7fd7c8857eac9b408708308 100644
--- a/src/pregmod/organFarm.tw
+++ b/src/pregmod/organFarm.tw
@@ -92,9 +92,10 @@ Organ Production
<br>
<</if>>
/* TODO: potentially allow organs to be implanted into children in the nursery
-<<if $nurserySlaves > 0>>
+<<set _NL = $NurseryiIDs.length>>
+<<if _NL > 0>>
<<for $x = 0; $x < $nurseryOrgans.length; $x++>>
- <<for _w = 0; _w < $nurserySlaves; _w++>>
+ <<for _w = 0; _w < _NL; _w++>>
<<if $cribs[_w].ID == $nurseryOrgans[$x].ID>>
<br>
$cribs[_w].slaveName's $nurseryOrgans[$x].type,
diff --git a/src/pregmod/saInflation.tw b/src/pregmod/saInflation.tw
index aea6202a47ce3208edad8e6b5e67609becc10b8b..86787c8c04957e99c960fa22186e5dc6c69307fc 100644
--- a/src/pregmod/saInflation.tw
+++ b/src/pregmod/saInflation.tw
@@ -1,5 +1,7 @@
:: SA inflation [nobr]
+<<set _DL = $DairyiIDs.length>>
+
<<if $slaves[$i].assignment == "be confined in the arcade" || $slaves[$i].assignment == "work in the dairy">>
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, $slaves[$i].milkSource = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].bellyImplant >= 1500>>
@@ -218,7 +220,7 @@
<<case "milk">>
<<if $slaves[$i].behavioralFlaw == "anorexic">>
<<if $slaves[$i].inflationMethod == 1>>
- <<if ($dairySlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
@@ -232,7 +234,7 @@
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>>
<</if>>
<<elseif $slaves[$i].inflationMethod == 2>>
- <<if ($dairySlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
@@ -266,7 +268,7 @@
<</if>>
<<elseif $slaves[$i].behavioralFlaw == "gluttonous">>
<<if $slaves[$i].inflationMethod == 1>>
- <<if ($dairySlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
@@ -280,7 +282,7 @@
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<</if>>
<<elseif $slaves[$i].inflationMethod == 2>>
- <<if ($dairySlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
@@ -314,7 +316,7 @@
<</if>>
<<else>>
<<if $slaves[$i].inflationMethod == 1>>
- <<if ($dairySlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
@@ -326,7 +328,7 @@
Throughout the week, $he makes sure to keep $himself filled with nearly two liters of milk, leaving $his belly noticeably distended. $He is full enough to be swollen but not enough to visibly jiggle.
<</if>>
<<elseif $slaves[$i].inflationMethod == 2>>
- <<if ($dairySlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
@@ -359,7 +361,7 @@
<<case "cum">>
<<if $slaves[$i].behavioralFlaw == "anorexic">>
<<if $slaves[$i].inflationMethod == 1>>
- <<if ($dairySlaves == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional cum dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
@@ -373,7 +375,7 @@
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 3>>
<</if>>
<<elseif $slaves[$i].inflationMethod == 2>>
- <<if ($dairySlaves == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional cum dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
@@ -404,7 +406,7 @@
<</if>>
<<elseif $slaves[$i].behavioralFlaw == "gluttonous">>
<<if $slaves[$i].inflationMethod == 1>>
- <<if ($dairySlaves == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional cum dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
@@ -418,7 +420,7 @@
<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
<</if>>
<<elseif $slaves[$i].inflationMethod == 2>>
- <<if ($dairySlaves == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional cum dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
@@ -449,7 +451,7 @@
<</if>>
<<else>>
<<if $slaves[$i].inflationMethod == 1>>
- <<if ($dairySlaves == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional cum dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
@@ -461,7 +463,7 @@
Throughout the week, $he makes sure to keep $himself filled with nearly two liters of cum, leaving $his belly noticeably distended. $He is full enough to be swollen but not enough to visibly jiggle.
<</if>>
<<elseif $slaves[$i].inflationMethod == 2>>
- <<if ($dairySlaves == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
+ <<if (_DL == 0 || $cumSlaves == 0 || $dairy == 0) && $arcologies[0].FSPastoralistLaw != 1>>
You no longer have a functional cum dairy. @@.yellow;$His inflation regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<<elseif $slaves[$i].inflation == 3>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 61d13ba7d9d99abcff09a2eb8a7ab4c436f862de..36bef7b24a97a07721d7751c4d38bd6df915452b 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -1,6 +1,6 @@
:: SE FCTV Shows [nobr]
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV">>
+<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "FCTV", _MSL = $MastSiIDs.length>>
<<if $randShow === "">>
<<set _usedRemote = 0>>
@@ -224,18 +224,18 @@
<</if>>
to play <<if $showTwo < 12>>the newest episode of a<<else>>a repeat of the<</if>> popular competitive reality show<<if $showTwo > 0>>: Next Top Breeder.<<else>> where several female citizens are competing for something.<</if>> The intro sequence shows a succession of beautiful ladies either participating in a mixture of contrived competitions, or talking and going about their lives in a sorority-like setting. The montage is overlaid with a narrator's voice: "12 of Canadia Arcology's most attractive women are all competing for the privilege of having the arcology owner's children. Clint Miles has desirable genes, and these ladies are determined to prove their worth as gestators. And here in Canadia, there are no restrictions on fertility drugs for the winner, so the competition this season is fierce! <<if $showTwo < 12>>_rerun<<else>>$showTwo<</if>> lad<<if $showTwo > 0>>ies have<<else>>y has<</if>> already been sent packing, who will be Canadia's... Next Top Breeder!?" The title finally pops up, redundantly labeling the show as 'Next Top Breeder: Canadia'.
<br><br>
- <<if $masterSuiteSlaves > 1 && $Concubine != 0>>
+ <<if _MSL > 1 && $Concubine != 0>>
<<setLocalPronouns $Concubine 2>>
You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has @@.pink;$Concubine.slaveName@@ eager for some attention from _his2 own arcology owner. Of course, the same could be said for the other eager slaves living in your bedroom, and the situation quickly devolves into a lust-filled orgy.
- <<elseif $masterSuiteSlaves > 0 && $Concubine != 0>>
+ <<elseif _MSL > 0 && $Concubine != 0>>
<<setLocalPronouns $Concubine 2>>
You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has @@.pink;$Concubine.slaveName@@ eager for some attention from _his2 own arcology owner. Of course, the same could be said for the other eager slave living in your bedroom, and the situation quickly devolves into a lust-filled threesome.
- <<elseif $masterSuiteSlaves == 0 && $Concubine != 0>>
+ <<elseif _MSL == 0 && $Concubine != 0>>
<<setLocalPronouns $Concubine 2>>
You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has @@.pink;$Concubine.slaveName@@ eager for some attention from _his2 own arcology owner. You've trained _him2 well, and _he2 knows exactly how to please you. You spend the rest of the evening doing something a lot more fun than watching reality TV.
- <<elseif $masterSuiteSlaves > 1 && $Concubine == 0>>
+ <<elseif _MSL > 1 && $Concubine == 0>>
You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has the pleasure slaves in your bed eager for some attention from their own arcology owner. You spend the rest of the evening doing something a lot more fun than watching reality TV.
- <<elseif $masterSuiteSlaves > 0>>
+ <<elseif _MSL > 0>>
You don't spend very much time actually watching the show; the randy opening, perverted competitions, and constant talk of creampies quickly has the pleasure slave in your bed eager for some attention from her own arcology owner. You spend the rest of the evening doing something a lot more fun than watching reality TV.
<</if>>
<<case 2>>
@@ -526,7 +526,7 @@
<<set $activeSlave.devotion = random(-25,25)>>
<<set $activeSlave.trust = random(-25,25)>>
<<set $activeSlave.origin = "You purchased $him from FCTV's Home Slave Shopping stream channel.">>
- <<elseif $randShow < 8>> /* huge balls */
+ <<elseif $randShow <= 8>> /* huge balls */
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
@@ -595,7 +595,7 @@
<<if $activeSlave.race == "amerindian" || $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan">>an<<else>>a<</if>> $activeSlave.race @@.pink;MILF.@@ $He's no longer young, but still quite attractive. $He has been a slave for many years now, and has been trained well. $He also has a good array of skills that you can put to use. $He has huge tits and a huge ass to play with, but $he'd also make good <<if $seePreg == 0>><i>sandwiches</i><<else>>stock for a breeding program<</if>>."
<<elseif $randShow == 6>> /* discount young hottie */
a bargain discount offer on a young $activeSlave.race $girl. Unlike our usual stock $he's something of a @@.red;disobedient@@ slave, but that means savings for you, and all the fun of breaking in a new slave. We have to admit that $his previous owner had a hard time training $him, but I'm sure you can tell that $his body has potential<<if $activeSlave.clit > 4>>, just look at the @@.pink;clit@@ on $him<</if>>!"
- <<elseif $randShow < 8>> /* huge balls */
+ <<elseif $randShow <= 8>> /* huge balls */
<<if $activeSlave.race == "amerindian" || $activeSlave.race == "asian" || $activeSlave.race == "indo-aryan">>an<<else>>a<</if>> $activeSlave.race cum cow. Just take a look at that pair of @@.pink;massive balls.@@ This slave also has a prostate stimulating hormone implant to ramp up $his cum production even further. $He's a perfect fit for your dairy, or even your own kitchen creamery!"
<br><br>The woman helping to display the slaves shows her hand to the camera; it's coated in a sticky layer of precum from handling the cum cow's equipment.
<<elseif $randShow == 9>> /* mpreg dickgirl */
diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw
index b85bd80c79545811a892ebbe0cd41eccd97da316..05126d62716d708e1afcc4a2f9487b50aff0a7a5 100644
--- a/src/pregmod/widgets/pregmodBirthWidgets.tw
+++ b/src/pregmod/widgets/pregmodBirthWidgets.tw
@@ -1031,7 +1031,8 @@
<<case "be your Head Girl">>
<<if (random(1,20) > $suddenBirth)>>
- $He returns to <<if $HGSuite == 1>>$his room's bed<<else>>$his bed<</if>> and strips before slipping into it. $He makes $himself comfortable<<if $HGSuiteSlaves != 0>>, as $his slave rushes to $his side,<</if>> and begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby. $His child is promptly taken<<if $HGSuiteSlaves != 0>> by $his roommate<</if>> and $he rests awhile before returning to managing your slaves.
+ <<set _HGL = $HGSuiteiIDs.length>>
+ $He returns to <<if $HGSuite == 1>>$his room's bed<<else>>$his bed<</if>> and strips before slipping into it. $He makes $himself comfortable<<if _HGL != 0>>, as $his slave rushes to $his side,<</if>> and begins working on birthing <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby. $His child is promptly taken<<if _HGL != 0>> by $his roommate<</if>> and $he rests awhile before returning to managing your slaves.
<<else>>
While overseeing your other slaves, $slaves[$i].slaveName's water breaks. $He attempts to hold back the coming birth until $he can catch a break in $his duties but ultimately fails.
<<set $humiliation = 1>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 11f1c32dbbe1b003ebe6a871b3a0e1c7bb8c8339..7219588c94b1195e86821154e337d543ea7dd16c 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -11,6 +11,43 @@
<<set $nationalities = weightedArray2HashMap($nationalities)>>
<</if>>
+<<if def $brothelSlaves>>
+ <<unset $brothelSlaves>>
+<</if>>
+<<if def $clubSlaves>>
+ <<unset $clubSlaves>>
+<</if>>
+<<if def $arcadeSlaves>>
+ <<unset $arcadeSlaves>>
+<</if>>
+<<if def $dairySlaves>>
+ <<unset $dairySlaves>>
+<</if>>
+<<if def $servantsQuartersSlaves>>
+ <<unset $servantsQuartersSlaves>>
+<</if>>
+<<if def $masterSuiteSlaves>>
+ <<unset $masterSuiteSlaves>>
+<</if>>
+<<if def $HGSuiteSlaves>>
+ <<unset $HGSuiteSlaves>>
+<</if>>
+<<if def $farmyardSlaves>>
+ <<unset $farmyardSlaves>>
+<</if>>
+<<if def $cellblockSlaves>>
+ <<unset $cellblockSlaves>>
+<</if>>
+<<if def $schoolroomSlaves>>
+ <<unset $schoolroomSlaves>>
+<</if>>
+<<if def $spaSlaves>>
+ <<unset $spaSlaves>>
+<</if>>
+<<if def $nurserySlaves>>
+ <<unset $nurserySlaves>>
+<</if>>
+
<<if def $youngCareers>>
<<unset $youngCareers, $educatedCareers, $uneducatedCareers, $gratefulCareers, $menialCareers, $entertainmentCareers, $whoreCareers, $HGCareers, $madamCareers, $DJCareers, $bodyguardCareers, $wardenessCareers, $nurseCareers, $attendantCareers, $matronCareers, $milkmaidCareers, $farmerCareers, $stewardessCareers, $schoolteacherCareers>>
@@ -785,9 +822,6 @@
<<if ndef $nurseryBabies>>
<<set $nurseryBabies = 0>>
<</if>>
-<<if ndef $nurserySlaves>>
- <<set $nurserySlaves = 0>>
-<</if>>
<<if ndef $Matron>>
<<set $Matron = 0>>
<</if>>
@@ -850,9 +884,6 @@
<<if ndef $farmyard>>
<<set $farmyard = 0>>
<</if>>
-<<if ndef $farmyardSlaves>>
- <<set $farmyardSlaves = 0>>
-<</if>>
<<if ndef $farmyardShowgirls>>
<<set $farmyardShowgirls = []>>
<</if>>
@@ -1892,10 +1923,6 @@ Setting missing global variables:
<<set $roomsPopulation = 0>>
<</if>>
-<<if ndef $clinicSlaves>>
- <<set $clinicSlaves = 0>>
-<</if>>
-
<<if ndef $universalHGImpregnateMasterSuiteToggle>>
<<set $universalHGImpregnateMasterSuiteToggle = 0>>
<</if>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 6160c7c107fd4dd5d5ad5488b6d893db87a64e1b..d99dbb50ffcc18fdac8732ae7790ca6d1581a71f 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -296,7 +296,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
s.counter.oral += 1;
};
})>>
- <<set $oralTotal += $schoolroomSlaves>>
+ <<set $oralTotal += $SchlRiIDs.length>>
<</replace>>
<</link>>
<br><<link "Take the delinquent student in hand">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 41ab427a1d4c76790dd9a78e2d927eb49a8dd89b..c7d7805985c28d68ee205a471f1e6d1e0c367875 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -758,7 +758,7 @@ One night, you see <<EventNameLink>> <<if (!hasAnyLegs($activeSlave))>>scooting
<<case "shift doorframe">>
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistantName == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistantName)>> <</if>>manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
<br><br>
You're at your desk as $he arrives; $his predecessor passes $him on the way out. $activeSlave.slaveName pauses for a moment in the doorway, and then decides to give you a show. $He spreads $his legs until $his
<<if $activeSlave.shoes == "heels">>
@@ -1271,7 +1271,7 @@ naked ass catching your eye as $he goes.
<<case "shift masturbation">>
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the girls from getting predictable. <<EventNameLink>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistantName == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistantName)>> <</if>>manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
<br><br>
And has $he ever come on shift. $He enters your office at something not far removed from a run, displaying evident signs of sexual excitation, a blush visible on $his $activeSlave.skin cheeks. Between $his job, the mild drugs in $his food, and $his life, $he's beside $himself with need. $He realizes you're working and tries to compose $himself, but gives up after a short struggle and flings $himself down on the couch. $He scoots down so $his <<if $activeSlave.butt > 5>>enormous<<elseif $activeSlave.butt > 2>>healthy<<else>>trim<</if>> butt is hanging off the edge of the cushion, and spreads $his legs up and back<<if $activeSlave.belly >= 5000>> to either side of $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly<</if>> as wide as they'll go<<if ($activeSlave.boobs > 1000)>>, hurriedly shoving $his tits out of the way<</if>>. $He uses both hands to frantically
<<if ($activeSlave.dick > 0) && !canAchieveErection($activeSlave)>>
@@ -1303,7 +1303,7 @@ but after a moment $he clearly decides this isn't enough stimulation. $He <<if $
<<case "shift sleep">>
-Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. Your <<if $Concubine != 0>>concubine<<elseif $HeadGirl != 0>>Head Girl<<else>>personal assistant<</if>> manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
+Your fucktoys have to eat, sleep, and look after themselves, just like anyone, so they can't spend every moment offering themselves to you. <<if $Concubine != 0>>Your concubine, $Concubine.slaveName<<elseif $HeadGirl != 0>>Your Head Girl, $HeadGirl.slaveName<<elseif $assistantName == "your personal assistant">>Your personal assistant<<else>>Your personal assistant, <<= capFirstChar($assistantName)>> <</if>>manages a schedule for them, constantly changing it up to keep the sluts from getting predictable. <<EventNameLink>> has just come on shift.
<br><br>
Though it's late, $he's surprised to find the lights in the master suite off. You had an unusually trying day, so you've retired for the night; you're on the point of sleep when $he comes in<<if $Concubine != 0>>, $Concubine.slaveName nestled under your arm<</if>>. After a moment's hesitation, $activeSlave.slaveName strips quietly and
<<if $activeSlave.belly >= 100000>>
diff --git a/src/uncategorized/arcade.tw b/src/uncategorized/arcade.tw
index 8480c50b4c10a3fdb705a07d8425cdc1a9f739ce..ce3ce29a36f9880b5653b85924320e564d19670a 100644
--- a/src/uncategorized/arcade.tw
+++ b/src/uncategorized/arcade.tw
@@ -1,6 +1,6 @@
:: Arcade [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Arcade", $showEncyclopedia = 1, $encyclopedia = "Arcade", $arcadeSlaves = $ArcadeiIDs.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Arcade", $showEncyclopedia = 1, $encyclopedia = "Arcade", _AL = $ArcadeiIDs.length>>
<<if $arcadeName != "the Arcade">>
<<set $arcadeNameCaps = $arcadeName.replace("the ", "The ")>>
@@ -67,9 +67,9 @@ $arcadeNameCaps
is a standard Free Cities sex arcade: a pair of hallways extend away from the entrance, lined with doorless stalls like those in a public restroom. One hallway offers mouths, the other <<if $seeDicks != 100>>vaginas and <</if>>anuses.
<</switch>>
-<<if $arcadeSlaves > 2>>
+<<if _AL > 2>>
It's busy. Customers are entering and exiting, leaving a few ¤ behind in the charge machines and loads of semen behind in the holes.
-<<elseif $arcadeSlaves > 0>>
+<<elseif _AL > 0>>
It's understaffed; there are lines here and there for the few holes available.
<<else>>
It's empty and quiet.
@@ -82,10 +82,10 @@ $arcadeNameCaps
<</link>>
<</if>>
-<<if $arcadeSlaves > 0>>
- <<set _NewPop = $arcadeSlaves+$dormitoryPopulation>>
+<<if _AL > 0>>
+ <<set _NewPop = _AL+$dormitoryPopulation>>
<<link "Remove all slaves" "Arcade">>
- <<for $arcadeSlaves > 0>>
+ <<for _AL > 0>>
<<= assignJob($slaves[$slaveIndices[$ArcadeiIDs[0]]], "work a glory hole")>>
<</for>>
<</link>>
@@ -94,14 +94,14 @@ $arcadeNameCaps
<</if>>
<</if>>
-<br>It can support $arcade inmates. There <<if $arcadeSlaves == 1>>is<<else>>are<</if>> currently $arcadeSlaves slave<<if $arcadeSlaves != 1>>s<</if>> incarcerated in $arcadeName.
-<<if $arcadeUpgradeFuckdolls == 1 && $arcadeSlaves > 1>>
+<br>It can support $arcade inmates. There <<if _AL == 1>>is<<else>>are<</if>> currently _AL slave<<if _AL != 1>>s<</if>> incarcerated in $arcadeName.
+<<if $arcadeUpgradeFuckdolls == 1 && _AL > 1>>
<br>The arcade has automatic Fuckdollification functions, and you can decide to convert your least popular slave at the end of the week. [[Activate|Arcade][$arcadeUpgradeFuckdolls = 2]]
<<elseif $arcadeUpgradeFuckdolls == 2>>
<br>You have decided that the least popular inmate will be converted to a standard Fuckdoll this week. [[Deactivate|Arcade][$arcadeUpgradeFuckdolls = 1]]
<</if>>
-<<if $arcade > $arcadeSlaves && $fuckdolls > 0>>
- <<set _fuckdollRoom = $arcade - $arcadeSlaves>>
+<<if $arcade > _AL && $fuckdolls > 0>>
+ <<set _fuckdollRoom = $arcade - _AL>>
<br>There is room in the arcade for <<print _fuckdollRoom>> menial Fuckdolls. <<if $fuckdolls > 1>>They'll be more efficient in the arcade, so you restrain them here.<<else>>Your Fuckdoll will be more efficient serving in the arcade, so you send it here.<</if>>
<</if>>
<<set _Tmult0 = Math.trunc($arcade*1000*$upgradeMultiplierArcology)>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 240283537fa3219241566a9a99fa204396674443..a5968a8e7a12794a1798546364c057e58b4ce149 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -4,7 +4,7 @@
</span>
<<SlaveIDSort $ArcadeiIDs>>
-<<set _DL = $ArcadeiIDs.length, $arcadeSlaves = _DL, _SL = $slaves.length, _cockmilked = 0, _milked = 0, _milkprofits = 0, _profits = 0, _oldCash = 0, _boobsImplanted = 0, _prostatesImplanted = 0, _vasectomiesUndone = 0, _mSlave = 0, _bSlave = 0, _pSlave = 0, _cSlave = 0>>
+<<set _DL = $ArcadeiIDs.length, _SL = $slaves.length, _cockmilked = 0, _milked = 0, _milkprofits = 0, _profits = 0, _oldCash = 0, _boobsImplanted = 0, _prostatesImplanted = 0, _vasectomiesUndone = 0, _mSlave = 0, _bSlave = 0, _pSlave = 0, _cSlave = 0>>
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.arcade = initFacilityStatistics($facility.arcade)>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 89dc508a915c1ca6274de2759702afe40cd67d69..1dea845f33034b5ed12bcc11c133b3c4e425624c 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1203,9 +1203,10 @@ You own
<<if $fuckdolls > 0>>
- <<if ($fuckdolls > $arcade - $arcadeSlaves) && ($arcade > $arcadeSlaves)>>
- <<set _fuckdollsArcade = $arcade - $arcadeSlaves>>
- <<elseif $fuckdolls < $arcade - $arcadeSlaves>>
+ <<set _AL = $ArcadeiIDs.length>>
+ <<if ($fuckdolls > $arcade - _AL) && ($arcade > _AL)>>
+ <<set _fuckdollsArcade = $arcade - _AL>>
+ <<elseif $fuckdolls < $arcade - _AL>>
<<set _fuckdollsArcade = $fuckdolls>>
<<else>>
<<set _fuckdollsArcade = 0>>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 65b19cc722703f65c23b2c524c076634b782eaba..125efef5578db273806bb9172722c49230063986 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -1,6 +1,6 @@
:: Brothel [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Brothel", $showEncyclopedia = 1, $encyclopedia = "Brothel", $brothelSlaves = $BrothiIDs.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Brothel", $showEncyclopedia = 1, $encyclopedia = "Brothel", _BL = $BrothiIDs.length>>
<<if $brothelName != "the Brothel">>
<<set $brothelNameCaps = $brothelName.replace("the ", "The ")>>
@@ -135,9 +135,9 @@ $brothelNameCaps
<</if>>
<</if>>
-<<if $brothelSlaves > 2>>
+<<if _BL > 2>>
$brothelNameCaps is bustling with activity. Customers are coming and going and slave girls are displaying themselves. When a slave catches a customer's eye, he leads her back into a little cubicle.
-<<elseif $brothelSlaves > 0>>
+<<elseif _BL > 0>>
$brothelNameCaps is working steadily. Customers are present and slave girls are on offer. When a slave catches a customer's eye, he leads her back into a little cubicle.
<<elseif $Madam != 0>>
$Madam.slaveName is alone in $brothelName, and has nothing to do but keep the place clean and plan future sales efforts.
@@ -152,14 +152,14 @@ $brothelNameCaps
<</link>>
<</if>>
-<<if $brothelSlaves > 0>>
+<<if _BL > 0>>
<<if $Madam != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $brothelSlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = _BL+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Brothel">>
<<if $Madam != 0>>
<<= assignJob($Madam, "rest")>>
<</if>>
- <<for $brothelSlaves > 0>>
+ <<for _BL > 0>>
<<= assignJob($slaves[$slaveIndices[$BrothiIDs[0]]], "whore")>>
<</for>>
<</link>>
@@ -169,7 +169,7 @@ $brothelNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($brothel*1000*$upgradeMultiplierArcology)>>
-<br>It can support $brothel whores. Currently there <<if $brothelSlaves == 1>>is<<else>>are<</if>> $brothelSlaves whore<<if $brothelSlaves != 1>>s<</if>> at $brothelName.
+<br>It can support $brothel whores. Currently there <<if _BL == 1>>is<<else>>are<</if>> _BL whore<<if _BL != 1>>s<</if>> at $brothelName.
[[Expand the brothel|Brothel][cashX(forceNeg(_Tmult0), "capEx"), $brothel += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
<<if $Madam != 0>>
@@ -203,9 +203,9 @@ $brothelNameCaps
Last week this
<<set $lastWeeksCashProfits.brothelAds = $lastWeeksCashIncome.brothelAds + $lastWeeksCashExpenses.brothelAds>>
<<if $lastWeeksCashProfits.brothelAds > 0>>
- made you an extra @@.green;<<print cashFormat($lastWeeksCashProfits.brothelAds)>>,@@<<if $brothelSlaves > 1>> as well as increasing business for your whores.<</if>>
+ made you an extra @@.green;<<print cashFormat($lastWeeksCashProfits.brothelAds)>>,@@<<if _BL > 1>> as well as increasing business for your whores.<</if>>
<<elseif $lastWeeksCashProfits.brothelAds < 0>>
- cost you @@.red;<<print cashFormat($lastWeeksCashProfits.brothelAds)>>,@@<<if $brothelSlaves > 1>> but still increased business for your whores.<</if>>
+ cost you @@.red;<<print cashFormat($lastWeeksCashProfits.brothelAds)>>,@@<<if _BL > 1>> but still increased business for your whores.<</if>>
<</if>>
<<link "Manage brothel advertisements" "Brothel Advertisement">><<set $nextLink = passage(), $nextButton = "Back">><</link>>
diff --git a/src/uncategorized/brothelAdvertisement.tw b/src/uncategorized/brothelAdvertisement.tw
index 3aae4b54d661735dd90907ab60a5c3e9cc5db2ce..5c449dd84d33e5fb889d002f905df98b6388427b 100644
--- a/src/uncategorized/brothelAdvertisement.tw
+++ b/src/uncategorized/brothelAdvertisement.tw
@@ -131,7 +131,7 @@
You are spending @@.red;<<print cashFormat($brothelAdsSpending)>>@@ each week to advertise the brothel.
<<if $lastWeeksCashIncome.brothelAds > 0>>
- Last week's ads increased profits by @@.green;<<print cashFormat($lastWeeksCashIncome.brothelAds)>>@@<<if $brothelSlaves > 1>> and also increased business for your whores<</if>>, and cost @@.red;<<print cashFormat($lastWeeksCashExpenses.brothelAds)>>.@@
+ Last week's ads increased profits by @@.green;<<print cashFormat($lastWeeksCashIncome.brothelAds)>>@@<<if $BrothiIDs.length > 1>> and also increased business for your whores<</if>>, and cost @@.red;<<print cashFormat($lastWeeksCashExpenses.brothelAds)>>.@@
<</if>>
<<if $brothelAdsSpending > 900>>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index b517fc3f113a41bebd07cae98d6a063e35dceb86..835532c02fd1b3ab1f7b14e6815161fc88e879e7 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -4,7 +4,7 @@
</span>
<<SlaveIDSort $BrothiIDs>>
-<<set _DL = $BrothiIDs.length, $brothelSlaves = _DL, _SL = $slaves.length, $legendaryWhoreID = 0, $madamCashBonus = 0, _FLsFetish = 0, _profits = 0>>
+<<set _DL = $BrothiIDs.length, _SL = $slaves.length, $legendaryWhoreID = 0, $madamCashBonus = 0, _FLsFetish = 0, _profits = 0>>
<<set $legendaryWombID = 0>>
<<set _modded = 0, _old = 0, _pure = 0, _slim = 0, _implanted = 0, _stacked = 0, _unmodded = 0, _XX = 0, _XY = 0, _young = 0, _pregYes = 0, _pregNo = 0, _minBonus = 50, _maxBonus = 150>>
diff --git a/src/uncategorized/buildingWidgets.tw b/src/uncategorized/buildingWidgets.tw
index d8dce067612aeaa230b3f07b22a8d79030e994de..1738a2ba54d3ff2f1ec2739b6b63ec689ede1303 100644
--- a/src/uncategorized/buildingWidgets.tw
+++ b/src/uncategorized/buildingWidgets.tw
@@ -73,18 +73,18 @@ if(!Macro.has('sectorblock')) {
sectors: {
LuxuryApartments: { base: 'Apartments' },
DenseApartments: { base: 'Apartments' },
- Club: { extra: ' <<if $clubNameCaps != "The Club">>$clubNameCaps<</if>> ($clubSlaves/<<print $club>><<if $DJ>>, L<</if>>)' },
- Brothel: { extra: ' <<if $brothelNameCaps != "The Brothel">>$brothelNameCaps<</if>> ($brothelSlaves/<<print $brothel>><<if $Madam>>,L<</if>>)' },
+ Club: { extra: ' <<if $clubNameCaps != "The Club">>$clubNameCaps<</if>> ($ClubiIDs.length/<<print $club>><<if $DJ>>, L<</if>>)' },
+ Brothel: { extra: ' <<if $brothelNameCaps != "The Brothel">>$brothelNameCaps<</if>> ($BrothiIDs.length/<<print $brothel>><<if $Madam>>,L<</if>>)' },
CorporateMarket: { base: 'Corporate Market' },
Pit: { extra: ' <<if $pitNameCaps != "The Pit">>$pitNameCaps<</if>> ($fighterIDs.length)'},
- Arcade: { extra: ' <<if $arcadeNameCaps != "The Arcade">>$arcadeNameCaps<</if>> ($arcadeSlaves/<<print $arcade>>)'},
- Dairy: { extra: ' <<if $dairyNameCaps != "The Dairy">>$dairyNameCaps<</if>> <<set _SCapT9 = $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>> ($dairySlaves<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>><<if $Milkmaid>>,L<</if>>)' },
+ Arcade: { extra: ' <<if $arcadeNameCaps != "The Arcade">>$arcadeNameCaps<</if>> ($ArcadeiIDs.length/<<print $arcade>>)'},
+ Dairy: { extra: ' <<if $dairyNameCaps != "The Dairy">>$dairyNameCaps<</if>> <<set _SCapT9 = $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>> ($DairyiIDs.length<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>><<if $Milkmaid>>,L<</if>>)' },
Sweatshops: { base: 'Manufacturing' },
weapManu: { base: 'weaponsManufacturing', name: 'Weapons Manufacturing', cls: 'weapManu' },
transportHub: { base: 'transportHub', name: 'Transport Hub', cls: 'transportHub' },
Barracks: { base: 'Barracks', name: 'Garrison', extra: ' of $mercenariesTitle' },
- Farmyard: { extra: ' <<if $farmyardNameCaps != "The Farmyard">>$farmyardNameCaps<</if>> ($farmyardSlaves/<<print $farmyard>><<if $Farmer>>, L<</if>>)'},
- Nursery: { extra: ' <<if $nurseryNameCaps != "The Nursery">>$nurseryNameCaps<</if>> ($nurseryBabies babies, $nurserySlaves/<<print $nurseryNannies>><<if $Matron>>,L<</if>>)'},
+ Farmyard: { extra: ' <<if $farmyardNameCaps != "The Farmyard">>$farmyardNameCaps<</if>> ($FarmyardiIDs.length/<<print $farmyard>><<if $Farmer>>, L<</if>>)'},
+ Nursery: { extra: ' <<if $nurseryNameCaps != "The Nursery">>$nurseryNameCaps<</if>> ($nurseryBabies babies, $NurseryiIDs.length/<<print $nurseryNannies>><<if $Matron>>,L<</if>>)'},
/* speciality shop types */
'Subjugationist': { base: 'Shops', name: 'Subjugationist Shops', cls: 'FSShops' },
'Supremacist': { base: 'Shops', name: 'Supremacist Shops', cls: 'FSShops' },
@@ -143,15 +143,15 @@ if(!Macro.has('sectorblock')) {
<<link "Penthouse">><<set $nextButton = "Back", $nextLink = _Pass>><<goto "Manage Penthouse">><</link>> @@.cyan;[P]@@
<<if $masterSuite||$HGSuite||$dojo||$servantsQuarters||$spa||$nursery||$clinic||$schoolroom||$cellblock||$incubator||$researchLab.level > 0>>
<br>
- <<if $masterSuite>> <<print MasterSuiteUIName()>> ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)<</if>>
- <<if $HGSuite>> <<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>><</if>>
+ <<if $masterSuite>> <<print MasterSuiteUIName()>> ($MastSiIDs.length/$masterSuite<<if $Concubine>>, C<</if>>)<</if>>
+ <<if $HGSuite>> <<print HeadGirlSuiteUIName()>> <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>>, 1)<<else>>)<</if>><</if>><</if>>
<<if $dojo > 1>>[[Armory|BG Select]] <<if $Bodyguard != 0>>(BG)<</if>> <</if>>
- <<if $servantsQuarters>> <<print ServantQuartersUIName()>> ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>>
- <<if $spa>> <<print SpaUIName()>> ($spaSlaves/$spa<<if $Attendant>>, L<</if>>)<</if>>
- <<if $nursery>> <<print NurseryUIName()>> (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $nurserySlaves/$nurseryNannies<<if $Matron>>, L<</if>>) <<if $readyChildren > 0>>@@.yellow;[!]@@<</if>> <</if>>
- <<if $clinic>> <<print ClinicUIName()>> ($clinicSlaves/$clinic<<if $Nurse>>, L<</if>>)<</if>>
- <<if $schoolroom>> <<print SchoolRoomUIName()>> ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>>
- <<if $cellblock>> <<print CellblockUIName()>> ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)<</if>>
+ <<if $servantsQuarters>> <<print ServantQuartersUIName()>> ($ServQiIDs.length/$servantsQuarters<<if $Stewardess>>, L<</if>>)<</if>>
+ <<if $spa>> <<print SpaUIName()>> ($SpaiIDs.length/$spa<<if $Attendant>>, L<</if>>)<</if>>
+ <<if $nursery>> <<print NurseryUIName()>> (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $NurseryiIDs.length/$nurseryNannies<<if $Matron>>, L<</if>>) <<if $readyChildren > 0>>@@.yellow;[!]@@<</if>> <</if>>
+ <<if $clinic>> <<print ClinicUIName()>> ($CliniciIDs.length/$clinic<<if $Nurse>>, L<</if>>)<</if>>
+ <<if $schoolroom>> <<print SchoolRoomUIName()>> ($SchlRiIDs.length/$schoolroom<<if $Schoolteacher>>, L<</if>>)<</if>>
+ <<if $cellblock>> <<print CellblockUIName()>> ($CellBiIDs.length/$cellblock<<if $Wardeness>>, L<</if>>)<</if>>
<<if $incubator>> <<print IncubatorUIName()>> (<<if $incubator-$incubatorSlaves == 0>>No empty tanks<<elseif $incubator-$incubatorSlaves == 1>>1 empty tank<<else>><<print $incubator-$incubatorSlaves>> empty tanks<</if>>) <<if $readySlaves > 0>>@@.yellow;[!]@@<</if>> <</if>>
<<if $researchLab.level > 0>>[[Prosthetic Lab]]<</if>>
<</if>>
diff --git a/src/uncategorized/cellblock.tw b/src/uncategorized/cellblock.tw
index 010002b8fca00b9a3df848aaa7c9767f3b93f852..ec33bc3502f3219dfb5e4240111930df93764606 100644
--- a/src/uncategorized/cellblock.tw
+++ b/src/uncategorized/cellblock.tw
@@ -1,6 +1,6 @@
:: Cellblock [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Cellblock", $showEncyclopedia = 1, $encyclopedia = "Cellblock", $cellblockSlaves = $CellBiIDs.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Cellblock", $showEncyclopedia = 1, $encyclopedia = "Cellblock", _CL = $CellBiIDs.length>>
<<if $cellblockName != "the Cellblock">>
<<set $cellblockNameCaps = $cellblockName.replace("the ", "The ")>>
@@ -67,9 +67,9 @@ $cellblockNameCaps
could be mistaken for a modern prison. A close inspection, however, reveals restraints in each cell that will hold inmates in sexually compromising positions, and compliance systems to force them to place their wrists and ankles in them.
<</switch>>
-<<if $cellblockSlaves > 2>>
+<<if _CL > 2>>
$cellblockNameCaps is full of slaves, though it's difficult to tell at first. In many of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
-<<elseif $cellblockSlaves > 0>>
+<<elseif _CL > 0>>
$cellblockNameCaps holds a few slaves, though it's difficult to tell at first. In several of the cells, a scene of loneliness and misery may be witnessed, but not one sound escapes them in fear of the punishment that would follow.
<<elseif $Wardeness != 0>>
$Wardeness.slaveName is alone in the cellblock, and seems rather lonely without anyone to oppress.
@@ -77,14 +77,14 @@ $cellblockNameCaps
None of your slaves are confined in the cellblock. [[Decommission the cellblock|Main][$cellblock = 0, $cellblockDecoration = "standard", $cellblockUpgrade = 0]]
<</if>>
-<<if $cellblockSlaves > 0>>
+<<if _CL > 0>>
<<if $Wardeness != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $cellblockSlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = _CL+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Cellblock">>
<<if $Wardeness != 0>>
<<= assignJob($Wardeness, "rest")>>
<</if>>
- <<for $cellblockSlaves > 0>>
+ <<for _CL > 0>>
<<= assignJob($slaves[$slaveIndices[$CellBiIDs[0]]], "stay confined")>>
<</for>>
<</link>>
@@ -94,7 +94,7 @@ $cellblockNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($cellblock*1000*$upgradeMultiplierArcology)>>
-<br>$cellblockNameCaps has room for $cellblock slaves to be kept in close confinement. There <<if $cellblockSlaves == 1>>is<<else>>are<</if>> currently $cellblockSlaves slaves<<if $cellblockSlaves != 1>>s<</if>> kept in close confinement in $cellblockName.
+<br>$cellblockNameCaps has room for $cellblock slaves to be kept in close confinement. There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slaves<<if _CL != 1>>s<</if>> kept in close confinement in $cellblockName.
[[Expand the cellblock|Cellblock][cashX(forceNeg(_Tmult0), "capEx"), $cellblock += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index fc602e4504dbfb9ea82b768deb455f30b92bf64c..9d2c0ecb3456cac595c3b432f9f57563f1e92a7d 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -1,7 +1,7 @@
:: Cellblock Report [nobr]
<<SlaveIDSort $CellBiIDs>>
-<<set _DL = $CellBiIDs.length, $cellblockSlaves = _DL, _SL = $slaves.length, _brokenSlaves = 0, _idleBonus = 0, _softenedQuirks = 0, _trustMalus = 0, _FLsFetish = 0>>
+<<set _DL = $CellBiIDs.length, _SL = $slaves.length, _brokenSlaves = 0, _idleBonus = 0, _softenedQuirks = 0, _trustMalus = 0, _FLsFetish = 0>>
<<if $cellblockDecoration != "standard">>
<<set _devBonus = 1>>
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index 3d1f8cdbb06f9f28f27833ab390678b646839c31..d2137246c688165f5dae4f4e8881dfb9a19112c2 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -1,6 +1,6 @@
:: Clinic [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Clinic", $showEncyclopedia = 1, $encyclopedia = "Clinic", $clinicSlaves = $CliniciIDs.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Clinic", $showEncyclopedia = 1, $encyclopedia = "Clinic", _CL = $CliniciIDs.length>>
<<if $clinicName != "the Clinic">>
<<set $clinicNameCaps = $clinicName.replace("the ", "The ")>>
@@ -67,9 +67,9 @@ $clinicNameCaps
is a well-equipped modern medical facility. Each patient has their own area, with heavy automation to provide them treatment without any human intervention at all.
<</switch>>
-<<if $clinicSlaves > 2>>
+<<if _CL > 2>>
$clinicNameCaps is busy. Patients occupy many of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.
-<<elseif $clinicSlaves > 0>>
+<<elseif _CL > 0>>
$clinicNameCaps is sparsely populated. Patients occupy a few of the beds; most are alert, but a few are dozing under medication designed to promote healing through deep rest.
<<elseif $Nurse != 0>>
$Nurse.slaveName is alone in the clinic, and has nothing to do but keep the place spotlessly clean and ready for its next patients.
@@ -77,14 +77,14 @@ $clinicNameCaps
$clinicNameCaps is empty and quiet. [[Decommission the Clinic|Main][$clinic = 0, $clinicDecoration = "standard", $clinicUpgradeScanner = 0, $clinicUpgradeFilters = 0, $clinicUpgradePurge = 0, $clinicInflateBelly = 0, $clinicSpeedGestation = 0]]
<</if>>
-<<if $clinicSlaves > 0>>
+<<if _CL > 0>>
<<if $Nurse != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $clinicSlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = _CL+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Clinic">>
<<if $Nurse != 0>>
<<= assignJob($Nurse, "rest")>>
<</if>>
- <<for $clinicSlaves > 0>>
+ <<for _CL > 0>>
<<= assignJob($slaves[$slaveIndices[$CliniciIDs[0]]], "rest")>>
<</for>>
<</link>>
@@ -94,7 +94,7 @@ $clinicNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($clinic*1000*$upgradeMultiplierArcology)>>
-<br>$clinicNameCaps has room to support $clinic slaves while they receive treatment. There <<if $clinicSlaves == 1>>is<<else>>are<</if>> currently $clinicSlaves slave<<if $clinicSlaves != 1>>s<</if>> receiving treatment in $clinicName.
+<br>$clinicNameCaps has room to support $clinic slaves while they receive treatment. There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slave<<if _CL != 1>>s<</if>> receiving treatment in $clinicName.
[[Expand the clinic|Clinic][cashX(forceNeg(_Tmult0), "capEx"), $clinic += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index b32ea8e19875af9cde85ddca62e004c2d7f45db0..0bf8a03951392a74cd946350e1220e7d49059d67 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -1,7 +1,7 @@
:: Clinic Report [nobr]
<<SlaveIDSort $CliniciIDs>>
-<<set _DL = $CliniciIDs.length, $clinicSlaves = _DL, _SL = $slaves.length, _healthBonus = 0, _idleBonus = 0, _FLsFetish = 0, _restedSlaves = 0>>
+<<set _DL = $CliniciIDs.length, _SL = $slaves.length, _healthBonus = 0, _idleBonus = 0, _FLsFetish = 0, _restedSlaves = 0>>
<<if $clinicDecoration != "standard">>
<<set _devBonus = 1>>
diff --git a/src/uncategorized/club.tw b/src/uncategorized/club.tw
index 9003526c1e98c4cc3b73fed111da7b9a3f57afcd..b0846050042cf66ebe25290c812818adfd3daae0 100644
--- a/src/uncategorized/club.tw
+++ b/src/uncategorized/club.tw
@@ -1,6 +1,6 @@
:: Club [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Club", $showEncyclopedia = 1, $encyclopedia = "Club", $clubSlaves = $ClubiIDs.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Club", $showEncyclopedia = 1, $encyclopedia = "Club", _CL = $ClubiIDs.length>>
<<if $clubName != "the Club">>
<<set $clubNameCaps = $clubName.replace("the ", "The ")>>
@@ -135,9 +135,9 @@ $clubNameCaps
<</if>>
<</if>>
-<<if $clubSlaves > 2>>
+<<if _CL > 2>>
$clubNameCaps is dotted with pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.
-<<elseif $clubSlaves > 0>>
+<<elseif _CL > 0>>
There are a few pretty, flirtatious slaves, stripping on stages, serving drinks, and dancing. They're very willing to suck patrons off in the open or give a public handjob, and there are little private rooms for them to use when engaging in heavier intercourse.
<<elseif $DJ != 0>>
<<setLocalPronouns $DJ>>
@@ -153,14 +153,14 @@ $clubNameCaps
<</link>>
<</if>>
-<<if $clubSlaves > 0>>
+<<if _CL > 0>>
<<if $DJ != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $clubSlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = _CL+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Club">>
<<if $DJ != 0>>
<<= assignJob($DJ, "rest")>>
<</if>>
- <<for $clubSlaves > 0>>
+ <<for _CL > 0>>
<<= assignJob($slaves[$slaveIndices[$ClubiIDs[0]]], "serve the public")>>
<</for>>
<</link>>
@@ -169,7 +169,7 @@ $clubNameCaps
<</if>>
<</if>>
-<<if $clubSlaves > 2>>
+<<if _CL > 2>>
<<switch $clubDecoration>>
<<case "Chattel Religionist">>
From one of the private rooms, praying interspersed with the slap of leather on flesh can be heard.
@@ -233,7 +233,7 @@ $clubNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($club*1000*$upgradeMultiplierArcology)>>
-<br>There are rooms off $clubName to support slaves as they work as club sluts. They can support $club slaves. There <<if $clubSlaves == 1>>is<<else>>are<</if>> currently $clubSlaves slave<<if $clubSlaves != 1>>s<</if>> serving in $clubName.
+<br>There are rooms off $clubName to support slaves as they work as club sluts. They can support $club slaves. There <<if _CL == 1>>is<<else>>are<</if>> currently _CL slave<<if _CL != 1>>s<</if>> serving in $clubName.
[[Expand the club|Club][cashX(forceNeg(_Tmult0), "capEx"), $club += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
<br>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index ec4cdd4f9bc37f2f180874d10cc231dca3a0ea2f..822fe8c470c1612f489bc35176990cf7c3d7e0f8 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -4,7 +4,7 @@
</span>
<<SlaveIDSort $ClubiIDs>>
-<<set _DL = $ClubiIDs.length, $clubSlaves = _DL, _SL = $slaves.length, $clubBonuses = 0, $legendaryEntertainerID = 0, _FLsFetish = 0>>
+<<set _DL = $ClubiIDs.length, _SL = $slaves.length, $clubBonuses = 0, $legendaryEntertainerID = 0, _FLsFetish = 0>>
<<set $legendaryWombID = 0>>
<<set _implanted =0, _modded = 0, _old = 0, _pure = 0, _slim = 0, _stacked = 0, _unmodded = 0, _XX = 0, _XY = 0, _young = 0, _pregYes = 0, _pregNo = 0, _minBonus = 50, _maxBonus = 150>>
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 058f6858200ca7fe722b6ab8640c34d83abca8bf..693e4a4ca6ef16d950c56981e1bd689c7c408eb8 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -123,7 +123,7 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<h2>Structures</h2>
</tr>
- <<print budgetLine("brothel", "<<if $brothel>>[[$brothelNameCaps|Brothel][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$brothelNameCaps<</if>> ($brothelSlaves slaves)")>>
+ <<print budgetLine("brothel", "<<if $brothel>>[[$brothelNameCaps|Brothel][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$brothelNameCaps<</if>> ($BrothiIDs.length slaves)")>>
<<print budgetLine("whoreBrothel", "Brothel whores")>>
@@ -133,7 +133,7 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<br>
<</if>>
- <<print budgetLine("club", "<<if $club>>[[$clubNameCaps|Club][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$clubNameCaps<</if>> ($clubSlaves slaves)")>>
+ <<print budgetLine("club", "<<if $club>>[[$clubNameCaps|Club][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$clubNameCaps<</if>> ($ClubiIDs.length slaves)")>>
<<print budgetLine("clubAds", "<<if $club>>[[Club ads|Club Advertisement][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>Club ads<</if>>")>>
@@ -141,7 +141,7 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<br>
<</if>>
- <<print budgetLine("arcade", "<<if $arcade>>[[$arcadeNameCaps|Arcade][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$arcadeNameCaps<</if>> ($arcadeSlaves slaves)")>>
+ <<print budgetLine("arcade", "<<if $arcade>>[[$arcadeNameCaps|Arcade][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$arcadeNameCaps<</if>> ($ArcadeiIDs.length slaves)")>>
<<print budgetLine("gloryholeArcade", "Arcade slaves")>>
@@ -149,7 +149,7 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<br>
<</if>>
- <<print budgetLine("dairy", "<<if $dairy>>[[$dairyNameCaps|Dairy][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$dairyNameCaps<</if>> ($dairySlaves slaves)")>>
+ <<print budgetLine("dairy", "<<if $dairy>>[[$dairyNameCaps|Dairy][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$dairyNameCaps<</if>> ($DairyiIDs.length slaves)")>>
<<print budgetLine("milkedDairy", "Dairy cows")>>
@@ -157,25 +157,25 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<br>
<</if>>
- <<print budgetLine("servantsQuarters", "<<if $servantsQuarters>>[[Servants' Quarters][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>Servants' Quarters<</if>> ($servantsQuartersSlaves slaves)")>>
+ <<print budgetLine("servantsQuarters", "<<if $servantsQuarters>>[[Servants' Quarters][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>Servants' Quarters<</if>> ($ServQiIDs.length slaves)")>>
- <<print budgetLine("masterSuite", "<<if $masterSuite>>[[Master Suite][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>Master Suite<</if>> ($masterSuiteSlaves slaves)")>>
+ <<print budgetLine("masterSuite", "<<if $masterSuite>>[[Master Suite][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>Master Suite<</if>> ($MastSiIDs.length slaves)")>>
- <<print budgetLine("school", "<<if $schoolroom>>[[$schoolroomNameCaps|Schoolroom][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$schoolroomNameCaps<</if>> ($schoolroomSlaves slaves)")>>
+ <<print budgetLine("school", "<<if $schoolroom>>[[$schoolroomNameCaps|Schoolroom][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$schoolroomNameCaps<</if>> ($SchlRiIDs.length slaves)")>>
- <<print budgetLine("spa", "<<if $spa>>[[$spaNameCaps|Spa][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$spaNameCaps<</if>> ($spaSlaves slaves)")>>
+ <<print budgetLine("spa", "<<if $spa>>[[$spaNameCaps|Spa][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$spaNameCaps<</if>> ($SpaiIDs.length slaves)")>>
- <<print budgetLine("clinic", "<<if $clinic>>[[$clinicNameCaps|Clinic][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$clinicNameCaps<</if>> ($clinicSlaves slaves)")>>
+ <<print budgetLine("clinic", "<<if $clinic>>[[$clinicNameCaps|Clinic][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$clinicNameCaps<</if>> ($CliniciIDs.length slaves)")>>
- <<print budgetLine("cellblock", "<<if $cellblock>>[[$cellblockNameCaps|Cellblock][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$cellblockNameCaps<</if>> ($cellblockSlaves slaves)")>>
+ <<print budgetLine("cellblock", "<<if $cellblock>>[[$cellblockNameCaps|Cellblock][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$cellblockNameCaps<</if>> ($CellBiIDs.length slaves)")>>
<<print budgetLine("lab", "<<if $researchLab.level > 0>>[[Prosthetic Lab][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>Prosthetic Lab<</if>> maintenance")>>
<<print budgetLine("incubator", "<<if $incubator>>[[$incubatorNameCaps|Incubator][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$incubatorNameCaps<</if>> ($incubatorSlaves slaves)")>>
- <<print budgetLine("nursery", "<<if $nursery>>[[$nurseryNameCaps|Nursery][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$nurseryNameCaps<</if>> ($nurserySlaves slaves)")>>
+ <<print budgetLine("nursery", "<<if $nursery>>[[$nurseryNameCaps|Nursery][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$nurseryNameCaps<</if>> ($NurseryiIDs.length slaves)")>>
- <<print budgetLine("farmyard", "<<if $farmyard>>[[$farmyardNameCaps|Farmyard][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$farmyardNameCaps<</if>> ($farmyardSlaves slaves)")>>
+ <<print budgetLine("farmyard", "<<if $farmyard>>[[$farmyardNameCaps|Farmyard][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$farmyardNameCaps<</if>> ($FarmyardiIDs.length slaves)")>>
<<print budgetLine("pit", "<<if $pit>>[[$pitNameCaps|Pit][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$pitNameCaps<</if>> ($fighterIDs.length slaves)")>>
diff --git a/src/uncategorized/dairy.tw b/src/uncategorized/dairy.tw
index 6058e919aa73b767147609cea6aa41431c86936c..0d92193b7b223cf30c6520132170e6f6225dba9a 100644
--- a/src/uncategorized/dairy.tw
+++ b/src/uncategorized/dairy.tw
@@ -1,9 +1,8 @@
:: Dairy [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Dairy", $showEncyclopedia = 1, $encyclopedia = "Dairy", _SL = $slaves.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Dairy", $showEncyclopedia = 1, $encyclopedia = "Dairy", _SL = $slaves.length, _DL = _DL>>
<<SlaveIDSort $DairyiIDs>>
-<<set _DL = $DairyiIDs.length, $dairySlaves = _DL>>
<<if $dairyName != "the Dairy">>
<<set $dairyNameCaps = $dairyName.replace("the ", "The ")>>
<</if>>
@@ -27,7 +26,7 @@
<br><br>
<</if>>
-<<if ($dairySlaves > 1)>>
+<<if (_DL > 1)>>
<<if $dairyFeedersSettingChanged == 1>>
In unison, the milking machines press their feeding phalli into the slaves' mouths and down their throats. Once situated, they begin to facefuck the slaves, who gag and struggle as they figure out how to breathe while this is going on. Once each slave is no longer panicking and is inhaling and exhaling regularly, there is a hydraulic sound and the transparent reservoir of feeding fluid near their head begins to drain. The slaves swallow desperately, their bellies beginning to swell with nutrition and drugs.<br><br>
<<elseif $dairyFeedersSettingChanged == -1>>
@@ -130,7 +129,7 @@
<</if>>
<</if>>
-<<set $dairySlaves = $DairyiIDs.length, $dairyStimulatorsSettingChanged = 0, $dairyFeedersSettingChanged = 0, $dairyPregSettingChanged = 0, $dairyRestraintsSettingChanged = 0>>
+<<set $dairyStimulatorsSettingChanged = 0, $dairyFeedersSettingChanged = 0, $dairyPregSettingChanged = 0, $dairyRestraintsSettingChanged = 0>>
<<if ($dairyRestraintsSetting > 1)>>
@@ -262,7 +261,7 @@
<</if>>
-<<if $dairySlaves > 2>>
+<<if _DL > 2>>
$dairyNameCaps is working steadily.
<<if ($dairyRestraintsUpgrade == 1) && ($dairyRestraintsSetting > 1)>>
Each cow is strapped into their own milking machine. The machines are set up in rows, alternating forward and backward so that the cows are interleaved as closely as possible without touching.
@@ -306,7 +305,7 @@
<</if>>
<<elseif $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren > 0>>
$dairyNameCaps is quiet and calm. The only sounds are faint sucking and gushing noises.
-<<elseif $dairySlaves > 0>>
+<<elseif _DL > 0>>
$dairyNameCaps is sparsely populated.
<<elseif $Milkmaid != 0>>
$Milkmaid.slaveName is alone in $dairyName, and has nothing to do but clean and maintain the equipment.
@@ -321,14 +320,14 @@
<</link>>
<</if>>
-<<if $dairySlaves > 0>>
+<<if _DL > 0>>
<<if $Milkmaid != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $dairySlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = _DL+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Dairy">>
<<if $Milkmaid != 0>>
<<= assignJob($Milkmaid, "rest")>>
<</if>>
- <<for $dairySlaves > 0>>
+ <<for _DL > 0>>
<<= assignJob($slaves[$slaveIndices[$DairyiIDs[0]]], "get milked")>>
<</for>>
<</link>>
@@ -338,7 +337,7 @@
<</if>>
<<set _Tmult0 = Math.trunc($dairy*1000*$upgradeMultiplierArcology)>>
-<br>$dairyNameCaps can support $dairy milkers. There <<if $dairySlaves == 1>>is<<else>>are<</if>> currently $dairySlaves cow<<if $dairySlaves != 1>>s<</if>>. [[Expand the dairy|Dairy][cashX(forceNeg(_Tmult0), "capEx"), $dairy += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
+<br>$dairyNameCaps can support $dairy milkers. There <<if _DL == 1>>is<<else>>are<</if>> currently _DL cow<<if _DL != 1>>s<</if>>. [[Expand the dairy|Dairy][cashX(forceNeg(_Tmult0), "capEx"), $dairy += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs//
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
<br><br>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index de5cb027dc77d476936366281227209b1a0820f7..b99f023d7416d6bdb23dcc6d1a8fd220b2e2d45c 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -6,7 +6,7 @@
<<set _MMWorkout = 0>>
<<SlaveIDSort $DairyiIDs>>
-<<set _DL = $DairyiIDs.length, $dairySlaves = _DL, _SL = $slaves.length, $bioreactorPerfectedID = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 1, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 1, $milkmaidDevotionThreshold = 45, $milkmaidTrustThreshold = 35, _anusesStretched = 0, _birthers = 0, _births = 0, _cumWeek = 0, _femCumWeek = 0, _FLsFetish = 0, _milkWeek = 0, _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hatefilled = 0, _horrified = 0, _intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0, _cmSlave = 0, _dsSlave = 0, _hfSlave = 0, _hrSlave = 0, _slSlave = 0, _cfSlave = 0, _stSlave = 0, _btSlave = 0>>
+<<set _DL = $DairyiIDs.length, _SL = $slaves.length, $bioreactorPerfectedID = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 1, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 1, $milkmaidDevotionThreshold = 45, $milkmaidTrustThreshold = 35, _anusesStretched = 0, _birthers = 0, _births = 0, _cumWeek = 0, _femCumWeek = 0, _FLsFetish = 0, _milkWeek = 0, _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hatefilled = 0, _horrified = 0, _intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0, _cmSlave = 0, _dsSlave = 0, _hfSlave = 0, _hrSlave = 0, _slSlave = 0, _cfSlave = 0, _stSlave = 0, _btSlave = 0>>
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.dairy = initFacilityStatistics($facility.dairy)>>
diff --git a/src/uncategorized/freeRangeDairyAssignmentScene.tw b/src/uncategorized/freeRangeDairyAssignmentScene.tw
index 830776ebac7f728683cd56820aff5ad8f9a45e7d..95ec91b8e855d7f5460c671b16883580682b5aa5 100644
--- a/src/uncategorized/freeRangeDairyAssignmentScene.tw
+++ b/src/uncategorized/freeRangeDairyAssignmentScene.tw
@@ -11,7 +11,7 @@ $activeSlave.slaveName reports to the dairy.
<</if>>
/* AROUSAL WHEN ENTERING */
<<set _aroused = false >>
-<<if $dairySlaves > 1 && canSee($activeSlave)>>
+<<if $DairyiIDs.length > 1 && canSee($activeSlave)>>
<br><br>
While <<if canWalk($activeSlave) >>walking<<else>>being carried<</if>> to $his designated stall, $he passes the other cows currently at their milking machines. Not being hurried, $he occasionally watches a cow in detail.
<<if $activeSlave.fetish == "boobs">>
diff --git a/src/uncategorized/headGirlSuite.tw b/src/uncategorized/headGirlSuite.tw
index 704755c93c4a711676bfd36e8dc71192aa5c0590..c243b1194c7e303ee9d639343dea2a86b1bffd9a 100644
--- a/src/uncategorized/headGirlSuite.tw
+++ b/src/uncategorized/headGirlSuite.tw
@@ -1,6 +1,6 @@
:: Head Girl Suite [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Head Girl Suite", $showEncyclopedia = 1, $encyclopedia = "Head Girl Suite", $HGSuiteSlaves = $HGSuiteiIDs.length, _SL = $slaves.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Head Girl Suite", $showEncyclopedia = 1, $encyclopedia = "Head Girl Suite", _SL = $slaves.length>>
<<if $HGSuiteName != "the Head Girl Suite">>
<<set $HGSuiteNameCaps = $HGSuiteName.replace("the ", "The ")>>
@@ -10,7 +10,7 @@
<<if $HeadGirl == 0>>
You have no Head Girl appointed to live in $HGSuiteName.
<<link "Select Head Girl">><<goto "HG Select">><</link>>
-<<elseif $HGSuiteSlaves > 0>>
+<<elseif $HGSuiteiIDs.length > 0>>
<<setLocalPronouns $HeadGirl>>
Your Head Girl $HeadGirl.slaveName has $slaves[_i].slaveName living in $HGSuiteName with $him, as $his servant, assistant, and sexual appliance.
<<link "Manage Head Girl">><<goto "HG Select">><</link>>
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index d838ece7f14a7e30f24f98e7964edb6ac0869202..c80a6a9e3567491ef717442fd9276e6548372ab4 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -68,7 +68,7 @@
_BG = $slaveIndices[$Bodyguard.ID]>>
<<if (def _HG && $HGSuite > 0)>><<set $slavesVisible++>><</if>>
-<<if ($HGSuiteSlaves > 0)>><<set $slavesVisible++>><</if>>
+<<if ($HGSuiteiIDs.length > 0)>><<set $slavesVisible++>><</if>>
<<if (def _BG && $dojo > 1)>><<set $slavesVisible++>><</if>>
<<set $nextButton = "END WEEK", $nextLink = "End Week", $showEncyclopedia = 1, $encyclopedia = "How to Play">>
diff --git a/src/uncategorized/masterSuite.tw b/src/uncategorized/masterSuite.tw
index fc3a1701ad7172e7211369a97b21af2376ec6409..2dfc51a57e444019cd1785bf35f2a92e8b15cd6c 100644
--- a/src/uncategorized/masterSuite.tw
+++ b/src/uncategorized/masterSuite.tw
@@ -1,9 +1,8 @@
:: Master Suite [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Master Suite", $showEncyclopedia = 1, $encyclopedia = "Master Suite", _SL = $slaves.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Master Suite", $showEncyclopedia = 1, $encyclopedia = "Master Suite", _SL = $slaves.length, _MsL = $MastSiIDs.length>>
<<SlaveIDSort $MastSiIDs>>
-<<set _DL = $MastSiIDs.length, $masterSuiteSlaves = _DL>>
<<if $masterSuiteName != "the Master Suite">>
<<set $masterSuiteNameCaps = $masterSuiteName.replace("the ", "The ")>>
@@ -18,8 +17,8 @@
<</if>>
<</if>>
-<<if $masterSuiteSlaves > 0>>
-<<for _dI = 0; _dI < _DL; _dI++>>
+<<if _MsL > 0>>
+<<for _dI = 0; _dI < _MsL; _dI++>>
<<set _i = $slaveIndices[$MastSiIDs[_dI]]>>
<<set _Slave = $slaves[_i]>>
@@ -45,13 +44,13 @@
<</if>>
<</if>>
<</for>>
- <<set $masterSuiteAverageEnergy = $masterSuiteAverageEnergy/$masterSuiteSlaves>>
- <<set _masterSuiteAverageMilk = _masterSuiteAverageMilk/$masterSuiteSlaves>>
- <<set _masterSuiteAverageCum = _masterSuiteAverageCum/$masterSuiteSlaves>>
- <<set _masterSuiteAverageDick = _masterSuiteAverageDick/$masterSuiteSlaves>>
- <<set _masterSuiteAveragePreg = _masterSuiteAveragePreg/$masterSuiteSlaves>>
- <<set _masterSuiteAverageDom = _masterSuiteAverageDom/$masterSuiteSlaves>>
- <<set _masterSuiteAverageSadism = _masterSuiteAverageSadism/$masterSuiteSlaves>>
+ <<set $masterSuiteAverageEnergy = $masterSuiteAverageEnergy/_MsL>>
+ <<set _masterSuiteAverageMilk = _masterSuiteAverageMilk/_MsL>>
+ <<set _masterSuiteAverageCum = _masterSuiteAverageCum/_MsL>>
+ <<set _masterSuiteAverageDick = _masterSuiteAverageDick/_MsL>>
+ <<set _masterSuiteAveragePreg = _masterSuiteAveragePreg/_MsL>>
+ <<set _masterSuiteAverageDom = _masterSuiteAverageDom/_MsL>>
+ <<set _masterSuiteAverageSadism = _masterSuiteAverageSadism/_MsL>>
<</if>>
<<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology)>>
@@ -120,7 +119,7 @@ $masterSuiteNameCaps is furnished
<</switch>>
It is full of luxuries of all kinds. The slaves here live free of want or worry, and have everything except their freedom. Their only duties are to please you and look after the suite and one another.
-<<if $masterSuiteSlaves > 2>>
+<<if _MsL > 2>>
It's busy with slaves, so many that they are able to rotate through keeping themselves perfect and ready for your pleasure. The slaves not on call at the moment are beautifying themselves, cleaning, or serving others.
<<if (_masterSuitePregnantSlaves > 2) && (_masterSuitePregnantSlavesMultiple < 2)>>
Many of the slaves are pregnant, and they walk around proudly displaying their bellies and the new slaves growing inside them.<br>
@@ -129,7 +128,7 @@ It is full of luxuries of all kinds. The slaves here live free of want or worry,
<<elseif (_masterSuitePregnantSlaves > 2) && (_masterSuitePregnantSlavesMultiple > 2)>>
Many of the slaves are pregnant with multiple children, and they walk around proudly displaying their distended bellies and the next generation of slaves growing within them.<br>
<</if>>
-<<elseif $masterSuiteSlaves > 0>>
+<<elseif _MsL > 0>>
It's sparsely populated, so that the few slaves here have to work hard and quickly to ensure that an assortment of sex slaves is perfect and ready for your pleasure at any given moment.
<<else>>
None of your slaves are serving here.
@@ -200,7 +199,7 @@ $masterSuiteNameCaps is furnished
<</switch>>
The true focus of the suite is, however, the fuckpit. This stepped depression in the middle of the floor
-<<if $masterSuiteSlaves > 3>>
+<<if _MsL > 3>>
is filled by cushions and every slave in the suite who isn't sleeping, eating, or bathing.
<<if $masterSuiteAverageEnergy > 90>>
They're having energetic group sex; most of them are fucking and being fucked at the same time.
@@ -228,7 +227,7 @@ The true focus of the suite is, however, the fuckpit. This stepped depression in
<<elseif (_masterSuitePregnantSlaves > 2) && (_masterSuitePregnantSlavesMultiple > 2)>>
Many of the slaves are pregnant with multiple children, and more than one has her face buried in the cunt directly below a grossly swollen belly while she lovingly massages her own distended stomach.<br>
<</if>>
-<<elseif $masterSuiteSlaves > 0>>
+<<elseif _MsL > 0>>
has a few lonely-looking fucktoys in it, badly outnumbered by the cushions.
<<else>>
is desolate and unpopulated.
@@ -298,7 +297,7 @@ $masterSuiteNameCaps is furnished
comfortably, as a fairly normal luxury suite. It is unusually large, to accommodate as large a stable of sex slaves as strikes your fancy.
<</switch>>
-<<if $masterSuiteSlaves > 2>>
+<<if _MsL > 2>>
It's busy with slaves, so many that they are able to rotate through keeping themselves perfect and ready for your pleasure. The slaves not on call at the moment are beautifying themselves, cleaning, or serving others.
<<if (_masterSuitePregnantSlaves > 2) && (_masterSuitePregnantSlavesMultiple < 2)>>
Many of the slaves are pregnant, and they walk around proudly displaying their bellies and the new slaves growing inside them.<br>
@@ -307,7 +306,7 @@ $masterSuiteNameCaps is furnished
<<elseif (_masterSuitePregnantSlaves > 2) && (_masterSuitePregnantSlavesMultiple > 2)>>
Many of the slaves are pregnant with multiple children, and they walk around proudly displaying their distended bellies and the next generation of slaves growing within them.<br>
<</if>>
-<<elseif $masterSuiteSlaves > 0>>
+<<elseif _MsL > 0>>
It's sparsely populated, so that the few slaves here have to work hard and quickly to ensure that an assortment of sex slaves is perfect and ready for your pleasure at any given moment.
<<else>>
None of your slaves are serving here.
@@ -317,21 +316,21 @@ $masterSuiteNameCaps is furnished
<</if>>
-<br>$masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>. There <<if $masterSuiteSlaves == 1>>is<<else>>are<</if>> currently $masterSuiteSlaves slave<<if $masterSuiteSlaves != 1>>s<</if>> in $masterSuiteName.
+<br>$masterSuiteNameCaps has room for $masterSuite slaves to live comfortably<<if $masterSuiteUpgradeLuxury == 2>> in the moments when they're not in the fuckpit<<elseif $masterSuiteUpgradeLuxury == 1>> on its huge bed<</if>>. There <<if _MsL == 1>>is<<else>>are<</if>> currently _MsL slave<<if _MsL != 1>>s<</if>> in $masterSuiteName.
<<set _Tmult0 = Math.trunc($masterSuite*1000*$upgradeMultiplierArcology)>>
[[Expand the Master Suite|Master Suite][cashX(forceNeg(_Tmult0), "capEx"), $masterSuite += 2, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
-<<if $Concubine == 0 && $masterSuiteSlaves == 0>>
+<<if $Concubine == 0 && _MsL == 0>>
| [[Decommission the Master Suite|Main][$masterSuite = 0, $masterSuiteUpgradeLuxury = 0, $masterSuitePregnancySlaveLuxuries = 0, $masterSuiteDecoration = "standard", $masterSuitePregnancyFertilityDrugs = 0, $masterSuitePregnancyFertilitySupplements = 0, $masterSuiteUpgradePregnancy = 0, $masterSuiteHyperPregnancy = 0]]
<</if>>
-<<if $masterSuiteSlaves > 0>>
+<<if _MsL > 0>>
<<if $Concubine != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $masterSuiteSlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = _MsL+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Master Suite">>
<<if $Concubine != 0>>
<<= assignJob($Concubine, "rest")>>
<</if>>
- <<for $masterSuiteSlaves > 0>>
+ <<for _MsL > 0>>
<<= assignJob($slaves[$slaveIndices[$MastSiIDs[0]]], "please you")>>
<</for>>
<</link>>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 6572a48ac0193edd3ccf7a130b78b9cec52ce8b1..bccf5f5b7c88f3c26155af4bba23d8d057cb266d 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -1,7 +1,7 @@
:: Master Suite Report [nobr]
<<SlaveIDSort $MastSiIDs>>
-<<set _DL = $MastSiIDs.length, $masterSuiteSlaves = _DL, _SL = $slaves.length, $legendaryAbolitionistID = 0, $masterSuiteAverageEnergy = 0, _masterSuiteAverageCum = 0, _masterSuiteAverageDick = 0, _masterSuiteAverageDom = 0, _masterSuiteAverageMilk = 0, _masterSuiteAveragePreg = 0, _masterSuiteAverageSadism = 0, _masterSuitePregnantSlaves = 0, _masterSuitePregnantSlavesMultiple = 0>>
+<<set _DL = $MastSiIDs.length, _SL = $slaves.length, $legendaryAbolitionistID = 0, $masterSuiteAverageEnergy = 0, _masterSuiteAverageCum = 0, _masterSuiteAverageDick = 0, _masterSuiteAverageDom = 0, _masterSuiteAverageMilk = 0, _masterSuiteAveragePreg = 0, _masterSuiteAverageSadism = 0, _masterSuitePregnantSlaves = 0, _masterSuitePregnantSlavesMultiple = 0>>
<<if $Concubine != 0>>
<<set _FLs = $slaveIndices[$Concubine.ID]>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 5ed2f9c9d551176dd79066a053630356b3627224..8206058cbfc74b5c520606c6522871e73c6c9991 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -2195,7 +2195,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<set $activeSlave.trust -= 10>>
<</link>>
<<if ($activeSlave.lactation > 0 || (($dairySlimMaintainUpgrade == 0 || $dairySlimMaintain == 0) && ($activeSlave.boobs > 300 || $activeSlave.dick == 0 || $dairyImplantsSetting == 1) && $dairyImplantsSetting != 2)) || ($activeSlave.balls > 0)>>
- <<if ($dairyPrepUpgrade == 1) && ($dairy > $dairySlaves+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren)>>
+ <<if ($dairyPrepUpgrade == 1) && ($dairy > $DairyiIDs.length+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren)>>
| <<link "Send $him straight to the Industrial Dairy">>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<set $activeSlave.anus = Math.clamp($activeSlave.anus, 3, 4)>>
@@ -2207,7 +2207,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</replace>>
<</link>>
<</if>>
- <<if $dairy > $dairySlaves+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
+ <<if $dairy > $DairyiIDs.length+$bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
| <<link "Break $him in for the Industrial Dairy">>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<set $activeSlave.anus = Math.clamp($activeSlave.anus, 3, 4)>>
@@ -2301,14 +2301,14 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<set $activeSlave.trust -= 10>>
<</link>>
- <<if ($arcade > $arcadeSlaves) || ($arcadeUpgradeFuckdolls == 2)>>
+ <<if ($arcade > $ArcadeiIDs.length) || ($arcadeUpgradeFuckdolls == 2)>>
| <<link "Send $him straight to the Arcade">>
<<set $activeSlave.assignment = "be confined in the arcade">>
<<set $activeSlave.assignmentVisible = 0>>
<<set $activeSlave.choosesOwnAssignment = 0>>
<<replace "#introResult">>
You order <<if $HeadGirl == 0>>another slave<<else>>$HeadGirl.slaveName<</if>> to get $activeSlave.slaveName set up in $arcadeName. The new slave does not know what $arcadeName is, not really, and $he doesn't know what being set up there means, either. $He'll be confined inside a small space, not too different from the indignities $he's suffered already. It's only when the restraints lock into place that $he'll understand $his doom. $His mouth will be forced open and presented at one wall of $arcadeName, and $his ass will protrude from its other side, $his holes available for public relief at both ends. $He'll probably refuse to believe the truth, until the first cockhead enters $his mouth<<if $activeSlave.vagina > -1>>, parts $his pussylips,<</if>> or presses against $his poor anus.
- <<if ($arcade <= $arcadeSlaves)>>Mere <<if $showInches == 2>>yards<<else>>meters<</if>> away, preparations to convert the least appealing Arcade slave into a Fuckdoll begin. As $activeSlave.slaveName is broken in by $his first customers, $he's blissfully unaware that $he's $arcade new slaves away from the same fate.<</if>>
+ <<if ($arcade <= $ArcadeiIDs.length)>>Mere <<if $showInches == 2>>yards<<else>>meters<</if>> away, preparations to convert the least appealing Arcade slave into a Fuckdoll begin. As $activeSlave.slaveName is broken in by $his first customers, $he's blissfully unaware that $he's $arcade new slaves away from the same fate.<</if>>
<</replace>>
<</link>>
<</if>>
diff --git a/src/uncategorized/penthouseReport.tw b/src/uncategorized/penthouseReport.tw
index 21ea5af71525901c82e10c0dc0a2488060196d35..1e73f8fb7944e85ad29d6d43660072f7c25ab0b8 100644
--- a/src/uncategorized/penthouseReport.tw
+++ b/src/uncategorized/penthouseReport.tw
@@ -13,7 +13,7 @@
<<include "Full Report">>
<br><br>
- <<if ($slaves[$i].assignment == "be your Head Girl") && ($HGSuiteSlaves > 0)>>
+ <<if ($slaves[$i].assignment == "be your Head Girl") && ($HGSuiteiIDs.length > 0)>>
/% We found the Head Girl, now let's find her slave %/
<<set _iTemp = $i>>
<<set _ID = $HGSuiteiIDs[0], $i = $slaveIndices[_ID]>>
@@ -38,4 +38,4 @@
<</for>>
/* count open spots in facilities after all assignments have been decided for the week */
-<<set $brothelSpots = $brothel - $brothelSlaves, $clubSpots = $club - $clubSlaves, $dairySpots = $dairy - $dairySlaves, $servantsQuartersSpots = $servantsQuarters - $servantsQuartersSlaves>>
+<<set $brothelSpots = $brothel - $BrothiIDs.length, $clubSpots = $club - $ClubiIDs.length, $dairySpots = $dairy - $DairyiIDs.length, $servantsQuartersSpots = $servantsQuarters - $ServQiIDs.length>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index c0ef88734c2dcf920d4cc754d5ea24caf2d84fed..cab43b1f9eb7d34abbbf68bca19942ffd96fcb92 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -372,27 +372,27 @@
<<set $events.push("RE rebels")>>
<</if>>
- <<if $brothelSlaves > 3>>
+ <<if $BrothiIDs.length > 3>>
<<set $events.push("RE busy brothel")>>
<</if>>
- <<if $brothelSlaves > 5>>
+ <<if $BrothiIDs.length > 5>>
<<set $events.push("RE brothel function")>>
<</if>>
- <<if $clubSlaves > 3>>
+ <<if $ClubiIDs.length > 3>>
<<set $events.push("RE busy club")>>
<</if>>
- <<if $dairySlaves > 3>>
+ <<if $DairyiIDs.length > 3>>
<<if $dairyRestraintsSetting < 2>>
<<set $events.push("RE busy dairy")>>
<</if>>
<</if>>
- <<if $servantsQuartersSlaves > 3>>
+ <<if $ServQiIDs.length > 3>>
<<set $events.push("RE busy servants quarters")>>
<</if>>
- <<if $arcadeSlaves > 3>>
+ <<if $ArcadeiIDs.length > 3>>
<<set $events.push("RE busy arcade")>>
<</if>>
- <<if $masterSuiteSlaves > 3>>
+ <<if $MastSiIDs.length > 3>>
<<if $Concubine != 0>>
<<set $events.push("RE busy master suite")>>
<</if>>
@@ -470,7 +470,7 @@
<</if>>
- <<if ($Milkmaid != 0) && ($dairySlaves >= 5) && ($Milkmaid.health >= 70)>>
+ <<if ($Milkmaid != 0) && ($DairyiIDs.length >= 5) && ($Milkmaid.health >= 70)>>
<<if ($Milkmaid.muscles > 5)>>
<<set $PESSevent.push("tired milkmaid")>>
<</if>>
@@ -479,31 +479,31 @@
<</if>>
<</if>>
- <<if ($Stewardess != 0) && ($servantsQuartersSlaves > 0) && ($Stewardess.actualAge >= 35 || $AgePenalty == 0)>>
+ <<if ($Stewardess != 0) && ($ServQiIDs.length > 0) && ($Stewardess.actualAge >= 35 || $AgePenalty == 0)>>
<<set $PETSevent.push("stewardess beating")>>
<</if>>
- <<if ($Madam != 0) && ($brothelSlaves >= 5) && ($Madam.actualAge >= 35 || $AgePenalty == 0) && ($Madam.skill.whoring >= 100)>>
+ <<if ($Madam != 0) && ($BrothiIDs.length >= 5) && ($Madam.actualAge >= 35 || $AgePenalty == 0) && ($Madam.skill.whoring >= 100)>>
<<set $PESSevent.push("madam strategy")>>
<</if>>
- <<if ($DJ != 0) && ($clubSlaves >= 5) && ($DJ.face > 95) && ($DJ.skill.entertainment >= 100)>>
+ <<if ($DJ != 0) && ($ClubiIDs.length >= 5) && ($DJ.face > 95) && ($DJ.skill.entertainment >= 100)>>
<<set $PESSevent.push("DJ publicity")>>
<</if>>
- <<if ($Schoolteacher != 0) && ($schoolroomSlaves > 0) && ($Schoolteacher.intelligence+$Schoolteacher.intelligenceImplant > 15) && ($Schoolteacher.actualAge >= 35)>>
+ <<if ($Schoolteacher != 0) && ($SchlRiIDs.length > 0) && ($Schoolteacher.intelligence+$Schoolteacher.intelligenceImplant > 15) && ($Schoolteacher.actualAge >= 35)>>
<<set $PETSevent.push("aggressive schoolteacher")>>
<</if>>
- <<if ($Wardeness != 0) && ($cellblockSlaves > 0) && canTalk($Wardeness)>>
+ <<if ($Wardeness != 0) && ($CellBiIDs.length > 0) && canTalk($Wardeness)>>
<<set $PETSevent.push("abusive wardeness")>>
<</if>>
- <<if ($Attendant != 0) && ($spaSlaves > 0) && canTalk($Attendant)>>
+ <<if ($Attendant != 0) && ($SpaiIDs.length > 0) && canTalk($Attendant)>>
<<set $PETSevent.push("comforting attendant")>>
<</if>>
- <<if ($Nurse != 0) && ($clinicSlaves > 0) && ($Nurse.energy > 95) || (($Nurse.fetishStrength > 60) && ($Nurse.fetish == "sadist" || $Nurse.fetish == "dom"))>>
+ <<if ($Nurse != 0) && ($CliniciIDs.length > 0) && ($Nurse.energy > 95) || (($Nurse.fetishStrength > 60) && ($Nurse.fetish == "sadist" || $Nurse.fetish == "dom"))>>
<<set $subSlave = $slaves.find(function(s) { return s.anus != 0 && s.assignment == "get treatment in the clinic"; })>>
<<if (def $subSlave)>>
<<set $PETSevent.push("nurse molestation")>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 0ecb66e8276ab0cf5cd65eeb98b21f035b1aa53a..e9a1a2c28b6f8638dd963201c715e27a8663b912 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2555,7 +2555,7 @@ He explains that one of his servant <<= $girl>>s was impregnated by his fool of
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName participates matter-of-factly, and there's a certain sense of relief about $him. $His fate is out of $his hands now, and you get the impression $he isn't sorry about that at all.
<<case "desperate birth">>
You complete the legalities and biometric scanning quickly before
- <<if $clinic > 0 && $clinic < $clinicSlaves>>
+ <<if $clinic > 0 && $clinic < $CliniciIDs.length>>
rushing $him to $clinicName,
<<set $activeSlave.assignment = "get treatment in the clinic">>
<<else>>
diff --git a/src/uncategorized/repBudget.tw b/src/uncategorized/repBudget.tw
index 754d8c1a67f15267db6f0f2b6d25cd608b464ebe..c1eeedf91342c3d9b6263a11b15202f0515705be 100644
--- a/src/uncategorized/repBudget.tw
+++ b/src/uncategorized/repBudget.tw
@@ -75,13 +75,13 @@ for (var i = 0; i < State.variables.lastWeeksRepIncome.length; i++){
<h2>Structures</h2> /* TODO: using h2s doesn't fit in with the rest of the game */
</tr>
- <<print budgetLine("arcade", "<<if $arcade>>[[$arcadeNameCaps|Arcade][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$arcadeNameCaps<</if>> ($arcadeSlaves slaves)")>>
+ <<print budgetLine("arcade", "<<if $arcade>>[[$arcadeNameCaps|Arcade][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$arcadeNameCaps<</if>> ($ArcadeiIDs.length slaves)")>>
<<print budgetLine("gloryholeArcade", "Free arcade")>>
- <<print budgetLine("brothel", "<<if $brothel>>[[$brothelNameCaps|Brothel][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$brothelNameCaps<</if>> ($brothelSlaves slaves)")>>
+ <<print budgetLine("brothel", "<<if $brothel>>[[$brothelNameCaps|Brothel][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$brothelNameCaps<</if>> ($BrothiIDs.length slaves)")>>
- <<print budgetLine("club", "<<if $club>>[[$clubNameCaps|Club][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$clubNameCaps<</if>> ($clubSlaves slaves)")>>
+ <<print budgetLine("club", "<<if $club>>[[$clubNameCaps|Club][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$clubNameCaps<</if>> ($ClubiIDs.length slaves)")>>
<<print budgetLine("publicServantClub", "Club servants")>>
@@ -93,9 +93,9 @@ for (var i = 0; i < State.variables.lastWeeksRepIncome.length; i++){
<<print budgetLine("pit", "<<if $pit>>[[$pitNameCaps|Pit][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$pitNameCaps<</if>> ($fighterIDs.length slaves)")>>
- <<print budgetLine("servantsQuarters", "<<if $servantsQuarters>>[[Servants' Quarters][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>Servants' Quarters<</if>> ($servantsQuartersSlaves slaves)")>>
+ <<print budgetLine("servantsQuarters", "<<if $servantsQuarters>>[[Servants' Quarters][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>Servants' Quarters<</if>> ($ServQiIDs.length slaves)")>>
- <<print budgetLine("spa", "<<if $spa>>[[$spaNameCaps|Spa][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$spaNameCaps<</if>> ($spaSlaves slaves)")>>
+ <<print budgetLine("spa", "<<if $spa>>[[$spaNameCaps|Spa][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]<<else>>$spaNameCaps<</if>> ($SpaiIDs.length slaves)")>>
<<print budgetLine("architecture", "[[Architecture|Manage Arcology][$nextButton = \"Back to Budget\", $nextLink = \"Rep Budget\"]]")>>
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index 37fd59503d3616c8c2b56ba062be4e7e29004e0d..77e8b02ca8462fa1b1302ab2aefdfb2890ffb0bb 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -1,5 +1,7 @@
:: SA chooses own job [nobr]
+<<set _clinicL = $CliniciIDs.length, _schoolL = $SchlRiIDs.length, _servQL = $ServQiIDs.length, _nurseryL = $NurseryiIDs.length, _brothelL = $BrothiIDs.length, _clubL = $ClubiIDs.length, _masterSL = $MastSiIDs.length, _spaL = $SpaiIDs.length, _dairyL = $DairyiIDs.length,
+
<<if ($slaves[$i].choosesOwnAssignment == 0) || ($slaves[$i].fuckdoll > 0) || ($slaves[$i].fetish == "mindbroken")>>
/* nothing to do */
@@ -20,7 +22,7 @@
<<set $slaves[$i].devotion -= 5>>
<<elseif ($slaves[$i].health < 20)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($clinic > $clinicSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($clinic > _clinicL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is unhealthy, so $he decides to get treatment at $clinicName.">>
<<= assignJob($slaves[$i], "get treatment in the clinic")>>
<<else>>
@@ -33,7 +35,7 @@
<<= assignJob($slaves[$i], "get milked")>>
<<elseif ($slaves[$i].intelligenceImplant < 15)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($schoolroom > $schoolroomSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($schoolroom > _schoolL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is uneducated, so $he sits $himself down in $schoolroomName.">>
<<= assignJob($slaves[$i], "learn in the schoolroom")>>
<<else>>
@@ -46,7 +48,7 @@
<<= assignJob($slaves[$i], "rest in the spa")>>
<<elseif ($slaves[$i].devotion <= 50) && canWalk($slaves[$i]) && canSee($slaves[$i])>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > $servantsQuartersSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > _servQL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is obedient but not devoted, so $he decides to work from $servantsQuartersName since it's the least sexually demanding job available.">>
<<= assignJob($slaves[$i], "work as a servant")>>
<<else>>
@@ -54,7 +56,7 @@
<<= assignJob($slaves[$i], "be a servant")>>
<</if>>
- <<elseif $universalRulesAssignsSelfFacility == 1 && $slaves[$i].devotion > 50 && canWalk($slaves[$i]) && canSee($slaves[$i]) && $nurseryNannies > $nurserySlaves>>
+ <<elseif $universalRulesAssignsSelfFacility == 1 && $slaves[$i].devotion > 50 && canWalk($slaves[$i]) && canSee($slaves[$i]) && $nurseryNannies > _nurseryL>>
<<if $slaves[$i].daughters > 0 && $cribs.findIndex(function(c) { c.mother === $slaves[$i].ID})>> /* TODO: this may need another lookover */
<<set $slaves[$i].choosesOwnAssignmentText += " wants to look after $his child, so $he decides to work in $nurseryName.">>
<<=assignJob($slaves[$i], "work as a nanny")>>
@@ -67,7 +69,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " relies on promiscuity to fulfill $his emotional needs,">>
<<if ($cash < 10000)>>
<<set $slaves[$i].choosesOwnAssignmentText += " and doesn't mind being a whore, so $he prostitutes $himself">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " in $brothelName.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -76,7 +78,7 @@
<</if>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $he eagerly decides to slut around">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($club > _clubL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " in $clubName.">>
<<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
@@ -90,7 +92,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " is emotionally bonded to you,">>
<<if ($slaves[$i].behavioralQuirk == "insecure")>>
<<set $slaves[$i].choosesOwnAssignmentText += " but insecure, so $he decides to make you money by prostituting $himself">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " in $brothelName.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -99,7 +101,7 @@
<</if>>
<<elseif ($slaves[$i].behavioralQuirk == "advocate")>>
<<set $slaves[$i].choosesOwnAssignmentText += " and an advocate for slavery, so $he decides to burnish your reputation by slutting it up">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($club > _clubL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " in $clubName.">>
<<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
@@ -109,7 +111,7 @@
<<set $slaves[$i].sexAmount = 10>>
<<elseif ($slaves[$i].energy > 60)>>
<<set $slaves[$i].choosesOwnAssignmentText += " and $he thinks of little but sex with you,">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > _masterSL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $he heads straight to $masterSuiteName.">>
<<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
@@ -118,7 +120,7 @@
<</if>>
<<elseif canSee($slaves[$i]) && canWalk($slaves[$i])>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $he decides to work">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > $servantsQuartersSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > _servQL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " from $servantsQuartersName">>
<<= assignJob($slaves[$i], "work as a servant")>>
<<else>>
@@ -128,7 +130,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " to make your penthouse as clean and homelike as possible.">>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " but unable to do much on $his own,">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > _masterSL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $he heads straight to $masterSuiteName to await your caress.">>
<<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
@@ -150,7 +152,7 @@
<<if $slaves[$i].devotion > 50>>
<<if ($slaves[$i].energy > 60)>>
<<set $slaves[$i].choosesOwnAssignmentText += " and $he thinks of little but sex with you,">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > _masterSL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $he heads straight to $masterSuiteName.">>
<<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
@@ -159,7 +161,7 @@
<</if>>
<<elseif canSee($slaves[$i]) && canWalk($slaves[$i])>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $he decides to work">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > $servantsQuartersSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > _servQL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " from $servantsQuartersName">>
<<= assignJob($slaves[$i], "work as a servant")>>
<<else>>
@@ -169,7 +171,7 @@
<<set $slaves[$i].choosesOwnAssignmentText += " to make your penthouse as clean and homelike as possible.">>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " but unable to do much on $his own">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > _masterSL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $he heads straight to $masterSuiteName to await your caress.">>
<<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
@@ -179,7 +181,7 @@
<</if>>
<<elseif $slaves[$i].devotion < -20 && $slaves[$i].trust > 20>>
<<set $slaves[$i].choosesOwnAssignmentText += " and $he thinks of all the ways $he can take advantage of this,">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($spa > $spaSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($spa > _spaL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $he heads straight to $spaName to relax.">>
<<= assignJob($slaves[$i], "rest in the spa")>>
<<else>>
@@ -192,7 +194,7 @@
<<else>>
<<if ($slaves[$i].energy > 60)>>
<<set $slaves[$i].choosesOwnAssignmentText += " and $he thinks of little but sex,">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > _masterSL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $he heads straight to $masterSuiteName.">>
<<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
@@ -201,7 +203,7 @@
<</if>>
<<elseif canSee($slaves[$i]) && canWalk($slaves[$i])>>
<<set $slaves[$i].choosesOwnAssignmentText += " so $he decides to work">>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > $servantsQuartersSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > _servQL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " from $servantsQuartersName">>
<<= assignJob($slaves[$i], "work as a servant")>>
<<else>>
@@ -217,7 +219,7 @@
<<elseif ($slaves[$i].fetishKnown == 1)>>
<<if ($slaves[$i].fetish == "submissive") && canWalk($slaves[$i]) && canSee($slaves[$i])>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > $servantsQuartersSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($servantsQuarters > _servQL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " thinks $he belongs at the bottom of the penthouse hierarchy, so $he goes to live in $servantsQuartersName.">>
<<= assignJob($slaves[$i], "work as a servant")>>
<<else>>
@@ -225,7 +227,7 @@
<<= assignJob($slaves[$i], "be a servant")>>
<</if>>
<<elseif ($slaves[$i].fetish == "dom") || ($slaves[$i].fetish == "sadist")>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($club > _clubL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is self-confident, so $he decides to work in $clubName.">>
<<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
@@ -234,7 +236,7 @@
<</if>>
<<set $slaves[$i].sexAmount = 10>>
<<elseif ($slaves[$i].fetish == "masochist")>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " enjoys abuse, so $he hurries down to $brothelName.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -242,7 +244,7 @@
<<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($slaves[$i].fetish == "cumslut")>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " hurries down to $brothelName to suck cocks.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -250,7 +252,7 @@
<<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($slaves[$i].fetish == "humiliation")>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName, since it's even more embarrassing to be a whore than a club slut.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -259,7 +261,7 @@
<</if>>
<<elseif ($slaves[$i].fetish == "buttslut")>>
<<if ($slaves[$i].balls > 0)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > $dairySlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > _dairyL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " chooses confinement in $dairyName, since all $he will be expected to do is produce cum by orgasming to buttsex.">>
<<= assignJob($slaves[$i], "work in the dairy")>>
<<else>>
@@ -267,7 +269,7 @@
<<= assignJob($slaves[$i], "get milked")>>
<</if>>
<<else>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName, since whores get buttfucked more than anyone else.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -277,7 +279,7 @@
<</if>>
<<elseif ($slaves[$i].fetish == "pregnancy")>>
<<if ($slaves[$i].lactation > 0)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > $dairySlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > _dairyL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads down to $dairyName to be around other lactating girls.">>
<<= assignJob($slaves[$i], "work in the dairy")>>
<<else>>
@@ -285,14 +287,14 @@
<<= assignJob($slaves[$i], "get milked")>>
<</if>>
<<elseif ($PC.dick == 1) && isFertile($slaves[$i])>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > _masterSL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to serve you in $masterSuiteName, hoping that you'll get $him pregnant.">>
<<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to be your fucktoy, hoping that you'll get $him pregnant.">>
<<= assignJob($slaves[$i], "please you")>>
<</if>>
- <<elseif ($universalRulesAssignsSelfFacility == 1) && ($dairyPregSetting > 0) && ($dairy > $dairySlaves) && isFertile($slaves[$i])>>
+ <<elseif ($universalRulesAssignsSelfFacility == 1) && ($dairyPregSetting > 0) && ($dairy > _dairyL) && isFertile($slaves[$i])>>
<<if $dairyPregSetting > 1>>
<<set $slaves[$i].choosesOwnAssignmentText += " eagerly rushes to $dairyName in the hopes that $his fertile womb will be packed full of children.">>
<<= assignJob($slaves[$i], "work in the dairy")>>
@@ -303,7 +305,7 @@
<<elseif ($slaves[$i].bellyPreg >= 1500)>>
<<if $arcologies[0].FSRepopulationFocus > 20>>
<<if ($cash < 10000)>>
- <<if $brothel > $brothelSlaves && $universalRulesAssignsSelfFacility == 1>>
+ <<if $brothel > _brothelL && $universalRulesAssignsSelfFacility == 1>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads to $brothelName since $he wants to set an example for any unimpregnated girls.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -311,7 +313,7 @@
<<= assignJob($slaves[$i], "whore")>>
<</if>>
<<else>>
- <<if $club > $clubSlaves && $universalRulesAssignsSelfFacility == 1>>
+ <<if $club > _clubL && $universalRulesAssignsSelfFacility == 1>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads to $clubName to show off $his growing middle and lavish in the public's attention.">>
<<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
@@ -320,7 +322,7 @@
<</if>>
<<set $slaves[$i].sexAmount = 10>>
<</if>>
- <<elseif $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
+ <<elseif $masterSuite > _masterSL && $universalRulesAssignsSelfFacility == 1>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads straight to $masterSuiteName to share the intimacy of $his pregnant body with you.">>
<<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
@@ -328,7 +330,7 @@
<<= assignJob($slaves[$i], "please you")>>
<</if>>
<<elseif ($slaves[$i].pregKnown == 1)>>
- <<if $masterSuite > $masterSuiteSlaves && $universalRulesAssignsSelfFacility == 1>>
+ <<if $masterSuite > _masterSL && $universalRulesAssignsSelfFacility == 1>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads straight to $masterSuiteName so you may watch for the day that $he finally starts to show.">>
<<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
@@ -336,7 +338,7 @@
<<= assignJob($slaves[$i], "please you")>>
<</if>>
<<else>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " can't indulge $his fetish by getting pregnant $himself, so $he just heads down to $brothelName.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -346,7 +348,7 @@
<</if>>
<<elseif ($slaves[$i].fetish == "boobs")>>
<<if ($slaves[$i].lactation > 0)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > $dairySlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > _dairyL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " heads down to $dairyName for all the attention that'll be lavished on $his nipples.">>
<<= assignJob($slaves[$i], "work in the dairy")>>
<<else>>
@@ -354,7 +356,7 @@
<<= assignJob($slaves[$i], "get milked")>>
<</if>>
<<else>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($club > _clubL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $clubName so $he can show off $his bare breasts.">>
<<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
@@ -364,7 +366,7 @@
<<set $slaves[$i].sexAmount = 10>>
<</if>>
<<elseif ($slaves[$i].attrXX > 85)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($club > _clubL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $clubName so $he can hit on hot girls.">>
<<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
@@ -373,7 +375,7 @@
<</if>>
<<set $slaves[$i].sexAmount = 10>>
<<elseif ($slaves[$i].attrXY > 85)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($club > _clubL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $clubName so $he can hit on cute boys.">>
<<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
@@ -382,7 +384,7 @@
<</if>>
<<set $slaves[$i].sexAmount = 10>>
<<elseif ($slaves[$i].energy > 95)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to help those of your slaves who mind taking dick all day by working in $brothelName.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -391,7 +393,7 @@
<</if>>
<<elseif ($arcologies[0].FSChattelReligionist > 0)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a pure and faithful slave, so $he sells $his body in the holy brothel.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -399,7 +401,7 @@
<<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($arcologies[0].FSEgyptianRevivalist > 0)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > $masterSuiteSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($masterSuite > _masterSL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a devoted slave, so $he immediately joins your harem.">>
<<= assignJob($slaves[$i], "serve in the master suite")>>
<<else>>
@@ -407,7 +409,7 @@
<<= assignJob($slaves[$i], "please you")>>
<</if>>
<<elseif ($arcologies[0].FSRomanRevivalist > 0)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a devoted slave, so $he decides $he can best serve the state by raising money for the treasury, by selling $his body in $brothelName.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -415,7 +417,7 @@
<<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($arcologies[0].FSAztecRevivalist > 0)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " is a devoted slave, so $he decides $he can best serve the empire by serving at the fertility temple.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -424,7 +426,7 @@
<<set $slaves[$i].sexAmount = 10>>
<</if>>
<<elseif ($arcologies[0].FSPaternalist > 0)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName, a respectable position for a slave in this enlightened arcology.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -433,7 +435,7 @@
<</if>>
<<elseif ($arcologies[0].FSPastoralist > 0)>>
<<if ($slaves[$i].lactation > 0)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > $dairySlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($dairyRestraintsSetting < 2) && ($dairy > _dairyL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " hurries to join your herd of dairy cows.">>
<<= assignJob($slaves[$i], "work in the dairy")>>
<<else>>
@@ -441,7 +443,7 @@
<<= assignJob($slaves[$i], "get milked")>>
<</if>>
<<else>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName to help raise money to get more girls lactating properly.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -450,7 +452,7 @@
<</if>>
<</if>>
<<elseif ($arcologies[0].FSHedonisticDecadence > 0)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($spa > $spaSlaves) && (($slaves[$i].trust < 60) || ($slaves[$i].devotion <= 60))>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($spa > _spaL) && (($slaves[$i].trust < 60) || ($slaves[$i].devotion <= 60))>>
<<set $slaves[$i].choosesOwnAssignmentText += " could use a break, so $he heads to take a dip in the spa.">>
<<= assignJob($slaves[$i], "rest in the spa")>>
<<else>>
@@ -459,7 +461,7 @@
<</if>>
<<else>>
<<if ($slaves[$i].skill.whoring > $slaves[$i].skill.entertainment)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to work in $brothelName, since $he thinks $himself a better whore than a public slut.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -467,7 +469,7 @@
<<= assignJob($slaves[$i], "whore")>>
<</if>>
<<elseif ($slaves[$i].skill.entertainment > $slaves[$i].skill.whoring)>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($club > _clubL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to be a club $girl, since $he thinks $himself a better public slut than a whore.">>
<<= assignJob($slaves[$i], "serve in the club")>>
<<else>>
@@ -476,7 +478,7 @@
<</if>>
<<set $slaves[$i].sexAmount = 10>>
<<else>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > $brothelSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($brothel > _brothelL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to join $his sisters and work in $brothelName.">>
<<= assignJob($slaves[$i], "work in the brothel")>>
<<else>>
@@ -486,7 +488,7 @@
<</if>>
<</if>>
<<else>>
- <<if ($universalRulesAssignsSelfFacility == 1) && ($club > $clubSlaves)>>
+ <<if ($universalRulesAssignsSelfFacility == 1) && ($club > _clubL)>>
<<set $slaves[$i].choosesOwnAssignmentText += " decides to be a club $girl, since partying is better than sitting around and failing to think of a job to do.">>
<<= assignJob($slaves[$i], "serve in the club")>>
<<elseif canWalk($slaves[$i]) && canSee($slaves[$i])>>
diff --git a/src/uncategorized/saRecruitGirls.tw b/src/uncategorized/saRecruitGirls.tw
index 1cb40acc21e6f9cc3bcf57dc8aaf60ddf1bcf282..502ef1ba4c7c0435327b4ad702ac80e5ab5a46a0 100644
--- a/src/uncategorized/saRecruitGirls.tw
+++ b/src/uncategorized/saRecruitGirls.tw
@@ -598,8 +598,8 @@
<</if>>
<</if>>
<<if $arcologies[0].FSPastoralist != "unset">>
- <<if $dairy > 0 && ($slaves[$i].lactation > 0 || ($dairySlaves > 0 && _FSIntMod > ($dairyRestraintsSetting+1)))>>
- <<if $dairySlaves > 0 && _FSIntMod > ($dairyRestraintsSetting+1)>>
+ <<if $dairy > 0 && ($slaves[$i].lactation > 0 || ($DairyiIDs.length > 0 && _FSIntMod > ($dairyRestraintsSetting+1)))>>
+ <<if $DairyiIDs.length > 0 && _FSIntMod > ($dairyRestraintsSetting+1)>>
<<set _seed += 3, _FSdefend++>>
<</if>>
<<if $slaves[$i].lactation > 0>>
@@ -663,7 +663,7 @@
<</if>>
<</if>>
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- <<if $clubDecoration != "standard" && $clubSlaves > 1>>
+ <<if $clubDecoration != "standard" && $ClubiIDs.length > 1>>
<<if $clubAdsSpending > 0>>
<<set _clubSeed = ($clubBonuses+Math.abs($clubAdsOld)+Math.abs($clubAdsStacked)+Math.abs($clubAdsImplanted)+Math.abs($clubAdsModded)+Math.abs($clubAdsXX))>>
<<else>>
@@ -674,7 +674,7 @@
<</if>>
<</if>>
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
- <<if $masterSuiteDecoration == "Arabian Revivalist" && $masterSuiteUpgradeLuxury > 0 && $masterSuiteAverageEnergy > 60 && $masterSuiteSlaves >= 3>>
+ <<if $masterSuiteDecoration == "Arabian Revivalist" && $masterSuiteUpgradeLuxury > 0 && $masterSuiteAverageEnergy > 60 && $MastSiIDs.length >= 3>>
<<set _seed += 6, _FSmatch++, $arcologies[0].FSArabianRevivalist += 0.02*$FSSingleSlaveRep>>
<</if>>
<<elseif $arcologies[0].FSChineseRevivalist != "unset">>
@@ -898,7 +898,7 @@
<</if>>
<<if $arcologies[0].FSPastoralist != "unset">>
<<if $dairy>>
- <<if $dairySlaves && _FSIntMod > ($dairyRestraintsSetting+1)>>
+ <<if $DairyiIDs.length && _FSIntMod > ($dairyRestraintsSetting+1)>>
<<if $slaves[$i].lactation > 0>>
$He schedules VR tours of $dairyName in order to popularize your free-range practices and quality products: the highlight each time is when $he hooks $his own teats into a milker and brings $himself to orgasm.
<<else>>
@@ -1035,7 +1035,7 @@
<</if>>
<</if>> /*end extended family mode */
<<elseif $arcologies[0].FSEdoRevivalist != "unset">>
- <<if $clubDecoration != "standard" && $clubSlaves > 1>>
+ <<if $clubDecoration != "standard" && $ClubiIDs.length > 1>>
<<if _clubSeed >= 3>>
The candid, POV-style videos of $slaves[$i].slaveName dancing, making out, and giving blowjobs alongside your regular sluts in $clubName's $clubDecoration atmosphere earn a lot of thumbs up.
<<else>>
@@ -1043,14 +1043,14 @@
<</if>>
<<elseif $club == 0>>
$He'd like to integrate $his personal profile with your cultural Revival, but there's no clear place in your arcology to focus $his attention.
- <<elseif $clubSlaves <= 1>>
+ <<elseif $ClubiIDs.length <= 1>>
$He travels down to $clubName for some POV video footage, but $he can't get enough reliable dance partners.
<<else>>
$He gets some hot POV-style footage when $he films in your nightclub, but there's nothing special about its atmosphere to distinguish it from any other bar in any other arcology.
<</if>>
<<elseif $arcologies[0].FSArabianRevivalist != "unset">>
<<if $masterSuiteDecoration == "Arabian Revivalist" && $masterSuiteUpgradeLuxury > 0 && $masterSuiteAverageEnergy > 60>>
- <<if $masterSuiteSlaves >= 3>>
+ <<if $MastSiIDs.length >= 3>>
An exposé that "pulls back the curtain" on your elaborate master bedroom goes viral after several harem slaves drag $him into <<if $masterSuiteUpgradeLuxury == 1>>four-way action with their <<= properMaster()>><<else>>a fuckpit daisy chain<</if>> and another takes over the filming.
<<else>>
$He makes a short video essay about your elaborate master suite, but the empty space unfilled by luscious slave bodies fails to impress.
diff --git a/src/uncategorized/schoolroom.tw b/src/uncategorized/schoolroom.tw
index daa85c6167ed1bba34a187a31cd0ed78cba3c4bc..27b84cab8970bc32583f9ee0b4c3141dcb6c30ae 100644
--- a/src/uncategorized/schoolroom.tw
+++ b/src/uncategorized/schoolroom.tw
@@ -1,6 +1,6 @@
:: Schoolroom [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Schoolroom", $showEncyclopedia = 1, $encyclopedia = "Schoolroom", $schoolroomSlaves = $SchlRiIDs.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Schoolroom", $showEncyclopedia = 1, $encyclopedia = "Schoolroom">>
<<if $schoolroomName != "the Schoolroom">>
<<set $schoolroomNameCaps = $schoolroomName.replace("the ", "The ")>>
@@ -67,9 +67,9 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
reviewing the often complex subject of how to address citizens other that one's owner.
<</switch>>
-<<if $schoolroomSlaves > 2>>
+<<if $SchlRiIDs.length > 2>>
$schoolroomNameCaps is busy with slaves, repeating their lessons out loud to drill the instruction home. A few students are maintaining uncomfortable positions in the corner as punishment for poor work.
-<<elseif $schoolroomSlaves > 0>>
+<<elseif $SchlRiIDs.length > 0>>
$schoolroomNameCaps is sparsely populated, the few students repeating their lessons out loud to drill the instruction home. One slave is maintaining an uncomfortable position in the corner as punishment for poor work.
<<elseif $Schoolteacher != 0>>
<<setLocalPronouns $Schoolteacher>>
@@ -79,14 +79,14 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
[[Decommission the schoolroom|Main][$schoolroom = 0, $schoolroomUpgradeSkills = 0, $schoolroomUpgradeLanguage = 0, $schoolroomUpgradeRemedial = 0, $schoolroomDecoration = "standard"]]
<</if>>
-<<if $schoolroomSlaves > 0>>
+<<if $SchlRiIDs.length > 0>>
<<if $Schoolteacher != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $schoolroomSlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = $SchlRiIDs.length+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Schoolroom">>
<<if $Schoolteacher != 0>>
<<= assignJob($Schoolteacher, "rest")>>
<</if>>
- <<for $schoolroomSlaves > 0>>
+ <<for $SchlRiIDs.length > 0>>
<<= assignJob($slaves[$slaveIndices[$SchlRiIDs[0]]], "take classes")>>
<</for>>
<</link>>
@@ -96,7 +96,7 @@ $schoolroomNameCaps is well-equipped, with wallscreens to display lessons. These
<</if>>
<<set _Tmult0 = Math.trunc($schoolroom*1000*$upgradeMultiplierArcology)>>
-<br>$schoolroomNameCaps has room to house $schoolroom slaves while they learn. There <<if $schoolroomSlaves == 1>>is<<else>>are<</if>> currently $schoolroomSlaves slave<<if $schoolroomSlaves != 1>>s<</if>> learning in $schoolroomName.
+<br>$schoolroomNameCaps has room to house $schoolroom slaves while they learn. There <<if $SchlRiIDs.length == 1>>is<<else>>are<</if>> currently $SchlRiIDs.length slave<<if $SchlRiIDs.length != 1>>s<</if>> learning in $schoolroomName.
[[Expand the schoolroom|Schoolroom][cashX(forceNeg(_Tmult0), "capEx"), $schoolroom += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index f10b10637c4204f75fa84cbd14fe9e267484f775..75db2e70068710ab89e90d91b9308d51e11a40d8 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -1,7 +1,7 @@
:: Schoolroom Report [nobr]
<<SlaveIDSort $SchlRiIDs>>
-<<set _DL = $SchlRiIDs.length, $schoolroomSlaves = _DL, _SL = $slaves.length, _idleBonus = 0, _FLsFetish = 0>>
+<<set _DL = $SchlRiIDs.length, _SL = $slaves.length, _idleBonus = 0, _FLsFetish = 0>>
<<if $schoolroomDecoration != "standard">>
<<set _devBonus = 1>>
diff --git a/src/uncategorized/servantsQuarters.tw b/src/uncategorized/servantsQuarters.tw
index 5c1addbf62f0a6db85e79222bf21daa234fdb020..c8607ae55cc12f1f9dcbed145ef8e1d2d691acf1 100644
--- a/src/uncategorized/servantsQuarters.tw
+++ b/src/uncategorized/servantsQuarters.tw
@@ -1,6 +1,6 @@
:: Servants' Quarters [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Servants' Quarters", $showEncyclopedia = 1, $encyclopedia = "Servants' Quarters", $servantsQuartersSlaves = $ServQiIDs.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Servants' Quarters", $showEncyclopedia = 1, $encyclopedia = "Servants' Quarters">>
<<if $servantsQuartersName != "the Servants' Quarters">>
<<set $servantsQuartersNameCaps = $servantsQuartersName.replace("the ", "The ")>>
@@ -67,9 +67,9 @@ $servantsQuartersNameCaps
are comfortable. Servants sleep together in a dormitory, eat together in a little kitchen, bathe together in a communal shower, and then head out into the penthouse to serve.
<</switch>>
-<<if $servantsQuartersSlaves > 2>>
+<<if $ServQiIDs.length > 2>>
$servantsQuartersNameCaps are busy with hurrying slaves. One shift of servants is eating, cleaning the quarters, and bathing. The second is sleeping, and the third is out in the penthouse cleaning and serving.
-<<elseif $servantsQuartersSlaves > 0>>
+<<elseif $ServQiIDs.length > 0>>
A few slaves are working out of the servants' quarters. They must split their scant time between looking after their own needs and the superior needs of everyone else.
<<elseif $Stewardess != 0>>
$Stewardess.slaveName is alone, and seems rather bereft without anyone to order around.
@@ -77,14 +77,14 @@ $servantsQuartersNameCaps
None of your slaves are working out of the servants' quarters. [[Decommission the quarters|Main][$servantsQuarters = 0, $servantsQuartersUpgradeMonitoring = 0, $servantsQuartersDecoration = "standard"]]
<</if>>
-<<if $servantsQuartersSlaves > 0>>
+<<if $ServQiIDs.length > 0>>
<<if $Stewardess != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $servantsQuartersSlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = $ServQiIDs.length+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Servants' Quarters">>
<<if $Schoolteacher != 0>>
<<= assignJob($Stewardess, "rest")>>
<</if>>
- <<for $servantsQuartersSlaves > 0>>
+ <<for $ServQiIDs.length > 0>>
<<= assignJob($slaves[$slaveIndices[$ServQiIDs[0]]], "be a servant")>>
<</for>>
<</link>>
@@ -94,7 +94,7 @@ $servantsQuartersNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($servantsQuarters*1000*$upgradeMultiplierArcology)>>
-<br>$servantsQuartersNameCaps has room to keep $servantsQuarters slaves while they serve. There <<if $servantsQuartersSlaves == 1>>is<<else>>are<</if>> currently $servantsQuartersSlaves slave<<if $servantsQuartersSlaves != 1>>s<</if>> serving in $servantsQuartersName.
+<br>$servantsQuartersNameCaps has room to keep $servantsQuarters slaves while they serve. There <<if $ServQiIDs.length == 1>>is<<else>>are<</if>> currently $ServQiIDs.length slave<<if $ServQiIDs.length != 1>>s<</if>> serving in $servantsQuartersName.
[[Expand the Servants' Quarters|Servants' Quarters][cashX(forceNeg(_Tmult0), "capEx"), $servantsQuarters += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 0fa47fa9957fa6d381fb634fdc770b1107c40ea8..0a2dfc8acc6fca08445c6ccd92074251c5620e1d 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -1,7 +1,7 @@
:: Servants' Quarters Report [nobr]
<<SlaveIDSort $ServQiIDs>>
-<<set _DL = $ServQiIDs.length, $servantsQuartersSlaves = _DL, _SL = $slaves.length, _FLsFetish = 0, $stewardessBonus = 0>>
+<<set _DL = $ServQiIDs.length, _SL = $slaves.length, _FLsFetish = 0, $stewardessBonus = 0>>
<<if $servantsQuartersDecoration != "standard">>
<<set _devBonus = 1>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 422cb747ca2ec374f301c9e35f839f5f076ab6d6..7b0d3451c15f8be259af3377d1afab3b3ac10c71 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -726,20 +726,20 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl
*/
<<set _facListArr = [
- ["Arcade Report", $arcadeNameCaps, $arcade, $arcadeSlaves, -1, -1],
- ["Brothel Report", $brothelNameCaps, $brothel, $brothelSlaves, $Madam, "Madam"],
- ["Cellblock Report", $cellblockNameCaps, $cellblock, $cellblockSlaves, $Wardeness, "Wardeness"],
- ["Clinic Report", $clinicNameCaps, $clinic, $clinicSlaves, $Nurse, "Nurse"],
- ["Club Report", $clubNameCaps, $club, $clubSlaves, $DJ, "DJ"],
- ["Dairy Report", $dairyNameCaps, $dairy, $dairySlaves, $Milkmaid, "Milkmaid"],
- ["Farmyard Report", $farmyardNameCaps, $farmyard, $farmyardSlaves, $Farmer, "Farmer"],
- ["Schoolroom Report", $schoolroomNameCaps, $schoolroom, $schoolroomSlaves, $Schoolteacher, "Schoolteacher"],
- ["Spa Report", $spaNameCaps, $spa, $spaSlaves, $Attendant, "Attendant"],
- ["Nursery Report", $nurseryNameCaps, $nurseryNannies, $nurserySlaves, $Matron, "Matron"],
- ["Servants' Quarters Report", $servantsQuartersNameCaps, $servantsQuarters, $servantsQuartersSlaves, $Stewardess, "Stewardess"],
+ ["Arcade Report", $arcadeNameCaps, $arcade, $ArcadeiIDs.length, -1, -1],
+ ["Brothel Report", $brothelNameCaps, $brothel, $BrothiIDs.length, $Madam, "Madam"],
+ ["Cellblock Report", $cellblockNameCaps, $cellblock, $CellBiIDs.length, $Wardeness, "Wardeness"],
+ ["Clinic Report", $clinicNameCaps, $clinic, $CliniciIDs.length, $Nurse, "Nurse"],
+ ["Club Report", $clubNameCaps, $club, $ClubiIDs.length, $DJ, "DJ"],
+ ["Dairy Report", $dairyNameCaps, $dairy, $DairyiIDs.length, $Milkmaid, "Milkmaid"],
+ ["Farmyard Report", $farmyardNameCaps, $farmyard, $FarmyardiIDs.length, $Farmer, "Farmer"],
+ ["Schoolroom Report", $schoolroomNameCaps, $schoolroom, $SchlRiIDs.length, $Schoolteacher, "Schoolteacher"],
+ ["Spa Report", $spaNameCaps, $spa, $SpaiIDs.length, $Attendant, "Attendant"],
+ ["Nursery Report", $nurseryNameCaps, $nurseryNannies, $NurseryiIDs.length, $Matron, "Matron"],
+ ["Servants' Quarters Report", $servantsQuartersNameCaps, $servantsQuarters, $ServQiIDs.length, $Stewardess, "Stewardess"],
["Children Report", "Nursery Children", $nursery, $nurseryBabies, -1, -1],
["Incubator Report", $incubatorNameCaps, $incubator, $incubatorSlaves, -1, -1],
- ["Master Suite Report", $masterSuiteNameCaps, $masterSuite, $masterSuiteSlaves, $Concubine, "Concubine"],
+ ["Master Suite Report", $masterSuiteNameCaps, $masterSuite, $MastSiIDs.length, $Concubine, "Concubine"],
["Penthouse Report", "The Penthouse", 1, $slavesVisible, -1, -1],
["Rules Assistant Report", "Rules Assistant", $rulesAssistantAuto, 1, -1, -1] /** should be last — may reassign slaves **/
]>>
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index e65b5676b479b6a4d5b9a96b340cd66906b036a9..6b495140ada48f3f12b7743a6c57dbaaf36435ea 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -1,6 +1,6 @@
:: Spa [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Spa", $showEncyclopedia = 1, $encyclopedia = "Spa", $spaSlaves = $SpaiIDs.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Spa", $showEncyclopedia = 1, $encyclopedia = "Spa">>
<<if $spaName != "the Spa">>
<<set $spaNameCaps = $spaName.replace("the ", "The ")>>
@@ -67,9 +67,9 @@ $spaNameCaps
is well-appointed, with massage tables, hot tubs, and a cold pool.
<</switch>>
-<<if $spaSlaves > 3>>
+<<if $SpaiIDs.length > 3>>
It's busy in here. Slaves are relaxing in the warm water, splashing around or just floating. Here and there some of the more sex-starved are in the early stages of intercourse, but most prefer to take time off from it all.
-<<elseif $spaSlaves > 0>>
+<<elseif $SpaiIDs.length > 0>>
It's sparsely populated; though the few slaves here have little company they like having the water to themselves.
<<elseif $Attendant != 0>>
<<setLocalPronouns $Attendant>>
@@ -78,14 +78,14 @@ $spaNameCaps
It's empty and quiet. [[Decommission the Spa|Main][$spa = 0, $spaDecoration = "standard", $spaUpgrade = 0, $spaFix = 0]]
<</if>>
-<<if $spaSlaves > 0>>
+<<if $SpaiIDs.length > 0>>
<<if $Attendant != 0>><<set _X = 1>><<else>><<set _X = 0>><</if>>
- <<set _NewPop = $spaSlaves+$dormitoryPopulation+_X>>
+ <<set _NewPop = $SpaiIDs.length+$dormitoryPopulation+_X>>
<<link "Remove all slaves" "Spa">>
<<if $Attendant != 0>>
<<= assignJob($Attendant, "rest")>>
<</if>>
- <<for $spaSlaves > 0>>
+ <<for $SpaiIDs.length > 0>>
<<= assignJob($slaves[$slaveIndices[$SpaiIDs[0]]], "rest")>>
<</for>>
<</link>>
@@ -95,7 +95,7 @@ $spaNameCaps
<</if>>
<<set _Tmult0 = Math.trunc($spa*1000*$upgradeMultiplierArcology)>>
-<br>$spaNameCaps can house $spa slaves while they recuperate here. There <<if $spaSlaves == 1>>is<<else>>are<</if>> currently $spaSlaves slave<<if $spaSlaves != 1>>s<</if>> recuperating in $spaName.
+<br>$spaNameCaps can house $spa slaves while they recuperate here. There <<if $SpaiIDs.length == 1>>is<<else>>are<</if>> currently $SpaiIDs.length slave<<if $SpaiIDs.length != 1>>s<</if>> recuperating in $spaName.
[[Expand the spa|Spa][cashX(forceNeg(_Tmult0), "capEx"), $spa += 5]] //Costs <<print cashFormat(_Tmult0)>>//
<br>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 2e6f7b1808d8eb164ff8c33d67e9e70e4e34a4e0..646cb81e1c5b02e04b4e669f6a27fd904879d50c 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -1,7 +1,7 @@
:: Spa Report [nobr]
<<SlaveIDSort $SpaiIDs>>
-<<set _DL = $SpaiIDs.length, $spaSlaves = _DL, _SL = $slaves.length, _bonusToggle = 0, _healthBonus = 0, _idleBonus = 0, _restedSlaves = 0, _trustBonus = 0>>
+<<set _DL = $SpaiIDs.length, _SL = $slaves.length, _bonusToggle = 0, _healthBonus = 0, _idleBonus = 0, _restedSlaves = 0, _trustBonus = 0>>
<<if $spaDecoration != "standard">>
<<set _devBonus = 1>>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index ca493468ee54716f50756baf08901c37f7a12248..c9ca6bcd6489a2ed8e12b0f2b07dff1dfc810745 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -558,9 +558,9 @@
<<if ($HGSuite)>>
<br> <<link "$HGSuiteNameCaps""Head Girl Suite">><</link>>
<<if $abbreviateSidebar == 2>>
- <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>>, 1)<<else>>)<</if>><</if>>
+ <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>>, 1)<<else>>)<</if>><</if>>
<<else>>
- <<if $HeadGirl != 0>>(HG<<if $HGSuiteSlaves > 0>> and slave<<else>>)<</if>><</if>>
+ <<if $HeadGirl != 0>>(HG<<if $HGSuiteiIDs.length > 0>> and slave<<else>>)<</if>><</if>>
<</if>>
<</if>>
<<if ($dojo > 1)>>
@@ -573,103 +573,103 @@
<<if ($brothel)>>
<br> <<link "$brothelNameCaps""Brothel">><</link>>
<<if $abbreviateSidebar == 2>>
- ($brothelSlaves/<<print $brothel>> whores<<if $Madam>>, madam<</if>>)
+ ($BrothiIDs.length/<<print $brothel>> whores<<if $Madam>>, madam<</if>>)
<<else>>
- ($brothelSlaves/<<print $brothel>><<if $Madam>>, L<</if>>)
+ ($BrothiIDs.length/<<print $brothel>><<if $Madam>>, L<</if>>)
<</if>>
<</if>>
<<if ($club)>>
<br> <<link "$clubNameCaps""Club">><</link>>
<<if $abbreviateSidebar == 2>>
- ($clubSlaves/<<print $club>> sluts<<if $DJ>>, DJ<</if>>)
+ ($ClubiIDs.length/<<print $club>> sluts<<if $DJ>>, DJ<</if>>)
<<else>>
- ($clubSlaves/<<print $club>><<if $DJ>>, L<</if>>)
+ ($ClubiIDs.length/<<print $club>><<if $DJ>>, L<</if>>)
<</if>>
<</if>>
<<if ($arcade)>>
<br> <<link "$arcadeNameCaps""Arcade">><</link>>
<<if $abbreviateSidebar == 2>>
- ($arcadeSlaves/<<print $arcade>> inmates)
+ ($ArcadeiIDs.length/<<print $arcade>> inmates)
<<else>>
- ($arcadeSlaves/<<print $arcade>>)
+ ($ArcadeiIDs.length/<<print $arcade>>)
<</if>>
<</if>>
<<if ($dairy)>>
<br> <<link "$dairyNameCaps""Dairy">><</link>>
<<set _SCapT9 = $bioreactorsXY+$bioreactorsXX+$bioreactorsHerm+$bioreactorsBarren>>
<<if $abbreviateSidebar == 2>>
- ($dairySlaves<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>> cows<<if $Milkmaid>>, milkmaid<</if>>)
+ ($DairyiIDs.length<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>> cows<<if $Milkmaid>>, milkmaid<</if>>)
<<else>>
- ($dairySlaves<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>><<if $Milkmaid>>, L<</if>>)
+ ($DairyiIDs.length<<if _SCapT9>>+_SCapT9<</if>>/<<print $dairy>><<if $Milkmaid>>, L<</if>>)
<</if>>
<</if>>
<<if ($farmyard)>>
<br> <<link "$farmyardNameCaps""Farmyard">><</link>>
<<if $abbreviateSidebar == 2>>
- ($farmyardSlaves/$farmyard farmhands<<if $Farmer>>, farmer<</if>>)
+ ($FarmyardiIDs.length/$farmyard farmhands<<if $Farmer>>, farmer<</if>>)
<<else>>
- ($farmyardSlaves/$farmyard<<if $Farmer>>, L<</if>>)
+ ($FarmyardiIDs.length/$farmyard<<if $Farmer>>, L<</if>>)
<</if>>
<</if>>
<<if ($servantsQuarters)>>
<br> <<link "$servantsQuartersNameCaps""Servants' Quarters">><</link>>
<<if $abbreviateSidebar == 2>>
- ($servantsQuartersSlaves/$servantsQuarters servants<<if $Stewardess>>, stewardess<</if>>)
+ ($ServQiIDs.length/$servantsQuarters servants<<if $Stewardess>>, stewardess<</if>>)
<<else>>
- ($servantsQuartersSlaves/$servantsQuarters<<if $Stewardess>>, L<</if>>)
+ ($ServQiIDs.length/$servantsQuarters<<if $Stewardess>>, L<</if>>)
<</if>>
<</if>>
<<if ($masterSuite)>>
<br> <<link "$masterSuiteNameCaps""Master Suite">><</link>>
<<if $abbreviateSidebar == 2>>
- ($masterSuiteSlaves/$masterSuite <<if $masterSuiteSlaves != 1>>fucktoys<<else>>fucktoy<</if>><<if $Concubine>>, Concubine<</if>>)
+ ($MastSiIDs.length/$masterSuite <<if $MastSiIDs.length != 1>>fucktoys<<else>>fucktoy<</if>><<if $Concubine>>, Concubine<</if>>)
<<else>>
- ($masterSuiteSlaves/$masterSuite<<if $Concubine>>, C<</if>>)
+ ($MastSiIDs.length/$masterSuite<<if $Concubine>>, C<</if>>)
<</if>>
<</if>>
<<if ($schoolroom)>>
<br> <<link "$schoolroomNameCaps""Schoolroom">><</link>>
<<if $abbreviateSidebar == 2>>
- ($schoolroomSlaves/$schoolroom <<if $schoolroomSlaves != 1>>students<<else>>student<</if>><<if $Schoolteacher>>, schoolteacher<</if>>)
+ ($SchlRiIDs.length/$schoolroom <<if $SchlRiIDs.length != 1>>students<<else>>student<</if>><<if $Schoolteacher>>, schoolteacher<</if>>)
<<else>>
- ($schoolroomSlaves/$schoolroom<<if $Schoolteacher>>, L<</if>>)
+ ($SchlRiIDs.length/$schoolroom<<if $Schoolteacher>>, L<</if>>)
<</if>>
<</if>>
<<if ($spa)>>
<br> <<link "$spaNameCaps""Spa">><</link>>
<<if $abbreviateSidebar == 2>>
- ($spaSlaves/$spa <<if $spaSlaves != 1>>bathers<<else>>bathing<</if>><<if $Attendant>>, attendant<</if>>)
+ ($SpaiIDs.length/$spa <<if $SpaiIDs.length != 1>>bathers<<else>>bathing<</if>><<if $Attendant>>, attendant<</if>>)
<<else>>
- ($spaSlaves/$spa<<if $Attendant>>, L<</if>>)
+ ($SpaiIDs.length/$spa<<if $Attendant>>, L<</if>>)
<</if>>
<</if>>
<<if ($nursery)>>
<br> <<link "$nurseryNameCaps""Nursery">><</link>>
<<if $abbreviateSidebar == 2>>
- (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $nurserySlaves/$nurseryNannies <<if $nurserySlaves != 1>>nannies<<else>>nanny<</if>><<if $Matron>>, attendant<</if>>)
+ (<<if $nursery-$nurseryBabies == 0>>No empty rooms<<elseif $nursery-$nurseryBabies == 1>>1 empty room<<else>><<print $nursery-$nurseryBabies>> empty rooms<</if>>, $NurseryiIDs.length/$nurseryNannies <<if $NurseryiIDs.length != 1>>nannies<<else>>nanny<</if>><<if $Matron>>, attendant<</if>>)
<<else>>
- ($nurseryBabies/$nursery, $nurserySlaves/$nurseryNannies<<if $Matron>>, L<</if>>)
+ ($nurseryBabies/$nursery, $NurseryiIDs.length/$nurseryNannies<<if $Matron>>, L<</if>>)
<</if>>
<</if>>
<<if ($clinic)>>
<br> <<link "$clinicNameCaps""Clinic">><</link>>
<<if $abbreviateSidebar == 2>>
- ($clinicSlaves/$clinic <<if $clinicSlaves != 1>>patients<<else>>patient<</if>><<if $Nurse>>, nurse<</if>>)
+ ($CliniciIDs.length/$clinic <<if $CliniciIDs.length != 1>>patients<<else>>patient<</if>><<if $Nurse>>, nurse<</if>>)
<<else>>
- ($clinicSlaves/$clinic<<if $Nurse>>, L<</if>>)
+ ($CliniciIDs.length/$clinic<<if $Nurse>>, L<</if>>)
<</if>>
<</if>>
<<if ($cellblock)>>
<br> <<link "$cellblockNameCaps""Cellblock">><</link>>
<<if $abbreviateSidebar == 2>>
- ($cellblockSlaves/$cellblock <<if $cellblockSlaves != 1>>prisoners<<else>>prisoner<</if>><<if $Wardeness>>, wardeness<</if>>)
+ ($CellBiIDs.length/$cellblock <<if $CellBiIDs.length != 1>>prisoners<<else>>prisoner<</if>><<if $Wardeness>>, wardeness<</if>>)
<<else>>
- ($cellblockSlaves/$cellblock<<if $Wardeness>>, L<</if>>)
+ ($CellBiIDs.length/$cellblock<<if $Wardeness>>, L<</if>>)
<</if>>
<</if>>
@@ -736,7 +736,7 @@
<<if $rep >= 10000>>
<br>[[Black Market|The Black Market]]
<<else>>
- <br>You lack the reputation to be invited to the underground Black Market.
+ <br>You lack the reputation (<<print num(10000)>>) to be invited to the underground Black Market.
<</if>>
<<elseif ["Dispensary", "Organ Farm", "Implant Manufactory", "Gene Lab", "Prosthetic Lab"].includes(_Pass)>>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index a5f417717824924af267affda2404f36416414a0..fa368b4a41d488089a7de53880f3f19a20b02b3f 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -378,7 +378,8 @@
$He waddles to $his maternity ward and strips before laying on an open bed. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>> as $his assistants watch. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he is helped to the recovery ward until $he recovers enough to take over $clinicName again.
<<case "be your Head Girl">>
- $He returns to <<if $HGSuite == 1>>$his room's bed<<else>>$his bed<</if>> and strips before slipping into it. $He makes $himself comfortable<<if $HGSuiteSlaves != 0>> as $his slave rushes to $his side,<</if>> and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken<<if $HGSuiteSlaves != 0>> by $his roommate<</if>> and $he rests awhile before returning to managing your slaves.
+<<set _HGL = $HGSuiteiIDs.length>>
+ $He returns to <<if $HGSuite == 1>>$his room's bed<<else>>$his bed<</if>> and strips before slipping into it. $He makes $himself comfortable<<if _HGL != 0>> as $his slave rushes to $his side,<</if>> and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken<<if _HGL != 0>> by $his roommate<</if>> and $he rests awhile before returning to managing your slaves.
<<case "guard you">>
Or $he would have, if $he'd stop refusing to leave your side. You lead $him someplace private and help $him undress. $He makes $himself comfortable and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. You call for a servant to quickly gather $his child<<if $slaves[$i].pregType > 1>>ren<</if>> as you help $him into the shower, making sure to wait outside for your loyal guardian to finish.