diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js index c07b1af6ce9deaebe35b4e885ee8a6e08639c777..f86ef1d11aa86d418c30b3b75fb3edf204672522 100644 --- a/src/js/descriptionWidgets.js +++ b/src/js/descriptionWidgets.js @@ -339,91 +339,91 @@ App.Desc.AgeAndHealth = /** @param {App.Entity.SlaveState} slave */ function (sl } 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) { - if (slave.birthWeek === 51) { - r += `${his} birthday is next week.`; - } else { - r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`; - } - } 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)) { - if (slave.birthWeek === 51) { - r += `${his} birthday is next week.`; - } else { - r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks`; - } - } - } else if (slave.actualAge < 18) { - r += `young, fresh, and nearly 18; `; - if (V.showAgeDetail && (V.seeAge)) { - if (slave.birthWeek === 51) { - r += `${his} birthday is next week.`; - if (V.seeAge) { - r += `people are already beginning to eye ${him}`; - } - } else { - r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`; - } - } - } else if (slave.actualAge < 19) { - if (slave.birthWeek === 0 && 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 if (slave.actualAge < 16) { + r += `almost a child, `; + if (V.showAgeDetail) { + r += `${num(slave.actualAge)} years old; `; + if (V.seeAge) { + if (slave.birthWeek === 51) { + r += `${his} birthday is next week.`; } else { - r += `${num(slave.actualAge)} years old; `; - if (V.showAgeDetail && (V.seeAge)) { - if (slave.birthWeek === 51) { - r += `${his} birthday is next week.`; - } - } 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)) { - if (slave.birthWeek === 51) { - r += `${his} birthday is next week.`; - } else { - r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`; - } + r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`; } - } else if (slave.actualAge < 26) { - r += `a young V.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.`; - } - } else { - r += `in ${his} early twenties.`; + } 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)) { + if (slave.birthWeek === 51) { + r += `${his} birthday is next week.`; + } else { + r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks`; + } + } + } else if (slave.actualAge < 18) { + r += `young, fresh, and nearly 18; `; + if (V.showAgeDetail && (V.seeAge)) { + if (slave.birthWeek === 51) { + r += `${his} birthday is next week.`; + if (V.seeAge) { + r += `people are already beginning to eye ${him}`; } + } else { + r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`; } - } else if (slave.actualAge < 30) { - r += `a younger V.woman, `; - if (V.showAgeDetail) { - r += `${num(slave.actualAge)} years old; `; - if (V.seeAge); + } + } else if (slave.actualAge < 19) { + if (slave.birthWeek === 0 && 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)) { if (slave.birthWeek === 51) { r += `${his} birthday is next week.`; - } else { - r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`; } } else { - r += `in ${his} late twenties.`; + 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)) { + if (slave.birthWeek === 51) { + r += `${his} birthday is next week.`; + } else { + r += `${his} birthday is in ${num(52-slave.birthWeek)} weeks.`; + } + } + } else if (slave.actualAge < 26) { + r += `a young V.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.`; } + } else { + r += `in ${his} early twenties.`; + } + } else if (slave.actualAge < 30) { + r += `a younger V.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.`; + } + } else { + r += `in ${his} late twenties.`; } } else if (slave.actualAge < 36) { if (V.showAgeDetail) {