diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index d0cf1f798a191c2b022d176cc66ed56e913c0430..277aa7b0bb21dc250324c4180e4c36cac925f6fc 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -239,31 +239,31 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
<span id="rules">
<<if $farmyardSlaves > 0>>
<br><br>
- <<if $farmyardShows == true && (_CL > 0 || _HL > 0 || _FL > 0)>>
+ <<if $farmyardShows == 1 && (_CL > 0 || _HL > 0 || _FL > 0)>>
Slaves ''are'' putting on shows with animals.
- [[End shows|Farmyard][$farmyardShows = false, $farmyardBreeding = false, $farmyardRestraints = false]]
+ [[End shows|Farmyard][$farmyardShows = 0, $farmyardBreeding = 0, $farmyardRestraints = 0]]
<<if $seeBestiality == 1>>
<br>
- <<if $farmyardBreeding == true>>
+ <<if $farmyardBreeding == 1>>
Slaves ''are'' being bred with animals.
- [[End breeding|Farmyard][$farmyardBreeding = false, $farmyardRestraints = false]]
+ [[End breeding|Farmyard][$farmyardBreeding = 0, $farmyardRestraints = 0]]
<br>
- <<if $farmyardRestraints == true>>
+ <<if $farmyardRestraints == 1>>
''All of the slaves'' are being restrained.
- [[Restrain only disobedient slaves|Farmyard][$farmyardRestraints = false]]
+ [[Restrain only disobedient slaves|Farmyard][$farmyardRestraints = 0]]
<<else>>
''Only disobedient slaves'' are being restrained.
- [[Restrain all of the slaves|Farmyard][$farmyardRestraints = true]]
+ [[Restrain all of the slaves|Farmyard][$farmyardRestraints = 1]]
<</if>>
<<else>>
Slaves ''are not'' being bred with animals.
- [[Begin breeding|Farmyard][$farmyardBreeding = true]]
+ [[Begin breeding|Farmyard][$farmyardBreeding = 1]]
<</if>>
<</if>>
<<else>>
Slaves ''are not'' putting on shows with animals.
<<if (_CL > 0 || _HL > 0 || _FL > 0)>>
- [[Begin shows|Farmyard][$farmyardShows = true]]
+ [[Begin shows|Farmyard][$farmyardShows = 1]]
<<else>>
//You must purchase animals before you put on shows//
<</if>>
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 5dcdc8b01eb2a87ce9264776b4a0b79e7246d19a..ca4363116c9b1e5495e5a8efdad3b085401f23fc 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -326,7 +326,7 @@
<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 == true>>
+ <<elseif $farmyardShows == 1>>
@@.green;watching farmhands put on shows in $farmyardDecoration surroundings.@@
<<else>>
/* TODO: not sure about this one */
diff --git a/src/facilities/farmyard/saWorkTheFarm.tw b/src/facilities/farmyard/saWorkTheFarm.tw
index bb4c4e2bebf508594584a6217afa54385d40f6b0..3d3269a562ff57e1f9c17c233c420d52deeee314 100644
--- a/src/facilities/farmyard/saWorkTheFarm.tw
+++ b/src/facilities/farmyard/saWorkTheFarm.tw
@@ -90,7 +90,7 @@ As a result, $he produces @@.chocolate;<<print massFormat(_food)>>@@ of food ove
/* OPEN SHOWS */
<<set _incomeStats.income += farmShowsIncome(_slave)>>
-<<if $farmyardShows == true>>
+<<if $farmyardShows == 1>>
$He also puts on shows with animals this week.
@@ -141,7 +141,7 @@ $He also puts on shows with animals this week.
<</if>>
<<if _arcology.FSPaternalist != "unset">>
<<if $seeBestiality == 1>>
- <<if $farmyardBreeding == true>>
+ <<if $farmyardBreeding == 1>>
Your citizens are @@.red;very disapproving@@ of the fact that you would go so far as to allow your slaves to be knocked up by filthy beasts.
<<else>>
Your citizens @@.red;disapprove@@ of the fact that you would allow your slaves to be degraded in such a manner.
@@ -150,7 +150,7 @@ $He also puts on shows with animals this week.
<</if>>
<<if _arcology.FSDegradationist != "unset">>
<<if $seeBestiality == 1>>
- <<if $farmyardBreeding == true>>
+ <<if $farmyardBreeding == 1>>
Your citizens are @@.green;very approving@@ of the fact that you would go so far as to allow your slaves to be knocked up by filthy beasts. /* TODO: write something more original for these */
<<else>>
Your citizens @@.green;approve@@ of the fact that you would allow your slaves to be degraded in such a manner.
@@ -330,7 +330,7 @@ $He also puts on shows with animals this week.
/* CLOSE SHOWS*/
<<if _slave.fetishKnown && ((_slave.fetish == ("submissive") || ("humiliation") || ("masochist")) || (_slave.energy > 95))>>
- <<if $farmyardShows == true>>
+ <<if $farmyardShows == 1>>
<<if $seeBestiality == 1>>
Getting fucked by animals is the perfect job for $him, as far as $he can tell. @@.hotpink;$He is happy@@ to spend $his days being utterly degraded.
<<else>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 55f2061c589d915b880b1140a0b7c67789b8f4d4..b844bc7ee67111445994b5e1191888c15efbcdde 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -160,7 +160,6 @@ You should have received a copy of the GNU General Public License along with thi
<</if>>
<</if>> /*closes family mode */
<<set $slaves[_i].milk = 0>>
- <<set $slaves[_i].food = 0>> /* TODO: would this make sense to include? */
<<set $slaves[_i].cum = 0>>
<<set $slaves[_i].births = 0>>
<<set $slaves[_i].mammaryCount = 0>>
@@ -621,44 +620,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
animalTesticles: 0,
animalMpreg: 0
}>>
-<<set $animalsBought = {
- canines: 0,
- hooved: 0,
- felines: 0,
- labradorRetrievers: 0,
- germanShepherds: 0,
- goldenRetrievers: 0,
- frenchBulldogs: 0,
- bulldogs: 0,
- beagles: 0,
- poodles: 0,
- rottweilers: 0,
- yorkshireTerriers: 0,
- siberianHuskies: 0,
- horses: 0,
- siameses: 0,
- persians: 0,
- maineCoons: 0,
- ragdolls: 0,
- bengals: 0,
- abbysinians: 0,
- birmans: 0,
- orientalShorthairs: 0,
- sphynxes: 0,
- russianBlues: 0,
- wolves: 0,
- foxes: 0,
- jackals: 0,
- dingos: 0,
- zebras: 0,
- cougars: 0,
- jaguars: 0,
- pumas: 0,
- lynx: 0,
- leopards: 0,
- lions: 0,
- tigers: 0
- }>>
+<<set $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}>>
<<set $canines = []>>
<<set $hooved = []>>
<<set $felines = []>>
@@ -1489,7 +1451,7 @@ erectileImplant: 0
} >>
<<set $merchantFSWares = ["GenderRadicalistResearch", "TransformationFetishistResearch", "AssetExpansionistResearch", "SlimnessEnthusiastResearch", "YouthPreferentialistResearch", "HedonisticDecadenceResearch"]>>
-<<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack", "sympatheticOvaries", "asexualReproduction", "AnimalOrgans"]>>
+<<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack", "sympatheticOvaries", "asexualReproduction"]>> /* "AnimalOrgans" for future use */
<<set $RapidCellGrowthFormula = 0>>
<<set $UterineRestraintMesh = 0>>
<<set $PGHack = 0>>
diff --git a/src/js/datatypeCleanup.js b/src/js/datatypeCleanup.js
index 331cce3c736e976be6ccb45ab328412c80426acc..0d08a8dba843f8dd01e0aa64a61440bfe0f2bfdc 100644
--- a/src/js/datatypeCleanup.js
+++ b/src/js/datatypeCleanup.js
@@ -488,7 +488,6 @@ window.slaveStatCountDatatypeCleanup = function slaveStatCountDatatypeCleanup(sl
slave.penetrativeCount = Math.max(+slave.penetrativeCount, 0) || 0;
slave.pitKills = Math.max(+slave.pitKills, 0) || 0;
slave.milk = Math.max(+slave.milk, 0) || 0;
- slave.food = Math.max(+slave.food, 0) || 0;
slave.cum = Math.max(+slave.cum, 0) || 0;
slave.births = Math.max(+slave.births, 0) || 0;
slave.birthsTotal = Math.max(+slave.birthsTotal, 0) || slave.births;
diff --git a/src/js/food.js b/src/js/food.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc7952227bbe0488b5ddb9d09bd99e82a151e7a0
--- /dev/null
+++ b/src/js/food.js
@@ -0,0 +1,54 @@
+window.foodAmount = function (slave) {
+ const V = State.variables
+ var food = 400; //kg / food produced by base slave / week
+ if (!slave) {
+ return null;
+ } else {
+ if (V.Farmer !== 0) { //if a farmer is assigned
+ food *= 1.1; //TODO: expand this to account for farmer XP and skill
+ if (V.Farmer.skillFA >= V.masteredXP) { //if farmer is master
+ food *= 1.1;
+ }
+ }
+ if (slave.devotion > 50) {
+ food *= 1.1;
+ } else if (slave.devotion < -50) {
+ food *= 0.8;
+ }
+ if (slave.health > 50) { //slave is extremely healthy or more
+ food *= 1.1;
+ } else if (slave.health < -50) { //slave is unhealthy or less
+ food *= 0.8;
+ }
+ if (slave.muscles > 30) { //slave is muscular or more
+ food *= 1.1;
+ } else if (slave.muscles <= -6) { //slave is weak or less
+ food *= 0.8;
+ }
+ if (slave.weight > 95) { //slave is overweight or more
+ food *= 0.9;
+ } else if (slave.weight > 130) { //slave is fat or more
+ food *= 0.8;
+ } else if (slave.weight > 160) { //slave is obese or more
+ food *= 0.7;
+ } else if (slave.weight > 190) { //slave is very obese or more
+ food *= 0.6;
+ }
+ if (slave.eyes === -1) { //slave is nearsighted
+ food *= 0.8;
+ } else if (slave.eyes < -1) { //slave is blind
+ food *= 0.6;
+ }
+ if (slave.hears == -1) { //slave is hard of hearing
+ food *= 0.8;
+ } else if (slave.hears < -1) { //slave is deaf
+ food *= 0.6;
+ }
+ if (slave.tired == 1) { //slave is tired
+ food *= 0.8;
+ }
+ food = Math.trunc(food);
+ food = Math.clamp(food, 1, 1000000000000000000);
+ return food;
+ }
+};
\ No newline at end of file
diff --git a/src/js/slaveGeneration.js b/src/js/slaveGeneration.js
index c53fdd394bd43b3f780657fdd2e07d5cea146b37..9e03b7e2e94cc8a78a6af1f306a7683fa6c9bfc9 100644
--- a/src/js/slaveGeneration.js
+++ b/src/js/slaveGeneration.js
@@ -1540,7 +1540,6 @@ window.BaseSlave = function BaseSlave() {
induceLactation: 0,
lactationAdaptation: 0,
milk: 0,
- food: 0, /* TODO: would this make sense to include? */
cum: 0,
hips: 0,
hipsImplant: 0,
diff --git a/src/js/story.js b/src/js/story.js
index 546ae51d630e2fa1238b079d7dc31b90cf75f739..b7c9d710abd70dd1f952e854140552b1352f445f 100644
--- a/src/js/story.js
+++ b/src/js/story.js
@@ -628,60 +628,7 @@ window.milkAmount = function(slave) {
}
};
-window.foodAmount = function(slave) {
- const V = State.variables
- var food = 400; //kg / food produced by base slave / week
- if (!slave) {
- return null;
- } else {
- if (V.Farmer !== 0) { //if a farmer is assigned
- food *= 1.1 //TODO: expand this to account for farmer XP and skill
- if (V.Farmer.skillFA >= V.masteredXP) { //if farmer is master
- food *= 1.1
- }
- }
- if (slave.devotion > 50) {
- food *= 1.1
- } else if (slave.devotion < -50) {
- food *= 0.8
- }
- if (slave.health > 50) { //slave is extremely healthy or more
- food *= 1.1
- } else if (slave.health < -50) { //slave is unhealthy or less
- food *= 0.8
- }
- if (slave.muscles > 30) { //slave is muscular or more
- food *= 1.1
- } else if (slave.muscles <= -6) { //slave is weak or less
- food *= 0.8
- }
- if (slave.weight > 95) { //slave is overweight or more
- food *= 0.9
- } else if (slave.weight > 130) { //slave is fat or more
- food *= 0.8
- } else if (slave.weight > 160) { //slave is obese or more
- food *= 0.7
- } else if (slave.weight > 190) { //slave is very obese or more
- food *= 0.6
- }
- if (slave.eyes == -1) { //slave is nearsighted
- food *= 0.8
- } else if (slave.eyes < -1) { //slave is blind
- food *= 0.6
- }
- if (slave.hears == -1) { //slave is hard of hearing
- food *= 0.8
- } else if (slave.hears < -1) { //slave is deaf
- food *= 0.6
- }
- if (slave.tired == 1) { //slave is tired
- food *= 0.8
- }
- food = Math.trunc(food);
- food = Math.clamp(food,1,1000000000000000000);
- return food;
- }
-};
+
window.cumAmount = function(slave) {
var cum = 0;
@@ -794,8 +741,8 @@ window.farmShowsIncome = function(slave) {
}
}
if (arcology.FSPaternalist != "unset") {
- if (V.seeBestiality === true) {
- if (V.farmyardBreeding === true) { //slaves are being bred
+ if (V.seeBestiality === 1) {
+ if (V.farmyardBreeding === 1) { //slaves are being bred
cash *= 0.8
} else { //slaves are putting on shows
cash *= 0.9
@@ -803,8 +750,8 @@ window.farmShowsIncome = function(slave) {
}
}
if (arcology.FSDegradationist != "unset") {
- if (V.seeBestiality === true) {
- if (V.farmyardBreeding === true) { //slaves are being bred
+ if (V.seeBestiality === 1) {
+ 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 b6524287f127e76d809cda80b915b9b47861c5bb..1d1f480ac4571d00a22d9536ca9e826abeb499ea 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -3337,7 +3337,7 @@ window.GetVignette = function GetVignette(slave) {
});
} else if (slave.assignment === "work as a farmhand" || slave.assignment === window.Job.FARMYARD || slave.assignment === window.Job.FARMER) {
//TODO: add more vignettes
- if ((V.farmyardShows == true) && (V.seeBestiality == 1)) {
+ if ((V.farmyardShows == 1) && (V.seeBestiality == 1)) {
vignettes.push({
text: `a citizen didn't realize how disgusting he found bestiality until he attended one of ${V.farmyardName}'s shows,`,
type: "rep",
diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw
index 5fe1fdad66677df23120902c3f508f819ba90d55..d5372f3c0f6440e2b90f381f28f55204c4b8b125 100644
--- a/src/npc/uploadSlave.tw
+++ b/src/npc/uploadSlave.tw
@@ -87,7 +87,6 @@ boobsTat: "$activeSlave.boobsTat",
lactation: $activeSlave.lactation,
lactationAdaptation: 0,
milk: 0,
-food: 0, /* TODO: would this make sense to include? */
cum: 0,
hips: $activeSlave.hips,
hipsImplant: $activeSlave.hipsImplant,
diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
index 2102ae749475a916789f2ba69663f9360946e613..57ab89805de5f22ca93aef7262512a5ac6662d3a 100644
--- a/src/pregmod/beastFucked.tw
+++ b/src/pregmod/beastFucked.tw
@@ -30,29 +30,29 @@
<<set _orifice = "mouth">>
<</if>>
-<<set _used = {mouth: false, vagina: false, anus: false}>>
+<<set _used = {mouth: 0, vagina: 0, anus: 0}>>
<<if $activeSlave.vagina > 0>>
- <<set _used.vagina = true>>
+ <<set _used.vagina = 1>>
<</if>>
<<if $activeSlave.anus > 0>>
- <<set _used.anus = true>>
+ <<set _used.anus = 1>>
<</if>>
<<if $activeSlave.oralCount > 0>>
- <<set _used.mouth = true>>
+ <<set _used.mouth = 1>>
<</if>>
<<if $activeSlave.fetish == "masochist">>
- <<set _fetishDesc = "committing such a painful act", _activeQuirk = true>>
+ <<set _fetishDesc = "committing such a painful act", _activeQuirk = 1>>
<<elseif $activeSlave.fetish == "humiliation">>
- <<set _fetishDesc = "committing such a humiliating act", _activeQuirk = true>>
+ <<set _fetishDesc = "committing such a humiliating act", _activeQuirk = 1>>
<<elseif $activeSlave.sexualQuirk == "perverted">>
- <<set _fetishDesc = "committing such a perverted act", _activeQuirk = true>>
+ <<set _fetishDesc = "committing such a perverted act", _activeQuirk = 1>>
<<elseif $activeSlave.behavioralQuirk == "sinful">>
- <<set _fetishDesc = "committing such a sinful act", _activeQuirk = true>>
+ <<set _fetishDesc = "committing such a sinful act", _activeQuirk = 1>>
<<elseif $activeSlave.fetish == "cumslut">>
- <<set _fetishDesc = "getting to drink more cum", _activeQuirk = true>>
+ <<set _fetishDesc = "getting to drink more cum", _activeQuirk = 1>>
<<elseif $activeSlave.sexualQuirk == "gagfuck queen">>
- <<set _fetishDesc = "getting to suck more dick", _activeQuirk = true>>
+ <<set _fetishDesc = "getting to suck more dick", _activeQuirk = 1>>
<</if>>
<<if canWalk($activeSlave)>>You call $him over and<<else>>You order another slave to bring $activeSlave.slaveName over. Once $he is situated, you<</if>> tell $him you want to watch $him <<switch _sexAct>><<case "oral">>suck off<<default>>get fucked by<</switch>> <<print _a>> _animal.species.
diff --git a/src/pregmod/organFarm.tw b/src/pregmod/organFarm.tw
index 7193f4c266f47b56261fcac73805871ad0e5033e..21c279cf585be4b25cd392aa55c6226cfff82d81 100644
--- a/src/pregmod/organFarm.tw
+++ b/src/pregmod/organFarm.tw
@@ -150,7 +150,7 @@ Organ Production
<br>
<</if>>
-<<if $seePreg != 0 && $seeBestiality != false>>
+<<if $seePreg != 0 && $seeBestiality == 1>>
<<if $farmyardLabUpgrades.animalOvaries > 0>>
<<if $animalOvaries < 1>>
//You lack the required designs for cloning animal ovaries for slaves.//
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index d86f95fa4b76104362887b764c1cc8ba465ad513..68b892877af0c44cbf7cb7198928ff2d27de0226 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -206,7 +206,7 @@ Now the only question is what to do with the would-be rapist. You could toss the
<<= assignJob($activeSlave, "work as a farmhand")>>
<<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
<<replace "#result">>
- You complete the legalities and biometric scanning quickly and cautiously. The idiot will wake up in $farmyardName, where $he will spend the rest of $his days working the fields<<if $farmyardShows == true>> and <<if $seeBestiality == 1>>getting fucked by animals<<else>>putting on shows with animals<</if>><</if>>.
+ You complete the legalities and biometric scanning quickly and cautiously. The idiot will wake up in $farmyardName, where $he will spend the rest of $his days working the fields<<if $farmyardShows == 1>> and <<if $seeBestiality == 1>>getting fucked by animals<<else>>putting on shows with animals<</if>><</if>>.
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</replace>>
<</link>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 49b943a2fcda28cb86d978dfc3d6114f4cb08803..2def6610b4857c463d2b57344107399a1c79f216 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -841,44 +841,7 @@
}>>
<</if>>
<<if ndef $animalsBought>>
- <<set $animalsBought = {
- canines: 0,
- hooved: 0,
- felines: 0,
- labradorRetrievers: 0,
- germanShepherds: 0,
- goldenRetrievers: 0,
- frenchBulldogs: 0,
- bulldogs: 0,
- beagles: 0,
- poodles: 0,
- rottweilers: 0,
- yorkshireTerriers: 0,
- siberianHuskies: 0,
- horses: 0,
- siameses: 0,
- persians: 0,
- maineCoons: 0,
- ragdolls: 0,
- bengals: 0,
- abbysinians: 0,
- birmans: 0,
- orientalShorthairs: 0,
- sphynxes: 0,
- russianBlues: 0,
- wolves: 0,
- foxes: 0,
- jackals: 0,
- dingos: 0,
- zebras: 0,
- cougars: 0,
- jaguars: 0,
- pumas: 0,
- lynx: 0,
- leopards: 0,
- lions: 0,
- tigers: 0
- }>>
+ <<set $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}>>
<</if>>
<<if ndef $canines>>
<<set $canines = []>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 384858a1701a14472410f44efa2a7bba3e9de6a5..609b48dbd64ed88ae216f9ea07e1bedefe18a4ea 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -267,7 +267,7 @@ __Special Arcology Upgrades__
<br><br>
-Your slaves have participated in approximately <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print commaNum($oralTotal)>> primarily oral, <<print commaNum($vaginalTotal)>> vanilla, <<print commaNum($mammaryTotal)>> mammary, <<print commaNum($analTotal)>> anal, and <<print commaNum($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print commaNum($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print commaNum($cumTotal)>> deciliters of marketable cum, <<print massFormat($foodTotal)>> of edible food, <</if>>and have given birth <<print commaNum($birthsTotal)>> times.
+Your slaves have participated in approximately <<print commaNum($oralTotal+$vaginalTotal+$analTotal)>> sexual encounters: <<print commaNum($oralTotal)>> primarily oral, <<print commaNum($vaginalTotal)>> vanilla, <<print commaNum($mammaryTotal)>> mammary, <<print commaNum($analTotal)>> anal, and <<print commaNum($penetrativeTotal)>> with the slave penetrating another. They have produced about <<print commaNum($milkTotal)>> liters of marketable milk, <<if $seeDicks != 0>>about <<print commaNum($cumTotal)>> deciliters of marketable cum, <</if>>and have given birth <<print commaNum($birthsTotal)>> times.
<<if $pitKillsTotal > 0>>$pitKillsTotal slaves have died in your fighting pit.<</if>>
<<if $fuckdollsSold > 0>>$fuckdollsSold mindbroken arcade slaves have been converted into Fuckdolls and sold.<</if>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 028eb0a563479ce52c2d79b24b6299386a6301a6..7612ce5afddc94231b78f73d49eb11cd62caa1d2 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1357,7 +1357,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<<if $incubator > 0>>
<<if $activeSlave.preg > 0 && $activeSlave.broodmother == 0 && $activeSlave.pregKnown == 1 && $activeSlave.eggType == "human">>
-<<if ($activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0) || ($activeSlave.assignment == "breed in the farmyard" && $farmyardPregSetting > 0)>>
+<<if ($activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0) || ($activeSlave.assignment == "work in the farmyard" && $farmyardBreeding > 0)>>
<<else>>
<br>
<<if _WL - _reservedNursery == 0>>
@@ -1407,7 +1407,7 @@ Aphrodisiacs: <span id="aphrodisiacs"><strong><<if $activeSlave.aphrodisiacs > 1
<<if $nursery > 0>>
<<if $activeSlave.preg > 0 && $activeSlave.broodmother == 0 && $activeSlave.pregKnown == 1 && $activeSlave.eggType == "human">>
-<<if ($activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0) || ($activeSlave.assignment == "breed in the farmyard" && $farmyardPregSetting > 0)>>
+<<if ($activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0) || ($activeSlave.assignment == "work in the farmyard" && $farmyardBreeding > 0)>>
<<else>>
<br>
<<if _WL - _reservedIncubator == 0>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index f39ecd5623f4127e9988305f36518ee712e61ebd..98ea7560a738da631a4ff71bdb762bedb4e574c3 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -446,17 +446,12 @@
<<case "Milkmaid Select">>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Milkmaid Workaround][$i = _ssi]]
-<<case "Farmyard">> /* TODO: THIS WILL NEED TO BE REWORKED - CURRENTLY AN AMALGAMATION OF THE SERVANTS' QUARTERS AND THE DAIRY REQUIREMENTS (but mostly the servant's quarters)*/
+<<case "Farmyard">>
<<if $Flag == 0>>
<<if _Slave.assignment == ("work as a farmhand")>><<continue>><</if>>
<<if $farmyard <= $farmyardSlaves>><<continue>><</if>>
- <<if (_Slave.devotion >= -20) || ((_Slave.devotion >= -50) && (_Slave.trust <= 20)) || (_Slave.trust < -20)>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
- <<else>>
- <br>//_Slave.slaveName must be either more fearful of you or devoted to you//
- <<continue>>
- <</if>>
<<elseif $Flag == 1>>
<br style="clear:both" /><<if $lineSeparations == 0>><br><<else>><hr style="margin:0"><</if>><<if ($seeImages == 1) && ($seeSummaryImages == 1)>><div class="imageRef smlImg"><<SlaveArt _Slave 1>></div><</if>>
[[_slaveName|Slave Interact][$activeSlave = $slaves[_ssi]]]
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index 5904ef79c88bc3c60c4efc5fbc1289a5ba95cc4c..e53e4236926724592b870bfc7c52082cf786e2bb 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -124,16 +124,16 @@
<<set _animals.push($canines[_roll])>>
<</if>>
<<if $slaves[$i].fetish == "mindbroken">>
- <<if $farmyardShows == true>>
+ <<if $farmyardShows == 1>>
<<set _roll = random(0, _animals.length)>>
$He shows no interest in $his coming birth as $he continues being rutted by a <<print _animals[_roll].species>>, so <<if $Farmer > 0.>>$Farmer.name<<else>>another slave<</if>> has to pull the animal off of $him and pull $him into the nearest birthing stall. /* TODO: is that what the farmyard would use? */ $He also shows almost no reaction when $his child<<if $slaves[$i].pregType > 1>>ren<</if>> begin<<if $slaves[$i].pregType <= 1>>s<</if>> to come out, or when $he is subsequently hosed off before being led back to $farmyardName.
<<else>>
-
+
<<if !canWalk($slaves[$i])>>$He is helped back to $his bed and stripped before slipping into it<<else>>$He returns to $his bed and strips before slipping into it<</if>>. Instinctively, $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and $he rests awhile before returning to the milkers to lighten $his swelling breasts.
<</if>>
<<else>>
- <<if $farmyardShows == true>>
+ <<if $farmyardShows == 1>>
Since the farmyard is designed for pregnant slaves, $he stays hooked up to the milkers. $He meekly protests $his situation, but ultimately accepts it. $He begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, and catches a glimpse of $his child<<if $slaves[$i].pregType > 1>>ren<</if>> being removed from the milking stall, but quickly forgets when $he is hosed off.
<<set $humiliation = 1>>
<<else>>