diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index caff7f584b0d96dcfd5b213bddbd32ecebb05279..14a9f87f1e26063fdc2d28cd50662a26851d458c 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, hers, himself, boy, He, His
+ he, him, his, He, His
} = getPronouns(slave),
incomeStats = getSlaveStatisticData(slave, V.facility.farmyard);
@@ -144,17 +144,9 @@ App.SlaveAssignment.workTheFarm = function(slave) {
};
- if (V.Farmer !== 0) {
- t += `While there, ${he} benefits from ${V.Farmer.slaveName}'s `;
- if (V.Farmer.physicalAge < 21) {
- t += `youthful energy`;
- } else {
- t += `care`;
- }
- if (V.Farmer.skill.oral) { // TODO: keep this? replace with something else?
- t += ` and talented tongue`;
- }
- t += `. `;
+ 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` : ``}.`;
if (slave.devotion < V.FarmerDevotionThreshold) {
slave.devotion += V.FarmerDevotionBonus;
}
@@ -199,7 +191,7 @@ App.SlaveAssignment.workTheFarm = function(slave) {
if (slave.race === arcology.FSSubjugationistRace) {
t += `Society <span class="green">approves</span> of the degradation you submit your ${arcology.FSSubjugationistRace} slaves to, and so ${he} earns you a bit more. `;
} else {
- 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}. `;
+ t += `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") {
@@ -207,13 +199,7 @@ App.SlaveAssignment.workTheFarm = function(slave) {
if (slave.eggType !== "human") {
t += `Society is <span class="red">disgusted</span> by ${his} pregnancy when they realize that what it is in ${his} womb is not human. `;
} else {
- t += `Society <span class="green">greatly approves</span> of your having pregnant slaves `;
- if (V.seeBestiality === 1) {
- t += `have sex`;
- } else {
- t += `put on shows`;
- }
- t += ` with animals. `;
+ t += `Society <span class="green">greatly approves</span> of your having pregnant slaves ${V.seeBestiality ? `have sex` : `put on shows`} with animals. `;
}
}
}
@@ -222,13 +208,7 @@ App.SlaveAssignment.workTheFarm = function(slave) {
if (slave.eggType !== "human") {
t += `Society is disgusted by ${his} pregnancy until they learn that what is in ${his} womb is not human. `;
} else {
- t += `Society is <span class="red">extremely disgusted</span> by ${his} pregnancy and the fact that you would have ${him} `;
- if (V.seeBestiality === 1) {
- t += `have sex`;
- } else if (V.farmyardShows) {
- t += `put on shows`;
- }
- t += ` with animals while sporting a baby bump. `;
+ t += `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. `;
}
}
}
@@ -236,29 +216,29 @@ App.SlaveAssignment.workTheFarm = function(slave) {
if (slave.dick > 0) {
t += `${His} patrons <span class="green">approve</span> of the fact that ${he} has a dick. `;
} else {
- // TODO: not sure what to do for this
+ t += `${His} patrons <span class="red">are disappointed</span> that ${he} doesn't have a dick. `;
}
}
if (arcology.FSGenderFundamentalist !== "unset") {
if (slave.pregWeek > 16) {
- t += `${His} patrons <span class="green">approve</span> of the fact that ${he} is sporting a baby bump. `;
+ t += `${His} viewers <span class="green">approve</span> of the fact that ${he} is sporting a baby bump. `;
} else {
- // TODO: also this
+ t += `${His} viewers <span class="red">are disappointed</span> that ${he} isn't pregnant. `;
}
if (slave.dick > 0) {
// TODO: something here?
}
}
if (arcology.FSPaternalist !== "unset") {
- if (V.seeBestiality === 1 && V.farmyardBreeding) {
- t += `Your citizens are <span class="red">very disapproving</span> of the fact that you would allow something as degrading as having your slaves to be knocked up by filthy beasts. `;
+ if (V.seeBestiality && V.farmyardBreeding) {
+ t += `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. `;
} else {
t += `Your citizens <span class="red">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 === 1 && V.farmyardBreeding) {
- t += `Your citizens are <span class="green">very approving</span> of the fact that you would allow something as degrading as having your slaves to be knocked up by filthy beasts. `;
+ if (V.seeBestiality && V.farmyardBreeding) {
+ t += `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. `;
} else {
t += `Your citizens <span class="green">approve</span> of the fact that you would allow your slaves to be degraded in such a manner. `;
}
@@ -309,14 +289,10 @@ App.SlaveAssignment.workTheFarm = function(slave) {
}
if (arcology.FSSlimnessEnthusiast !== "unset") {
if (slave.weight > 10) {
- t += `Society finds a slave with such a flabby body <span class="red">absolutely disgusting.</span> `;
+ t += `Society finds your using a slave with such a flabby body <span class="red">absolutely disgusting.</span> `;
}
if (slave.boobs > 799) {
- 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. `;
+ t += `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
@@ -391,21 +367,9 @@ App.SlaveAssignment.workTheFarm = function(slave) {
t += `${His} poor health negatively affects ${his} ability to put on good shows, cutting into your profits. `;
}
if (slave.face > 40) {
- t += `${He} is so `;
- if (slave.genes === "XY") {
- t += `handsome`;
- } else {
- t += `beautiful`;
- }
- t += ` that ${his} audience is willing to pay more to watch ${him} put on shows. `;
+ t += `${He} is so ${slave.genes === "XY" ? `handsome` : `beautiful`} that ${his} audience is willing to pay more to watch ${him} put on shows. `;
} else if (slave.face > 10) {
- t += `${He} is so `;
- if (slave.genes === "XY") {
- t += `good-looking`;
- } else {
- t += `pretty`;
- }
- t += ` that ${his} audience is willing to pay more to watch ${him} put on shows. `;
+ t += `${He} is so ${slave.genes === "XY" ? `good-looking` : `pretty`} that ${his} audience is willing to pay more to watch ${him} put on shows. `;
} else if (slave.face < -10) {
t += `${His} audience isn't willing to pay as much because of how unattractive ${his} face is. `;
} else if (slave.face < -40) {
@@ -433,22 +397,10 @@ App.SlaveAssignment.workTheFarm = function(slave) {
// TODO: write this - maybe something about the slave's ability to handle the animal?
}
if (!canSeePerfectly(slave)) {
- t += `${His} `;
- if (!canSee(slave)) {
- t += `blindness makes it impossible`;
- } else {
- t += `nearsightedness makes it harder`;
- }
- t += ` for ${him} to see what ${he}'s doing, affecting ${his} ability to put on a good show. `;
+ t += `${His} ${!canSee(slave) ? `blindness makes it impossible` : `nearsightedness makes it harder`}} for ${him} to see what ${he}'s doing, affecting ${his} ability to put on a good show. `;
}
if (slave.hears < 0) {
- t += `${His} `;
- if (slave.hears < -1) {
- t += `lack of`;
- } else {
- t += `poor`;
- }
- t += `hearing makes it difficult for ${him} to do a good job of putting on a show. `;
+ t += `${His} ${slave.hears < -1 ? `lack of` : `poor`} hearing makes it difficult for ${him} to do a good job of putting on a show. `;
}
if (slave.boobs > 800) {
// TODO: write this
@@ -498,7 +450,7 @@ App.SlaveAssignment.workTheFarm = function(slave) {
if (slave.fetishKnown && (slave.fetish === "submissive" || slave.fetish === "humiliation" || slave.fetish === "masochist") || slave.energy > 95) {
if (V.farmyardShows) {
- if (V.seeBestiality === 1) {
+ if (V.seeBestiality) {
t += `Getting fucked by animals is the perfect job for ${him}, as far as ${he} can tell. <span class="devotion inc">${He} is happy</span> to spend ${his} days being utterly degraded. `;
} else {
t += `${He} loves putting on shows with animals, and as far as ${he} can tell, it's the perfect job for ${him}. <span class="devotion inc">${He} is happy</span> to spend ${his} days doing something so degrading. `; // TODO: not sure how degrading putting on shows is
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 7fd9c29e8ec350591586763b79efa5a5d6dfa048..7d002ca8e0004040250904520b70ab5918708443 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -1,349 +1,3 @@
:: Farmyard Report [nobr]
-<span id="farmyardstats">
-</span>
-
-<<set _slaves = App.Utils.sortedEmployees(App.Entity.facilities.farmyard)>>
-<<set _DL = _slaves.length, _SL = $slaves.length, $FarmerCashBonus = 0, _FLsFetish = 0, _profits = 0, _foodWeek = 0>>
-<<set $FarmerDevotionBonus = 1, $FarmerDevotionThreshold = 45, $FarmerTrustBonus = 1, $FarmerTrustThreshold = 35, $FarmerHealthBonus = 0>>
-/*<<set $legendaryWombID = 0>> TODO: will the Farmyard have a legendary womb system? */
-
-<!-- Statistics gathering -->
-<<set $facility = $facility || {}, $facility.farmyard = initFacilityStatistics($facility.farmyard)>>
-
-<<if ($Farmer != 0)>>
- <<set _FLs = $slaveIndices[$Farmer.ID]>>
-
- <<if ($slaves[_FLs].health.condition < -80)>>
- <<run improveCondition($slaves[_FLs], 20)>>
- <<elseif $slaves[_FLs].health.condition < -40>>
- <<run improveCondition($slaves[_FLs], 15)>>
- <<elseif $slaves[_FLs].health.condition < 0>>
- <<run improveCondition($slaves[_FLs], 10)>>
- <<elseif $slaves[_FLs].health.condition < 90>>
- <<run improveCondition($slaves[_FLs], 7)>>
- <</if>>
- <<if $slaves[_FLs].devotion <= 45>>
- <<set $slaves[_FLs].devotion += 5>>
- <</if>>
- <<if $slaves[_FLs].trust < 45>>
- <<set $slaves[_FLs].trust += 5>>
- <</if>>
- <<if $slaves[_FLs].rules.living != "luxurious">>
- <<set $slaves[_FLs].rules.living = "luxurious">>
- <</if>>
- <<if $slaves[_FLs].fetishStrength <= 95>>
- <<if $slaves[_FLs].fetish != "dom">>
- <<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "dom">>
- <</if>>
- <<elseif $slaves[_FLs].fetishKnown == 0>>
- <<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
- <<else>>
- <<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
- <</if>>
- <</if>>
- /% Make sure we have registered living expenses as for any other slave %/
- <<run getSlaveStatisticData($Farmer, $facility.farmyard)>>
- <<set $Farmer = $slaves[_FLs]>>
- <<setLocalPronouns $Farmer>>
- <<= SlaveFullName($Farmer)>> is serving as the Farmer.
- <<if $Farmer.relationship == -3 && $Farmer.devotion > 50>>
- As your loving $wife, $he does $his best to ensure $farmyardName runs smoothly.
- <<set $FarmerCashBonus += 0.25>>
- <</if>>
- <<if (_FLsFetish == 1)>>
- $He isn't above sampling the merchandise $himself; before long it's obvious to $his workers that $he @@.lightcoral;really likes fucking them.@@
- <<elseif (_FLsFetish == 2)>>
- $He's careful that all of the farmhands under $his supervision are all ready to work every morning, and $he @@.lightsalmon;becomes more dominant.@@
- <</if>>
- <<if ($Farmer.skill.farmer <= 10)>>
- Though $Farmer.slaveName does $his best to manage the farmyard, with $his lack of skill $he can do little.
- <<elseif ($Farmer.skill.farmer <= 30)>>
- $Farmer.slaveName's basic skills marginally @@.yellowgreen;improve@@ business at $farmyardName.
- <<set $FarmerCashBonus += 0.05>>
- <<elseif ($Farmer.skill.farmer <= 60)>>
- $Farmer.slaveName's skills @@.yellowgreen;improve@@ business at $farmyardName.
- <<set $FarmerCashBonus += 0.1>>
- <<elseif ($Farmer.skill.farmer < 100)>>
- $Farmer.slaveName's skills greatly @@.yellowgreen;improve@@ business at $farmyardName.
- <<set $FarmerCashBonus += 0.15>>
- <<else>>
- $Farmer.slaveName's mastery immensely @@.yellowgreen;improves@@ business at $farmyardName.
- <<set $FarmerCashBonus += 0.20>>
- <</if>>
- <<if ($Farmer.actualAge > 35)>>
- $His age and experience also contribute.
- <<set $FarmerCashBonus += 0.05>>
- <<elseif $AgePenalty == 0>>
- <<set $FarmerCashBonus += 0.05>>
- <</if>>
- <<if setup.farmerCareers.includes($Farmer.career)>>
- $He has experience from $his life before $he was a slave that helps $him in the difficult life of managing animals and property.
- <<set $FarmerCashBonus += 0.05>>
- <<elseif $Farmer.skill.farmer >= $masteredXP>>
- $He has experience from working for you that helps $him in the difficult life of managing animals and property.
- <<set $FarmerCashBonus += 0.05>>
- <<else>>
- <<set $slaves[_FLs].skill.farmer += random(1,Math.ceil(($Farmer.intelligence+$Farmer.intelligenceImplant)/15) + 8)>>
- <</if>>
- <<if ($Farmer.intelligence+$Farmer.intelligenceImplant > 15)>>
- $He is a clever manager.
- <<set _intSum = $Farmer.intelligence+$Farmer.intelligenceImplant>>
- <<set $FarmerCashBonus += 0.05*(Math.floor(-0.00008*_intSum*_intSum+0.0337*_intSum+0.5))>>
- <</if>>
- <<if ($Farmer.dick > 2) && (canPenetrate($Farmer))>>
- $His turgid dick helps $him manage $his workers.
- <<set $FarmerCashBonus += 0.05>>
- <</if>>
- <<if !canSmell($Farmer)>>
- $His lack of a sense of smell protects $him from that omnipresent barnyard scent.
- <<set $FarmerCashBonus += 0.05>>
- <</if>>
-
- <<setLocalPronouns $Farmer 2>>
-
- <<for _slave range _slaves>>
- <<set $i = $slaveIndices[_slave.ID]>>
- <<setLocalPronouns _slave>>
- <<if $Farmer.rivalryTarget == _slave.ID>>
- _He2 forces _his2 <<print rivalryTerm($Farmer)>> to service all the slaves in $farmyardName. /* TODO: not sure about this */
- <<set _slave.devotion -= 2, _slave.trust -= 2>>
- <<if canDoVaginal(_slave)>>
- <<run seX(_slave, "vaginal", "public", "penetrative", 10)>>
- <</if>>
- <<if canDoAnal(_slave)>>
- <<run seX(_slave, "anal", "public", "penetrative", 10)>>
- <</if>>
- <<run seX(_slave, "oral", "public", "penetrative", 10)>>
- <<if random(1,100) > 65>>
- <<set $slaves[_FLs].rivalry++, $Farmer.rivalry++, _slave.rivalry++>>
- <</if>>
- <<elseif $Farmer.relationshipTarget == _slave.ID>>
- _He2 dotes over _his2 <<print relationshipTerm($Farmer)>>, _slave.slaveName, making sure $he isn't worked too hard, but unfortunately manages to get in the way of $his work.
- <<set _slave.devotion++, $FarmerCashBonus -= 0.05>>
- <<elseif areRelated($Farmer, _slave)>>
- _He2 pays special attention to _his2 <<print relativeTerm($Farmer.ID,_slave.ID)>>, _slave.slaveName, making sure $he is treated well and showing off $his skills. /* TODO: does this need rewriting? */
- <<set _slave.trust++, $FarmerCashBonus += 0.05>>
- <</if>>
- <</for>>
-
- <<if (_DL < 5)>>
- /* TODO: will we need this block?
- <<set $slavesGettingHelp = 0>>
- <<if $universalRulesFacilityWork == 1>>
- <<for $i = 0; $i < _SL; $i++>>
- <<if (_slave.assignment == "farmhand")>>
- <<set $slavesGettingHelp++>>
- <</if>>
- <</for>>
- <</if>>
- */
- <<if (_DL+$slavesGettingHelp < 5)>>
- <<set $i = _FLs>> /* apply following SA passages to facility leader */
- <<set _oldCash = $cash>>
- <<if $showEWD != 0>>
- <br> $He <<include "SA work the farm">>
- <<else>>
- <<silently>><<include "SA work the farm">><</silently>>
- <</if>>
- <<set _seed = $cash-_oldCash, cashX(Math.trunc(0.5*_seed), "farmyard"), _seed = Math.trunc(1.5*_seed), _profits += _seed, _beauty = Beauty($activeSlave)>>
- /* TODO: what will the Farmer do when $he isn't busy? */
- <br> Since $he doesn't have enough farmhands to manage to keep $him busy, $he sees _beauty customers $himself (<<= Math.trunc(_beauty/7)>> a day), earning you @@.yellowgreen;<<print cashFormat(_seed)>>.@@ $He can charge more for $his time, since many citizens find it erotic to fuck the Farmer.
- <</if>>
- <</if>>
- <<if (_DL > 0)>><br><br><</if>>
-<</if>>
-
-<<if (_DL > 0)>>
- <<if _DL != 1>>''There are _DL farmhands working out of $farmyardName.''<<else>>''There is one farmhand working out of $farmyardName.''<</if>>
-<</if>>
-
-<<if $Farmer != 0>>
- <<set $i = _FLs>> /* apply following SA passages to facility leader */
- <<if $showEWD != 0>>
- <br><br>
- /* 000-250-006 */
- <<if $seeImages && $seeReportImages>>
- <div class="imageRef tinyImg">
- <<= SlaveArt($slaves[_FLs], 0, 0)>>
- </div>
- <</if>>
- /* 000-250-006 */
- <span class='slave-name'><<= SlaveFullName($slaves[_FLs])>></span> is serving as the Farmer.
- <br>
- <<= App.SlaveAssignment.choosesOwnClothes($slaves[$i])>>
- <<include "SA rules">>
- <<include "SA diet">>
- <<include "SA long term effects">>
- <<= App.SlaveAssignment.drugs($slaves[$i])>>
- <<include "SA relationships">>
- <<include "SA rivalries">>
- <br><<include "SA devotion">>
- <<else>>
- <<silently>>
- <<run App.SlaveAssignment.choosesOwnClothes($slaves[$i])>>
- <<include "SA rules">>
- <<include "SA diet">>
- <<include "SA long term effects">>
- <<run App.SlaveAssignment.drugs($slaves[$i])>>
- <<include "SA relationships">>
- <<include "SA rivalries">>
- <<include "SA devotion">>
- <</silently>>
- <</if>>
-<</if>>
-
-<<if (_DL > 0)>>
- <<set _oldCash = $cash, _oldFood = $food>>
- <<for _slave range _slaves>>
- <<set $i = $slaveIndices[_slave.ID]>>
- <<setLocalPronouns _slave>>
- /* Perform facility based rule changes */
- <<switch $farmyardDecoration>>
- <<case "Degradationist" "standard">> /* TODO: add the rest of the FS */
- <<set _slave.rules.living = "spare">>
- <<case "Roman Revivalist">>
- <<set _slave.rules.living = "luxurious">>
- <<default>>
- <<set _slave.rules.living = "normal">>
- <</switch>>
- /* TODO: should FS with "spare" living rules cause some minor health damage and devotion / trust loss? */
- <<if (_slave.health.condition < -80)>>
- <<run improveCondition(_slave, 20)>>
- <<elseif _slave.health.condition < -40>>
- <<run improveCondition(_slave, 15)>>
- <<elseif _slave.health.condition < 0>>
- <<run improveCondition(_slave, 10)>>
- <<elseif _slave.health.condition < 90>>
- <<run improveCondition(_slave, 7)>>
- <</if>>
- <<if (_slave.devotion <= 20) && (_slave.trust >= -20)>>
- <<set _slave.devotion -= 5, _slave.trust -= 5>>
- <<elseif (_slave.devotion < 45)>>
- <<set _slave.devotion += 4>>
- <<elseif (_slave.devotion > 50)>>
- <<set _slave.devotion -= 4>>
- <</if>>
- <<if (_slave.trust < 30)>>
- <<set _slave.trust += 5>>
- <</if>>
- <<if _slave.energy > 40 && _slave.energy < 95>>
- <<set _slave.energy++>>
- <</if>>
-
- <<if $showEWD != 0>>
- <br><br>
- /* 000-250-006 */
- <<if $seeImages && $seeReportImages>>
- <div class="imageRef tinyImg">
- <<= SlaveArt(_slave, 0, 0)>>
- </div>
- <</if>>
- /* 000-250-006 */
- <span class='slave-name'><<= SlaveFullName(_slave)>></span>
- <<if _slave.choosesOwnAssignment == 2>>
- <<include "SA chooses own job">>
- <<else>>
- is working out of $farmyardName.
- <</if>>
- <br> $He <<= App.SlaveAssignment.workTheFarm(_slave)>>
- <br>
- <<= App.SlaveAssignment.choosesOwnClothes(_slave)>>
- <<include "SA rules">>
- <<include "SA diet">>
- <<include "SA long term effects">>
- <<= App.SlaveAssignment.drugs(_slave)>>
- <<include "SA relationships">>
- <<include "SA rivalries">>
- <br><<include "SA devotion">>
- <<else>>
- <<silently>>
- <<include "SA chooses own job">>
- <<run App.SlaveAssignment.workTheFarm(_slave)>>
- <<run App.SlaveAssignment.choosesOwnClothes(_slave)>>
- <<include "SA rules">>
- <<include "SA diet">>
- <<include "SA long term effects">>
- <<run App.SlaveAssignment.drugs(_slave)>>
- <<include "SA relationships">>
- <<include "SA rivalries">>
- <<include "SA devotion">>
- <</silently>>
- <</if>>
- <span id="showProfits">
- <<set _incomeStats = getSlaveStatisticData(_slave, _slave.assignment === Job.FARMYARD ? $facility.farmyard : undefined)>>
- <<set _profits += _incomeStats.income>>
- </span>
-
- <span id="foodProduction">
- /* TODO: is this right? */
- <<if _DL > 0>>
- <<set _foodWeek = _incomeStats.food>>
- <</if>>
- <<if $farmMenials > 0>>
- <<set _farmMenialProductivity = 9>>
- <<if $farmyardUpgrade.pump == 1>>
- <<set _farmMenialProductivity += 1>>
- <</if>>
- <<if $farmyardUpgrade.fertilizer == 1>>
- <<set _farmMenialProductivity += 2>>
- <</if>>
- <<if $farmyardUpgrade.seeds == 1>>
- <<set _farmMenialProductivity += 3>>
- <</if>>
- <<if $farmyardUpgrade.machinery == 1>>
- <<set _farmMenialProductivity += 3>>
- <</if>>
- <<set _foodWeek += ($farmMenials*_farmMenialProductivity)>>
- <</if>>
- </span>
- <</for>>
-
- <<set _profits += $cash-_oldCash, _foodWeek += $food-_oldFood>>
- <!-- Record statistics gathering -->
- <<script>>
- var b = State.variables.facility.farmyard;
- b.farmhandIncome = 0;
- b.customers = 0;
- b.farmhandCosts = 0;
- b.rep = 0;
- for (var si of b.income.values()) {
- b.farmhandIncome += si.income + si.adsIncome;
- b.customers += si.customers;
- b.farmhandCosts += si.cost;
- b.rep += si.rep;
- }
- b.maintenance = ((State.variables.farmyard*State.variables.facilityCost)+(0.1*State.variables.farmyardUpgrade.fertilizer*State.variables.farmyard*State.variables.facilityCost)-(0.2*State.variables.farmyardUpgrade.hydroponics*State.variables.farmyard*State.variables.facilityCost)+(0.2*State.variables.farmyardUpgrade.seeds*State.variables.farmyard*State.variables.facilityCost)-(0.4*State.variables.farmyardUpgrade.machinery*State.variables.farmyard*State.variables.facilityCost))*2;
- b.totalIncome = b.farmhandIncome;
- b.totalExpenses = b.farmhandCosts + b.maintenance;
- b.profit = b.totalIncome - b.totalExpenses;
- <</script>>
-
- $farmyardNameCaps makes you <span class="cash inc"><<print cashFormat(_profits)>></span> and produced @@.chocolate;<<print massFormat(_foodWeek)>>@@ of food this week.
- <<set $food += _foodWeek>>
-
- <<if $farmyardDecoration != "standard">>
- <br>$farmyardNameCaps's customers enjoyed
- <<if $seeBestiality == 1 && $farmyardBreeding > 0 && ($canines.length > 0 || $hooved.length > 0 || $felines.length > 0)>>
- @@.green;watching farmhands fuck animals in $farmyardDecoration surroundings.@@
- <<elseif $farmyardShows == 1>>
- @@.green;watching farmhands put on shows in $farmyardDecoration surroundings.@@
- <<else>>
- /* TODO: not sure about this one */
- @@.green;partaking of $farmyardName's fine produce in its $farmyardDecoration décor.@@
- <</if>>
- <</if>>
-
- <!-- Statistics output -->
- <<FarmyardStatistics 0>>
- <<timed 50ms>>
- <<replace #farmyardstats>>
- <<FarmyardStatistics 1>>
- <</replace>>
- <</timed>>
-<</if>>
-
-<<if _DL > 0 || $Farmer != 0>>
- <br><br>
-<</if>>
+<<print App.Facilities.Farmyard.farmyardReport()>>
diff --git a/src/facilities/farmyard/reports/farmyardReport.js b/src/facilities/farmyard/reports/farmyardReport.js
index 805a45066ab4498fa06ee0a9b5f695b97e6c8010..2a9c2edb939e85aa0d053f925a7edd688d83189a 100644
--- a/src/facilities/farmyard/reports/farmyardReport.js
+++ b/src/facilities/farmyard/reports/farmyardReport.js
@@ -195,7 +195,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
t += `<<include "SA rules">>`;
t += `<<include "SA diet">>`;
t += `<<include "SA long term effects">>`;
- t += `<<include "SA drugs">>`;
+ t += App.SlaveAssignment.drugs(slave);
t += `<<include "SA relationships">>`;
t += `<<include "SA rivalries">>`;
t += `<br><<include "SA devotion">>`;
@@ -204,7 +204,7 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
t += `<<silently>><<include "SA rules">><</silently>>`;
t += `<<silently>><<include "SA diet">><</silently>>`;
t += `<<silently>><<include "SA long term effects">><</silently>>`;
- t += `<<silently>><<include "SA drugs">><</silently>>`;
+ App.SlaveAssignment.drugs(slave);
t += `<<silently>><<include "SA relationships">><</silently>>`;
t += `<<silently>><<include "SA rivalries">><</silently>>`;
t += `<<silently>><br><<include "SA devotion">><</silently>>`;
@@ -292,17 +292,17 @@ App.Facilities.Farmyard.farmyardReport = function farmyardReport() {
t += `<<include "SA rules">>`;
t += `<<include "SA diet">>`;
t += `<<include "SA long term effects">>`;
- t += `<<include "SA drugs">>`;
+ t += App.SlaveAssignment.drugs(slave);
t += `<<include "SA relationships">>`;
t += `<<include "SA rivalries">>`;
t += `<br><<include "SA devotion">>`;
} else {
t += `<<silently>><<include "SA chooses own job">><</silently>>`;
- t += App.SlaveAssignment.choosesOwnClothes(slave);
+ App.SlaveAssignment.choosesOwnClothes(slave);
t += `<<silently>><<include "SA rules">><</silently>>`;
t += `<<silently>><<include "SA diet">><</silently>>`;
t += `<<silently>><<include "SA long term effects">><</silently>>`;
- t += `<<silently>><<include "SA drugs">><</silently>>`;
+ App.SlaveAssignment.drugs(slave);
t += `<<silently>><<include "SA relationships">><</silently>>`;
t += `<<silently>><<include "SA rivalries">><</silently>>`;
t += `<<silently>><br><<include "SA devotion">><</silently>>`;
diff --git a/src/gui/Encyclopedia/encyclopediaEntries.js b/src/gui/Encyclopedia/encyclopediaEntries.js
index 3962b84229b21b51cf6e2eb19ca582993d3ff2f8..1a96162a5bc2d5426fc1565826585fdb89f75733 100644
--- a/src/gui/Encyclopedia/encyclopediaEntries.js
+++ b/src/gui/Encyclopedia/encyclopediaEntries.js
@@ -56,7 +56,7 @@ App.Encyclopedia.Entries = (function() {
const fragment = document.createDocumentFragment();
fragment.append(topic("Farming"), " is an assignment which produces ", encyLink("food", "Food"),
" from your slaves' hard work");
- if (V.seeBestiality === 1) {
+ if (V.seeBestiality) {
fragment.append(" and allows you to breed slaves with animals");
}
fragment.append(". Can also reduce arcology upkeep with upgrades in the ",
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index afbddd8505467dfc90504fdad25cfa0fb86296b5..9eedbf0d2cbd0a8fb272403c7af5f322ccdc2aa1 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -1094,7 +1094,7 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
} else if (slave.clit >= 4) {
sexOptions.push({text: `Have another slave ride ${his} clit-dick`, scene: `FSlaveSlaveDick`});
}
- if (V.seeBestiality === 1 && V.cheatMode === 1) {
+ if (V.seeBestiality && V.cheatMode === 1) {
if (V.farmyardKennels > 0 && V.activeCanine !== 0) {
sexOptions.push({text: `Have a ${V.activeCanine.species} mount ${him}`, scene: `BeastFucked`, update: {animalType: "canine"}});
}
diff --git a/src/js/food.js b/src/js/food.js
index ef90c684006d7137d2a53e8e9713ace85fc109ec..6ff8ce76947e838f606b7ad3394e1b040a6d8ec8 100644
--- a/src/js/food.js
+++ b/src/js/food.js
@@ -127,7 +127,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
}
}
if (arcology.FSPaternalist !== "unset") {
- if (V.seeBestiality === 1) {
+ if (V.seeBestiality) {
if (V.farmyardBreeding === 1) { // slaves are being bred
cash *= 0.8;
} else { // slaves are putting on shows
@@ -136,7 +136,7 @@ App.Facilities.Farmyard.farmShowsIncome = function(slave) {
}
}
if (arcology.FSDegradationist !== "unset") {
- if (V.seeBestiality === 1) {
+ if (V.seeBestiality) {
if (V.farmyardBreeding === 1) { // slaves are being bred
cash *= 1.2;
} else { // slaves are putting on shows
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index 3d19e8f1e5fee3ad4db29ac1f665fe2aed97d952..7719f6ccd13a0bfa02462adb29aa57a0567376f2 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -4242,7 +4242,7 @@ globalThis.GetVignette = function(slave) {
});
}
// TODO: add more vignettes
- if ((V.farmyardBreeding) && (V.seeBestiality === 1)) {
+ if ((V.farmyardBreeding) && (V.seeBestiality)) {
vignettes.push({
text: `a citizen didn't realize how disgusting he found bestiality until he attended one of ${V.farmyardName}'s shows,`,
type: "rep",