From 4d7426007ff059f4e4718e6aae4e3c63df3213b1 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Mon, 29 Jun 2020 01:03:43 -0400
Subject: [PATCH] Text fixes and changes
---
src/endWeek/saWorkTheFarm.js | 113 +++++++++++++----------------------
1 file changed, 43 insertions(+), 70 deletions(-)
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index 639efbbb14f..96d966a1a76 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -69,7 +69,7 @@ App.SlaveAssignment.workTheFarm = function(slave) {
let r = [];
if (slave.health.illness > 0 || slave.health.tired > 60) {
- r.push(`${He} performed worse this week due to<span class="red">`);
+ r.push(`${He} performed worse this week due to<span class="reputation dec">`);
if (slave.health.illness === 1) {
r.push(`feeling under the weather`);
} else if (slave.health.illness === 2) {
@@ -101,14 +101,14 @@ App.SlaveAssignment.workTheFarm = function(slave) {
const tired = slave => {
if (!slave.fuckdoll) {
if (slaveResting(slave)) {
- return `${He} spends reduced hours working the soil in order to <span class="green">offset ${his} lack of rest.</span>`;
+ return `${He} spends reduced hours working the soil in order to <span class="reputation inc">offset ${his} lack of rest.</span>`;
} else if (slave.health.tired + 20 >= 90 && !willWorkToDeath(slave)) {
slave.devotion -= 10; // FIXME: move this
slave.trust -= 5; // FIXME: move this
- return `${He} attempts to refuse work due to ${his} exhaustion, but can do little to stop it or the resulting <span class="trust dec">severe punishment.</span> ${He} <span class="devotion dec">purposefully underperforms,</span> choosing ${his} overall well-being over the consequences, <span class="red">greatly reducing yields.</span>`;
+ return `${He} attempts to refuse work due to ${his} exhaustion, but can do little to stop it or the resulting <span class="trust dec">severe punishment.</span> ${He} <span class="devotion dec">purposefully underperforms,</span> choosing ${his} overall well-being over the consequences, <span class="reputation dec">greatly reducing yields.</span>`;
} else {
- return `Hours of manual labor quickly add up, leaving ${him} <span class="red">physically drained</span> by the end of the day.`;
+ return `Hours of manual labor quickly add up, leaving ${him} <span class="reputation dec">physically drained</span> by the end of the day.`;
}
}
};
@@ -193,52 +193,52 @@ App.SlaveAssignment.workTheFarm = function(slave) {
// Open FS Subsection
if (arcology.FSSupremacist !== "unset") {
- if (slave.race === arcology.FSSupremacistRace) {
- r.push(`Society <span class="red">disapproves</span> of your allowing a member of the elite race to be degraded in such a fashion, and thus ${he} didn't earn as much.`);
+ if (isSuperiorRace(slave)) {
+ r.push(`Society <span class="reputation dec">disapproves</span> of your allowing a member of the elite race to be degraded in such a fashion, and thus ${he} didn't earn as much.`);
}
}
if (arcology.FSSubjugationist !== "unset") {
- if (slave.race === arcology.FSSubjugationistRace) {
- r.push(`Society <span class="green">approves</span> of the degradation you submit your ${arcology.FSSubjugationistRace} slaves to, and so ${he} earns you a bit more.`);
+ if (isInferiorRace(slave)) {
+ r.push(`Society <span class="reputation inc">approves</span> of the degradation you submit your ${arcology.FSSubjugationistRace} slaves to, and so ${he} earns you a bit more.`);
} else {
r.push(`Society doesn't disapprove of ${him} not being ${arcology.FSSubjugationistRace}, but ${he} doesn't earn as much as ${he} would if ${he} was.`);
}
}
if (arcology.FSRepopulationFocus !== "unset") {
- if (slave.pregWeek > 16) {
+ if (isPreg(slave)) {
if (slave.eggType !== "human") {
- r.push(`Society is <span class="red">disgusted</span> by ${his} pregnancy when they realize that what it is in ${his} womb is not human.`);
+ r.push(`Society is <span class="reputation dec">disgusted</span> by ${his} pregnancy when they realize that what it is in ${his} womb is not human.`);
} else {
- r.push(`Society <span class="green">greatly approves</span> of your having pregnant slaves ${V.seeBestiality ? `have sex` : `put on shows`} with animals.`);
+ r.push(`Society <span class="reputation inc">greatly approves</span> of your having pregnant slaves ${V.seeBestiality ? `have sex` : `put on shows`} with animals.`);
}
}
}
if (arcology.FSRestart !== "unset") {
- if (slave.pregWeek > 16) {
+ if (isPreg(slave)) {
if (slave.eggType !== "human") {
r.push(`Society is disgusted by ${his} pregnancy until they learn that what is in ${his} womb is not human.`);
} else {
- r.push(`Society is <span class="red">extremely disgusted</span> by ${his} pregnancy and the fact that you would have ${him} ${V.seeBestiality ? `have sex` : `put on shows`} with animals while sporting a baby bump.`);
+ r.push(`Society is <span class="reputation dec">extremely disgusted</span> by ${his} pregnancy and the fact that you would have ${him} ${V.seeBestiality ? `have sex` : `put on shows`} with animals while sporting a baby bump.`);
}
}
}
if (arcology.FSGenderRadicalist !== "unset") {
if (slave.dick > 0) {
- r.push(`${His} patrons <span class="green">approve</span> of the fact that ${he} has a dick.`);
+ r.push(`${His} patrons <span class="reputation inc">approve</span> of the fact that ${he} has a dick.`);
} else {
- r.push(`${His} patrons <span class="red">are disappointed</span> that ${he} doesn't have a dick.`);
+ r.push(`${His} patrons <span class="reputation dec">are disappointed</span> that ${he} doesn't have a dick.`);
}
}
if (arcology.FSGenderFundamentalist !== "unset") {
- if (slave.pregWeek > 16 || setup.fakeBellies.includes(slave.bellyAccessory)) {
- r.push(`${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` : ``}.`);
+ if (isPreg(slave) || setup.fakeBellies.includes(slave.bellyAccessory)) {
+ r.push(`${His} viewers <span class="reputation inc">approve</span> of the fact that ${he} is sporting a baby bump${setup.fakeBellies.includes(slave.bellyAccessory) ? `, even though ${hers} isn't real` : ``}.`);
} else {
- r.push(`${His} viewers <span class="red">are disappointed</span> that ${he} isn't pregnant.`);
+ r.push(`${His} viewers <span class="reputation dec">are disappointed</span> that ${he} isn't pregnant.`);
}
if (slave.dick > 0) {
// TODO: something here?
@@ -247,89 +247,63 @@ App.SlaveAssignment.workTheFarm = function(slave) {
if (arcology.FSPaternalist !== "unset") {
if (V.seeBestiality && V.farmyardBreeding) {
- r.push(`Your citizens are <span class="red">very disapproving</span> of the fact that you would allow something as degrading as having your slaves be knocked up by filthy beasts.`);
+ r.push(`Your citizens are <span class="reputation dec">very disapproving</span> of the fact that you would allow something as degrading as having your slaves be knocked up by filthy beasts.`);
} else {
- r.push(`Your citizens <span class="red">disapprove</span> of the fact that you would allow your slaves to be degraded in such a manner.`);
+ r.push(`Your citizens <span class="reputation dec">disapprove</span> of the fact that you would allow your slaves to be degraded in such a manner.`);
}
}
if (arcology.FSDegradationist !== "unset") {
if (V.seeBestiality && V.farmyardBreeding) {
- r.push(`Your citizens are <span class="green">very approving</span> of the fact that you would allow something as degrading as having your slaves be knocked up by filthy beasts.`);
+ r.push(`Your citizens are <span class="reputation inc">very approving</span> of the fact that you would allow something as degrading as having your slaves be knocked up by filthy beasts.`);
} else {
- r.push(`Your citizens <span class="green">approve</span> of the fact that you would allow your slaves to be degraded in such a manner.`);
+ r.push(`Your citizens <span class="reputation inc">approve</span> of the fact that you would allow your slaves to be degraded in such a manner.`);
}
}
if (arcology.FSBodyPurist !== "unset") {
/* TODO: requirements for these might change */
- if (slave.boobsImplant > 0) {
+ if (SlaveStatsChecker.isModded(slave)) {
// TODO: add stuff here
- }
- if (slave.buttImplant > 0) {
- // TODO: add stuff here
- }
- if (slave.faceImplant > 0) {
- // TODO: add stuff here
- }
- if (slave.lipsImplant > 0) {
+ } else {
// TODO: add stuff here
}
}
if (arcology.FSTransformationFetishist !== "unset") {
/* TODO: requirements for these might change */
- if (slave.boobsImplant > 0) {
+ if (SlaveStatsChecker.isModded(slave)) {
// TODO: add stuff here
- }
- if (slave.buttImplant > 0) {
- // TODO: add stuff here
- }
- if (slave.faceImplant > 0) {
- // TODO: add stuff here
- }
- if (slave.lipsImplant > 0) {
+ } else {
// TODO: add stuff here
}
}
if (arcology.FSYouthPreferentialist !== "unset") {
- if (slave.visualAge > 25) { // TODO: not sure about this age
- r.push(`${arcology.name}'s citizens <span class="red">disapprove</span> of your using such old slaves to put on shows.`);
+ if (isYoung(slave)) {
+ r.push(`${arcology.name}'s citizens <span class="reputation dec">disapprove</span> of your using such old slaves to put on shows.`);
} else {
- r.push(`${arcology.name}'s citizens <span class="green">approve</span> of your using young slaves to put on shows.`);
+ r.push(`${arcology.name}'s citizens <span class="reputation inc">approve</span> of your using young slaves to put on shows.`);
}
}
if (arcology.FSMaturityPreferentialist !== "unset") {
- if (slave.visualAge > 25) { // TODO: not sure about this age
- r.push(`${arcology.name}'s citizens <span class="green">approve</span> of your using mature slaves to put on shows.`);
+ if (isYoung(slave)) {
+ r.push(`${arcology.name}'s citizens <span class="reputation inc">approve</span> of your using mature slaves to put on shows.`);
} else {
- r.push(`${arcology.name}'s citizens <span class="red">disapprove</span> of your using such young slaves to put on shows.`);
+ r.push(`${arcology.name}'s citizens <span class="reputation dec">disapprove</span> of your using such young slaves to put on shows.`);
}
}
if (arcology.FSSlimnessEnthusiast !== "unset") {
- if (slave.weight > 10) {
- r.push(`Society finds your using a slave with such a flabby body <span class="red">absolutely disgusting.</span> `);
- }
- if (slave.boobs > 799) {
- r.push(`Your citizens ${slave.weight > 10 ? `also ` : ``} don't approve of you using a slave with such large tits as a showgirl.`);
- }
- if (slave.butt > 3) {
- // TODO: write this
+ if (!isSlim(slave)) {
+ r.push(`Society finds your using a slave with such a flabby body <span class="reputation dec">absolutely disgusting.</span>`);
}
}
if (arcology.FSAssetExpansionist !== "unset") {
- if (slave.weight > 10) {
- // TODO: should weight be in here?
- }
- if (slave.boobs > 799) {
- // TODO: write this
- }
- if (slave.butt > 3) {
- // TODO: write this
+ if (isSlim(slave)) {
+ r.push(`Society <span class="reputation inc">approves</span> of the fact that you respect their ideals in using a larger slave.`);
}
}
@@ -343,9 +317,7 @@ App.SlaveAssignment.workTheFarm = function(slave) {
}
if (arcology.FSPhysicalIdealist !== "unset") {
- if (slave.height > 169) {
- // TODO: write this
- } else {
+ if (genderLawPass(slave)) {
// TODO: write this
}
}
@@ -436,6 +408,7 @@ App.SlaveAssignment.workTheFarm = function(slave) {
// TODO: write this
}
+ // FIXME: probably don't need this block
if (slave.weight > 30 && arcology.FSHedonisticDecadence === "unset") {
r.push(`Your citizens are not willing to pay as much to see such a fat slave put on shows, so ${he} loses some income.`);
} else if (slave.weight < -30) {
@@ -553,7 +526,7 @@ App.SlaveAssignment.workTheFarm = function(slave) {
r.push(`<span class="yellowgreen">making you an extra ${cashFormat(cashVign)}.</span> `);
cashX(cashVign, "slaveAssignmentFarmyardVign", slave);
} else if (vignette.effect < 0) {
- r.push(`<span class="red">losing you ${cashFormat(Math.abs(cashVign))}.</span> `);
+ r.push(`<span class="reputation dec">losing you ${cashFormat(Math.abs(cashVign))}.</span> `);
cashX(forceNeg(cashVign), "slaveAssignmentFarmyardVign", slave);
} else {
r.push(`an incident without lasting effect.`);
@@ -610,10 +583,10 @@ App.SlaveAssignment.workTheFarm = function(slave) {
slave.trust += 1 * vignette.effect;
} else if (vignette.type === "health") {
if (vignette.effect > 0) {
- r.push(`<span class="green">improving ${his} health.</span> `);
+ r.push(`<span class="reputation inc">improving ${his} health.</span> `);
improveCondition(slave, 2 * vignette.effect);
} else if (vignette.effect < 0) {
- r.push(`<span class="red">affecting ${his} health.</span> `);
+ r.push(`<span class="reputation dec">affecting ${his} health.</span> `);
healthDamage(slave, 2 * vignette.effect);
} else {
r.push(`an incident without lasting effect.`);
@@ -621,9 +594,9 @@ App.SlaveAssignment.workTheFarm = function(slave) {
} else {
let FResultNumber = FResult(slave);
if (vignette.effect > 0) {
- r.push(`<span class="green">gaining you a bit of reputation.</span> `);
+ r.push(`<span class="reputation inc">gaining you a bit of reputation.</span> `);
} else if (vignette.effect < 0) {
- r.push(`<span class="red">losing you a bit of reputation.</span> `);
+ r.push(`<span class="reputation dec">losing you a bit of reputation.</span> `);
} else {
r.push(`an incident without lasting effect.`);
}
--
GitLab