diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js index 061fff2ce4e389cf5fc8c9c332ef536cb5138e90..9cc6970d05c70acbe7bb52a829e518e4fef49c1b 100644 --- a/src/endWeek/saWorkTheFarm.js +++ b/src/endWeek/saWorkTheFarm.js @@ -23,7 +23,7 @@ window.saWorkTheFarm = function(slave) { t += foodSight(slave); t += foodHearing(slave); - t += `As a result, ${he} produces <span class="chocolate">${massFormat(food)}</span> of food over the week. `; + t += V.foodMarket ? `As a result, ${he} produces <span class="chocolate">${massFormat(food)}</span> of food over the week. ` : ``; }; const foodFarmer = () => { diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw index 08f2e69cec82d6968f2dc4be6c313708d27a62ed..a9660ae3b456dcc824adf12de27d09e2db3f9573 100644 --- a/src/facilities/farmyard/farmyard.tw +++ b/src/facilities/farmyard/farmyard.tw @@ -105,7 +105,7 @@ </div> </div> <span id="menials"> -<br><br><br> +<br> <<if $farmMenials > 0>> Assigned here are $farmMenials slaves working to produce as much food as possible. <</if>> diff --git a/src/facilities/farmyard/farmyardWidgets.js b/src/facilities/farmyard/farmyardWidgets.js index 66da9e9393fd05ab32a4d4b15615b9e04f74ea11..40946fe274441511839eeb4231640906b68629aa 100644 --- a/src/facilities/farmyard/farmyardWidgets.js +++ b/src/facilities/farmyard/farmyardWidgets.js @@ -186,8 +186,6 @@ App.Facilities.Farmyard.farmyardReport = () => { }; const farmerEndWeek = slave => { - V.i = FLs; - let t = ``; if (V.showEWD) { @@ -343,7 +341,7 @@ App.Facilities.Farmyard.farmyardReport = () => { const farmhandEnergy = slave => slave.energy > 40 && slave.energy < 95 ? slave.energy++ : null; - // farmyard + // FARMYARD const farmyardStatsRecords = () => { // TODO: check over these setters and remove those we don't need @@ -397,10 +395,10 @@ App.Facilities.Farmyard.farmyardReport = () => { if (profit) { t += `makes you <span class="yellowgreen">${cashFormat(Math.trunc(profit))}</span>`; } - if (profit && foodWeek) { + if (profit && foodWeek && V.foodMarket) { t += ` and `; } - if (foodWeek) { + if (foodWeek && V.foodMarket) { t += `produced <span class="chocolate"> ${massFormat(foodWeek)}</span> of food`; } t += ` this week. `; @@ -414,6 +412,10 @@ App.Facilities.Farmyard.farmyardReport = () => { t += `<span id="farmyardstats"></span>`; SlaveSort.IDs(V.FarmyardiIDs); // TODO: not sure if I called this correctly + + + // MAIN LOOP + if (Farmer) { t += farmerHealth(Farmer); t += farmerDevotion(Farmer);