From 0c7d7c2b883612b7eee51e1e4ea08e9a8dc43ff4 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Mon, 27 Jul 2020 23:07:48 -0400
Subject: [PATCH] Removed unused variables
---
src/endWeek/saNanny.js | 14 ++------------
src/endWeek/saWorkTheFarm.js | 27 ++++++++-------------------
src/facilities/farmyard/farmyard.js | 8 ++++++++
3 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/src/endWeek/saNanny.js b/src/endWeek/saNanny.js
index 9b95fc3d0e2..f0f50025b64 100644
--- a/src/endWeek/saNanny.js
+++ b/src/endWeek/saNanny.js
@@ -3,8 +3,8 @@
* @returns {string}
*/
- // TODO: redo this
-App.SlaveAssignment.nanny = function(slave) {
+// TODO: redo this
+App.SlaveAssignment.nanny = function (slave) {
const
{ he, him, his, He, His } = getPronouns(slave),
child = `child${V.nurseryBabies > 0 ? `ren` : ``}`;
@@ -265,16 +265,6 @@ App.SlaveAssignment.nanny = function(slave) {
t += ` and talented tongue`;
}
t += `. `;
- /* TODO: farmer is often not set and makes no sense here. What should this be? LCD.
- if (slave.devotion < V.FarmerDevotionThreshold) {
- slave.devotion += V.FarmerDevotionBonus;
- }
- if (slave.devotion < V.FarmerTrustThreshold) {
- slave.trust += V.FarmerTrustBonus;
- }
- if (slave.condition < 100) {
- improveCondition(slave, V.FarmerHealthBonus);
- }*/
}
return t;
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index ff5d6f7a9ef..de41012df65 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -43,25 +43,14 @@ App.SlaveAssignment.workTheFarm = function (slave) {
const intro = () => `${He} works as a farmhand this week.`;
- function farmer(slave) {
- const F = getPronouns(S.Farmer);
-
- if (S.Farmer) {
- if (slave.devotion < V.FarmerDevotionThreshold) {
- slave.devotion += V.FarmerDevotionBonus;
- }
-
- if (slave.devotion < V.FarmerTrustThreshold) {
- slave.trust += V.FarmerTrustBonus;
- }
-
- if (slave.health.condition < 100) {
- improveCondition(slave, V.FarmerHealthBonus);
- }
-
- 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}.`;
- }
- }
+ // function farmer(slave) {
+ // TODO: update this with devotion and health effects
+ // const F = getPronouns(S.Farmer);
+
+ // if (S.Farmer) {
+ // 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}.`;
+ // }
+ // }
function devotion(slave) {
if (slave.devotion > 50) {
diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index 787d3478c38..29d0885fd13 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -4,6 +4,14 @@ App.Facilities.Farmyard.clearAnimalsBought = function () {
}
};
+App.Facilities.Farmyard.rules = function () {
+ const frag = new DocumentFragment();
+
+ if (V.farmyardShows && (V.canines || V.hooved || V.felines)) {
+
+ }
+};
+
App.Facilities.Farmyard.upgrades = function () {
const frag = new DocumentFragment(),
--
GitLab