diff --git a/src/facilities/farmyard/reports/farmyardReport.js b/src/facilities/farmyard/reports/farmyardReport.js index a0a1ebd8ebdde396e489e380d8542802b248cc14..4fa80ad728d4b404142d29d5aed47b12bb45b1da 100644 --- a/src/facilities/farmyard/reports/farmyardReport.js +++ b/src/facilities/farmyard/reports/farmyardReport.js @@ -442,16 +442,15 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { // MARK: Farmyard const farmyardStatsRecords = () => { - // TODO: check over these setters and remove those we don't need const f = V.facility.farmyard; if (typeof f === "undefined") { return; } + f.farmhandIncome = 0; f.customers = 0; f.farmhandCosts = 0; f.rep = 0; - f.adsCosts = V.farmyardAdsSpending; f.maintenance = V.farmyard * V.facilityCost; f.totalIncome = f.farmhandIncome + f.adsIncome; f.totalExpenses = f.farmhandCosts + f.maintenance; @@ -476,7 +475,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { r.push(`${V.farmyardNameCaps}'s customer's enjoyed`); - if (V.seeBestiality && V.farmyardShows > 0 && (V.canines.length || V.hooved.length || V.felines.length)) { + if (V.seeBestiality && V.farmyardShows > 0 && (V.canines || V.hooved || V.felines)) { r.push(`<span class="green">watching farmhands fuck animals in ${V.farmyardDecoration} surroundings.</span>`); } else if (V.farmyardShows) { r.push(`<span class="green">watching farmhands put on shows in ${V.farmyardDecoration} surroundings.</span>`); @@ -490,24 +489,32 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() { return r; }; - const farmyardProfit = (profit, foodWeek) => { + const farmyardProfit = (profit, food) => { + const profitContent = App.UI.DOM.appendNewElement("p", frag, '', "indent"); + let r = []; - if (profit || foodWeek) { - r.push(`<br><br>${V.farmyardNameCaps}`); + $(profitContent).append(document.createElement("br")); + + if (profit || food) { + r.push(V.farmyardNameCaps); + if (profit) { r.push(`makes you <span class="yellowgreen">${cashFormat(Math.trunc(profit))}</span>`); } - if (profit && foodWeek && V.foodMarket) { - r.push(` and `); - } - if (foodWeek && V.foodMarket) { - r.push(`produced <span class="chocolate"> ${massFormat(foodWeek)}</span> of food`); + + if (V.foodMarket) { + if (profit && food) { + r.push(` and `); + } + if (food) { + r.push(`produced <span class="chocolate"> ${massFormat(food)}</span> of food`); + } } r.push(` this week.`); } - return r; + return $(profitContent).append(r.join(' ')); }; // FIXME: no idea what I'm doing here