From b3a8d7080a18cee8552c94bb1c6cf22283f59053 Mon Sep 17 00:00:00 2001
From: DCoded <dicoded@email.com>
Date: Tue, 18 May 2021 09:26:28 -0400
Subject: [PATCH] Farmyard report fixes
---
src/endWeek/reports/farmyardReport.js | 51 ++++++++++++++-------------
1 file changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/endWeek/reports/farmyardReport.js b/src/endWeek/reports/farmyardReport.js
index 213025c4c2c..389fdb27dfa 100644
--- a/src/endWeek/reports/farmyardReport.js
+++ b/src/endWeek/reports/farmyardReport.js
@@ -11,15 +11,17 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
- // MARK: Farmer
+ // Farmer
function farmerChanges() {
- farmerHealth(Farmer);
- farmerDevotion(Farmer);
- farmerTrust(Farmer);
- farmerLivingRules(Farmer);
- farmerRestRules(Farmer);
- farmerCashBonus(Farmer);
+ if (Farmer) {
+ farmerHealth(Farmer);
+ farmerDevotion(Farmer);
+ farmerTrust(Farmer);
+ farmerLivingRules(Farmer);
+ farmerRestRules(Farmer);
+ farmerCashBonus(Farmer);
+ }
}
function farmerHealth(slave) {
@@ -125,9 +127,9 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
const {he, his, himself, He} = getPronouns(slave);
if (fetish === 1) {
- return `${He} isn't above sampling the merchandise ${himself}; before long it's obvious to ${his} workers that ${he} <span class="lightcoral">really likes fucking them.</span> `;
+ return `${He} isn't above sampling the merchandise ${himself}; before long it's obvious to ${his} workers that ${he} <span class="fetish gain">really likes fucking them.</span> `;
} else if (fetish === 2) {
- return `${He}'s careful that all of the farmhands under ${his} supervision are all ready to work every morning, and ${he} <span class="lightsalmon">becomes more dominant.</span> `;
+ return `${He}'s careful that all of the farmhands under ${his} supervision are all ready to work every morning, and ${he} <span class="fetish inc">becomes more dominant.</span> `;
}
}
@@ -139,13 +141,13 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
if (slave.skill.farmer <= 10) {
r.push(`Though ${slave.slaveName} does ${his} best to manage the farmyard, with ${his} lack of skill ${he} can do little.`);
} else if (slave.skill.farmer <= 30) {
- r.push(`${slave.slaveName}'s basic skills marginally <span class="yellowgreen">improve</span> business at ${V.farmyardName}.`);
+ r.push(`${slave.slaveName}'s basic skills marginally <span class="cash">improve</span> business at ${V.farmyardName}.`);
} else if (slave.skill.farmer <= 60) {
- r.push(`${slave.slaveName}'s skills <span class="yellowgreen">improve</span> business at ${V.farmyardName}.`);
+ r.push(`${slave.slaveName}'s skills <span class="cash">improve</span> business at ${V.farmyardName}.`);
} else if (slave.skill.farmer < 100) {
- r.push(`${slave.slaveName}'s skills greatly <span class="yellowgreen">improve</span> business at ${V.farmyardName}.`);
+ r.push(`${slave.slaveName}'s skills greatly <span class="cash">improve</span> business at ${V.farmyardName}.`);
} else {
- r.push(`${slave.slaveName}'s mastery immensely <span class="yellowgreen">improves</span> business at ${V.farmyardName}.`);
+ r.push(`${slave.slaveName}'s mastery immensely <span class="cash">improves</span> business at ${V.farmyardName}.`);
}
if (slave.actualAge > 35) {
@@ -217,9 +219,9 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
let seed = V.farmyardShowgirls ? App.Facilities.Farmyard.farmShowsIncome(slave) : jsRandom(1, 10) * (jsRandom(150, 170) + (farmerBonus * 10));
if (V.farmyardShows && !V.farmyardShowgirls) {
- r.push(`<p class="indent">Since ${he} doesn't have enough showgirls to entertain your arcology's citizens, ${he} puts on shows with your animals on ${his} own, earning <span class="yellowgreen">${cashFormat(seed)}.</span></p>`);
+ r.push(`<p class="indent">Since ${he} doesn't have enough showgirls to entertain your arcology's citizens, ${he} puts on shows with your animals on ${his} own, earning <span class="cash">${cashFormat(seed)}.</span></p>`);
} else if (!V.farmyardFarmers) {
- r.push(`<p class="indent">Since ${V.farmyardName} doesn't have anyone tending to the crops, ${he} looks after them ${himself}, earning <span class="yellowgreen">${cashFormat(seed)}.</span></p>`);
+ r.push(`<p class="indent">Since ${V.farmyardName} doesn't have anyone tending to the crops, ${he} looks after them ${himself}, earning <span class="cash">${cashFormat(seed)}.</span></p>`);
}
return r;
@@ -257,7 +259,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
if (V.showEWD) {
const farmerEntry = App.UI.DOM.appendNewElement("div", frag, '', "slave-report");
App.SlaveAssignment.appendSlaveArt(farmerEntry, Farmer);
- App.SlaveAssignment.appendSlaveLinks(farmerEntry, slave);
+ App.SlaveAssignment.appendSlaveLinks(farmerEntry, Farmer);
$(farmerEntry).append(`<span class="slave-name">${SlaveFullName(Farmer)}</span> is serving as the Farmer.`);
farmerEntry.append(App.SlaveAssignment.standardSlaveReport(Farmer, false));
} else {
@@ -270,7 +272,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
- // MARK: Farmhands
+ // Farmhands
function farmhandCount(count) {
return `<strong>There ${count > 1 ? `are ${count} farmhands` : `is one farmhand`} working out of ${V.farmyardName}.</strong>`;
@@ -278,7 +280,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
function farmhandLivingRules(slave) {
switch (V.farmyardDecoration) {
- case 'Degradation':
+ case 'Degradationist':
case 'standard':
slave.rules.living = 'spare';
break;
@@ -383,7 +385,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
- // MARK: Menials
+ // Menials
if (V.farmMenials) {
let farmMenialProductivity = 9;
@@ -409,7 +411,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
- // MARK: Farmyard
+ // Farmyard
function farmyardStatsRecords() {
const f = V.facility.farmyard;
@@ -448,11 +450,11 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
r.push(`${farmyardNameCaps}'s customer's enjoyed`);
if (V.seeBestiality && V.policies.bestialityOpenness && (V.canine || V.hooved || V.feline)) {
- r.push(`<span class="green">watching farmhands fuck animals in ${V.farmyardDecoration} surroundings.</span>`);
+ r.push(`<span class="reputation inc">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>`);
+ r.push(`<span class="reputation inc">watching farmhands put on shows in ${V.farmyardDecoration} surroundings.</span>`);
} else {
- r.push(`<span class="green">partaking of ${V.farmyardName}'s fine produce in its ${V.farmyardDecoration} décor.</span>`);
+ r.push(`<span class="reputation inc">partaking of ${V.farmyardName}'s fine produce in its ${V.farmyardDecoration} décor.</span>`);
}
$(decorationEffects).append(r.join(' '));
@@ -473,7 +475,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
r.push(farmyardNameCaps);
if (profit) {
- r.push(`makes you <span class="yellowgreen">${cashFormat(Math.trunc(profit))}</span>`);
+ r.push(`makes you <span class="cash">${cashFormat(Math.trunc(profit))}</span>`);
}
if (V.foodMarket) {
@@ -490,7 +492,6 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
return $(profitContent).append(r.join(' '));
}
- // FIXME: no idea what I'm doing here
const statsSpan = document.createElement("span");
farmyardStatsRecords();
--
GitLab