From 2146f41b317dd971bad66889705f808f1a2d8c9c Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Sat, 8 Feb 2020 21:11:43 -0500
Subject: [PATCH] Minor changes
---
src/endWeek/saWorkTheFarm.js | 2 +-
src/facilities/farmyard/farmyard.tw | 2 +-
src/facilities/farmyard/farmyardWidgets.js | 12 +++++++-----
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index 061fff2ce4e..9cc6970d05c 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 08f2e69cec8..a9660ae3b45 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 66da9e9393f..40946fe2744 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);
--
GitLab