diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js index 3c5175e5cd972e5494bd5a23d4e81eb63e496f0a..bc6117979dcc14e06ef17a0a195c8e1b5981b64d 100644 --- a/src/endWeek/saWorkTheFarm.js +++ b/src/endWeek/saWorkTheFarm.js @@ -41,7 +41,7 @@ App.SlaveAssignment.workTheFarm = function (slave) { $(report).append(r.join(' ')); } - const intro = () => `works as a farmhand this week.`; + const intro = () => `${He} works as a farmhand this week.`; function farmer() { if (V.Farmer) { @@ -175,7 +175,7 @@ App.SlaveAssignment.workTheFarm = function (slave) { improveCondition(slave, V.FarmerHealthBonus); } - return `${S.Farmer} is a tough boss, but a fair one. ${slave.slaveName} benefits from ${his} care while working in ${V.farmyardName}.`; + return `${S.Farmer.slaveName} is a tough boss, but a fair one. ${slave.slaveName} benefits from ${his} care while working in ${V.farmyardName}.`; } } @@ -241,11 +241,25 @@ App.SlaveAssignment.workTheFarm = function (slave) { r.push(`<span class="story-label">This week</span> ${vignette.text}`); - r.push(vignetteCash(vignette)); - r.push(vignetteDevotion(vignette)); - r.push(vignetteTrust(vignette)); - r.push(vignetteHealth(vignette)); - r.push(vignetteOther(vignette)); + if (vignette.type === "cash") { + r.push(vignetteCash(vignette)); + } + + if (vignette.type === "devotion") { + r.push(vignetteDevotion(vignette)); + } + + if (vignette.type === "trust") { + r.push(vignetteTrust(vignette)); + } + + if (vignette.type === "health") { + r.push(vignetteHealth(vignette)); + } + + if (vignette.type === "rep") { + r.push(vignetteReputation(vignette)); + } return r.join(' '); } @@ -336,7 +350,7 @@ App.SlaveAssignment.workTheFarm = function (slave) { } } - function vignetteOther(vignette) { + function vignetteReputation(vignette) { const FResultNumber = FResult(slave); repX(Math.trunc(FResultNumber * vignette.effect * 0.1), "vignette", slave); @@ -352,7 +366,7 @@ App.SlaveAssignment.workTheFarm = function (slave) { } if (V.showVignettes) { - const vignettes = App.UI.DOM.appendNewElement("div", frag, '', "indent"); + const vignettes = App.UI.DOM.appendNewElement("p", frag, ''); $(vignettes).append(slaveVignettes()); } diff --git a/src/facilities/farmyard/reports/farmyardReport.js b/src/facilities/farmyard/reports/farmyardReport.js index dc668f42ec2b0508aa7f9f641a6fc25d0b53dd97..ad7ab1b14a8a35a801e2f7a7d4cae6072cfa2b55 100644 --- a/src/facilities/farmyard/reports/farmyardReport.js +++ b/src/facilities/farmyard/reports/farmyardReport.js @@ -170,6 +170,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport(slave) { } } + // TODO: rewrite? function farmerDick(slave) { const { his, him } = getPronouns(slave); @@ -398,14 +399,12 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport(slave) { farmhandFood(slave); profits += farmhandProfit(slave); - const - { He } = getPronouns(slave), - farmhandContent = App.UI.DOM.appendNewElement("div", slaveEntry, '', "indent"); + const farmhandContent = App.UI.DOM.appendNewElement("div", slaveEntry, '', "indent"); - $(farmhandContent).append(`${He} ${App.SlaveAssignment.workTheFarm(slave, farmerBonus)}`); + $(farmhandContent).append(App.SlaveAssignment.workTheFarm(slave)); $(slaveEntry).append(App.SlaveAssignment.standardSlaveReport(slave, false)); } else { // silently discard return values - App.SlaveAssignment.workTheFarm(slave, farmerBonus); + App.SlaveAssignment.workTheFarm(slave); App.SlaveAssignment.standardSlaveReport(slave, true); } }