diff --git a/src/facilities/nursery/nursery.tw b/src/facilities/nursery/nursery.tw
index 3b551e2bdfdfd8b4b678a6c9d374c53c4cf4c81a..86e754f2f8c30e6c56794f2fc1d3c93e2cbf5820 100644
--- a/src/facilities/nursery/nursery.tw
+++ b/src/facilities/nursery/nursery.tw
@@ -8,7 +8,7 @@
<<set $nurseryNameCaps = $nurseryName.replace("the ", "The ")>>
<</if>>
-<<set $readyChildren = 0, $nurseryBabies = $cribs.length, _freecribs = $nursery - $nurseryBabies, _NL = App.Entity.facilities.nursery.employeesIDs().size, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
+<<set $nurseryBabies = $cribs.length, _freecribs = $nursery - $nurseryBabies, _NL = App.Entity.facilities.nursery.employeesIDs().size, _SL = $slaves.length, _eligibility = 0, $reservedChildren = FetusGlobalReserveCount("incubator"), $reservedChildrenNursery = FetusGlobalReserveCount("nursery")>>
<p class="scene-intro">
$nurseryNameCaps
<<switch $nurseryDecoration>>
@@ -394,24 +394,6 @@
<br>
<<includeDOM App.Facilities.Nursery.childList()>>
-
- /*
- FIXME: not sure if this works
- <<set $newSlavePool = []>>
- <<for _nur = 0; _nur < $cribs.length; _nur++>>
- <<if $cribs[_nur].growTime <= 0>>
- <<set $nurseryOldID = $cribs[_nur].ID>> /* single slave case *//*
- <<set _tempObject = {object: $cribs[_nur], ID: $cribs[_nur].ID}>>
- <<set $newSlavePool.push(clone(_tempObject))>>
- <<run $cribs.splice(_nur, 1)>>
- <<set _nur-->>
- <</if>>
- <</for>>
- <<if $newSlavePool.length == 1>>
- <<set $readySlave = $newSlavePool[0].object>>
- <<set $newSlavePool = 0>>
- <</if>>
- */
</div>
</div>
diff --git a/src/facilities/nursery/widgets/children/longChildDescription.js b/src/facilities/nursery/widgets/children/longChildDescription.js
index 78e5d86fc110e2ef4fee1c27e292aada45e3b150..c4aa78761a622c029132e842c450a625e3437158 100644
--- a/src/facilities/nursery/widgets/children/longChildDescription.js
+++ b/src/facilities/nursery/widgets/children/longChildDescription.js
@@ -19,9 +19,7 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
r = ``;
const
- {
- he, him, his, hers, himself, boy, He, His
- } = getPronouns(child);
+ { he, him, his, hers, himself, boy, He, His } = getPronouns(child);
// helper functions
function accent(child) {
@@ -4372,7 +4370,7 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
}
}
} else if (V.seeRace) {
- r += `Ethnically, ${he}'s <span class=tan>${child.race},</span> and ${his} skin is ${child.skin}${child.markings === "freckles" ? ` and lightly freckled${skinToneLevel(child.skin) > 5 && skinToneLevel(child.skin < 10) && child.hColor === "red" ? `, an attractive combination` : ``}` : child.markings === "heavily freckled" ? `and heavily freckled${skinToneLevel(child.skin > 5) && skinToneLevel(child.skin) < 10 && child.hColor === "red" ? `, an attractive combination` : ``}. ` : `. `}`;
+ r += `Ethnically, ${he}'s <span class="tan">${child.race},</span> and ${his} skin is ${child.skin}${child.markings === "freckles" ? ` and lightly freckled${skinToneLevel(child.skin) > 5 && skinToneLevel(child.skin < 10) && child.hColor === "red" ? `, an attractive combination` : ``}` : child.markings === "heavily freckled" ? `and heavily freckled${skinToneLevel(child.skin > 5) && skinToneLevel(child.skin) < 10 && child.hColor === "red" ? `, an attractive combination` : ``}. ` : `. `}`;
r += `${child.skin === "sun tanned" || child.skin === "spray tanned" ? `${His} skin has been tanned ${child.skin === "sun tanned" ? `to a natural, healthy-looking tone` : `with obvious, garish-looking makeup`}. ` : ``}`;
@@ -7282,13 +7280,13 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
r += `${He} is somewhat entertaining. `;
}
} else if (child.skill.entertainment <= 30) {
- r += `${He} is <span class=aquamarine>reasonably entertaining.</span> `;
+ r += `${He} is <span class="aquamarine">reasonably entertaining.</span> `;
} else if (child.skill.entertainment <= 60) {
- r += `${He} is a <span class=aquamarine>skilled entertainer.</span> `;
+ r += `${He} is a <span class="aquamarine">skilled entertainer.</span> `;
} else if (child.skill.entertainment < 100) {
- r += `${He} is an <span class=aquamarine>expert entertainer.</span> `;
+ r += `${He} is an <span class="aquamarine">expert entertainer.</span> `;
} else {
- r += `${He} is a <span class=aquamarine>master of entertainment.</span> `;
+ r += `${He} is a <span class="aquamarine">master of entertainment.</span> `;
}
} else {
if (child.skill.entertainment <= 10) {
@@ -7298,13 +7296,13 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
r += `${He} is somewhat entertaining and `;
}
} else if (child.skill.entertainment <= 30) {
- r += `${He} is <span class=aquamarine>reasonably entertaining</span> and `;
+ r += `${He} is <span class="aquamarine">reasonably entertaining</span> and `;
} else if (child.skill.entertainment <= 60) {
- r += `${He} is a <span class=aquamarine>skilled entertainer</span> and `;
+ r += `${He} is a <span class="aquamarine">skilled entertainer</span> and `;
} else if (child.skill.entertainment < 100) {
- r += `${He} is an <span class=aquamarine>expert entertainer</span> and `;
+ r += `${He} is an <span class="aquamarine">expert entertainer</span> and `;
} else {
- r += `${He} is a <span class=aquamarine>master of entertainment</span> and `;
+ r += `${He} is a <span class="aquamarine">master of entertainment</span> and `;
}
}
if (child.skill.whoring <= 10) {
@@ -7317,22 +7315,22 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
if (child.skill.entertainment <= 10) {
r += `${He} `;
}
- r += `has <span class=aquamarine>basic experience as a prostitute.</span> `;
+ r += `has <span class="aquamarine">basic experience as a prostitute.</span> `;
} else if (child.skill.whoring <= 60) {
if (child.skill.entertainment <= 10) {
r += `${He} is `;
}
- r += `a <span class=aquamarine>skilled streetwalker.</span> `;
+ r += `a <span class="aquamarine">skilled streetwalker.</span> `;
} else if (child.skill.whoring < 100) {
if (child.skill.entertainment <= 10) {
r += `${He} is `;
}
- r += `an <span class=aquamarine>expert working ${boy}.</span> `;
+ r += `an <span class="aquamarine">expert working ${boy}.</span> `;
} else {
if (child.skill.entertainment <= 10) {
r += `${He} is `;
}
- r += `a <span class=aquamarine>masterful whore.</span> `;
+ r += `a <span class="aquamarine">masterful whore.</span> `;
}
if (child.custom.desc !== "" && jsDef(child.custom.desc)) {
diff --git a/src/facilities/nursery/widgets/reports/childrenReport.js b/src/facilities/nursery/widgets/reports/childrenReport.js
index 83a407e7524028020a70233b323801f31e46d9a2..5dc0bf6c3f5ea815a138b2e52014f64e7ca4e9ee 100644
--- a/src/facilities/nursery/widgets/reports/childrenReport.js
+++ b/src/facilities/nursery/widgets/reports/childrenReport.js
@@ -13,31 +13,9 @@ App.Facilities.Nursery.childrenReport = function childrenReport() {
let
r = ``;
- for (let i = 0; i < CL; i++) {
+ for (const child of V.cribs) {
const
- child = V.cribs[i];
- // {
- // he, him, his, He, His
- // } = getPronouns(child);
-
- let
- he,
- his,
- him,
- He,
- His;
-
- // FIXME: get pronoun system to work with child objects
- if (child.genes === "XX") {
- he = "she",
- him = "her",
- his = "her";
- } else {
- he = "he",
- him = "him",
- his = "his";
- }
- He = capFirstChar(he), His = capFirstChar(his);
+ { he, his, He, His } = getPronouns(child);
if (child.growTime > 0) {
r += `<br><span class="pink">${child.slaveName}</span> is growing steadily. ${He} will be ready for release in about ${years(child.growTime)}. `;