From ccb90041d0bbc77320561c65094f7a30bb395059 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Sat, 20 Jun 2020 20:09:17 -0400
Subject: [PATCH] Bugfix, styling
---
src/endWeek/saWorkTheFarm.js | 16 ++++-----
src/facilities/farmyard/showsIncome.js | 50 +++++++++++++++++++++-----
2 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index 17eba531d85..a9e8dcebdaa 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -5,7 +5,7 @@
App.SlaveAssignment.workTheFarm = function(slave) {
const arcology = V.arcologies[0];
const {
- he, him, his, He, His
+ he, him, his, hers, He, His
} = getPronouns(slave),
incomeStats = getSlaveStatisticData(slave, V.facility.farmyard);
@@ -146,7 +146,7 @@ App.SlaveAssignment.workTheFarm = function(slave) {
if (V.Farmer) {
// TODO: keep oral check? replace with something else?
- t += `While there, ${he} benefits from ${V.Farmer.slaveName}'s ${V.Farmer.physicalAge < 21 ? `youthful energy` : `care`} ${V.Farmer.skill.oral ? ` and talented tongue` : ``}.`;
+ t += `While there, ${he} benefits from ${V.Farmer.slaveName}'s ${V.Farmer.physicalAge < 21 ? `youthful energy` : `care`} ${V.Farmer.skill.oral ? ` and talented tongue` : ``}. `;
if (slave.devotion < V.FarmerDevotionThreshold) {
slave.devotion += V.FarmerDevotionBonus;
}
@@ -220,14 +220,12 @@ App.SlaveAssignment.workTheFarm = function(slave) {
}
}
if (arcology.FSGenderFundamentalist !== "unset") {
- if (slave.pregWeek > 16) {
- t += `${His} viewers <span class="green">approve</span> of the fact that ${he} is sporting a baby bump. `;
+ if (slave.pregWeek > 16 || setup.fakeBellies.includes(slave.bellyAccessory)) {
+ t += `${His} viewers <span class="green">approve</span> of the fact that ${he} is sporting a baby bump${setup.fakeBellies.includes(slave.bellyAccessory)
+ ? `, even though ${hers} isn't real`
+ : ``}. `;
} else {
- if (setup.fakeBellies.includes(slave.bellyAccessory)) {
- t += `${His} viewers can't tell ${his} pregnant belly isn't real, luckily enough for ${him}. `;
- } else {
- t += `${His} viewers <span class="red">are disappointed</span> that ${he} isn't pregnant. `;
- }
+ t += `${His} viewers <span class="red">are disappointed</span> that ${he} isn't pregnant. `;
}
if (slave.dick > 0) {
// TODO: something here?
diff --git a/src/facilities/farmyard/showsIncome.js b/src/facilities/farmyard/showsIncome.js
index 8189fc3876b..ffa7e7a706d 100644
--- a/src/facilities/farmyard/showsIncome.js
+++ b/src/facilities/farmyard/showsIncome.js
@@ -22,6 +22,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
repX(-10, "food"); // TODO: should this cause a rep loss
}
}
+
if (arcology.FSSubjugationist !== "unset") {
if (slave.race === arcology.FSSubjugationistRace) { // slave is of subjugated race
cash *= 1.1;
@@ -30,6 +31,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 0.9; // TODO: should unsubjugated race slaves receive a penalty?
}
}
+
if (arcology.FSRepopulationFocus !== "unset") {
if (slave.pregWeek > 16) { // slave is visibly pregnant
if (slave.eggType !== "human") { // with a non-human
@@ -40,6 +42,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 0.8; // TODO: should non-pregnant slaves receive a penalty?
}
}
+
if (arcology.FSRestart !== "unset") {
if (slave.pregWeek > 16) { // slave is visibly pregnant
if (slave.eggType !== "human") { // with a non-human
@@ -50,6 +53,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
repX(-10, "food");
}
}
+
if (arcology.FSGenderRadicalist !== "unset") {
if (slave.dick > 0) { // TODO: does this make sense?
cash *= 1.1;
@@ -57,13 +61,12 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 0.8;
}
}
+
if (arcology.FSGenderFundamentalist !== "unset") {
- if (slave.pregWeek > 16) {
+ if (slave.pregWeek > 16 || setup.fakeBellies.includes(slave.bellyAccessory)) {
cash *= 1.1;
} else {
- if (!setup.fakeBellies.includes(slave.bellyAccessory)) {
- cash *= 0.9;
- }
+ cash *= 0.9;
}
if (slave.dick > 0) {
@@ -72,6 +75,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 0.8;
}
}
+
if (arcology.FSPaternalist !== "unset") {
if (V.seeBestiality) {
if (V.farmyardBreeding === 1) { // slaves are being bred
@@ -81,6 +85,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
}
}
}
+
if (arcology.FSDegradationist !== "unset") {
if (V.seeBestiality) {
if (V.farmyardBreeding === 1) { // slaves are being bred
@@ -90,6 +95,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
}
}
}
+
if (arcology.FSBodyPurist !== "unset") {
if (slave.boobsImplant > 0) { // slave has breast implants
cash *= 0.9;
@@ -104,6 +110,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 0.9;
}
}
+
if (arcology.FSTransformationFetishist !== "unset") {
if (slave.boobsImplant > 0) { // slave has breast implants
cash *= 1.1;
@@ -118,6 +125,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 1.1;
}
}
+
if (arcology.FSYouthPreferentialist !== "unset") {
if (slave.visualAge > 25) { // slave looks older than 25
cash *= 0.8; // TODO: not sure what age this should be
@@ -125,6 +133,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 1.2;
}
}
+
if (arcology.FSMaturityPreferentialist !== "unset") {
if (slave.visualAge > 25) { // slave looks older than 25
cash *= 1.2; // TODO: not sure what age this should be
@@ -132,6 +141,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 0.8;
}
}
+
if (arcology.FSSlimnessEnthusiast !== "unset") {
if (slave.weight > 10) { // slave is curvy or more
cash *= 0.9; // TODO: not sure what weight this should be
@@ -143,6 +153,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 0.9;
}
}
+
if (arcology.FSAssetExpansionist !== "unset") {
if (slave.weight > 10) { // slave is curvy or more
cash *= 1.1; // TODO: not sure what weight this should be
@@ -154,6 +165,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 1.1;
}
}
+
if (arcology.FSPastoralist !== "unset") {
if (slave.boobs > 799) { // slave has larger than a D cup
cash *= 1.2;
@@ -162,6 +174,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 1.1;
}
}
+
if (arcology.FSPhysicalIdealist !== "unset") {
if (slave.height > 169) { // slave is tall or taller
cash *= 1.1;
@@ -169,6 +182,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 0.9;
}
}
+
if (arcology.FSHedonisticDecadence !== "unset") {
if (slave.weight > 10) { // slave is curvy or fatter
cash *= 1.1;
@@ -176,11 +190,13 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
cash *= 0.9;
}
}
+
if (arcology.FSChattelReligionist !== "unset") { // TODO: I don't know what to put for this one
if (slave.devotion < 21) { // if slave is careful or less
cash *= 0.9;
}
}
+
// TODO: should I add the ancient cultures FS?
/* CLOSE FS EFFECTS */
@@ -189,6 +205,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
} else if (setup.farmerCareers.includes(slave.career)) {
cash *= 1.1;
}
+
if (slave.prestige === 1) { // slave is prestigious
cash *= 1.1;
} else if (slave.prestige === 2) { // slave is very prestigious
@@ -196,13 +213,15 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
} else if (slave.prestige === 3) { // slave is extremely prestigious
cash *= 1.3;
}
+
if (slave.porn.prestige === 1) { // slave is prestigious from porn
cash *= 1.1;
- } else if (slave.porn.prestige === 2) { // slave is very prestigious from porn
+ } else if (slave.porn.prestige === 2) { // slave is very prestigious from porn
cash *= 1.2;
- } else if (slave.porn.prestige === 3) { // slave is extremely prestigious from porn
+ } else if (slave.porn.prestige === 3) { // slave is extremely prestigious from porn
cash *= 1.3;
- } // TODO: add relationship checks
+ }
+ // TODO: add relationship checks
if (slave.face > 40) { // slave is beautiful or more
cash *= 1.3;
} else if (slave.face > 10) { // slave is very pretty or more
@@ -212,47 +231,58 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
} else if (slave.face < -40) { // slave is less than ugly
cash *= 0.7;
}
+
if (slave.devotion > 50) { // slave is devoted or more
cash *= 1.1;
} else if (slave.devotion < -50) { // slave is reluctant or less
cash *= 0.8;
}
+
if (slave.trust > 50) { // slave is trusting or more
cash *= 1.1;
} else if (slave.trust < -50) { // slave is less than frightened
cash *= 0.8; // TODO: should trust be a factor?
}
+
if (slave.weight > 30) { // slave is curvy or more
cash *= 0.8; // TODO: tie in Hedonistic FS
} else if (slave.weight < -30) { // slave is very thin or less
cash *= 0.8; // TODO: put this on a scale
}
+
if (slave.muscles > 30) { // slave is muscular or more
cash *= 0.9; // TODO: tie in height eugenics policy
} else if (slave.muscles < -30) { // slave is very weak or less
cash *= 0.9; // TODO: should this be on a scale?
}
+
if (!canSeePerfectly(slave)) { // slaves eyesight is nearsighted or worse
cash *= 0.9; // TODO: should nearsighted and blind slaves receive a penalty?
}
+
if (slave.hears < 0) { // slave is hard of hearing or less
cash *= 0.9; // TODO: should hard of hearing slaves receive a penalty?
}
+
if (slave.boobs > 800) { // slave has a DD cup or bigger
cash *= 0.9; // TODO: would this make sense?
}
+
if (slave.butt > 4) { // slave has an enormous butt or bigger
cash *= 0.9; // TODO: would this make sense?
}
+
if (slave.preg > 10) { // slave is pregnant and showing
cash *= 0.8; // TODO: not sure how to incorporate pregnancy
- } // TODO: incorporate skills
+ }
+ // TODO: incorporate skills
cash *= healthPenalty(slave);
if (slave.intelligence > 50) { // slave is very smart or better
cash *= 1.1;
} else if (slave.intelligence < -50) { // slave is very slow or less
cash *= 0.8;
}
+
if (slave.energy <= 20) { // slave has no sex drive
cash *= 0.7;
} else if (slave.energy <= 40) { // slave has poor sex drive
@@ -266,13 +296,15 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
} else { // slave is a nymphomaniac
cash *= 1.3;
}
+
if (slave.fetish === "submissive") {
cash *= 1.1;
} else if (slave.fetish === "humiliation") {
cash *= 1.1;
} else if (slave.fetish === "masochist") {
cash *= 1.1;
- } // TODO: tie in quirks and flaws
+ }
+ // TODO: tie in quirks and flaws
return cash;
}
};
--
GitLab