diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 49f667f49672b2e34eb2c9501880c0f28ed46916..1eab24cbd759667235793ad535f11419e1ae347e 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -18709,7 +18709,8 @@ window.rulesAssistantOptions = (function() {
["Permissive", "permissive"],
["Sapphic", "sapphic"],
["Masturbation", "masturbation"],
- ["Restrictive", "restrictive"]
+ ["Restrictive", "restrictive"],
+ ["Chastity", "chastity"]
];
super("Release rules", pairs);
this.setValue(current_rule.set.releaseRules);
diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index bd2354c6e034d205aac95b20799f12b498d85f03..69922242888916be10a46d22f301e8e85c4b0a07 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -71,8 +71,8 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
$farmyardNameCaps is working steadily. Farmhands are moving about, looking after the animals and crops.
<<elseif $Farmer != 0>>
$Farmer.slaveName is alone in $farmyardName, and has nothing to do but look after the animals and crops.
-<<else>>
- $farmyardNameCaps is empty and quiet. <<link "Decommission the Farmyard" "Main">><<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardSlaves = 0, $farmyardDecoration = "standard", $farmyardUpgrade = {pump: 0, fertilizer: 0, hydroponics: 0, machinery: 0, seeds: 0, lab: 0}, $farmyardLab = 0, $farmyardLabUpgrades = {animalOvaries: 0, animalTesticles: 0, animalMpreg: 0}, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0, $farmyardCages = 0, $activeCanine = 0, $activeHooved = 0, $activeFeline = 0, $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}, $pitAnimal = 0, $canines = [], $hooved = [], $felines = []>>
+<<else>> /* TODO: is there any way of cleaning up $animalsBought? I can't think of a good way */
+ $farmyardNameCaps is empty and quiet. <<link "Decommission the Farmyard" "Main">><<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardSlaves = 0, $farmyardDecoration = "standard", $farmyardUpgrade = {pump: 0, fertilizer: 0, hydroponics: 0, machinery: 0, seeds: 0, lab: 0}, $farmyardLab = 0, $farmyardLabUpgrades = {animalOvaries: 0, animalTesticles: 0, animalMpreg: 0}, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0, $farmyardCages = 0, $activeCanine = -1, $activeHooved = -1, $activeFeline = -1, $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}, $pitAnimal = 0, $canines = [], $hooved = [], $felines = []>>
<<set _far = $sectors.findIndex(function(s) { return s.type == "Farmyard"; })>>
<<if _far != -1>>
<<set $sectors[_far].type = "Manufacturing">>
diff --git a/src/facilities/nursery/saNanny.tw b/src/facilities/nursery/saNanny.tw
new file mode 100644
index 0000000000000000000000000000000000000000..d05791bc01b25b4b9309271548da573656d71a68
--- /dev/null
+++ b/src/facilities/nursery/saNanny.tw
@@ -0,0 +1,5 @@
+:: SA Nanny [nobr]
+
+works as a nanny this week.
+
+/* TODO: this needs to be written */
\ No newline at end of file
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index dde5f8948af3d0b737969e187958f2e4fd563c5a..7b1f295a1c8eba6ad8675a9712e9ce5dec6f0e1c 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -578,9 +578,9 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $farmyardStable = 0>>
<<set $farmyardKennels = 0>>
<<set $farmyardCages = 0>>
-<<set $activeCanine = 0>>
-<<set $activeHooved = 0>>
-<<set $activeFeline = 0>>
+<<set $activeCanine = -1>>
+<<set $activeHooved = -1>>
+<<set $activeFeline = -1>>
<<set $farmyardLab = 0>>
<<set $farmyardLabUpgrades = {animalOvaries: 0, 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}>>
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index 384e979c3c5f2bc41b178aacf59e581b654a6124..2e8f49cbe35dac54a05f4bbacf34589668e23771 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -1936,7 +1936,8 @@ window.rulesAssistantOptions = (function() {
["Permissive", "permissive"],
["Sapphic", "sapphic"],
["Masturbation", "masturbation"],
- ["Restrictive", "restrictive"]
+ ["Restrictive", "restrictive"],
+ ["Chastity", "chastity"]
];
super("Release rules", pairs);
this.setValue(current_rule.set.releaseRules);
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 7c590495109e434160c8d317880372955d47ae45..d28f0c5da7653d0baa62b0840e3b817ffd86f715 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -843,13 +843,13 @@
<<unset $defaultFelinePlural = "cougars">>
<</if>>
<<if ndef $activeCanine>>
- <<set $activeCanine = 0>>
+ <<set $activeCanine = -1>>
<</if>>
<<if ndef $activeHooved>>
- <<set $activeHooved = 0>>
+ <<set $activeHooved = -1>>
<</if>>
<<if ndef $activeFeline>>
- <<set $activeFeline = 0>>
+ <<set $activeFeline = -1>>
<</if>>
<<if def $boughtWolves>>
<<unset $boughtWolves>>
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index c81d2202f98a7781569199dd9025c6f50eb5d452..545cfec7a7711cdc58690b85e62c8197ad1328c5 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -1,6 +1,6 @@
:: Pit [nobr]
-<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Pit", $showEncyclopedia = 1, $encyclopedia = "Pit", _DL = $fighterIDs.length, _SL = $slaves.length>>
+<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Pit", $showEncyclopedia = 1, $encyclopedia = "Pit", _DL = $fighterIDs.length, _SL = $slaves.length, _CL = $canines.length, _HL = $hooved.length, _FL = $felines.length>>
<<showallAssignmentFilter>>
<<if $pitName != "the Pit">>
<<set $pitNameCaps = $pitName.replace("the ", "The ")>>
@@ -19,7 +19,7 @@ $pitNameCaps is clean and ready,
<<else>>
but no slaves are assigned to fight.
<<link "Decommission the pit" "Main">>
- <<set $pit = 0>>
+ <<set $pit = 0, $pitAnimal = 0, $pitAnimalType = 0>>
<<set _pit = $sectors.findIndex(function(s) { return s.type == "Pit"; })>>
<<if _pit != -1>>
<<set $sectors[_pit].type = "Markets">>
@@ -38,16 +38,20 @@ $pitNameCaps is clean and ready,
Admission is charged to the fights here. [[Close them|Pit][$pitAudience = "none"]] | [[Stop charging|Pit][$pitAudience = "free"]]
<</if>>
-<<if $Bodyguard != 0 || $farmyardKennels > 0 || $farmyardStable > 0 || $farmyardCages > 0>>
+<<if $Bodyguard != 0 || _CL > 0 || _HL > 0 || _FL > 0>>
<br>
<<if $pitBG == 0>>
<<if $pitAnimal == 0>>
- Two fighters will be selected from the pool at random. <<if $Bodyguard != 0>>[[Guarantee your Bodyguard a slot|Pit][$pitBG = 1, $pitAnimal = 0]]<</if>><<if $farmyardKennels > 0 || $farmyardStable > 0 || $farmyardCages > 0>> | [[Have a slave fight an animal|Pit][$pitBG = 0, $pitAnimal = 1]]<</if>>
+ Two fighters will be selected from the pool at random.
+ <<if $Bodyguard != 0>>[[Guarantee your Bodyguard a slot|Pit][$pitBG = 1, $pitAnimal = 0]]<</if>>
+ <<if $Bodyguard != 0 && ($activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0)>> | <</if>>
+ <<if $activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0>>[[Have a slave fight an animal|Pit][$pitBG = 0, $pitAnimal = 1]]<</if>>
<<else>>
A random slave will fight an animal. [[Have them fight another slave|Pit][$pitBG = 0, $pitAnimal = 0]]<<if $Bodyguard != 0>> | [[Have them fight your Bodyguard|Pit][$pitBG = 1, $pitAnimal = 0]]<</if>>
<</if>>
<<else>>
- Your Bodyguard will fight a slave selected from the pool at random. [[Make both slots random|Pit][$pitBG = 0, $pitAnimal = 0]]<<if $farmyardKennels > 0 || $farmyardStable > 0 || $farmyardCages > 0>> | [[Have a slave fight an animal|Pit][$pitBG = 0, $pitAnimal = 1]]<</if>>
+ Your Bodyguard will fight a slave selected from the pool at random. [[Make both slots random|Pit][$pitBG = 0, $pitAnimal = 0]]
+ <<if $_CL > 0 || $_HL > 0 || $_FL > 0>> | [[Have a slave fight an animal|Pit][$pitBG = 0, $pitAnimal = 1]]<</if>>
<</if>>
<</if>>
@@ -90,6 +94,8 @@ $pitNameCaps is clean and ready,
<</if>>
<</if>>
+<<if $activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0>>
+
<<switch $activeCanine.breed>>
<<case "French Bulldog" "Beagle" "Poodle" "Yorkshire Terrier">>
<<set _animalEligible = 0>>
@@ -100,14 +106,14 @@ $pitNameCaps is clean and ready,
<<if $pitAnimal == 1>>
<br>
<<if $pitLethal == 1>>
- <<if $pitAnimalType == $activeCanine.species>>
+ <<if $pitAnimalType === $activeCanine>>
<<if $activeCanine.species != "dog">>
Your slave will fight a ''$activeCanine.species''.
$activeCanine.speciesCap
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
@@ -116,65 +122,65 @@ $pitNameCaps is clean and ready,
<<if _animalEligible == 1>>
Your slave will fight a ''$activeCanine.breed''.
$activeCanine.breed
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
<</if>>
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
<</if>>
- <<elseif $pitAnimalType == $activeHooved.species>>
+ <<elseif $pitAnimalType === $activeHooved>>
Your slave will fight a ''$activeHooved.species''.
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]] |
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]] |
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]] |
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]] |
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight// |
<</if>>
<</if>>
<</if>>
$activeHooved.speciesCap
- <<if $farmyardCages > 0>> |
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
<</if>>
- <<elseif $pitAnimalType == $activeFeline.species>>
+ <<elseif $pitAnimalType === $activeFeline>>
<<if $activeFeline.species != "cat">>
Your slave will fight a ''$activeFeline.species''.
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]] | <</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]] | <</if>>
<<if $activeFeline.species != "cat">>
$activeFeline.speciesCap
<<else>>
@@ -182,28 +188,30 @@ $pitNameCaps is clean and ready,
<</if>>
<<else>>
Select an animal for your slave to fight.
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
- <<if ($farmyardCages > 0 && $farmyardStable > 0) || ($farmyardCages > 0 && $farmyardKennels > 0) || ($farmyardStable > 0 && $farmyardKennels > 0)>> | <</if>>
- <<if $farmyardStable > 0>>[["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if ($farmyardStable > 0 && $farmyardCages > 0)>> | <</if>>
+ /* yes, this block is a mess. if you figure out a cleaner way to do it, let me know */
+ <<if (_FL > 0 && _HL > 0) || (_FL > 0 && _CL > 0) || (_HL > 0 && _CL > 0)>> | <</if>>
+ <<if _HL > 0>>[["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if (_HL > 0 && _FL > 0)>> | <</if>>
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small for your slave to fight//
<</if>>
+
<</if>>
<<elseif $pitLethal == 0>>
- <<if $pitAnimalType == $activeCanine.species>>
+ <<if $pitAnimalType === $activeCanine>>
<<if $activeCanine.species != "dog">>
Your slave will try to avoid being used by a ''$activeCanine.species''.
$activeCanine.speciesCap
@@ -211,73 +219,73 @@ $pitNameCaps is clean and ready,
<<if _animalEligible == 1>>
Your slave will try to avoid being used by a ''$activeCanine.breed''.
$activeCanine.breed
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
<<else>>
//<<print $activeCanine.breed>>s are too small to use your slave//
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
<</if>>
<</if>>
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if $farmyardCages > 0>> |
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
- <<elseif $pitAnimalType == $activeHooved.species>>
+ <<elseif $pitAnimalType === $activeHooved>>
Your slave will try to avoid being used by a ''$activeHooved.species''.
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]] |
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]] |
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]] |
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]] |
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight// |
<</if>>
<</if>>
<</if>>
$activeHooved.speciesCap
- <<if $farmyardCages > 0>> |
+ <<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
<</if>>
- <<elseif $pitAnimalType == $activeFeline.species>>
+ <<elseif $pitAnimalType === $activeFeline>>
<<if $activeFeline.species != "cat">>
Your slave will try to avoid being used by a ''$activeFeline.species''.
<<else>>
//Housecats are too small to use your slave//
<</if>>
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
- <</if>>
+ <</if>>
<</if>>
<</if>>
- <<if $farmyardStable > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]] | <</if>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]] | <</if>>
<<if $activeFeline.species != "cat">>
$activeFeline.speciesCap
<<else>>
@@ -285,23 +293,23 @@ $pitNameCaps is clean and ready,
<</if>>
<<else>>
Select an animal for your slave to try to avoid.
- <<if $farmyardKennels > 0>>
+ <<if _CL > 0>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine.species]]
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = $activeCanine]]
<<else>>
//<<print $activeCanine.breed>>s are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
- <<if ($farmyardCages > 0 && $farmyardStable > 0) || ($farmyardCages > 0 && $farmyardKennels > 0) || ($farmyardStable > 0 && $farmyardKennels > 0)>> | <</if>>
- <<if $farmyardStable > 0>>[["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved.species]]<</if>>
- <<if ($farmyardStable > 0 && $farmyardCages > 0)>> | <</if>>
+ <<if (_FL > 0 && _HL > 0) || (_FL > 0 && _CL > 0) || (_HL > 0 && _CL > 0)>> | <</if>>
+ <<if _HL > 0>>[["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = $activeHooved]]<</if>>
+ <<if (_HL > 0 && _FL > 0)>> | <</if>>
<<if $activeFeline.species != "cat">>
- <<if $farmyardCages > 0>>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline.species]]
+ <<if _FL > 0>>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = $activeFeline]]
<<else>>
//Housecats are too small to use your slave//
<</if>>
@@ -311,6 +319,7 @@ $pitNameCaps is clean and ready,
<<else>>
<<set $pitAnimalType = 0>>
<</if>>
+<</if>>
<<if _DL > 0>>
<br><br>''Cancel a slave's fight:''
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index b97509045a02a8142dda6901642e186f3de91bc8..fa8b3ad52db9b98107f06ea55befa0f01ba54a95 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -15,22 +15,29 @@
<<goto "Nonrandom Event">>
<</if>>
<<else>>
- <<switch $pitAnimalType>>
- <<case "wolf" "fox" "jackal" "dingo">>
+ <<switch $pitAnimalType.type>>
+ <<case "canine">>
<<set _animal = $activeCanine>>
- <<case "horse">>
+ <<case "hooved">>
<<set _animal = $activeHooved>>
- <<case "cougar" "jaguar" "lynx" "leopard" "lion" "tiger">>
+ <<case "feline">>
<<set _animal = $activeFeline>>
<<default>>
<<set _animal = "undefined">>
<</switch>>
<</if>>
-<<if $pitAnimal > 0 && _animal == "undefined">>
+<<if $pitAnimal > 0 && _animal == "undefined">> /* TODO: this doesn't work */
This week, _fighterOne.slaveName was scheduled to fight an animal to the death, but was spared because no animal has been chosen.
<<else>>
- This week's pit fight is between _fighterOne.slaveName and <<if $pitAnimal == 0>>_fighterTwo.slaveName<<else>>a _animal.species<</if>>. <<if $pitAudience == "none">>You are alone above the pit, left to watch them kill and die in private.<<elseif $pitAudience == "free">>Your guests line the rim of the pit, joking and betting, nervous and excited by the close prospect of watching a girl die.<<else>>The attendees line the rim of the pit, betting and arguing, nervous and excited by the close prospect of watching a girl die.<</if>>
+ This week's pit fight is between _fighterOne.slaveName and <<if $pitAnimal == 0>>_fighterTwo.slaveName<<else>>a _animal.species<</if>>.
+ <<if $pitAudience == "none">>
+ You are alone above the pit, left to watch them kill and die in private.
+ <<elseif $pitAudience == "free">>
+ Your guests line the rim of the pit, joking and betting, nervous and excited by the close prospect of watching a girl die.
+ <<else>>
+ The attendees line the rim of the pit, betting and arguing, nervous and excited by the close prospect of watching a girl die.
+ <</if>>
<</if>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
@@ -351,11 +358,11 @@ You review the rules - the <<if $pitAnimal == 0>>combatants<<else>>slave<</if>>
<<else>> /*if fighting an animal*/
<<set $activeSlave = _fighterOne>>
<<set _fighterTwo = _animal>>
- <<switch $pitAnimalType>>
- <<case "hooved">>
- <<set _fighterTwoDeadliness = (random(1,3))>>
+ <<switch $pitAnimalType.type>>
<<case "canine">>
<<set _fighterTwoDeadliness = (random(2,4))>>
+ <<case "hooved">>
+ <<set _fighterTwoDeadliness = (random(1,3))>>
<<case "feline">>
<<set _fighterTwoDeadliness = (random(2,6))>>
<</switch>>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index a1f26a53a651c424c8eace67661f06726e979d8d..b4fa75afd318a8e14680d30102f2241c7b5fe32c 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -15,12 +15,12 @@
<<goto "Nonrandom Event">>
<</if>>
<<else>>
- <<switch $pitAnimalType>>
- <<case "wolf" "fox" "jackal" "dingo">>
+ <<switch $pitAnimalType.type>>
+ <<case "canine">>
<<set _animal = $activeCanine>>
- <<case "horse">>
+ <<case "hooved">>
<<set _animal = $activeHooved>>
- <<case "cougar" "jaguar" "lynx" "leopard" "lion" "tiger">>
+ <<case "feline">>
<<set _animal = $activeFeline>>
<<default>>
<<set _animal = "undefined">>