From 8c5d4097ff8e5be1eb587015c0d6f58a53fb1853 Mon Sep 17 00:00:00 2001
From: DCoded <dsoloha@live.com>
Date: Thu, 30 May 2019 23:35:35 -0400
Subject: [PATCH] Minor ageAndHealth() text fixes
---
src/js/descriptionWidgets.js | 164 +++++++++++++++++------------------
1 file changed, 82 insertions(+), 82 deletions(-)
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 7739b0d6361..58a5e6dac59 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -6,7 +6,7 @@ App.Desc.eyes = function(slave) {
"use strict";
const V = State.variables;
let r = ``;
- /* eslint-disable no-unused*/
+ /* eslint-disable*/
let pronouns = getPronouns(slave);
let he = pronouns.pronoun;
let him = pronouns.object;
@@ -270,7 +270,7 @@ App.Desc.ageAndHealth = function(slave) {
const V = State.variables;
let r = ``;
let woman;
- /* eslint-disable no-unused*/
+ /* eslint-disable*/
let pronouns = getPronouns(slave);
let he = pronouns.he;
let him = pronouns.him;
@@ -316,44 +316,44 @@ App.Desc.ageAndHealth = function(slave) {
r += `an infant, only `;
if (V.showAgeDetail) {
if (!slave.actualAge) {
- r += `${0 + V.week-slave.weekAcquired} weeks old${birthday}.`;
+ r += `${0 + V.week-slave.weekAcquired} weeks old${birthday}. `;
} else if (slave.actualAge) {
- r += `${num(slave.actualAge)} year old${birthday}.`;
+ r += `${num(slave.actualAge)} year old${birthday}. `;
} else {
- r += `${num(slave.actualAge)} years old${birthday}.`;
+ r += `${num(slave.actualAge)} years old${birthday}. `;
}
} else {
if (!slave.actualAge) {
- r += `${0 + V.week-slave.weekAcquired} weeks old.`;
+ r += `${0 + V.week-slave.weekAcquired} weeks old. `;
} else if (slave.actualAge) {
- r += `${num(slave.actualAge)} year old.`;
+ r += `${num(slave.actualAge)} year old. `;
} else {
- r += `${num(slave.actualAge)} years old.`;
+ r += `${num(slave.actualAge)} years old. `;
}
}
} else if (slave.actualAge < 5) {
r += `a toddler, `;
if (V.showAgeDetail) {
- r += `${num(slave.actualAge)} years old${birthday}.`;
+ 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${birthday}.`;
+ 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${birthday}.`;
+ 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)}${birthday}.`;
+ 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) {
@@ -364,79 +364,79 @@ App.Desc.ageAndHealth = function(slave) {
}
}
}
- 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${birthday}.`;
+ r += `${num(slave.actualAge)} years old${birthday}. `;
}
} else if (slave.actualAge < 20) {
- r += `in ${his} final year as a teenager at age 19${birthday}.`;
+ 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${birthday}.`;
+ 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${birthday}.`;
+ 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${birthday}.`;
+ 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${birthday}.`;
+ 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${birthday}.`;
+ 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; `;
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. `;
}
}
/*
@@ -455,21 +455,21 @@ App.Desc.ageAndHealth = function(slave) {
}
r += ` ${He} appears to be slave.visualAge years old and ${he} `;
if (slave.visualAge <= 8) {
- r += `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 += `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 += `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 += `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) {
@@ -484,67 +484,67 @@ App.Desc.ageAndHealth = function(slave) {
}
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}. `;
}
}
}
@@ -564,7 +564,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;
};
@@ -577,7 +577,7 @@ App.Desc.brand = function(slave, surface) {
"use strict";
let r = ``;
let bellyAccessory;
- /* eslint-disable no-unused*/
+ /* eslint-disable */
let pronouns = getPronouns(slave);
let he = pronouns.pronoun;
let him = pronouns.object;
@@ -625,7 +625,7 @@ App.Desc.brand = function(slave, surface) {
App.Desc.amputee = function(slave) {
"use strict";
let r = ``;
- /* eslint-disable no-unused*/
+ /* eslint-disable */
let pronouns = getPronouns(slave);
let he = pronouns.pronoun;
let him = pronouns.object;
--
GitLab