diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index d1fdb75cd431b8af793b4d516198655a3c0c7b30..b15c0d4c3b41f275b698800e01fb9c07ecd4163e 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -12,13 +12,13 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
var t = `works as a farmhand this week. `;
if (V.Farmer !== 0) {
- t += `While there, ${he} gets benefit of ${Farmer.slaveName}'s `;
- if (V.Farmer.physicalAge < 21) { // TODO: not sure about this age
+ t += `While there, ${he} benefits from ${Farmer.slaveName}'s `;
+ if (V.Farmer.physicalAge < 21) {
t += `youthful energy`;
} else {
t += `care`;
}
- if (V.Farmer.oralSkill) {
+ if (V.Farmer.oralSkill) { // TODO: keep this? replace with something else?
t += ` and talented tongue`;
}
t += `. `;
@@ -110,53 +110,52 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
t += `Society doesn't disapprove of ${him} not being ` + arcology.FSSubjugationistRace + `, but ${he} doesn't earn as much as ${he} would if ${he} was ` + arcology.FSSubjugationistRace + `. `;
}
}
- if (arcology.FSRepopulationFocus != "unset") { // FIXME: this block will need to be expanded
+ if (arcology.FSRepopulationFocus != "unset") {
if (slave.pregWeek > 16) {
if (slave.eggType !== "human") {
- t += `Society @@.green;approves@@ of you putting another child in ${him}, even if it isn't a human child. `;
+ t += `Society is @@.red;disgusted@@ by ${his} pregnancy when they realize that what it is in ${his} womb is not human. `;
} else {
t += `Society @@.green;greatly approves@@ of your having pregnant slaves `;
if (V.seeBestiality === 1) {
t += `have sex`;
- } else if (V.farmyardShows) { // FIXME: is not explicitly stating the vaiable's value bad practice?
- t += `put on shows`;
} else {
- // TODO: add a third case
+ t += `put on shows`;
}
t += ` with animals. `;
}
}
}
- if (arcology.FSRestart != "unset") { // FIXME: this will need to be expanded
+ if (arcology.FSRestart != "unset") {
if (slave.pregWeek > 16) {
if (slave.eggType !== "human") {
- t += `Society is @@.red;disgusted@@ by ${his} pregnancy, especially when they realize that what it is in ${his} womb is not human. `
+ t += `Society is disgusted by ${his} pregnancy until they learn that what is in ${his} womb is not human. `;
} else {
t += `Society is @@.red;extremely disgusted@@ by ${his} pregnancy and the fact that you would have ${him} `;
if (V.seeBestiality === 1) {
- t += `have sex`
+ t += `have sex`;
} else if (V.farmyardShows) {
- t += `put on shows`
- } else {
- // TODO: add a third case
+ t += `put on shows`;
}
- t += ` with animals while sporting a baby bump. `
+ t += ` with animals while sporting a baby bump. `;
}
}
}
if (arcology.FSGenderRadicalist !== "unset") {
- if (slave.genes === "XY") {
- // TODO: not sure what to do for this
+ if (slave.dick > 0) {
+ t += `${His} patrons @@.green;approve@@ of the fact that ${he} has a dick. `
} else {
- // TODO: also this
+ // TODO: not sure what to do for this
}
}
if (arcology.FSGenderFundamentalist !== "unset") {
- if (slave.genes === "XY") {
- // TODO: not sure what to do for this
+ if (slave.pregWeek > 16) {
+ t += `${His} patrons @@.green;approve@@ of the fact that ${he} is sporting a baby bump.`
} else {
// TODO: also this
}
+ if (slave.dick > 0) {
+ // TODO: something here?
+ }
}
if (arcology.FSPaternalist !== "unset") {
if (V.seeBestiality === 1 && V.farmyardBreeding) {
@@ -203,16 +202,14 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
}
}
if (arcology.FSYouthPreferentialist !== "unset") {
- if (slave.visualAge > 25) {
- // TODO: add a case for not putting on shows
+ if (slave.visualAge > 25) { // TODO: not sure about this age
t += arcology.name + `'s citizens @@.red;disapprove@@ of your using such old slaves to put on shows. `;
} else {
t += arcology.name + `'s citizens @@.green;approve@@ of your using young slaves to put on shows. `;
}
}
if (arcology.FSMaturityPreferentialist !== "unset") {
- if (slave.visualAge > 25) {
- // TODO: add a case for not putting on shows
+ if (slave.visualAge > 25) { // TODO: not sure about this age
t += arcology.name + `'s citizens @@.green;approve@@ of your using mature slaves to put on shows. `;
} else {
t += arcology.name + `'s citizens @@.red;disapprove@@ of your using such young slaves to put on shows. `;
@@ -223,7 +220,11 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
t += `Society finds a slave with such a flabby body @@.red;absolutely disgusting.@@ `
}
if (slave.boobs > 799) {
- // TODO: write this
+ t += `Your citizens `;
+ if (slave.weight > 10) {
+ t += `also `;
+ }
+ t += `don't approve of you using a slave with such large tits as a showgirl. `;
}
if (slave.butt > 3) {
// TODO: write this
@@ -273,15 +274,15 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
// Close FS Subsection
if (setup.entertainmentCareers.includes(slave.career)) {
- // TODO: write this
+ t += ` ${He} has experience with putting on shows from ${his} life before ${he} was a slave, making ${him} more effective at putting on shows.`;
}
- if (setup.farmerCareers.includes(slave.career)) {
+ if (setup.farmerCareers.includes(slave.career)) { // TODO: does this even make sense to include?
// TODO: write this
}
if (slave.prestige === 1) {
t += `Because some of your citizens already know of ${him}, ${he} earns more. `;
} else if (slave.prestige === 2) {
- t += `Because a lot of your citizens already know of ${him}, {he} earns quite a bit more. `;
+ t += `Because a lot of your citizens already know of ${him}, ${he} earns quite a bit more. `;
} else if (slave.prestige === 3) {
t += `Because ${he} is so famous, ${he} earns a lot more then ${he} would otherwise.`
}
@@ -410,8 +411,6 @@ window.saWorkTheFarm = /** @param {App.Entity.SlaveState} slave */ function saWo
} else {
t += `${He} loves putting on shows with animals, and as far as ${he} can tell, it's the perfect job for ${him}. @@.hotpink;${He} is happy@@ to spend ${his} days doing something so degrading. `; // TODO: not sure how degrading putting on shows is
}
- } else {
- // TODO: write this
}
slave.devotion += 1;
if (slave.need) {
diff --git a/src/js/food.js b/src/js/food.js
index 6dbc699781ac5ff31a19b64741dce6176ed54a80..97d39a998e59eb46780f9221def75beb37f4bad8 100644
--- a/src/js/food.js
+++ b/src/js/food.js
@@ -106,14 +106,14 @@ window.farmShowsIncome = function (slave) {
}
}
if (arcology.FSGenderRadicalist !== "unset") {
- if (slave.genes === "XY") { // TODO: does this make sense?
+ if (slave.dick > 0) { // TODO: does this make sense?
cash *= 1.1;
} else {
cash *= 0.8;
}
}
if (arcology.FSGenderFundamentalist !== "unset") {
- if (slave.genes === "XX") {
+ if (slave.dick > 0) {
cash *= 1.1; // TODO: does this make sense?
} else {
cash *= 0.8;
@@ -230,6 +230,7 @@ window.farmShowsIncome = function (slave) {
}
// TODO: should I add the ancient cultures FS?
/* CLOSE FS EFFECTS */
+
if (setup.entertainmentCareers.includes(slave.career)) {
cash *= 1.1;
} else if (setup.farmerCareers.includes(slave.career)) {
diff --git a/src/npc/fPCImpreg.tw b/src/npc/fPCImpreg.tw
index a6e6b23a125979a496151b5954d4b6d13e7d1275..29d611f7bbdb6fbcb67b3c594ed78419997dde75 100644
--- a/src/npc/fPCImpreg.tw
+++ b/src/npc/fPCImpreg.tw
@@ -123,7 +123,7 @@ You repeat this ritual throughout the week, ensuring that $activeSlave.slaveName
<</if>>
<</if>>
<<if $arcologies[0].FSGenderRadicalist != "unset" && $activeSlave.mpreg == 1>>
- Society @@.green;approves@@ of your fucking your slaves ass pregnant; this advances the ideal all a slave needs is $his rear.
+ Society @@.green;approves@@ of your fucking your slaves' asses pregnant; this advances the ideal all a slave needs is $his rear.
<<run repX($FSSingleSlaveRep*($arcologies[0].FSGenderRadicalist/$FSLockinLevel), "futureSocieties", $activeSlave)>>
<<set $arcologies[0].FSGenderRadicalist += 0.05*$FSSingleSlaveRep>>
<<elseif $arcologies[0].FSGenderFundamentalist != "unset" && $activeSlave.mpreg == 1>>
diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw
index c7b0adde93ed825146422a3ad9b4dd8f317d12c5..c70527ee76b56a969eb0513eb0134ee9436cb016 100644
--- a/src/npc/fSlaveImpregConsummate.tw
+++ b/src/npc/fSlaveImpregConsummate.tw
@@ -278,7 +278,7 @@ Throughout the week, you keep $activeSlave.slaveName's <<if $activeSlave.mpreg =
<<set $failedElite += 1>>
<</if>>
<<if $arcologies[0].FSGenderRadicalist != "unset" && $activeSlave.mpreg == 1>>
- Society @@.green;approves@@ of your breeding your slaves ass; this advances the ideal all a slave needs is their rear.
+ Society @@.green;approves@@ of your breeding your slave's ass; this advances the ideal all a slave needs is their rear.
<<run repX($FSSingleSlaveRep*($arcologies[0].FSGenderRadicalist/$FSLockinLevel), "futureSocieties", $activeSlave)>>
<<set $arcologies[0].FSGenderRadicalist += 0.05*$FSSingleSlaveRep>>
<<elseif $arcologies[0].FSGenderFundamentalist != "unset" && $activeSlave.mpreg == 1>>