From 4c8bce0a70ffe8cdcbe5e6fd3610523e81fe20f9 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Sat, 27 Jun 2020 00:39:11 -0400
Subject: [PATCH] Added Petite Admiration and Statuesque Glorification FS
---
src/endWeek/saWorkTheFarm.js | 16 +++++++++++
src/facilities/farmyard/farmyardShows.js | 34 +++++++++++++++++-------
2 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index a9e8dcebdaa..73d90c0a8e2 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -341,6 +341,22 @@ App.SlaveAssignment.workTheFarm = function(slave) {
}
}
+ if (arcology.FSPetiteAdmiration !== "unset") {
+ if (heightPass(slave)) {
+ t += `The fact that you are using such small slaves <span class="reputation inc">pleases your citizens</span>. `;
+ } else {
+ t += `The fact that you are using such small slaves <span class="reputation dec">displeases your citizens</span>. `;
+ }
+ }
+
+ if (arcology.FSStatuesqueGlorification !== "unset") {
+ if (heightPass(slave)) {
+ t += `Your citizens <span class="reputation inc">approve</span> of your using such tall slaves for putting on shows. `;
+ } else {
+ t += `Your citizens <span class="reputation dec">disapprove</span> of your using such tall slaves for putting on shows. `;
+ }
+ }
+
// Close FS Subsection
if (setup.entertainmentCareers.includes(slave.career)) {
diff --git a/src/facilities/farmyard/farmyardShows.js b/src/facilities/farmyard/farmyardShows.js
index 3a5f8bf85a3..8ab249b9e12 100644
--- a/src/facilities/farmyard/farmyardShows.js
+++ b/src/facilities/farmyard/farmyardShows.js
@@ -117,15 +117,15 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
}
if (arcology.FSMaturityPreferentialist !== "unset") {
- if (isYoung(slave)) {
- cash *= 0.8;
- } else {
+ if (!isYoung(slave)) {
cash *= 1.2;
+ } else {
+ cash *= 0.8;
}
}
if (arcology.FSSlimnessEnthusiast !== "unset") {
- if (!isSlim(slave)) {
+ if (!slimLawPass(slave)) {
cash *= 0.9;
}
}
@@ -152,17 +152,17 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
}
if (arcology.FSPhysicalIdealist !== "unset") { // TODO: check for musculature?
- if (heightPass(slave)) { // slave is tall or taller
+ if (genderLawPass(slave)) {
cash *= 1.1;
- } else if (!heightPass) { // slave is short or shorter
+ } else {
cash *= 0.9;
}
}
if (arcology.FSHedonisticDecadence !== "unset") {
- if (!isSlim(slave)) {
+ if (!isSlim(slave)) { // TODO: does isSlim() make sense here?
cash *= 1.1;
- } else if (isSlim(slave)) {
+ } else {
cash *= 0.9;
}
}
@@ -173,6 +173,22 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
}
}
+ if (arcology.FSPetiteAdmiration !== "unset") {
+ if (heightPass(slave)) {
+ cash *= 1.1;
+ } else {
+ cash *= 0.9;
+ }
+ }
+
+ if (arcology.FSStatuesqueGlorification !== "unset") {
+ if (heightPass(slave)) {
+ cash *= 1.1;
+ } else {
+ cash *= 0.9;
+ }
+ }
+
// TODO: should I add the ancient cultures FS?
/* CLOSE FS EFFECTS */
@@ -276,5 +292,5 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
}
// TODO: tie in quirks and flaws
return cash;
- }
+ };
};
--
GitLab