diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index c4b22205019fea1391840877aa6e411abf93b86e..f3a2959ecaf417a7df026611f03a0e57550edfbc 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -12,7 +12,7 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
var t = `works as a farmhand this week. `;
if (V.Farmer !== 0) {
- t += `While there, ${he} benefits from ${Farmer.slaveName}'s `;
+ t += `While there, ${he} benefits from ${V.Farmer.slaveName}'s `;
if (V.Farmer.physicalAge < 21) {
t += `youthful energy`;
} else {
@@ -44,7 +44,7 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
incomeStats.food += food;
if (V.Farmer) {
- t += `${Farmer.slaveName} watches over ${him}, making sure that ${he} doesn't slack off and works as hard as ${he} should. `;
+ t += `${V.Farmer.slaveName} watches over ${him}, making sure that ${he} doesn't slack off and works as hard as ${he} should. `;
}
if (slave.devotion > 50) {
t += `${He}'s so devoted to you that ${he} works harder and produces more food. `;
@@ -72,13 +72,13 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
if (slave.hears === -1) {
t += `${He} is hard-of-hearing, which gets in the way of ${his} work whenever ${he} misses directions`;
if (V.Farmer) {
- t += ` from ${Farmer.slaveName}`;
+ t += ` from ${V.Farmer.slaveName}`;
}
t += `. `;
} else if (slave.hears < -1) {
t += `${He} is deaf, which gets in the way of ${his} work whenever ${he} misses directions`;
if (V.Farmer) {
- t += ` from ${Farmer.slaveName}`;
+ t += ` from ${V.Farmer.slaveName}`;
}
t += `. `;
}
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 8d16d6c5c8f15bccd30bf2ea16420a1b8be60868..81824501ed08ff677b0f0620bd7d9ab4667d9fba 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -338,91 +338,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) {