diff --git a/src/endWeek/reports/nurseryReport.js b/src/endWeek/reports/nurseryReport.js index 698b1df07b0247c9e59a09ca817dbde1f92b44c2..cef8907e5390f1f428cee44ba1cb51f042391d0d 100644 --- a/src/endWeek/reports/nurseryReport.js +++ b/src/endWeek/reports/nurseryReport.js @@ -39,6 +39,9 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() { if (S.Matron.rules.living !== "luxurious") { S.Matron.rules.living = "luxurious"; } + if (S.Matron.rules.rest !== "restrictive") { + S.Matron.rules.rest = "restrictive"; + } } } diff --git a/src/facilities/farmyard/reports/farmyardReport.js b/src/facilities/farmyard/reports/farmyardReport.js index ff1cec85125d029eafaf2e7e742534db9ffc4669..47f1c0ccc9cb5bc414bdeb8b8538b24ed8bf4843 100644 --- a/src/facilities/farmyard/reports/farmyardReport.js +++ b/src/facilities/farmyard/reports/farmyardReport.js @@ -20,6 +20,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { farmerDevotion(Farmer); farmerTrust(Farmer); farmerLivingRules(Farmer); + farmerRestRules(Farmer); farmerCashBonus(Farmer); } @@ -50,6 +51,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { } const farmerLivingRules = slave => slave.rules.living = 'luxurious'; + const farmerRestRules = slave => slave.rules.rest = 'restrictive'; function farmerCashBonus(slave) { let FarmerCashBonus = Math.min(0.2, slave.skill.farmer * 0.002); @@ -172,7 +174,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { function farmerTiredness(slave) { const {he, his, him, He} = getPronouns(slave); - if (slaveResting(slave.career)) { + if (slaveResting(slave)) { return `To avoid exhaustion, ${he} has to take breaks to maintain ${his} strength, limiting how much ${he} can work.`; } } @@ -493,6 +495,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { function farmyardProfit(profit, food) { const profitContent = App.UI.DOM.appendNewElement("p", frag, '', "indent"); + const farmyardNameCaps = capFirstChar(V.farmyardName); let r = [];