diff --git a/sanityCheck.sh b/sanityCheck.sh
index 64f908ff52c0ec800f1c0c68ecdbc4c0cb9ec1e2..a9b919314930efd96725e8ec6b1c08de17f5abc8 100755
--- a/sanityCheck.sh
+++ b/sanityCheck.sh
@@ -119,6 +119,8 @@ $GREP "<<[a-zA-Z]\([^\"'>]\|[^\"'>]>[^\"'>]\)*[a-zA-Z][.][^a-zA-Z]" | myprint "S
# Check for @@. instead of .@@
$GREP -E "@@(\.|,|;|:)\s" -- src/*.tw | myprint "WrongSelectorPunctuation"
$GREP "@@[a-z]\+;" -- 'src/*' | myprint "SelectorMissingDot"
+# Check for </span>. instead of .</span>
+$GREP -E "</span>(\.|,|;|:)\s" -- src/*.js | myprint "WrongSelectorPunctuation"
# Check that we do not have any variables that we use only once. e.g. $onlyUsedOnce
# Ignore *Nationalities
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index de8ec63a98775103924d5c6af53bb6d93728ef18..326f02f17bc06a1c0d0e529a53ab6e1533dfb6a3 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -431,7 +431,7 @@ window.SFReport = function() {
r += ` The goods procured by ${V.SF.Lower} after accounting for the spoils retained by individual soldiers were `;
if (profit > 0) {
- r += `<span class='green'>more than sufficient to cover expenses</span>. Excess material and human assets totaling <span class='yellowgreen'>${cashFormat(income)}</span> (after liquidation) were transferred to your accounts.`;
+ r += `<span class='green'>more than sufficient to cover expenses.</span> Excess material and human assets totaling <span class='yellowgreen'>${cashFormat(income)}</span> (after liquidation) were transferred to your accounts.`;
if (V.economy < 100) r += ` The rapidly degrading global economy has one upside,<span class='green'> ${V.SF.Caps} was able to more easily use more 'persuasive' techniques thus leading to an increase in profit</span>.`;
} else {
r += `<span class='red'>barely enough to cover expenses.</span> More growth will be needed to ensure profitability, <span class='yellow'>hopefully purchasing more upgrades will help</span>.`;
@@ -1091,7 +1091,7 @@ window.UnitText = function(input) {
}
V.Cash -= cost;
V.SF.FS.Upgrade = 1;
- <</link>> //costs <span class='yellowgreen'>${cashFormat($Cost)}</span>, `;
+ <</link>> //costs <span class='yellowgreen'>${cashFormat($Cost)},</span> `;
if (ArraryName !== 'ColonelGift') { text += `increases`;
} else { text += `reduces`; } text += ` The Colonel's annoyance by 15%`;
if (ArraryName !== 'ColonelGift') { text += ` and will increase the acceptance of this FS by `;
diff --git a/src/endWeek/saServant.js b/src/endWeek/saServant.js
index 6fe6c24df528e8856544255ab22b81883517ecdc..c78991ea1a410e5074e49b1592e5540b12b3be5f 100644
--- a/src/endWeek/saServant.js
+++ b/src/endWeek/saServant.js
@@ -21,14 +21,14 @@ window.saServant = /** @param {App.Entity.SlaveState} slave */ function saServan
if (V.Stewardess !== 0) {
t += ` This brings ${him} under ${V.Stewardess.slaveName}'s supervision. The Stewardess `;
if (slave.devotion < -20) {
- t += `subjects ${him} to <span class='gold'>corrective rape</span> when ${his} service is imperfect, <span class='hotpink'>when ${he} steps out of line</span>, or when the Stewardess just feels like raping ${him}, forcing the poor slave to <span class='yellowgreen'>find refuge in work.</span>`;
+ t += `subjects ${him} to <span class='gold'>corrective rape</span> when ${his} service is imperfect, <span class='hotpink'>when ${he} steps out of line,</span> or when the Stewardess just feels like raping ${him}, forcing the poor slave to <span class='yellowgreen'>find refuge in work.</span>`;
slave.devotion += 2;
slave.trust -= 2;
} else if (slave.devotion <= 20) {
t += `molests ${him}, encouraging the poor slave to <span class='hotpink'>keep ${his} head down</span> and <span class='yellowgreen'>work harder.</span>`;
slave.devotion += 2;
} else {
- t += `uses <span class='hotpink'>sex as a reward</span>, getting ${him} off when ${he} <span class='yellowgreen'>works harder.</span>`;
+ t += `uses <span class='hotpink'>sex as a reward,</span> getting ${him} off when ${he} <span class='yellowgreen'>works harder.</span>`;
slave.devotion++;
}
if (!(canHear(slave))) {
diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw
index 22c06a20d683fc445791605aa76b805b1b2cc512..60ab771b900337dd88e5b0ba63cf08eeddcf40dd 100644
--- a/src/facilities/nursery/longChildDescription.tw
+++ b/src/facilities/nursery/longChildDescription.tw
@@ -327,7 +327,7 @@ is
women.
<</if>>
<<elseif ($activeChild.behavioralFlaw == "anorexic")>>
- $He suffers from @@.red;anorexia@@.
+ $He suffers from @@.red;anorexia.@@
<<elseif ($activeChild.behavioralFlaw == "gluttonous")>>
$He @@.red;tends to overeat@@ whenever $he can, reacting to the rigors of sexual slavery with overeating.
<</if>>
diff --git a/src/interaction/main/mainLinks.js b/src/interaction/main/mainLinks.js
index 6812e51f7ab6c9c7d4cd950f4cc19eadb9e962ee..d60f6c1244dc61b918f70931dc471c055f043b7c 100644
--- a/src/interaction/main/mainLinks.js
+++ b/src/interaction/main/mainLinks.js
@@ -160,7 +160,7 @@ App.UI.View.MainLinks = function() {
if (typeof V.limbs[j] === 'object' || getSlave(V.limbs[j].ID) !== undefined) {
let i = V.slaveIndices[V.limbs[j].ID];
if (V.limbs[j].weeksToCompletion <= 0) {
- r += `<br><span class=yellow>The facility has completed a set of limbs for</span> <span id="name"><<print "[[SlaveFullName($slaves[${i}])|Slave Interact][$activeSlave = $slaves[${i}]]]">></span>, <span class=yellow> which is ready to be attached.</span>`;
+ r += `<br><span class=yellow>The facility has completed a set of limbs for</span> <span id="name"><<print "[[SlaveFullName($slaves[${i}])|Slave Interact][$activeSlave = $slaves[${i}]]]">>,</span> <span class=yellow> which is ready to be attached.</span>`;
}
} else {
V.limbs.splice(j, 1);
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index aef40e98e359f81912bacc961b19838d71a82f97..dba381646aa4cef8c6eddd9eb787247e29f4b25d 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -1,9 +1,8 @@
-App.Desc.eyes =
/**
* @param {App.Entity.SlaveState} slave
- * @return {string} Slave's eyes
+ * @return {string} The slave's eyes
*/
-function (slave) {
+App.Desc.eyes = function (slave) {
"use strict";
const V = State.variables;
let r = ``;
@@ -52,9 +51,9 @@ function (slave) {
} else {
r += `${he} is so <span class=deepskyblue>brilliant</span> that ${his} `;
if (slave.intelligenceImplant > 0) {
- r += `meager `;
+ r += `meager`;
} else {
- r += `lack of `;
+ r += `lack of`;
}
r += ` education is unimportant.`;
}
@@ -80,7 +79,7 @@ function (slave) {
if (slave.intelligence + slave.intelligenceImplant > 50) {
r += `but ${his} face is alive with intelligence; with ${his} education, ${he} can be considered <span class=deepskyblue>highly intelligent.</span>`;
} else if (slave.intelligenceImplant >= 15) {
- r += `but ${his} facial expressions reveal ${his} cleverness; ${he} is of <span class=deepskyblue>above average intelligence</span> and `;
+ r += `but ${his} facial expressions reveal ${his} cleverness; ${he} is of <span class=deepskyblue>above average intelligence</span> and`;
if (slave.intelligenceImplant >= 30) {
r += `well `;
}
@@ -118,11 +117,11 @@ function (slave) {
} else if (slave.intelligenceImplant >= 15) {
r += `but ${his} facial expressions reveal ${he} is as dull as ${his} eyes; ${he} is <span class=orangered>quite stupid</span> despite having `;
if (slave.intelligenceImplant >= 30) {
- r += `an advanced `;
+ r += `an advanced`;
} else {
- r += `some `;
+ r += `some`;
}
- r += `education.`;
+ r += ` education.`;
} else {
r += `but ${his} facial expressions reveal ${he} is as dull as ${his} eyes; ${he} is <span class=orangered>quite stupid</span> and ignorant.`;
}
@@ -138,7 +137,7 @@ function (slave) {
}
} else {
if (slave.intelligence > 95) {
- r += `${His} ${App.Desc.eyeColor(slave)}-eyed gaze is incisive, quick, cunning; `;
+ r += `${His} ${slave.eyeColor}-eyed gaze is incisive, quick, cunning; `;
if (slave.intelligence + slave.intelligenceImplant >= 130) {
r += `with ${his} education, ${he} is so far <span class=deepskyblue>beyond brilliant</span> that ${he} is nearly peerless.`;
} else if (slave.intelligenceImplant >= 15) {
@@ -150,33 +149,33 @@ function (slave) {
} else {
r += `${he} is so <span class=deepskyblue>brilliant</span> that ${his} `;
if (slave.intelligenceImplant > 0) {
- r += `meager `;
+ r += `meager`;
} else {
- r += `lack of `;
+ r += `lack of`;
}
- r += `education is unimportant.`;
+ r += ` education is unimportant.`;
}
} else if (slave.intelligence > 50) {
- r += `${His} ${App.Desc.eyeColor(slave)}-eyed gaze is incisive, quick, cunning; `;
- if (slave.intelligence + slave.intelligenceImplant >= 95) {
- r += `${His} ${App.Desc.eyeColor(slave)} eyes are alive with intelligence; ${he} is both <span class=deepskyblue>highly intelligent</span> and `;
+ if (slave.intelligence + slave.intelligenceImplant > 95) {
+ r += `${His} ${slave.eyeColor}-eyed gaze is incisive, quick, cunning; with ${his} education, ${he} can be considered <span class=deepskyblue>brilliant.</span>`;
} else if (slave.intelligenceImplant >= 15) {
- r += `well `;
+ r += `${His} ${slave.eyeColor} eyes are alive with intelligence; ${he} is both <span class=deepskyblue>highly intelligent</span> and `;
if (slave.intelligenceImplant >= 30) {
- r += `educated.`;
+ r += `well `;
}
+ r += `educated.`;
} else {
- r += `${His} ${App.Desc.eyeColor(slave)} eyes are alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his} `;
+ r += `${His} ${slave.eyeColor} eyes are alive with intelligence; ${he} is so <span class=deepskyblue>highly intelligent</span> that ${his} `;
if (slave.intelligenceImplant > 0) {
- r += `meager `;
+ r += `meager`;
} else {
- r += `lack of `;
+ r += `lack of`;
}
- r += `education is unimportant.`;
+ r += ` education is unimportant.`;
}
} else if (slave.intelligence > 15) {
- r += `${His} ${App.Desc.eyeColor(slave)} eyes are `;
- if (slave.intelligence + slave.intelligenceImplant >= 50) {
+ r += `${His} ${slave.eyeColor} eyes are `;
+ if (slave.intelligence + slave.intelligenceImplant > 50) {
r += `alive with intelligence; with ${his} education, ${he} can be considered <span class=deepskyblue>highly intelligent.</span>`;
} else if (slave.intelligenceImplant >= 15) {
r += `clever; ${he} is of <span class=deepskyblue>above average intelligence</span> and `;
@@ -188,11 +187,11 @@ function (slave) {
r += `clever; ${he} is of <span class=deepskyblue>above average intelligence</span> despite being undereducated.`;
}
} else if (slave.intelligence >= -15) {
- r += `${His} ${App.Desc.eyeColor(slave)} eyes are `;
- if (slave.intelligence + slave.intelligenceImplant >= 15) {
+ r += `${His} ${slave.eyeColor} eyes are `;
+ if (slave.intelligence + slave.intelligenceImplant > 15) {
r += `clever; with ${his} education, ${he} can be considered of <span class=deepskyblue>above average intelligence.</span>`;
} else if (slave.intelligenceImplant >= 15) {
- r += `alert; ${he} is of average intelligence due to being `;
+ r += `alert; ${he} is of average intelligence due to being`;
if (slave.intelligenceImplant >= 30) {
r += `well `;
}
@@ -201,35 +200,35 @@ function (slave) {
r += `alert; ${he} is of average intelligence and is undereducated.`;
}
} else if (slave.intelligence >= -50) {
- r += `${His} ${App.Desc.eyeColor(slave)} eyes are `;
+ r += `${His} ${slave.eyeColor} eyes are `;
if (slave.intelligence + slave.intelligenceImplant >= -15) {
r += `alert; with ${his} education, ${he} can be considered of average intelligence.`;
} else if (slave.intelligenceImplant >= 15) {
r += `dim; ${he} is of <span class=orangered>below average intelligence</span> despite having been `;
if (slave.intelligenceImplant >= 30) {
r += `thoroughly `;
- } else {
- r += `educated.`;
}
- r += `dim; ${he} is of <span class=orangered>below average intelligence</span> and is poorly educated.`;
+ r += `educated.`;
} else {
- r += `dim; even with ${his} education, ${he} can only be considered of <span class=orangered>below average intelligence.</span>`;
+ r += `dim; ${he} is of <span class=orangered>below average intelligence</span> and is poorly educated.`;
}
} else if (slave.intelligence >= -95) {
- r += `${His} ${App.Desc.eyeColor(slave)} eyes are `;
+ r += `${His} ${slave.eyeColor} eyes are `;
if (slave.intelligence + slave.intelligenceImplant >= -50) {
- r += `dull; ${he} is <span class=orangered>quite stupid</span> despite having `;
+ r += `dim; even with ${his} education, ${he} can only be considered of <span class=orangered>below average intelligence.</span>`;
} else if (slave.intelligenceImplant >= 15) {
- r += `an advanced `;
+ r += `dull; ${he} is <span class=orangered>quite stupid</span> despite having `;
if (slave.intelligenceImplant >= 30) {
- r += `some `;
+ r += `an advanced`;
+ } else {
+ r += `some`;
}
- r += `education.`;
+ r += ` education.`;
} else {
r += `dull; ${he} is <span class=orangered>quite stupid</span> and ignorant.`;
}
} else {
- r += `${His} ${App.Desc.eyeColor(slave)}-eyed gaze betrays near-total insensibility; `;
+ r += `${His} ${slave.eyeColor}-eyed gaze betrays near-total insensibility; `;
if (slave.intelligence + slave.intelligenceImplant >= -95) {
r += `even with ${his} education, ${he} is still <span class=orangered>really stupid.</span>`;
} else if (slave.intelligenceImplant > 0) {
@@ -242,12 +241,11 @@ function (slave) {
return r;
}
-App.Desc.eyeColor =
/**
* @param {App.Entity.SlaveState} slave
* @returns {string} Slave's eye color
*/
-function (slave) {
+App.Desc.eyeColor = function (slave) {
"use strict";
let r;
@@ -259,12 +257,11 @@ function (slave) {
return r;
}
-App.Desc.ageAndHealth =
/**
* @param {App.Entity.SlaveState} slave
- * @returns {string}
+ * @returns {string} The slave's age and health
*/
-function (slave) {
+App.Desc.ageAndHealth = function (slave) {
"use strict";
const V = State.variables;
let r = ``;
@@ -280,6 +277,7 @@ function (slave) {
let He = capFirstChar(he);
let His = capFirstChar(his);
/* eslint-enable */
+ let age;
(boy === "girl" ? woman = "woman" : woman = "man");
@@ -297,34 +295,33 @@ function (slave) {
} else {
r += `${He} almost gleams; ${he}'s in the absolute <span class=green>best of health,</span>`;
}
- r += ` and `;
- let age = slave.actualAge + 1;
- r += `${he}'s `;
+ age = slave.actualAge + 1;
+ r += ` and ${he}'s `;
if (slave.birthWeek >= 52 && V.seeAge) {
- r += `going to turn ${age} this week. ${He}'s `;
+ r += `going to turn ${age} this week, `;
} else if (slave.actualAge < 3) {
- r += `an infant, `;
+ r += `an infant, only `;
if (V.showAgeDetail) {
- if (slave.actualAge === 0) {
- r += `${0+V.week-slave.weekAcquired} weeks`;
- } else if (slave.actualAge === 1) {
+ if (!slave.actualAge) {
+ r += `${0+$week-slave.weekAcquired} weeks`;
+ } else if (slave.actualAge) {
r += `${num(slave.actualAge)} year`;
} else {
r += `${num(slave.actualAge)} years`;
}
- r += `old. `;
- }
- if (V.seeAge) {
- if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
- } else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
+ r += ` old`;
+ if (V.seeAge !== 0) {
+ r += `; `;
+ if (slave.birthWeek === 51) {
+ r += `${his} birthday is next week`;
+ } else {
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
+ }
}
} else {
- r += `only `;
- if (slave.actualAge === 0) {
- r += `${0+V.week-slave.weekAcquired} weeks`;
- } else if (slave.actualAge === 1) {
+ if (!slave.actualAge) {
+ r += `${0+$week-slave.weekAcquired} weeks`;
+ } else if (slave.actualAge) {
r += `${num(slave.actualAge)} year`;
} else {
r += `${num(slave.actualAge)} years`;
@@ -334,99 +331,103 @@ function (slave) {
} else if (slave.actualAge < 5) {
r += `a toddler, `;
if (V.showAgeDetail) {
- r += `${num(slave.actualAge)} years old; `;
- if (V.seeAge) {
+ r += `${num(slave.actualAge)} years old`;
+ if (V.seeAge !== 0) {
+ r += `; `;
if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
+ r += `${his} birthday is next week`;
} else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
}
- } else {
- r += ` only ${num(slave.actualAge)} years old.`;
}
+ } else {
+ r += `only ${num(slave.actualAge)} years old.`;
}
} else if (slave.actualAge < 13) {
- r += `a little ${boy}, `;
+ r += `a little $girl, `;
if (V.showAgeDetail) {
- if (V.seeAge) {
- r += `${num(slave.actualAge)} years old; `;
+ r += `${num(slave.actualAge)} years old`;
+ if (V.seeAge !== 0) {
+ r += `; `;
if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
+ r += `${his} birthday is next week`;
} else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
}
- } else {
- r += ` only ${num(slave.actualAge)} years old.`;
}
+ } else {
+ r += `only ${num(slave.actualAge)} years old.`;
}
} else if (slave.actualAge < 16) {
r += `almost a child, `;
if (V.showAgeDetail) {
- r += `${num(slave.actualAge)} years old; `;
- if (V.seeAge) {
+ r += `${num(slave.actualAge)} years old`;
+ if (V.seeAge !== 0) {
+ r += `; `;
if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
+ r += `${his} birthday is next week`;
} else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
}
- } else {
- r += `less than 17 years old.`;
}
+ } else {
+ r += `less than 17 years old.`;
}
} else if (slave.actualAge < 17) {
- r += `young and fresh at ${num(slave.actualAge)}; `;
- if (V.showAgeDetail && (V.seeAge)) {
+ r += `young and fresh at ${num(slave.actualAge)}`;
+ if (V.showAgeDetail && V.seeAge !== 0) {
if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
+ r += `${his} birthday is next week`;
} else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks`;
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
}
}
} else if (slave.actualAge < 18) {
- r += `young, fresh, and nearly 18; `;
- if (V.showAgeDetail && (V.seeAge)) {
+ r += `young, fresh, and nearly 18`;
+ if (V.showAgeDetail && V.seeAge !== 0) {
if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
+ r += `${his} birthday is next week`;
if (V.seeAge) {
- r += `people are already beginning to eye ${him}`;
+ r += `and people are already beginning to eye ${him}`;
}
- } else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
}
}
+ r += `. `;
} else if (slave.actualAge < 19) {
- if (slave.birthWeek === 0 && V.seeAge) {
+ if (!slave.birthWeek && V.seeAge) {
r += `just turned ${num(slave.actualAge)} this week, which many citizens find especially appealing.`;
} else if (slave.birthWeek < 4 && V.seeAge) {
r += `only turned ${num(slave.actualAge)} this month.`;
} else {
- r += `${num(slave.actualAge)} years old; `;
- if (V.showAgeDetail && (V.seeAge)) {
+ r += `${num(slave.actualAge)} years old`;
+ if (V.showAgeDetail && V.seeAge !== 0) {
if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
+ r += `${his} birthday is next week`;
+ } else {
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
}
- } else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
}
}
} else if (slave.actualAge < 20) {
- r += `in ${his} final year as a teenager at age 19; `;
- if (V.showAgeDetail && (V.seeAge)) {
+ r += `in ${his} final year as a teenager at age 19 `;
+ if (V.showAgeDetail && V.seeAge !== 0) {
if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
+ r += `${his} birthday is next week`;
} else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
}
}
} else if (slave.actualAge < 26) {
r += `a young ${woman}, `;
if (V.showAgeDetail) {
- r += `${num(slave.actualAge)} years old; `;
- if (V.seeAge);
- if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
- } else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
+ r += `${num(slave.actualAge)} years old`;
+ if (V.seeAge !== 0) {
+ r += `; `;
+ if (slave.birthWeek === 51) {
+ r += `${his} birthday is next week`;
+ } else {
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
+ }
}
} else {
r += `in ${his} early twenties.`;
@@ -434,201 +435,204 @@ function (slave) {
} else if (slave.actualAge < 30) {
r += `a younger ${woman}, `;
if (V.showAgeDetail) {
- r += `${num(slave.actualAge)} years old; `;
- if (V.seeAge);
- if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
- } else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
+ r += `${num(slave.actualAge)} years old`;
+ if (V.seeAge !== 0) {
+ r += `; `;
+ if (slave.birthWeek === 51) {
+ r += `${his} birthday is next week`;
+ } else {
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
+ }
}
} else {
r += `in ${his} late twenties.`;
}
} else if (slave.actualAge < 36) {
if (V.showAgeDetail) {
- r += `${num(slave.actualAge)} years old; `;
- if (V.seeAge);
- if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
- } else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
+ r += `${num(slave.actualAge)} years old`;
+ if (V.seeAge !== 0) {
+ r += `; `;
+ if (slave.birthWeek === 51) {
+ r += `${his} birthday is next week`;
+ } else {
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
+ }
}
} else {
r += `in ${his} early thirties.`;
}
} else if (slave.actualAge < 40) {
- r += `middle-aged for a slave`;
+ r += `middle-aged for a slave, `;
if (V.showAgeDetail) {
- r += ` at ${num(slave.actualAge)} years old; `;
- if (V.seeAge);
- if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
- } else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
+ r += `at ${num(slave.actualAge)} years old`;
+ if (V.seeAge !== 0) {
+ r += `; `;
+ if (slave.birthWeek === 51) {
+ r += `${his} birthday is next week`;
+ } else {
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
+ }
}
} else {
- r += `, in ${his} late thirties.`;
+ r += `in ${his} late thirties.`;
}
} else {
+ r += `old for a slave, `;
if (V.showAgeDetail) {
- r += `old for a slave, at ${num(slave.actualAge)} years old; `;
- if (V.seeAge) {
+ r += `at ${num(slave.actualAge)} years old`;
+ if (V.seeAge !== 0) {
r += `; `;
if (slave.birthWeek === 51) {
- r += `${his} birthday is next week.`;
+ r += `${his} birthday is next week`;
} else {
- r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`;
+ r += `${his} birthday is in ${52-slave.birthWeek} weeks.`;
}
}
} else {
- if (slave.actualAge < 70) {
- r += `old for a slave, `;
- if (slave.actualAge < 50) {
- r += `in ${his} forties.`;
- } else if (slave.actualAge < 60) {
- r += `in ${his} fifties`;
- }
+ if (slave.actualAge < 50) {
+ r += `in ${his} forties.`;
+ } else if (slave.actualAge < 60) {
+ r += `in ${his} fifties. `;
} else if (slave.actualAge < 70) {
r += `extremely old for a slave, in ${his} 60s.`;
} else if (slave.actualAge < 80) {
- r += `extremely old for a slave, in ${his} 70s.`;
+ r += `extremely old for a slave, in ${his} ${num(70)}s.`;
} else if (slave.actualAge < 90) {
- r += `extremely old for a slave, in ${his} 80s.`;
+ r += `extremely old for a slave, in ${his} r += ${num(80)}s.`;
} else if (slave.actualAge < 100) {
- r += `extremely old for a slave, in ${his} 90s.`;
+ r += `extremely old for a slave, in ${his} r += ${num(90)}s.`;
} else if (slave.actualAge >= 100) {
r += `ancient by any measure, over a century old.`;
}
}
- }
- if (slave.actualAge !== slave.physicalAge) {
- r += ` However, ${he} has the body of a ${num(slave.physicalAge)}-year old; `;
- if (slave.physicalAge < 18 && slave.actualAge >= 18) {
- r += `a stark contrast given ${his} maturity.`;
- } else if (slave.physicalAge < 18 && slave.actualAge < 18) {
- r += `a noticeable difference thanks to ${his} immaturity.`;
- } else if (slave.physicalAge <= slave.actualAge - 20 || slave.physicalAge > slave.actualAge + 20) {
- r += `a shocking difference from ${his} actual age.`;
- } else if (slave.physicalAge <= slave.actualAge - 10 || slave.physicalAge > slave.actualAge + 10) {
- r += `a noticeable difference from ${his} actual age.`;
- } else if (slave.physicalAge <= slave.actualAge - 5 || slave.physicalAge > slave.actualAge + 5) {
- r += `a barely noticeable difference from ${his} actual age.`;
- } else {
- r += `though it is hard to tell the difference from ${his} actual age. `;
- }
- }
- /*
- ** This section replaces the age/therapy texts, giving more details for the NCS condition.
- */
- if (slave.geneMods.NCS) {
- let bodyNCS;
- if ((slave.vagina < 0) && (slave.dick <= 0)) {
- bodyNCS = 'childlike'
- } else if ((slave.vagina < 0) && (slave.dick > 0)) {
- bodyNCS = 'shota'
- } else if ((slave.vagina > 0) && (slave.dick <= 0)) {
- bodyNCS = 'loli'
- } else {
- bodyNCS = 'loli/shota'
- }
-
- r += `${He} appears to be ${slave.visualAge} years old `;
- if (slave.visualAge <= 8) {
- r += `and ${he} has induced <span class=orange>NCS</span> and will always have a ${bodyNCS} body, no matter how long ${he} lives.`;
- } else if ((slave.visualAge < 13)) {
- r += `and ${he} has induced <span class=orange>NCS</span> and will have a ${bodyNCS} body for the rest of ${his} life.`;
- } else if ((slave.visualAge < 20)) {
- r += `and ${he} still has a teen body for now, but with ${his} <span class=orange>NCS,</span> ${he} will eventually regress in age to look like a little ${boy} again.`;
- } else {
- r += `and ${he} still has the body of an adult, but ${his} <span class=orange>NCS</span> has `;
- if ((slave.physicalAge - slave.visualAge <= 5)) {
- r += `not really begun to youthen ${his} appearance yet.`;
- } else if ((slave.physicalAge - slave.visualAge <= 10)) {
- r += `clearly been at work on ${him}, making ${him} appear younger.`;
- } else if ((slave.physicalAge - slave.visualAge <= 20)) {
- r += `obviously helped take more than a decade off of ${his} age.`;
+ if (slave.actualAge !== slave.physicalAge) {
+ r += `However, ${he} has the body of a ${num(slave.physicalAge)}-year-old;`;
+ if (slave.physicalAge < 18 && slave.actualAge >= 18) {
+ r += `a stark contrast given ${his} maturity.`;
+ } else if (slave.physicalAge < 18 && slave.actualAge < 18) {
+ r += `a noticeable difference thanks to ${his} immaturity.`;
+ } else if (slave.physicalAge <= slave.actualAge - 20 || slave.physicalAge >= slave.actualAge + 20) {
+ r += `a shocking difference from ${his} actual age.`;
+ } else if (slave.physicalAge <= slave.actualAge - 10 || slave.physicalAge >= slave.actualAge + 10) {
+ r += `a noticeable difference from ${his} actual age.`;
+ } else if (slave.physicalAge <= slave.actualAge - 5 || slave.physicalAge >= slave.actualAge + 5) {
+ r += `a barely noticeable difference from ${his} actual age.`;
} else {
- r += `intensely youthened ${him}.`;
+ r += `though it is hard to tell the difference from ${his} actual age.`;
}
}
- } else if (slave.physicalAge !== slave.visualAge) {
- if (slave.visualAge <= slave.physicalAge - 20 || slave.visualAge >= slave.physicalAge + 20) {
- r += `${He} has undergone radical age therapy that makes ${him} look `;
- } else if (slave.visualAge <= slave.physicalAge - 10 || slave.visualAge > slave.physicalAge + 10) {
- r += `${He} has undergone drastic age therapy that makes ${him} look `;
- } else if (slave.visualAge <= slave.physicalAge - 5 || slave.visualAge > slave.physicalAge + 5) {
- r += `${He} has undergone noticeable age therapy that makes ${him} look `;
- } else {
- r += `For various reasons, ${he} looks `;
- }
- if (slave.physicalAge > slave.visualAge) {
- if (slave.physicalAge < slave.visualAge + 5) {
- r += `a slightly younger ${slave.visualAge}.`;
- } else if (slave.visualAge < 20) {
- r += `like ${he}'s barely an adult.`;
- } else if (slave.visualAge < 25) {
- r += `barely into ${his} early twenties.`;
- } else if (slave.visualAge < 30) {
- r += `like ${he}'s still in ${his} twenties.`;
- } else if (slave.visualAge < 35) {
- r += `barely thirty.`;
- } else if (slave.visualAge < 40) {
- r += `still in ${his} thirties.`;
- } else if (slave.visualAge < 45) {
- r += `barely forty.`;
- } else if (slave.visualAge < 50) {
- r += `still in ${his} forties.`;
- } else if (slave.visualAge < 55) {
- r += `barely fifty.`;
- } else if (slave.visualAge < 60) {
- r += `still in ${his} fifties.`;
- } else if (slave.visualAge < 65) {
- r += `barely sixty.`;
- } else if (slave.visualAge < 70) {
- r += `still in ${his} sixties.`;
- } else if (slave.visualAge < 75) {
- r += `barely seventy.`;
- } else if (slave.visualAge < 80) {
- r += `still in ${his} seventies.`;
+ /*
+ ** This section replaces the age/therapy texts, giving more details for the NCS condition.
+ */
+ if (slave.geneMods.NCS) {
+ if (slave.vagina < 0 && slave.dick <= 0) {
+ bodyNCS = 'childlike';
+ } else if (slave.vagina < 0 && slave.dick > 0) {
+ bodyNCS = 'shota';
+ } else if (slave.vagina > 0 && slave.dick <= 0) {
+ bodyNCS = 'loli';
} else {
- r += `a younger ${slave.visualAge}.`;
+ bodyNCS = 'loli/shota';
}
- } else {
- if (slave.physicalAge > slave.visualAge - 5) {
- r += `a slightly older ${slave.visualAge}.`;
+
+ r += `${He} appears to be slave.visualAge years old`;
+ if (slave.visualAge <= 8) {
+ r += `and ${he} has induced <span class=orange>NCS</span> and will always have a ${bodyNCS} body, no matter how long ${he} lives.`;
+ } else if (slave.visualAge < 13) {
+ r += `and ${he} has induced <span class=orange>NCS</span> and will have a ${bodyNCS} body for the rest of ${his} life.`;
} else if (slave.visualAge < 20) {
- r += `like a fresh adult.`;
- } else if (slave.visualAge < 25) {
- r += `just over twenty.`;
- } else if (slave.visualAge < 30) {
- r += `nearly thirty.`;
- } else if (slave.visualAge < 35) {
- r += `just over thirty.`;
- } else if (slave.visualAge < 40) {
- r += `nearly forty.`;
- } else if (slave.visualAge < 45) {
- r += `just over forty.`;
- } else if (slave.visualAge < 50) {
- r += `nearly fifty.`;
- } else if (slave.visualAge < 55) {
- r += `just over fifty.`;
- } else if (slave.visualAge < 60) {
- r += `nearly sixty.`;
- } else if (slave.visualAge < 65) {
- r += `just over sixty.`;
- } else if (slave.visualAge < 70) {
- r += `nearly seventy.`;
- } else if (slave.visualAge < 75) {
- r += `just over seventy.`;
- } else if (slave.visualAge < 80) {
- r += `nearly eighty.`;
+ r += `and ${he} still has a teen body for now, but with ${his} <span class=orange>NCS,</span> ${he} will eventually regress in age to look like a little $girl again.`;
+ } else {
+ r += `and ${he} still has the body of an adult, but ${his} <span class=orange>NCS</span> has`;
+ if (slave.physicalAge - slave.visualAge <= 5) {
+ r += `not really begun to youthen ${his} appearance yet.`;
+ } else if (slave.physicalAge - slave.visualAge <= 10) {
+ r += `clearly been at work on ${him}, making ${him} appear younger.`;
+ } else if (slave.physicalAge - slave.visualAge <= 20) {
+ r += `obviously helped take more than a decade off of ${his} age.`;
+ } else {
+ r += `intensely youthened ${him}.`;
+ }
+ }
+ } else if (slave.physicalAge !== slave.visualAge) {
+ if (slave.visualAge <= slave.physicalAge - 20 || slave.visualAge >= slave.physicalAge + 20) {
+ r += `${He} has undergone radical age therapy that makes ${him} look`;
+ } else if (slave.visualAge <= slave.physicalAge - 10 || slave.visualAge >= slave.physicalAge + 10) {
+ r += `${He} has undergone drastic age therapy that makes ${him} look`;
+ } else if (slave.visualAge <= slave.physicalAge - 5 || slave.visualAge >= slave.physicalAge + 5) {
+ r += `${He} has undergone noticeable age therapy that makes ${him} look`;
} else {
- r += `an ancient ${slave.visualAge}.`;
+ r += `For various reasons, ${he} looks`;
+ }
+ if (slave.physicalAge > slave.visualAge) {
+ if (slave.physicalAge < slave.visualAge + 5) {
+ r += `a slightly younger ${slave.visualAge}.`;
+ } else if (slave.visualAge < 20) {
+ r += `like ${he}'s barely an adult.`;
+ } else if (slave.visualAge < 25) {
+ r += `barely into ${his} early twenties.`;
+ } else if (slave.visualAge < 30) {
+ r += `like ${he}'s still in ${his} twenties.`;
+ } else if (slave.visualAge < 35) {
+ r += `barely thirty.`;
+ } else if (slave.visualAge < 40) {
+ r += `still in ${his} thirties.`;
+ } else if (slave.visualAge < 45) {
+ r += `barely forty.`;
+ } else if (slave.visualAge < 50) {
+ r += `still in ${his} forties.`;
+ } else if (slave.visualAge < 55) {
+ r += `barely fifty.`;
+ } else if (slave.visualAge < 60) {
+ r += `still in ${his} fifties.`;
+ } else if (slave.visualAge < 65) {
+ r += `barely sixty.`;
+ } else if (slave.visualAge < 70) {
+ r += `still in ${his} sixties.`;
+ } else if (slave.visualAge < 75) {
+ r += `barely seventy.`;
+ } else if (slave.visualAge < 80) {
+ r += `still in ${his} seventies.`;
+ } else {
+ r += `a younger ${slave.visualAge}.`;
+ }
+ } else {
+ if (slave.physicalAge > slave.visualAge - 5) {
+ r += `a slightly older ${slave.visualAge}.`;
+ } else if (slave.visualAge < 20) {
+ r += `like a fresh adult.`;
+ } else if (slave.visualAge < 25) {
+ r += `just over twenty.`;
+ } else if (slave.visualAge < 30) {
+ r += `nearly thirty.`;
+ } else if (slave.visualAge < 35) {
+ r += `just over thirty.`;
+ } else if (slave.visualAge < 40) {
+ r += `nearly forty.`;
+ } else if (slave.visualAge < 45) {
+ r += `just over forty.`;
+ } else if (slave.visualAge < 50) {
+ r += `nearly fifty.`;
+ } else if (slave.visualAge < 55) {
+ r += `just over fifty.`;
+ } else if (slave.visualAge < 60) {
+ r += `nearly sixty.`;
+ } else if (slave.visualAge < 65) {
+ r += `just over sixty.`;
+ } else if (slave.visualAge < 70) {
+ r += `nearly seventy.`;
+ } else if (slave.visualAge < 75) {
+ r += `just over seventy.`;
+ } else if (slave.visualAge < 80) {
+ r += `nearly eighty.`;
+ } else {
+ r += `an ancient ${slave.visualAge}.`;
+ }
}
}
}
} else {
- r += `The Fuckdoll gives no external indication of ${his} health or age, but upon query ${his} systems reports that ${he} is `;
+ r += `The Fuckdoll gives no external indication of ${his} health or age, but upon query ${his} systems reports that ${he} is`;
if (slave.health < -90) {
r += `<span class=red>dangerously sick</span>`;
} else if (slave.health < -50) {
@@ -638,12 +642,11 @@ function (slave) {
} else if (slave.health <= 20) {
r += `<span class=yellow>healthy</span>`;
} else if (slave.health <= 50) {
- r += `<span class=green>ve
- ry health</span>`;
+ r += `<span class=green>very health</span>`;
} else {
r += `<span class=green>extremely healthy</span>`;
}
- r += ` and ${slave.physicalAge} years old.`;
+ r += `and ${slave.physicalAge} years old.`;
}
return r;
}
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 8118682263bfde2dcf919590ba81280cdc4df63f..4336c0be2c321fd5e6a609525000a6d99388abcf 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -4163,7 +4163,7 @@ window.SlaveSummaryUncached = (function() {
if (_ssj !== -1) {
r += `${SlaveFullName(V.slaves[_ssj])}'s `;
if (slave.relationshipTarget !== slave.relationTarget) {
- r += `<span class="lightgreen">${slave.relation}</span>. `;
+ r += `<span class="lightgreen">${slave.relation}.</span> `;
} else {
r += `<span class="lightgreen">${slave.relation}</span> `;
}
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index c9c0d80109e20c8233e21098ef3dc45f3dc36549..3619f8926942d1742e21dc6c21bfa1bb879a9c07 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -609,7 +609,7 @@ is
women.
<</if>>
<<elseif ($activeSlave.behavioralFlaw == "anorexic")>>
- $He suffers from @@.red;anorexia@@.
+ $He suffers from @@.red;anorexia.@@
<<elseif ($activeSlave.behavioralFlaw == "gluttonous")>>
$He @@.red;tends to overeat@@ whenever $he can, reacting to the rigors of sexual slavery with overeating.
<</if>>