diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js index a9e8dcebdaac2a9b47c4485de8fad4577d6c947f..73d90c0a8e277ea54f3bc1634f180e7b1b777d22 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 3a5f8bf85a3be6001ed6014f5a38f74a65f486fe..8ab249b9e129a88f5032f6b432a0c6c0d207a998 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; - } + }; };