From 424f9e6ac243b518ccba5a68616161dee560959f Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Sun, 13 Jan 2019 20:41:04 -0500
Subject: [PATCH] Text changes, changed $seeBestiality to use true/false
---
src/events/intro/introSummary.tw | 6 +-
src/facilities/farmyard/farmyard.tw | 36 +++----
src/facilities/farmyard/farmyardReport.tw | 6 +-
src/facilities/farmyard/saWorkTheFarm.tw | 108 +++++++++++---------
src/facilities/nursery/childInteract.tw | 2 +-
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/gui/Encyclopedia/encyclopediaWidgets.tw | 2 +-
src/init/storyInit.tw | 2 +-
src/pregmod/organFarm.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 2 +-
src/uncategorized/options.tw | 6 +-
src/uncategorized/slaveInteract.tw | 2 +-
12 files changed, 92 insertions(+), 84 deletions(-)
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 49928f75fa1..717b8df8d80 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -457,12 +457,12 @@ Should children born in game strictly adhere to dick content settings?
<</if>>
<br>
-<<if $seeBestiality == 1>>
+<<if $seeBestiality == true>>
Bestiality content is ''enabled''.
- [[Disable|Intro Summary][$seeBestiality = 0]]
+ [[Disable|Intro Summary][$seeBestiality = false]]
<<else>>
Bestiality content is ''disabled''.
- [[Enable|Intro Summary][$seeBestiality = 1]]
+ [[Enable|Intro Summary][$seeBestiality = true]]
<</if>>
<<if $seeDicks != 0>>
diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index 8a1a6573c46..52d9cf473c0 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -14,25 +14,25 @@
$farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and concrete that is $arcologies[0].name. Animals are kept in pens, tended to by your slaves, while <<if $farmyardUpgrade.hydroponics == 1>>rows of hydroponics equipment<<else>>makeshift fields<</if>> grow crops.
<<switch $farmyardDecoration>>
<<case "Roman Revivalist">>
- Its red tiles and white stone walls are the very picture of a Roman farm villa's construction, as are the marble statues and reliefs. Saturn and Ceres look over the prosperity of the fields<<if $seeBestiality == 1>>, Mercury watches over the health of the animals, and Feronia ensures strong litters in your slaves.<<else>> and Mercury watches over the health of the animals.<</if>>. The slaves here are all looked after well, as they have one of the most important jobs in $arcologies[0].name.
+ Its red tiles and white stone walls are the very picture of a Roman farm villa's construction, as are the marble statues and reliefs. Saturn and Ceres look over the prosperity of the fields<<if $seeBestiality == true>>, Mercury watches over the health of the animals, and Feronia ensures strong litters in your slaves.<<else>> and Mercury watches over the health of the animals.<</if>>. The slaves here are all looked after well, as they have one of the most important jobs in $arcologies[0].name.
<<case "Aztec Revivalist">>
It can't completely recreate the floating farms in the ancient Aztec fashion, but it comes as close as it can, shallow pseudo-canals dividing each field into multiple sections. Smooth stone and colorful murals cover the walls, depicting bloody stories of gods and mortals alike.
<<case "Egyptian Revivalist">>
- It does its best to capture the wide open nature of ancient Egyptian farms, including mimicking the irrigation systems fed by the Nile. The stone walls are decorated with murals detailing its construction and your prowess in general, <<if $seeBestiality == 1>>with animal-bloated slaves featured prominently.<<else>>hieroglyphs spelling out a volumes of praise.<</if>>
+ It does its best to capture the wide open nature of ancient Egyptian farms, including mimicking the irrigation systems fed by the Nile. The stone walls are decorated with murals detailing its construction and your prowess in general, <<if $seeBestiality == true>>with animal-bloated slaves featured prominently.<<else>>hieroglyphs spelling out a volumes of praise.<</if>>
<<case "Edo Revivalist">>
It does its best to mimic the rice patties and thatch roofed buildings of the Edo period despite the wide variety of crops tended by various slaves. Not every crop can thrive in flooded fields, but the ones that can take advantage of your attention to detail.
<<case "Arabian Revivalist">>
//This is a placeholder//
<<case "Chinese Revivalist">>
- It does its best to capture the terraces that covered the ancient Chinese hills and mountains, turning every floor into ribbons of fields following a slight incline. Slaves wade through crops that can handle flooding and splash through the irrigation of the others when they aren't tending <<if $seeBestiality == 1>>or breeding with<</if>> your animals.
+ It does its best to capture the terraces that covered the ancient Chinese hills and mountains, turning every floor into ribbons of fields following a slight incline. Slaves wade through crops that can handle flooding and splash through the irrigation of the others when they aren't tending <<if $seeBestiality == true>>or breeding with<</if>> your animals.
<<case "Chattel Religionist">>
- It runs like a well oiled machine, slaves bent in humble service as they tend crops grown on the Prophet's command, or see to the animals' needs. Their clothing is tucked up and out of the way as they see to their tasks, keeping them clean as they work <<if $seeBestiality == 1>>around animal bloated bellies<</if>> as divine will dictates.
+ It runs like a well oiled machine, slaves bent in humble service as they tend crops grown on the Prophet's command, or see to the animals' needs. Their clothing is tucked up and out of the way as they see to their tasks, keeping them clean as they work <<if $seeBestiality == true>>around animal bloated bellies<</if>> as divine will dictates.
<<case "Degradationist">>
- It is constructed less as a converted warehouse and more as something to visit, allowing guests to enjoy the spectacle of slaves <<if $seeBestiality == 1>>being pounded by eager animals<<else>>elbow deep in scrubbing animal waste<</if>> to their satisfaction.
+ It is constructed less as a converted warehouse and more as something to visit, allowing guests to enjoy the spectacle of slaves <<if $seeBestiality == true>>being pounded by eager animals<<else>>elbow deep in scrubbing animal waste<</if>> to their satisfaction.
<<case "Repopulation Focus">>
- It teems with life, both in the belly of every animal and the belly of every slave, though the latter makes tending the fields difficult. They're ordered to take care, as they carry the future <<if $seeBestiality == 1>>of this farm<<else>>of the arcology<</if>> in their bellies.
+ It teems with life, both in the belly of every animal and the belly of every slave, though the latter makes tending the fields difficult. They're ordered to take care, as they carry the future <<if $seeBestiality == true>>of this farm<<else>>of the arcology<</if>> in their bellies.
<<case "Eugenics">>
- It holds a wide variety of crops and animals, but the best of the best is easy to find. They're set apart from the others, given only the best care and supplies<<if $seeBestiality == 1>>and bred with only the highest quality slaves<</if>>, while the sub-par stock is neglected off to the side.
+ It holds a wide variety of crops and animals, but the best of the best is easy to find. They're set apart from the others, given only the best care and supplies<<if $seeBestiality == true>>and bred with only the highest quality slaves<</if>>, while the sub-par stock is neglected off to the side.
<<case "Asset Expansionist">>
It is not easy to look after animals and till fields with such enormous body parts, but your slaves are diligent regardless, working hard to provide food and livestock for the arcology.
<<case "Transformation Fetishist">>
@@ -42,13 +42,13 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
<<case "Gender Fundamentalist">>
//This is a placeholder//
<<case "Physical Idealist">>
- Its animals are in exceptional shape, their coats unable to hide how muscular they are, requiring your slaves to be equally toned to control them. There's plenty of space for their exercise as well<<if $seeBestiality == 1>> and an abundance of curatives for the slaves full of their fierce kicking offspring<</if>>.
+ Its animals are in exceptional shape, their coats unable to hide how muscular they are, requiring your slaves to be equally toned to control them. There's plenty of space for their exercise as well<<if $seeBestiality == true>> and an abundance of curatives for the slaves full of their fierce kicking offspring<</if>>.
<<case "Supremacist">>
It is a clean and orderly operation, stables and cages mucked by a multitude of inferior slaves, along with grooming your animals and harvesting your crops.
<<case "Subjugationist">>
It is a clean and orderly operation, stables and cages mucked by a multitude of $arcologies[0].FSSubjugationistRace slaves, while the others are tasked with grooming your animals and harvesting your crops.
<<case "Paternalist">>
- It's full of healthy animals, crops, and slaves, the former's every need diligently looked after by the latter. The fields flourish to capacity under such care, and the animals give the distinct impression of happiness. <<if $seeBestiality == 1>>Some more than others if the growing bellies of your slaves are anything to go by, the only indication that such rutting takes place.<</if>> /* TODO: this sentence seems weird */
+ It's full of healthy animals, crops, and slaves, the former's every need diligently looked after by the latter. The fields flourish to capacity under such care, and the animals give the distinct impression of happiness. <<if $seeBestiality == true>>Some more than others if the growing bellies of your slaves are anything to go by, the only indication that such rutting takes place.<</if>> /* TODO: this sentence seems weird */
<<case "Pastoralist">>
//This is a placeholder//
<<case "Maturity Preferentialist">>
@@ -60,7 +60,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
<<case "Slimness Enthusiast">>
It features trim animals and slaves alike, not a pound of excess among them. The feed for both livestock and crops are carefully maintained to ensure optimal growth without waste, letting them flourish without being weighed down.
<<case "Hedonistic">>
- It features wider gates and stalls, for both the humans visiting or tending the occupants, and the animals starting to mimic their handlers <<if $seeBestiality == 1>>and company<</if>>, with plenty of seats along the way.
+ It features wider gates and stalls, for both the humans visiting or tending the occupants, and the animals starting to mimic their handlers <<if $seeBestiality == true>>and company<</if>>, with plenty of seats along the way.
<<default>>
It is very much a converted warehouse still, sectioned off in various 'departments'<<if $farmyardUpgrade.machinery == 1>> with machinery placed where it can be<</if>>.
<</switch>>
@@ -227,30 +227,30 @@ $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 == 1 && (_CL > 0 || _HL > 0 || _FL > 0)>>
+ <<if $farmyardShows == true && (_CL > 0 || _HL > 0 || _FL > 0)>>
Slaves ''are'' putting on shows with animals.
- [[End shows|Farmyard][$farmyardShows = 0, $farmyardBreeding = 0, $farmyardRestraintSettings = 0]]
- <<if $seeBestiality == 1>>
+ [[End shows|Farmyard][$farmyardShows = false, $farmyardBreeding = false, $farmyardRestraintSettings = false]]
+ <<if $seeBestiality == true>>
<br>
<<if $farmyardBreeding == 1>>
Slaves ''are'' being bred with animals.
- [[End breeding|Farmyard][$farmyardBreeding = 0, $farmyardRestraintSettings = 0]]
+ [[End breeding|Farmyard][$farmyardBreeding = false, $farmyardRestraintSettings = false]]
<br>
<<if $farmyardRestraintSettings == 1>>
''All of the slaves'' are being restrained.
- [[Restrain only disobedient slaves|Farmyard][$farmyardRestraintSettings = 0]]
+ [[Restrain only disobedient slaves|Farmyard][$farmyardRestraintSettings = false]]
<<else>>
''Only disobedient slaves'' are being restrained.
- [[Restrain all of the slaves|Farmyard][$farmyardRestraintSettings = 1]]
+ [[Restrain all of the slaves|Farmyard][$farmyardRestraintSettings = true]]
<</if>>
<<else>>
Slaves ''are not'' being bred with animals.
- [[Begin breeding|Farmyard][$farmyardBreeding = 1]]
+ [[Begin breeding|Farmyard][$farmyardBreeding = true]]
<</if>>
<</if>>
<<else>>
Slaves ''are not'' putting on shows with animals.
- [[Begin shows|Farmyard][$farmyardShows = 1]]
+ [[Begin shows|Farmyard][$farmyardShows = true]]
<</if>>
<</if>>
<br><br>
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 643fc5d3f12..2387f07ea12 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -334,7 +334,7 @@
<</silently>>
<</if>>
<span id="farmyardProfits">
- <<if $farmyardShows == 1>>
+ <<if $farmyardShows == true>>
<</if>>
</span>
@@ -380,9 +380,9 @@
<<if $farmyardDecoration != "standard">>
<br>$farmyardNameCaps's customers enjoyed
- <<if $seeBestiality == 1 && $farmyardBreeding > 0 && ($canines.length > 0 || $hooved.length > 0 || $felines.length > 0)>>
+ <<if $seeBestiality == true && $farmyardBreeding > 0 && ($canines.length > 0 || $hooved.length > 0 || $felines.length > 0)>>
@@.green;watching farmhands fuck animals in $farmyardDecoration surroundings.@@
- <<elseif $farmyardShows > 0>>
+ <<elseif $farmyardShows == true>>
@@.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 58ebf5077b0..8bd439316c1 100644
--- a/src/facilities/farmyard/saWorkTheFarm.tw
+++ b/src/facilities/farmyard/saWorkTheFarm.tw
@@ -1,4 +1,4 @@
-:: SA work the farm [nobr] /* TODO: This entire passage will need to be reworked */
+:: SA work the farm [nobr]
<!-- Statistics gathering -->
<<set _incomeStats = getSlaveStatisticData($slaves[$i], $slaves[$i].assignment === Job.FARMYARD ? $facility.farmyard : undefined)>>
@@ -8,7 +8,7 @@
<<set $slaves[$i].lactationAdaptation = 0>>
<</if>>
-<<set $food = 0>>
+<<set _food = 0>>
works as a farmhand this week.
<<if $farmyard > 0>>
@@ -28,65 +28,73 @@ works as a farmhand this week.
<</if>>
<</if>>
-/* FOOD PRODUCTION */
- <<set $food = foodAmount($slaves[$i])>>
+/* OPEN FOOD PRODUCTION */
- <<if ($Farmer != 0)>>
- <<print $Farmer.slaveName>> watches over $him, making sure that $he doesn't slack off and works as hard as $he needs to.
- <</if>>
- <<if ($slaves[$i].devotion > 50)>>
- $He's so devoted to you that $he works harder and produces more food.
- <<elseif ($slaves[$i].devotion < -50)>>
- $He's so resistant that $he doesn't work as hard and produces less food. /* TODO: could use some rewriting */
- <</if>>
+<<set _food = foodAmount($slaves[$i])>>
- <<if ($slaves[$i].health > 50)>>
- $His shining health helps $him really work hard.
- <<elseif ($slaves[$i].health < -50)>>
- $His poor health impedes $his ability to work efficiently.
- <</if>>
+<<if ($Farmer != 0)>>
+ <<print $Farmer.slaveName>> watches over $him, making sure that $he doesn't slack off and works as hard as $he needs to.
+<</if>>
+<<if ($slaves[$i].devotion > 50)>>
+ $He's so devoted to you that $he works harder and produces more food.
+<<elseif ($slaves[$i].devotion < -50)>>
+ $He's so resistant that $he doesn't work as hard, and thus produces less food.
+<</if>>
- <<if ($slaves[$i].muscles > 50)>>
- $His muscular form helps $him work better, increasing $his productivity.
- <<elseif ($slaves[$i]).muscles < -50>>
- $He is so weak that $he is not able to work effectively.
- <</if>>
+<<if ($slaves[$i].health > 50)>>
+ $His shining health helps $him really work hard.
+<<elseif ($slaves[$i].health < -50)>>
+ $His poor health impedes $his ability to work efficiently.
+<</if>>
- <<if ($slaves[$i].weight > 95)>>
- $He is so overweight that $he has to stop every few minutes to catch $his breath, and so $his productivity suffers.
- <</if>>
+<<if ($slaves[$i].muscles > 50)>>
+ $His muscular form helps $him work better, increasing $his productivity.
+<<elseif ($slaves[$i]).muscles < -50>>
+ $He is so weak that $he is not able to work effectively.
+<</if>>
- <<if ($slaves[$i].eyes == -1)>>
- $His nearsightedness makes it harder for $him to work as hard as $he otherwise would.
- <<elseif ($slaves[$i].eyes < -1)>>
- $His blindness makes it extremely difficult for $him to work, severely limiting $his production.
- <</if>>
+<<if ($slaves[$i].weight > 95)>>
+ $He is so overweight that $he has to stop every few minutes to catch $his breath, and so $his productivity suffers.
+<</if>>
- <<if ($slaves[$i].hears == -1)>>
- $He is hard-of-hearing, which gets in the way of $his work whenever $he misses directions<<if $Farmer != 0>> from $Farmer.name<</if>>.
- <<elseif ($slaves[$i].hears < -1)>>
- $He is deaf, which gets in the way of $his work whenever $he misses directions<<if $Farmer != 0>> from $Farmer.name<</if>>.
- <</if>>
+<<if ($slaves[$i].eyes == -1)>>
+ $His nearsightedness makes it harder for $him to work as hard as $he otherwise would.
+<<elseif ($slaves[$i].eyes < -1)>>
+ $His blindness makes it extremely difficult for $him to work, severely limiting $his production.
+<</if>>
- <<if ($slaves[$i].tired == 1)>>
- $He is so tired that $he doesn't have the energy to work efficiently, impacting $his production.
- <</if>>
+<<if ($slaves[$i].hears == -1)>>
+ $He is hard-of-hearing, which gets in the way of $his work whenever $he misses directions<<if $Farmer != 0>> from $Farmer.name<</if>>.
+<<elseif ($slaves[$i].hears < -1)>>
+ $He is deaf, which gets in the way of $his work whenever $he misses directions<<if $Farmer != 0>> from $Farmer.name<</if>>.
+<</if>>
- <<set $food = Math.trunc($food)>>
- <<if $food < 1>>
- <<set $food = 1>>
- <</if>>
- <<set $foodTotal += $food>>
-
- As a result, $he produces @@.chocolate;<<print foodFormat($food)>>@@ of food over the week.
- <<set _incomeStats.food += $food>>
+<<if ($slaves[$i].tired == 1)>>
+ $He is so tired that $he doesn't have the energy to work efficiently, impacting $his production.
+<</if>>
+
+<<set _food = Math.trunc(_food)>>
+<<if _food < 1>>
+ <<set _food = 1>>
+<</if>>
+<<set $foodTotal += _food, $food += _food>>
+
+As a result, $he produces @@.chocolate;<<print foodFormat(_food)>>@@ of food over the week.
+<<set _incomeStats.food += _food>>
/* CLOSE FOOD PRODUCTION */
- <<if $slaves[$i].fetishKnown>>
+/* OPEN SHOWS */
+
+<<set _showsIncome = 0>>
+
+
+
+/* CLOSE SHOWS*/
+
+ <<if $slaves[$i].fetishKnown && $farmyardShows == true>>
<<if ($slaves[$i].fetish == ("submissive") || ("humiliation") || ("masochist")) || ($slaves[$i].energy > 95)>>
- /* TODO: rewrite this */
- Getting constantly milked is as good as sex, as far as $he's concerned. @@.hotpink;$He is happy@@ to have $his breasts receive so much attention.
+ 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.
<<set $slaves[$i].devotion += 1>>
<<if $slaves[$i].need>><<set $slaves[$i].need = 0>><</if>>
<</if>>
@@ -187,7 +195,7 @@ works as a farmhand this week.
<<if $slaves[$i].assignment == "work as a farmhand">>
<<if $farmyardDecoration != "standard">>
-<<set _fsGain = Math.min(0.0001*$FSSingleSlaveRep*($food+5*$cum), 1)>>
+<<set _fsGain = Math.min(0.0001*$FSSingleSlaveRep*(_food+5*$cum), 1)>>
<<switch $farmyardDecoration>>
<<case "Roman Revivalist">>
<<set $arcologies[0].FSRomanRevivalist = Math.clamp($arcologies[0].FSRomanRevivalist += _fsGain,0,100)>>
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 47f74cedf8a..afdb9367ff8 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -160,7 +160,7 @@
<<elseif $activeChild.clit >= 4>>
| <<link "Have another slave ride $his clit-dick" "FSlaveSlaveDick">><</link>>
<</if>>
- <<if $seeBestiality == 1>>
+ <<if $seeBestiality == true>>
<<if $farmyardKennels > 0 && $activeCanine != 0>>
| <<link "Have a $activeCanine.species mount $him">><<set $animalType = "canine">><<replace "#miniscene">><<set $childSex = 1>><<include "BeastFucked">><br> <</replace>><</link>>
<</if>>
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index c05a40ff15a..0d56adb17bc 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -1689,7 +1689,7 @@ ARCOLOGY FACILITIES
<<case "Farmyard">> /* TODO: this will need more information */
- The ''Farmyard'' is where the majority of the [[food|Encyclopedia][$encyclopedia = "Food"]] in your arcology is grown, once it is built. It also allows you to house animals<<if $seeBestiality == 1>>, which you can have interact with your slaves<</if>>. The Farmyard can be furnished according to [[future society|Encyclopedia][$encyclopedia = "Future Societies"]] styles, and doing so can add a slight @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ boost to slaves working there. /* TODO: this may need to be changed */
+ The ''Farmyard'' is where the majority of the [[food|Encyclopedia][$encyclopedia = "Food"]] in your arcology is grown, once it is built. It also allows you to house animals<<if $seeBestiality == true>>, which you can have interact with your slaves<</if>>. The Farmyard can be furnished according to [[future society|Encyclopedia][$encyclopedia = "Future Societies"]] styles, and doing so can add a slight @@.hotpink;[[devotion|Encyclopedia][$encyclopedia = "From Rebellious to Devoted"]]@@ boost to slaves working there. /* TODO: this may need to be changed */
<br>//This entry still needs work and will be updated with more information as it matures. If this message is still here, remind one of the devs to remove it.//
diff --git a/src/gui/Encyclopedia/encyclopediaWidgets.tw b/src/gui/Encyclopedia/encyclopediaWidgets.tw
index 8a1c47f9b64..f3e3ecf3cc3 100644
--- a/src/gui/Encyclopedia/encyclopediaWidgets.tw
+++ b/src/gui/Encyclopedia/encyclopediaWidgets.tw
@@ -23,7 +23,7 @@
<</widget>>
<<widget "encyclopediaEntryFarming">>
-''Farming'' is an assignment which produces [[food|Encyclopedia][$encyclopedia = "Food"]] from your slaves' hard work<<if $seeBestiality == 1>> and allows you to breed slaves with animals<</if>>. Can also reduce arcology upkeep with upgrades in the [[Farmyard|Encyclopedia][$encyclopedia = "Farmyard"]].
+''Farming'' is an assignment which produces [[food|Encyclopedia][$encyclopedia = "Food"]] from your slaves' hard work<<if $seeBestiality == true>> and allows you to breed slaves with animals<</if>>. Can also reduce arcology upkeep with upgrades in the [[Farmyard|Encyclopedia][$encyclopedia = "Farmyard"]].
<</widget>>
<<widget "encyclopediaEntryPublicService">>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index d32ccbbe36e..381c51716c5 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -207,7 +207,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $seeFCNN = 1>>
<<set $useSummaryCache = true>>
<<set $seeExtreme = 0>>
- <<set $seeBestiality = 0>>
+ <<set $seeBestiality = false>>
<<set $extremeUnderage = 0>>
<<set $seeHyperPreg = 0>>
<<set $seePreg = 1>>
diff --git a/src/pregmod/organFarm.tw b/src/pregmod/organFarm.tw
index c0c2fada1e0..f65eee5b042 100644
--- a/src/pregmod/organFarm.tw
+++ b/src/pregmod/organFarm.tw
@@ -151,7 +151,7 @@ Organ Production
<</if>>
/*
-<<if $seePreg != 0 && $seeBestiality != 0>>
+<<if $seePreg != 0 && $seeBestiality != false>>
<<if $farmyardLabUpgrades.animalOvaries > 0>>
<<if $animalOvaries < 1>>
//You lack the required designs for cloning animal ovaries for slaves.//
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 62406554c59..d9aa78053e1 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -556,7 +556,7 @@
<<unset $showBestiality>>
<</if>>
<<if ndef $seeBestiality>>
- <<set $seeBestiality = 0>>
+ <<set $seeBestiality = false>>
<</if>>
<<if ndef $extremeUnderage>>
<<set $extremeUnderage = 0>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 0c06b2877b4..f4eec9ed92d 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -360,10 +360,10 @@ Assignment performance vignettes on the end week report are
<br> More granular control of what appears is in// [[Description Options]].
<br>
-<<if ($seeBestiality == 0)>>
- Bestiality related content is currently @@.red;DISABLED.@@ [[Enable|Options][$seeBestiality = 1]]
+<<if ($seeBestiality == false)>>
+ Bestiality related content is currently @@.red;DISABLED.@@ [[Enable|Options][$seeBestiality = true]]
<<else>>
- Bestiality related content is currently @@.cyan;ENABLED.@@ [[Disable|Options][$seeBestiality = 0]] //Will not remove existing facilities, but will block content from appearing.//
+ Bestiality related content is currently @@.cyan;ENABLED.@@ [[Disable|Options][$seeBestiality = false]] //Will not remove existing facilities, but will block content from appearing.//
<</if>>
<br>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index fc6fc2e39e7..19671593f0e 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -217,7 +217,7 @@
<<elseif $activeSlave.clit >= 4>>
| <<link "Have another slave ride $his clit-dick" "FSlaveSlaveDick">><</link>>
<</if>>
- <<if $seeBestiality == 1 && $cheatMode == 1>>
+ <<if $seeBestiality == true && $cheatMode == 1>>
<<if $farmyardKennels > 0 && $activeCanine != 0>>
| <<link "Have a $activeCanine.species mount $him">><<set $animalType = "canine">><<replace "#miniscene">><<include "BeastFucked">><br> <</replace>><</link>>
<</if>>
--
GitLab