diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js index bc6117979dcc14e06ef17a0a195c8e1b5981b64d..aaec17253643d67e5cf65c5985254bc33fd9c8cd 100644 --- a/src/endWeek/saWorkTheFarm.js +++ b/src/endWeek/saWorkTheFarm.js @@ -23,12 +23,13 @@ App.SlaveAssignment.workTheFarm = function (slave) { function fullReport(slave) { - const report = App.UI.DOM.appendNewElement("p", frag, '', "indent"); + const report = App.UI.DOM.appendNewElement("div", frag); let r = []; r.push(intro()); r.push(farmer()); + r.push(farmerEffects(slave)); r.push(devotion(slave)); r.push(muscles(slave)); r.push(weight(slave)); @@ -36,7 +37,10 @@ App.SlaveAssignment.workTheFarm = function (slave) { r.push(sight(slave)); r.push(hearing(slave)); r.push(food(slave)); - r.push(farmerEffects(slave)); + + r.push(slaveShows(slave)); + r.push(longTermEffects(slave)); + r.push(slaveVignettes()); $(report).append(r.join(' ')); } @@ -45,7 +49,25 @@ App.SlaveAssignment.workTheFarm = function (slave) { function farmer() { if (V.Farmer) { - return `${V.Farmer.slaveName} watches over ${him}, making sure that ${he} doesn't slack off and works as hard as ${he} should.`; + return `${S.Farmer.slaveName} watches over ${him}, making sure that ${he} doesn't slack off and works as hard as ${he} should.`; + } + } + + function farmerEffects(slave) { + if (V.Farmer) { + if (slave.devotion < V.FarmerDevotionThreshold) { + slave.devotion += V.FarmerDevotionBonus; + } + + if (slave.devotion < V.FarmerTrustThreshold) { + slave.trust += V.FarmerTrustBonus; + } + + if (slave.health.condition < 100) { + improveCondition(slave, V.FarmerHealthBonus); + } + + return `${getPronouns(S.Farmer).He}'s a tough boss, but a fair one. ${slave.slaveName} benefits from ${his} care while working in ${V.farmyardName}.`; } } @@ -159,26 +181,6 @@ App.SlaveAssignment.workTheFarm = function (slave) { } } - - - function farmerEffects(slave) { - if (V.Farmer) { - if (slave.devotion < V.FarmerDevotionThreshold) { - slave.devotion += V.FarmerDevotionBonus; - } - - if (slave.devotion < V.FarmerTrustThreshold) { - slave.trust += V.FarmerTrustBonus; - } - - if (slave.health.condition < 100) { - improveCondition(slave, V.FarmerHealthBonus); - } - - return `${S.Farmer.slaveName} is a tough boss, but a fair one. ${slave.slaveName} benefits from ${his} care while working in ${V.farmyardName}.`; - } - } - // Open Food Production if (V.foodMarket) { @@ -193,10 +195,10 @@ App.SlaveAssignment.workTheFarm = function (slave) { // Open Shows - if (V.farmyardShows) { - const shows = App.UI.DOM.appendNewElement("p", frag, '', "indent"); - - $(shows).append(App.Facilities.Farmyard.putOnShows(slave)); + function slaveShows(slave) { + if (V.farmyardShows) { + return App.Facilities.Farmyard.putOnShows(slave); + } } // Close Shows @@ -204,8 +206,6 @@ App.SlaveAssignment.workTheFarm = function (slave) { // Open Long-Term Effects function longTermEffects(slave) { - const longTermEffects = App.UI.DOM.appendNewElement("p", frag, '', "indent"); - let r = []; if (slave.fetishKnown && slaveApproves() || slave.energy > 95) { @@ -226,7 +226,7 @@ App.SlaveAssignment.workTheFarm = function (slave) { slave.devotion += 1; } - $(longTermEffects).append(r.join(' ')); + return r; } // Close Long-Term Effects @@ -234,34 +234,36 @@ App.SlaveAssignment.workTheFarm = function (slave) { // Open Vignettes function slaveVignettes() { - const - vignette = GetVignette(slave); + if (V.showVignettes) { + const + vignette = GetVignette(slave); - let r = []; + let r = []; - r.push(`<span class="story-label">This week</span> ${vignette.text}`); + r.push(`<span class="story-label">This week</span> ${vignette.text}`); - if (vignette.type === "cash") { - r.push(vignetteCash(vignette)); - } + if (vignette.type === "cash") { + r.push(vignetteCash(vignette)); + } - if (vignette.type === "devotion") { - r.push(vignetteDevotion(vignette)); - } + if (vignette.type === "devotion") { + r.push(vignetteDevotion(vignette)); + } - if (vignette.type === "trust") { - r.push(vignetteTrust(vignette)); - } + if (vignette.type === "trust") { + r.push(vignetteTrust(vignette)); + } - if (vignette.type === "health") { - r.push(vignetteHealth(vignette)); - } + if (vignette.type === "health") { + r.push(vignetteHealth(vignette)); + } - if (vignette.type === "rep") { - r.push(vignetteReputation(vignette)); - } + if (vignette.type === "rep") { + r.push(vignetteReputation(vignette)); + } - return r.join(' '); + return r.join(' '); + } } function vignetteCash(vignette) { @@ -365,16 +367,9 @@ App.SlaveAssignment.workTheFarm = function (slave) { } } - if (V.showVignettes) { - const vignettes = App.UI.DOM.appendNewElement("p", frag, ''); - - $(vignettes).append(slaveVignettes()); - } - // Close Vignettes fullReport(slave); - longTermEffects(slave); return frag; };