From f1514e49735500278c5dd67711c33c46fe179aa7 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Fri, 10 Jul 2020 00:42:39 -0400
Subject: [PATCH] Combined Farmer functions
---
src/endWeek/saWorkTheFarm.js | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index aaec1725364..23650145849 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -28,8 +28,7 @@ App.SlaveAssignment.workTheFarm = function (slave) {
let r = [];
r.push(intro());
- r.push(farmer());
- r.push(farmerEffects(slave));
+ r.push(farmer(slave));
r.push(devotion(slave));
r.push(muscles(slave));
r.push(weight(slave));
@@ -47,13 +46,9 @@ App.SlaveAssignment.workTheFarm = function (slave) {
const intro = () => `${He} works as a farmhand this week.`;
- function farmer() {
- if (V.Farmer) {
- return `${S.Farmer.slaveName} watches over ${him}, making sure that ${he} doesn't slack off and works as hard as ${he} should.`;
- }
- }
+ function farmer(slave) {
+ const F = getPronouns(S.Farmer);
- function farmerEffects(slave) {
if (V.Farmer) {
if (slave.devotion < V.FarmerDevotionThreshold) {
slave.devotion += V.FarmerDevotionBonus;
@@ -67,7 +62,7 @@ App.SlaveAssignment.workTheFarm = function (slave) {
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}.`;
+ return `${S.Farmer.slaveName} watches over ${him}, making sure that ${he} doesn't slack off and works as hard as ${he} should. ${F.He}'s a tough boss, but a fair one. ${slave.slaveName} benefits from ${F.his} care while working in ${V.farmyardName}.`;
}
}
--
GitLab