diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 71b0c7b9a553028ee56aa7537ec5696afd396a9f..1ae14e8fb719a292358285307ec68be0bf2ffa3f 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -282,6 +282,14 @@ App.Desc.ageAndHealth = function (slave) {
let His = capFirstChar(his);
/* eslint-enable */
let age;
+ let birthday;
+ if (V.seeAge !== 0) {
+ if (slave.birthWeek === 51) {
+ birthday = `; ${his} birthday is next week`;
+ } else {
+ birthday = `; ${his} birthday is in ${52-slave.birthWeek} weeks`;
+ }
+ }
(boy === "girl" ? woman = "woman" : woman = "man");
@@ -302,227 +310,132 @@ App.Desc.ageAndHealth = function (slave) {
age = slave.actualAge + 1;
r += ` and ${he}'s `;
if (slave.birthWeek >= 52 && V.seeAge) {
- r += `going to turn ${age} this week, `;
+ r += `going to turn ${age} this week,`;
} else if (slave.actualAge < 3) {
r += `an infant, only `;
if (V.showAgeDetail) {
if (!slave.actualAge) {
- r += `${0+$week-slave.weekAcquired} weeks`;
+ r += `${0+$week-slave.weekAcquired} weeks old${birthday}.`;
} else if (slave.actualAge) {
- r += `${num(slave.actualAge)} year`;
+ r += `${num(slave.actualAge)} year old${birthday}.`;
} else {
- r += `${num(slave.actualAge)} years`;
- }
- 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. `;
- }
+ r += `${num(slave.actualAge)} years old${birthday}.`;
}
} else {
if (!slave.actualAge) {
- r += `${0+$week-slave.weekAcquired} weeks`;
+ r += `${0+$week-slave.weekAcquired} weeks old.`;
} else if (slave.actualAge) {
- r += `${num(slave.actualAge)} year`;
+ r += `${num(slave.actualAge)} year old.`;
} else {
- r += `${num(slave.actualAge)} years`;
+ r += `${num(slave.actualAge)} years old.`;
}
- r += ` old. `;
}
} else if (slave.actualAge < 5) {
r += `a toddler, `;
if (V.showAgeDetail) {
- 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. `;
- }
- }
+ r += `${num(slave.actualAge)} years old${birthday}.`;
} else {
- r += `only ${num(slave.actualAge)} years old. `;
+ r += `only ${num(slave.actualAge)} years old.`;
}
} else if (slave.actualAge < 13) {
r += `a little $girl, `;
if (V.showAgeDetail) {
- 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. `;
- }
- }
+ r += `${num(slave.actualAge)} years old${birthday}.`;
} else {
- r += `only ${num(slave.actualAge)} years old. `;
+ 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 !== 0) {
- r += `; `;
- if (slave.birthWeek === 51) {
- r += `${his} birthday is next week`;
- } else {
- r += `${his} birthday is in ${52-slave.birthWeek} weeks. `;
- }
- }
+ r += `${num(slave.actualAge)} years old${birthday}.`;
} else {
- r += `less than 17 years old. `;
+ r += `less than 17 years old.`;
}
} else if (slave.actualAge < 17) {
- r += `young and fresh at ${num(slave.actualAge)}`;
- if (V.showAgeDetail && V.seeAge !== 0) {
- if (slave.birthWeek === 51) {
- r += `${his} birthday is next week`;
- } else {
- r += `${his} birthday is in ${52-slave.birthWeek} weeks. `;
- }
- }
+ r += `young and fresh at ${num(slave.actualAge)}${birthday}.`;
} else if (slave.actualAge < 18) {
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 += `and people are already beginning to eye ${him}`;
+ r += ` and people are already beginning to eye ${him}`;
}
}
}
- r += `. `;
+ r += `.`;
} else if (slave.actualAge < 19) {
if (!slave.birthWeek && V.seeAge) {
- r += `just turned ${num(slave.actualAge)} this week, which many citizens find especially appealing. `;
+ 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. `;
+ r += `only turned ${num(slave.actualAge)} this month.`;
} else {
- r += `${num(slave.actualAge)} years old`;
- if (V.showAgeDetail && V.seeAge !== 0) {
- if (slave.birthWeek === 51) {
- r += `${his} birthday is next week`;
- } else {
- r += `${his} birthday is in ${52-slave.birthWeek} weeks. `;
- }
- }
+ r += `${num(slave.actualAge)} years old${birthday}.`;
}
} else if (slave.actualAge < 20) {
- 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`;
- } else {
- r += `${his} birthday is in ${52-slave.birthWeek} weeks. `;
- }
- }
+ r += `in ${his} final year as a teenager at age 19${birthday}.`;
} else if (slave.actualAge < 26) {
r += `a young ${woman}, `;
if (V.showAgeDetail) {
- 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. `;
- }
- }
+ r += `${num(slave.actualAge)} years old${birthday}.`;
} else {
- r += `in ${his} early twenties. `;
+ r += `in ${his} early twenties.`;
}
} else if (slave.actualAge < 30) {
r += `a younger ${woman}, `;
if (V.showAgeDetail) {
- 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. `;
- }
- }
+ r += `${num(slave.actualAge)} years old${birthday}.`;
} else {
- r += `in ${his} late twenties. `;
+ r += `in ${his} late twenties.`;
}
} else if (slave.actualAge < 36) {
if (V.showAgeDetail) {
- 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. `;
- }
- }
+ r += `${num(slave.actualAge)} years old${birthday}.`;
} else {
- r += `in ${his} early thirties. `;
+ r += `in ${his} early thirties.`;
}
} else if (slave.actualAge < 40) {
r += `middle-aged for a slave, `;
if (V.showAgeDetail) {
- 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. `;
- }
- }
+ r += `at ${num(slave.actualAge)} years old${birthday}.`;
} else {
- r += `in ${his} late thirties. `;
+ r += `in ${his} late thirties.`;
}
} else {
r += `old for a slave, `;
if (V.showAgeDetail) {
- 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. `;
- }
- }
+ r += `at ${num(slave.actualAge)} years old${birthday}.`;
} else {
if (slave.actualAge < 50) {
- r += `in ${his} forties. `;
+ r += `in ${his} forties.`;
} else if (slave.actualAge < 60) {
- r += `in ${his} fifties. `;
+ r += `in ${his} fifties.`;
} else if (slave.actualAge < 70) {
- r += `extremely old for a slave, in ${his} 60s. `;
+ r += `extremely old for a slave, in ${his} 60s.`;
} else if (slave.actualAge < 80) {
- r += `extremely old for a slave, in ${his} ${num(70)}s. `;
+ r += `extremely old for a slave, in ${his} ${num(70)}s.`;
} else if (slave.actualAge < 90) {
- r += `extremely old for a slave, in ${his} r += ${num(80)}s. `;
+ 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} r += ${num(90)}s. `;
+ 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. `;
+ 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;`;
+ 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. `;
+ r += `a stark contrast given ${his} maturity.`;
} else if (slave.physicalAge < 18 && slave.actualAge < 18) {
- r += `a noticeable difference thanks to ${his} immaturity. `;
+ 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. `;
+ 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. `;
+ 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. `;
+ r += `a barely noticeable difference from ${his} actual age.`;
} else {
- r += `though it is hard to tell the difference from ${his} actual age. `;
+ r += `though it is hard to tell the difference from ${his} actual age.`;
}
}
/*
@@ -530,112 +443,112 @@ App.Desc.ageAndHealth = function (slave) {
*/
if (slave.geneMods.NCS) {
if (slave.vagina < 0 && slave.dick <= 0) {
- bodyNCS = 'childlike';
+ bodyNCS = "childlike";
} else if (slave.vagina < 0 && slave.dick > 0) {
- bodyNCS = 'shota';
+ bodyNCS = "shota";
} else if (slave.vagina > 0 && slave.dick <= 0) {
- bodyNCS = 'loli';
+ bodyNCS = "loli";
} else {
- bodyNCS = 'loli/shota';
+ bodyNCS = "loli/shota";
}
- r += `${He} appears to be slave.visualAge years old`;
+ r += ` ${He} appears to be slave.visualAge years old and ${he} `;
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. `;
+ r += `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. `;
+ r += `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 $girl again. `;
+ r += `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`;
+ r += `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. `;
+ 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. `;
+ 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. `;
+ r += `obviously helped take more than a decade off of ${his} age.`;
} else {
- r += `intensely youthened ${him}. `;
+ 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`;
+ 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`;
+ 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`;
+ r += ` ${He} has undergone noticeable age therapy that makes ${him} look `;
} else {
- r += `For various reasons, ${he} looks`;
+ r += ` For various reasons, ${he} looks `;
}
if (slave.physicalAge > slave.visualAge) {
if (slave.physicalAge < slave.visualAge + 5) {
- r += `a slightly younger ${slave.visualAge}. `;
+ r += `a slightly younger ${slave.visualAge}.`;
} else if (slave.visualAge < 20) {
- r += `like ${he}'s barely an adult. `;
+ r += `like ${he}'s barely an adult.`;
} else if (slave.visualAge < 25) {
- r += `barely into ${his} early twenties. `;
+ r += `barely into ${his} early twenties.`;
} else if (slave.visualAge < 30) {
- r += `like ${he}'s still in ${his} twenties. `;
+ r += `like ${he}'s still in ${his} twenties.`;
} else if (slave.visualAge < 35) {
- r += `barely thirty. `;
+ r += `barely thirty.`;
} else if (slave.visualAge < 40) {
- r += `still in ${his} thirties. `;
+ r += `still in ${his} thirties.`;
} else if (slave.visualAge < 45) {
- r += `barely forty. `;
+ r += `barely forty.`;
} else if (slave.visualAge < 50) {
- r += `still in ${his} forties. `;
+ r += `still in ${his} forties.`;
} else if (slave.visualAge < 55) {
- r += `barely fifty. `;
+ r += `barely fifty.`;
} else if (slave.visualAge < 60) {
- r += `still in ${his} fifties. `;
+ r += `still in ${his} fifties.`;
} else if (slave.visualAge < 65) {
- r += `barely sixty. `;
+ r += `barely sixty.`;
} else if (slave.visualAge < 70) {
- r += `still in ${his} sixties. `;
+ r += `still in ${his} sixties.`;
} else if (slave.visualAge < 75) {
- r += `barely seventy. `;
+ r += `barely seventy.`;
} else if (slave.visualAge < 80) {
- r += `still in ${his} seventies. `;
+ r += `still in ${his} seventies.`;
} else {
- r += `a younger ${slave.visualAge}. `;
+ r += `a younger ${slave.visualAge}.`;
}
} else {
if (slave.physicalAge > slave.visualAge - 5) {
- r += `a slightly older ${slave.visualAge}. `;
+ r += `a slightly older ${slave.visualAge}.`;
} else if (slave.visualAge < 20) {
- r += `like a fresh adult. `;
+ r += `like a fresh adult.`;
} else if (slave.visualAge < 25) {
- r += `just over twenty. `;
+ r += `just over twenty.`;
} else if (slave.visualAge < 30) {
- r += `nearly thirty. `;
+ r += `nearly thirty.`;
} else if (slave.visualAge < 35) {
- r += `just over thirty. `;
+ r += `just over thirty.`;
} else if (slave.visualAge < 40) {
- r += `nearly forty. `;
+ r += `nearly forty.`;
} else if (slave.visualAge < 45) {
- r += `just over forty. `;
+ r += `just over forty.`;
} else if (slave.visualAge < 50) {
- r += `nearly fifty. `;
+ r += `nearly fifty.`;
} else if (slave.visualAge < 55) {
- r += `just over fifty. `;
+ r += `just over fifty.`;
} else if (slave.visualAge < 60) {
- r += `nearly sixty. `;
+ r += `nearly sixty.`;
} else if (slave.visualAge < 65) {
- r += `just over sixty. `;
+ r += `just over sixty.`;
} else if (slave.visualAge < 70) {
- r += `nearly seventy. `;
+ r += `nearly seventy.`;
} else if (slave.visualAge < 75) {
- r += `just over seventy. `;
+ r += `just over seventy.`;
} else if (slave.visualAge < 80) {
- r += `nearly eighty. `;
+ r += `nearly eighty.`;
} else {
- r += `an ancient ${slave.visualAge}. `;
+ 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) {
@@ -649,7 +562,7 @@ App.Desc.ageAndHealth = function (slave) {
} 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/economyJS.js b/src/js/economyJS.js
index f4d4bef0f64c61c2ed939dad5a02467cb01bc6bd..51e884fb284f868f76bfaf02fc26b187494325d2 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -940,7 +940,7 @@ window.slaveJobValues = function() {
//''__@@.pink;$DJ.slaveName@@__'' can't speak @@.yellow;and cannot serve as your DJ any more.@@<br>
V.DJ = 0;
V.unDJ = 1;
- } else if(V.DJ.preg > 37 && $DJ.broodmother == 2) {
+ } else if(V.DJ.preg > 37 && V.DJ.broodmother === 2) {
//''__@@.pink;$DJ.slaveName@@__'' spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your DJ any longer.@@
V.DJ = 0;
V.unDJ = 2;