diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw index 7d002ca8e0004040250904520b70ab5918708443..f1f3443c0b0576a383498b8498646cc3c34cac52 100644 --- a/src/facilities/farmyard/farmyardReport.tw +++ b/src/facilities/farmyard/farmyardReport.tw @@ -1,3 +1,3 @@ :: Farmyard Report [nobr] -<<print App.Facilities.Farmyard.farmyardReport()>> +<<includeDOM App.Facilities.Farmyard.farmyardReport()>> diff --git a/src/facilities/farmyard/reports/farmyardReport.js b/src/facilities/farmyard/reports/farmyardReport.js index e3a87e244c6b67410e532a76c1836252b7988ad5..af018917e334a141faecd764bc2f8d2940e88cbe 100644 --- a/src/facilities/farmyard/reports/farmyardReport.js +++ b/src/facilities/farmyard/reports/farmyardReport.js @@ -133,7 +133,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { const farmerSkill = slave => { const - { he, his } = getPronouns(slave); + { he, his, His } = getPronouns(slave); let r = []; @@ -157,6 +157,8 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { }; const farmerExperience = slave => { + const { he, his, him, He } = getPronouns(slave); + if (setup.farmerCareers.includes(slave.career)) { return `${He} has experience from ${his} life before ${he} was a slave that helps ${him} in the difficult life of managing animals and property.`; } else if (slave.skill.farmer >= V.masteredXP) { @@ -167,6 +169,8 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { }; const farmerDick = slave => { + const { his, him } = getPronouns(slave); + if (slave.dick > 2 && canPenetrate(slave)) { return `${His} turgid dick helps ${him} manage ${his} workers.`; } @@ -203,7 +207,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { slave.trust++; } - return t; + return r; } } @@ -223,24 +227,32 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { }; const farmerRelationshipPC = slave => { + const { he, his, wife } = getPronouns(slave); + if (slave.relationship === -3 && slave.devotion > 50) { return `As your loving ${wife}, ${he} does ${his} best to ensure ${V.farmyardName} runs smoothly.`; } }; const farmerAgeSkill = slave => { + const { His } = getPronouns(slave); + if (slave.actualAge > 35) { return `${His} age and experience also contribute.`; } }; const farmerIntelligence = slave => { + const { He } = getPronouns(slave); + if (slave.intelligence + slave.intelligenceImplant > 15) { return `${He} is a clever manager.`; } }; const farmerSmell = slave => { + const { him, His } = getPronouns(slave); + if (!canSmell(slave)) { return `${His} lack of a sense of smell protects ${him} from that omnipresent barnyard stench.`; } @@ -277,7 +289,9 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { // MARK: FARMHANDS - const farmhandCount = count => `There ${count > 1 ? `are ${count} farmhands` : `is one farmhand`} working out of ${V.farmyardName}.`; + const farmhandCount = count => { + return `<strong>There ${count > 1 ? `are ${count} farmhands` : `is one farmhand`} working out of ${V.farmyardName}.</strong>`; + }; const farmhandLivingRules = slave => { switch (V.farmyardDecoration) { @@ -324,7 +338,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { r.push(farmhandCount); - $(intro).append(r.join(' ')); + $(intro).append(r); } const farmhandProfit = slave => { @@ -368,7 +382,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { if (slave.choosesOwnAssignment === 2) { $(slaveEntry).append(App.UI.DOM.renderPassage("SA chooses own job")); } else { - $(slaveEntry).append(`is working out of ${V.nurseryName}.`); + $(slaveEntry).append(`is working out of ${V.farmyardName}.`); } farmhandLivingRules(slave); @@ -379,9 +393,8 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { farmhandFood(slave); profits += farmhandProfit(slave); - t += farmhandEndWeek(slave); - const + { He } = getPronouns(slave), farmhandContent = App.UI.DOM.appendNewElement("div", slaveEntry, '', "indent"); $(farmhandContent).append(`${He} ${App.SlaveAssignment.workTheFarm(slave, farmerBonus)}`); @@ -494,9 +507,9 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { const farmyardStatsDisplay = () => `<<includeDOM App.Facilities.Farmyard.Stats(false)>><<timed 50ms>><<replace #farmyardstats>><<includeDOM App.Facilities.Farmyard.Stats(true)>><</replace>><</timed>>`; farmyardStatsRecords(); - t += farmyardProfit(profits, foodWeek); - t += farmyardDecoration(); - t += farmyardStatsDisplay(); + farmyardProfit(profits, foodWeek); + farmyardDecoration(); + farmyardStatsDisplay(); V.food += foodWeek; @@ -531,5 +544,5 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { } } - return t; + return frag; };