diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw
index a844d0b9f9d5bbf7be1252af4517c9d868f94644..dc71bf926e1b6aba9c1777cad076c2aef6770dcc 100644
--- a/src/pregmod/beastFucked.tw
+++ b/src/pregmod/beastFucked.tw
@@ -3,36 +3,14 @@
<<run clearSummaryCache($activeSlave)>>
<<setLocalPronouns $activeSlave>>
-<<if $animalType == "hooved">> /*"hooved" animals will default to horses for now, until variants of the scene are written for different types*/
- <<set _animal = {species: "horse", type: "hooved", dickSize: "huge", ballType: "horse"}>>
-<<elseif $animalType == "canine">>
- <<switch $continent>>
- <<case "North America">>
- <<set _animal = {species: "wolf", type: "canine", dickSize: "large", ballType: "wolf"}>>
- <<case "South America" "Brazil">>
- <<set _animal = {species: "fox", type: "canine", dickSize: "large", ballType: "fox"}>>
- <<case "Europe" "the Middle East" "Africa" "Asia" "Japan">>
- <<set _animal = {species: "jackal", type: "canine", dickSize: "large", ballType: "jackal"}>>
- <<case "Australia">>
- <<set _animal = {species: "dingo", type: "canine", dickSize: "large", ballType: "dingo"}>>
- <</switch>>
+/*TODO: Add slave-animal impregnation*/
+
+<<if $animalType == "canine">>
+ <<set _animal = $activeCanine>>
+<<elseif $animalType == "hooved">>
+ <<set _animal = $activeHooved>>
<<elseif $animalType == "feline">>
- <<switch $continent>>
- <<case "North America">>
- <<set _animal = {species: "cougar", type: "feline", dickSize: "large", ballType: "cougar"}>>
- <<case "South America">>
- <<set _animal = {species: "jaguar", type: "feline", dickSize: "large", ballType: "jaguar"}>>
- <<case "Brazil">>
- <<set _animal = {species: "puma", type: "feline", dickSize: "large", ballType: "puma"}>>
- <<case "Europe">>
- <<set _animal = {species: "lynx", type: "feline", dickSize: "large", ballType: "lynx"}>>
- <<case "the Middle East" "Australia">> /*Australia doesn't actually have a native big cat, so it's assumed they imported some*/
- <<set _animal = {species: "leopard", type: "feline", dickSize: "large", ballType: "leopard"}>>
- <<case "Africa">>
- <<set _animal = {species: "lion", type: "feline", dickSize: "large", ballType: "lion"}>>
- <<case "Asia" "Japan">>
- <<set _animal = {species: "tiger", type: "feline", dickSize: "large", ballType: "tiger"}>>
- <</switch>>
+ <<set _animal = $activeFeline>>
<</if>>
<<if canDoVaginal($activeSlave)>>
@@ -181,12 +159,12 @@
<<if ($activeSlave.devotion <= 20)>>
and only the threat of worse punishment prevents $him from running out of the room.
<</if>>
- You have $him <<if ($activeSlave.clothes != "naked") && (_sexAct != "oral")>>take off $his clothing and <</if>><<if ($activeSlave.collar != "no collar")>>take off $his $activeSlave.collar, then <</if>><<if _sexAct == "oral">>lay <<else>>kneel <</if>>down on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>on $his back<</if>>
+ You have $him <<if ($activeSlave.clothing != "naked") && (_sexAct != "oral")>>take off $his clothing and <</if>><<if ($activeSlave.collar != "no collar" || $activeSlave.collar != "none")>>$his $activeSlave.collar, then <</if>><<if _sexAct == "oral">>lay <<else>>kneel <</if>>down on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>on $his back<</if>>
<<else>>
- and $Bodyguard.slaveName has to physically prevent $him from running out of the room<<if random(1,100) > 75>><<set $activeSlave.minorInjury = either("black eye", "split lip", "bruise")>>, resulting in a $activeSlave.minorInjury. <<else>>. <</if>>You <<if ($activeSlave.clothes != "no clothing")>>force $him to take off $his $activeSlave.clothes and <</if>>restrain $him on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>with a ring gag in $his mouth<</if>> -- all the while ignoring $his screams and pleas for mercy --
+ and $Bodyguard.slaveName has to physically prevent $him from running out of the room<<if random(1,100) > 75>><<set $activeSlave.minorInjury = either("black eye", "split lip", "bruise")>>, resulting in a $activeSlave.minorInjury. <<else>>. <</if>>You <<if ($activeSlave.clothing != "naked")>>force $him to take off $his $activeSlave.clothing and <</if>>restrain $him on the floor <<if _sexAct != "oral">>with $his ass in the air<<else>>with a ring gag in $his mouth<</if>> -- all the while ignoring $his screams and pleas for mercy --
<</if>>
<<else>>
- but $he knows $he is powerless to stop you. You <<if ($activeSlave.clothes != "no clothing")>>take off $his clothes and <</if>><<if _sexAct == "oral">>place a ring gag in $his mouth, then<</if>>place $him on the ground with a cushion under $his hips <<if _sexAct != "oral">>, $his ass in the air,<</if>>
+ but $he knows $he is powerless to stop you. You <<if ($activeSlave.clothing != "naked")>>take off $his clothes and <</if>><<if _sexAct == "oral">>place a ring gag in $his mouth, then<</if>>place $him on the ground with a cushion under $his hips <<if _sexAct != "oral">>, $his ass in the air,<</if>>
<</if>>
before calling in the _animal.species. The _animal.species slowly saunters up to the <<if ($activeSlave.devotion <= 20)>>bound <</if>>slave and takes its position
diff --git a/src/pregmod/farmyard.tw b/src/pregmod/farmyard.tw
index 3973e7f58d6a24ce08abe069f82e377630788d72..794987e16cc390ea8246869c8bea1c41f4359d86 100644
--- a/src/pregmod/farmyard.tw
+++ b/src/pregmod/farmyard.tw
@@ -6,36 +6,6 @@
<<set $farmyardNameCaps = $farmyardName.replace("the ", "The ")>>
<</if>>
-<<set _hooved = {species: "horse", type: "hooved", dickSize: "huge", ballType: "horse"}>>
-
-<<switch $continent>>
-<<case "North America">>
- <<set _canine = {species: "wolf", type: "canine", dickSize: "large", ballType: "wolf"}>>
-<<case "South America" "Brazil">>
- <<set _canine = {species: "fox", type: "canine", dickSize: "large", ballType: "fox"}>>
-<<case "Europe" "the Middle East" "Africa" "Asia" "Japan">>
- <<set _canine = {species: "jackal", type: "canine", dickSize: "large", ballType: "jackal"}>>
-<<case "Australia">>
- <<set _canine = {species: "dingo", type: "canine", dickSize: "large", ballType: "dingo"}>>
-<</switch>>
-
-<<switch $continent>>
-<<case "North America">>
- <<set _feline = {species: "cougar", type: "feline", dickSize: "large", ballType: "cougar"}>>
-<<case "South America">>
- <<set _feline = {species: "jaguar", type: "feline", dickSize: "large", ballType: "jaguar"}>>
-<<case "Brazil">>
- <<set _feline = {species: "puma", type: "feline", dickSize: "large", ballType: "puma"}>>
-<<case "Europe">>
- <<set _feline = {species: "lynx", type: "feline", dickSize: "large", ballType: "lynx"}>>
-<<case "the Middle East" "Australia">> /*Australia doesn't actually have a native big cat, so it's assumed they imported some*/
- <<set _feline = {species: "leopard", type: "feline", dickSize: "large", ballType: "leopard"}>>
-<<case "Africa">>
- <<set _feline = {species: "lion", type: "feline", dickSize: "large", ballType: "lion"}>>
-<<case "Asia" "Japan">>
- <<set _feline = {species: "tiger", type: "feline", dickSize: "large", ballType: "tiger"}>>
-<</switch>>
-
$farmyardNameCaps is not dissimilar to a warehouse in its basic size and form, but most warehouses don't contain the huge, dense, banks of crop-growing machinery this one does. Here, fruits and vegetables of all shapes and sizes are grown; from exotic, succulent Old World fruits to the average, everyday, vegetables. This is where the majority of the food in $arcologies[0].name comes from, making this one of the more critical facilities in your arcology.
<br><br>
@@ -74,34 +44,132 @@ $farmyardNameCaps is not dissimilar to a warehouse in its basic size and form, b
<</if>>
<<if $seeBestiality == 1>>
-<br><br>
+<br>
<<if ($farmyardKennels == 0)>>
+ <br>
+ <<switch $continent>>
+ <<case "North America">>
+ <<set $activeCanine = {species: "wolf", speciesCap: "Wolf", speciesPlural: "wolves", type: "canine", dickSize: "large", ballType: "wolf"}>>
+ <<set $boughtWolves = 1>>
+ <<case "South America" "Brazil">>
+ <<set $activeCanine = {species: "fox", speciesCap: "Fox", speciesPlural: "foxes", type: "canine", dickSize: "large", ballType: "fox"}>>
+ <<set $boughtFoxes = 1>>
+ <<case "Europe" "the Middle East" "Africa" "Asia" "Japan">>
+ <<set $activeCanine = {species: "jackal", speciesCap: "Jackal", speciesPlural: "jackals", type: "canine", dickSize: "large", ballType: "jackal"}>>
+ <<set $boughtJackals = 1>>
+ <<case "Australia">>
+ <<set $activeCanine = {species: "dingo", speciesCap: "Dingo", speciesPlural: "dingos", type: "canine", dickSize: "large", ballType: "dingo"}>>
+ <<set $boughtDingos = 1>>
+ <</switch>>
[[Add kennels|Farmyard][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $farmyardKennels = 1]]
- //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> and allows you to keep <<print _canine.species>>s. This description is temporary and will be changed.//
+ //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>> and allows you to keep <<print $activeCanine.species>>s. This description is temporary and will be changed.//
<br>
- <</if>>
- <<if ($farmyardKennels == 1)>>
- Kennels have been built in one corner of $farmyardName, and are currently occupied by <<print _canine.species>>s. //This description is temporary and will be changed.//
+ <<elseif ($farmyardKennels == 1)>>
+ <br>
+ Kennels have been built in one corner of $farmyardName, and are currently occupied by <<print $activeCanine.species>>s. //This description is temporary and will be changed.//
+ <<if $rep > 10000>>
+ <br>
+ [[Upgrade kennels|Farmyard][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $farmyardKennels = 2]]
+ //Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>> and allows you to keep all types of exotic canines. This description is temporary and will be changed.//
+ <</if>>
+ <br>
+ <<elseif ($farmyardKennels == 2)>>
+ <br>
+ <<link"Kennels" "FarmyardAnimals">><</link>> have been built in one corner of $farmyardName, and are currently occupied by
+ <<nobr>>
+ <<if $boughtCanines > 0>>
+ <<if $boughtWolves == 1 && $activeCanine.species != "wolf">>
+ wolves<<if $boughtCanines > 1>>,<</if>>
+ <</if>>
+ <<if $boughtFoxes == 1 && $activeCanine.species != "fox">>
+ foxes<<if $boughtCanines > 1>>,<</if>>
+ <</if>>
+ <<if $boughtJackals == 1 && $activeCanine.species != "jackal">>
+ jackals<<if $boughtCanines > 1>>,<</if>>
+ <</if>>
+ <<if $boughtDingos == 1 && $activeCanine.species != "dingo">>
+ dingos<<if $boughtCanines > 1>>,<</if>>
+ <</if>>
+ and
+ <</if>>
+ <<print $activeCanine.speciesPlural>>.
+ <</nobr>>
<br>
<</if>>
<<if ($farmyardStable == 0)>>
+ <br>
+ <<set $activeHooved = {species: "horse", speciesCap: "Horse", speciesPlural: "horses", type: "hooved", dickSize: "huge", ballType: "horse"}>>
[[Add a stable|Farmyard][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $farmyardStable = 1]]
//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>> and allows you to keep <<print "horse">>s. This description is temporary and will be changed.//
<br>
- <</if>>
- <<if ($farmyardStable == 1)>>
+ <<elseif ($farmyardStable == 1)>>
+ <br>
A large stable has been built at the far end of $farmyardName, and currently holds a decent amount of large <<print "horse">>s. //This description is temporary and will be changed.//
<br>
<</if>>
<<if ($farmyardCages == 0)>>
+ <br>
+ <<switch $continent>>
+ <<case "North America">>
+ <<set $activeFeline = {species: "cougar", speciesCap: "Cougar", speciesPlural: "cougars", type: "feline", dickSize: "large", ballType: "cougar"}>>
+ <<set $boughtCougars = 1>>
+ <<case "South America" "Brazil">>
+ <<set $activeFeline = {species: "jaguar", speciesCap: "Jaguar", speciesPlural: "jaguars", type: "feline", dickSize: "large", ballType: "jaguar"}>>
+ <<set $boughtJaguars = 1>>
+ <<case "Europe">>
+ <<set $activeFeline = {species: "lynx", speciesCap: "Lynx", speciesPlural: "lynx", type: "feline", dickSize: "large", ballType: "lynx"}>>
+ <<set $boughtLynx = 1>>
+ <<case "the Middle East" "Australia">>
+ <<set $activeFeline = {species: "leopard", speciesCap: "Leopard", speciesPlural: "leopards", type: "feline", dickSize: "large", ballType: "leopard"}>>
+ <<set $boughtLeopards = 1>>
+ <<case "Africa">>
+ <<set $activeFeline = {species: "lion", speciesCap: "Lion", speciesPlural: "lions", type: "feline", dickSize: "large", ballType: "lion"}>>
+ <<set $boughtLions = 1>>
+ <<case "Asia" "Japan">>
+ <<set $activeFeline = {species: "tiger", speciesCap: "Tiger", speciesPlural: "tigers", type: "feline", dickSize: "large", ballType: "tiger"}>>
+ <<set $boughtTigers = 1>>
+ <</switch>>
[[Add cages|Farmyard][$cash -= Math.trunc(25000*$upgradeMultiplierArcology), $farmyardCages = 1]]
- //Costs <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>> and allows you to keep <<print _feline.species>>s. This description is temporary and will be changed.//
+ //Costs <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology))>> and allows you to keep <<print $activeFeline.species>>s. This description is temporary and will be changed.//
+ <br>
+ <<elseif ($farmyardCages == 1)>>
+ <br>
+ Large cages have been set up along one wall of $farmyardName, and are currently occupied by large <<print($activeFeline.species)>>s. //This description is temporary and will be changed.//
+ <<if $rep > 15000>>
+ <br>
+ [[Upgrade cages|Farmyard][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $farmyardCages = 2]]
+ //Costs <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>> and allows to keep all types of exotic felines. This description is temporary and will be changed.//
+ <</if>>
+ <<elseif ($farmyardCages == 2)>>
+ <br>
+ <<link "Large cages" "FarmyardAnimals">><</link>> have been built in one corner of $farmyardName, and are currently occupied by large
+ <<nobr>>
+ <<if $boughtFelines > 0>>
+ <<if $boughtCougars == 1 && $activeFeline.species != "cougar">>
+ cougars<<if $boughtFelines > 1>>,<</if>>
+ <</if>>
+ <<if $boughtJaguars == 1 && $activeFeline.species != "jaguar">>
+ jaguars<<if $boughtFelines > 1>>,<</if>>
+ <</if>>
+ <<if $boughtLynx == 1 && $activeFeline.species != "lynx">>
+ lynx<<if $boughtFelines > 1>>,<</if>>
+ <</if>>
+ <<if $boughtLeopards == 1 && $activeFeline.species != "leopard">>
+ leopards<<if $boughtFelines > 1>>,<</if>>
+ <</if>>
+ <<if $boughtLions == 1 && $activeFeline.species != "lion">>
+ lions<<if $boughtFelines > 1>>,<</if>>
+ <</if>>
+ <<if $boughtTigers == 1 && $activeFeline.species != "tiger">>
+ tigers<<if $boughtFelines > 1>>,<</if>>
+ <</if>>
+ and
+ <</if>>
+ <<print $activeFeline.speciesPlural>>.
+ <</nobr>>
<br>
- <</if>>
- <<if ($farmyardCages == 1)>>
- Large cages have been set up along one wall of $farmyardName, and are currently occupied by large <<print(_feline.species)>>s. //This description is temporary and will be changed.//
<</if>>
<</if>>
@@ -113,7 +181,7 @@ $farmyardNameCaps is not dissimilar to a warehouse in its basic size and form, b
<br><br>
<<link "Decommission $farmyardName and return this sector to manufacturing">>
- <<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardUpgrade = 0, $farmyardUpgradeList = [], $farmyardLab = 0, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0, $farmyardCages = 0>>
+ <<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardUpgrade = 0, $farmyardUpgradeList = [], $farmyardLab = 0, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0, $farmyardCages = 0, $activeCanine = "wolf", $activeHooved = "horse", $activeFeline = "cougar", $boughtCanines = 0, $boughtFelines = 0, $boughtWolves = 0, $boughtFoxes = 0, $boughtJackals = 0, $boughtDingos = 0, $boughtCougars = 0, $boughtJaguars = 0, $boughtLynx = 0, $boughtLeopards = 0, $boughtLions = 0, $boughtTigers = 0, $pitAnimal = 0>>
<<for _i = 0; _i < $sectors.length; _i++>>
<<if $sectors[_i].type == "Farmyard">><<set $sectors[_i].type = "Manufacturing">><<break>><</if>>
<</for>>
diff --git a/src/pregmod/farmyardAnimals.tw b/src/pregmod/farmyardAnimals.tw
new file mode 100644
index 0000000000000000000000000000000000000000..32326ef95f0c98ba2baf017b4a455555d11053fd
--- /dev/null
+++ b/src/pregmod/farmyardAnimals.tw
@@ -0,0 +1,146 @@
+:: FarmyardAnimals [nobr]
+
+<<set $nextButton = "Back", $nextLink = "Farmyard", $returnTo = "FarmyardAnimals", $showEncyclopedia = 1, $encyclopedia = "Farmyard">>
+
+<br>
+''Exotic Animals''
+<hr>
+
+<<if $farmyardKennels == 2>>
+ <br>
+ Exotic Canines:
+ <hr>
+ <<if $boughtWolves == 0>>
+ [[Purchase wolves|FarmyardAnimals][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $boughtWolves = 1, $boughtCanines += 1]]
+ <br>
+ <<elseif $boughtWolves == 1>>
+ A couple of adult wolves are lounging about in their kennels.
+ <<if $activeCanine.species != "wolf">>
+ [[Set as active canine|FarmyardAnimals][$activeCanine.species = "wolf"]]
+ <<else>>
+ //Set as active canine//
+ <</if>>
+ <br>
+ <</if>>
+
+ <<if $boughtFoxes == 0>>
+ [[Purchase foxes|FarmyardAnimals][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $boughtFoxes = 1, $boughtCanines += 1]]
+ <br>
+ <<elseif $boughtFoxes == 1>>
+ Red foxes play in one corner of their kennels, chasing one another.
+ <<if $activeCanine.species != "fox">>
+ [[Set as active canine|FarmyardAnimals][$activeCanine.species = "fox"]]
+ <<else>>
+ //Set as active canine//
+ <</if>>
+ <br>
+ <</if>>
+
+ <<if $boughtJackals == 0>>
+ [[Purchase jackals|FarmyardAnimals][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $boughtJackals = 1, $boughtCanines += 1]]
+ <br>
+ <<elseif $boughtJackals == 1>>
+ A group of male jackals are fighting over a potential mate, causing quite a ruckus.
+ <<if $activeCanine.species != "jackal">>
+ [[Set as active canine|FarmyardAnimals][$activeCanine.species = "jackal"]]
+ <<else>>
+ //Set as active canine//
+ <</if>>
+ <br>
+ <</if>>
+
+ <<if $boughtDingos == 0>>
+ [[Purchase dingos|FarmyardAnimals][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $boughtDingos = 1, $boughtCanines += 1]]
+ <br>
+ <<elseif $boughtDingos == 1>>
+ The dingos are eating their meal, growling at each other when one gets to close to another's food.
+ <<if $activeCanine.species != "dingo">>
+ [[Set as active canine|FarmyardAnimals][$activeCanine.species = "dingo"]]
+ <<else>>
+ //Set as active canine//
+ <</if>>
+ <br>
+ <</if>>
+<</if>>
+<<if $farmyardCages == 2>>
+ <br>
+ Exotic Felines
+ <hr>
+ <<if $boughtCougars == 0>>
+ [[Purchase cougars|FarmyardAnimals][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $boughtCougars = 1, $boughtFelines += 1]]
+ <br>
+ <<elseif $boughtCougars == 1>>
+ The cougars are sleeping, their lean bodies scattered around under trees.
+ <<if $activeFeline.species != "cougar">>
+ [[Set as active feline|FarmyardAnimals][$activeFeline.species = "cougar"]]
+ <<else>>
+ //Active feline set //
+ <</if>>
+ <br>
+ <</if>>
+
+ <<if $boughtJaguars == 0>>
+ [[Purchase jaguars|FarmyardAnimals][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $boughtJaguars = 1, $boughtFelines += 1]]
+ <br>
+ <<elseif $boughtJaguars == 1>>
+ You can see a few jaguars laying around in the trees in their enclosure.
+ <<if $activeFeline.species != "jaguar">>
+ [[Set as active feline|FarmyardAnimals][$activeFeline.species = "jaguar"]]
+ <<else>>
+ //Active feline set //
+ <</if>>
+ <br>
+ <</if>>
+
+ <<if $boughtLynx == 0>>
+ [[Purchase lynxs|FarmyardAnimals][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $boughtLynx = 1, $boughtFelines += 1]]
+ <br>
+ <<elseif $boughtLynx == 1>>
+ The lynxes are playfully running around their enclosure.
+ <<if $activeFeline.species != "lynx">>
+ [[Set as active feline|FarmyardAnimals][$activeFeline.species = "lynx"]]
+ <<else>>
+ //Active feline set //
+ <</if>>
+ <br>
+ <</if>>
+
+ <<if $boughtLeopards == 0>>
+ [[Purchase leopards|FarmyardAnimals][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $boughtLeopards = 1, $boughtFelines += 1]]
+ <br>
+ <<elseif $boughtLeopards == 1>>
+ The leopards are lazing about in the trees in their enclosure.
+ <<if $activeFeline.species != "leopard">>
+ [[Set as active feline|FarmyardAnimals][$activeFeline.species = "leopard"]]
+ <<else>>
+ //Active feline set //
+ <</if>>
+ <br>
+ <</if>>
+
+ <<if $boughtLions == 0>>
+ [[Purchase lions|FarmyardAnimals][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $boughtLions = 1, $boughtFelines += 1]]
+ <br>
+ <<elseif $boughtLions == 1>>
+ Most of the lions are sunning themselves.
+ <<if $activeFeline.species != "lion">>
+ [[Set as active feline|FarmyardAnimals][$activeFeline.species = "lion"]]
+ <<else>>
+ //Active feline set //
+ <</if>>
+ <br>
+ <</if>>
+
+ <<if $boughtTigers == 0>>
+ [[Purchase tigers|FarmyardAnimals][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $boughtTigers = 1, $boughtFelines += 1]]
+ <br>
+ <<elseif $boughtTigers == 1>>
+ Some of the tigers are swimming, and the ones that aren't are lazing about.
+ <<if $activeFeline.species != "tiger">>
+ [[Set as active feline|FarmyardAnimals][$activeFeline.species = "tiger"]]
+ <<else>>
+ //Active feline set //
+ <</if>>
+ <br>
+ <</if>>
+<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index f4010e02639b1989e2c50fdfae8dfca6688bedf4..4d114a6a168d1a7b3dbbcecb962b9d37f5fb6a45 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -193,14 +193,14 @@
| <<link "Have another slave ride $his clit-dick" "FSlaveSlaveDick">><</link>>
<</if>>
<<if $seeBestiality == 1 && $cheatMode == 1>>
- <<if $farmyardKennels == 1>>
- | <<link "Have a hound mount $him">><<set $species = "dog">><<replace "#miniscene">><<include "BeastFucked">><br> <</replace>><</link>>
+ <<if $farmyardKennels > 0>>
+ | <<link "Have a $activeCanine.species mount $him">><<set $animalType = "canine">><<replace "#miniscene">><<include "BeastFucked">><br> <</replace>><</link>>
<</if>>
- <<if $farmyardStable == 1>>
- | <<link "Let a stallion mount $him">><<set $species = "horse">><<replace "#miniscene">><<include "BeastFucked">><br> <</replace>><</link>>
+ <<if $farmyardStable > 0>>
+ | <<link "Let a stallion mount $him">><<set $animalType = "hooved">><<replace "#miniscene">><<include "BeastFucked">><br> <</replace>><</link>>
<</if>>
- <<if $farmyardCages == 1>>
- | <<link "Let a lion mount $him">><<set $species = "lion">><<replace "#miniscene">><<include "BeastFucked">><br> <</replace>><</link>>
+ <<if $farmyardCages > 0>>
+ | <<link "Have a $activeFeline.species mount $him">><<set $animalType = "feline">><<replace "#miniscene">><<include "BeastFucked">><br> <</replace>><</link>>
<</if>>
<</if>>
| <<link "Abuse $him">><<replace "#miniscene">><<include "FAbuse">><</replace>><</link>>