diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw
index 280c694962fa4f3c15019b11ba0dbd4b0b671ccc..0e698bcacf749ed82bbca421371a2fb94a61546e 100644
--- a/src/pregmod/killSlave.tw
+++ b/src/pregmod/killSlave.tw
@@ -1,7 +1,5 @@
:: KillSlave [nobr]
-<<set $killChoice = -1>>
-
<<set _qualifiedFS = []>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
<<set _qualifiedFS.push("roman revivalist"), _weapon = 'gladius'>>
@@ -46,7 +44,7 @@
<<if $activeSlave.fetish != "mindbroken">> $His expression changes to one of <</if>>
<<if $activeSlave.fetish != "mindbroken">>
<<if $activeSlave.devotion > 50>>
- abject sorrow
+ pure sorrow
<<elseif ($activeSlave.devotion) > 20 && ($activeSlave.devotion <= 50)>>
sadness
<<else>>
@@ -66,14 +64,18 @@
to which $he still doesn't respond.
<</if>>
-<br>
-<br><<link "Kill $him" "KilledSlave">><<set $killChoice = 0>><</link>>
-<br><<link "Have mercy on $him" "KilledSlave">><<set $killChoice = 1>><</link>>
-<<if ($activeSlave.assignment != "guard you") && ($pit > 0)>>
- <<if ($pitLethal == 1)>>
- <br><<link "Let $him win $his life in combat" "KilledSlave">><<set $killChoice = 2>><</link>>
- <<else>>
- <br>//You must allow lethal fights in $pitName to have $activeSlave.slaveName fight your bodyguard for $his life//
+<<if $killChoice == -1>>
+ <br>
+ <br><<link "Kill $him" "KilledSlave">><<set $killChoice = 0>><</link>>
+ <br><<link "Have mercy on $him" "KilledSlave">><<set $killChoice = 1>><</link>>
+ <<if ($activeSlave.assignment != "guard you") && ($pit > 0)>>
+ <<if ($pitLethal == 1)>>
+ <br><<link "Let $him win $his life in combat" "KilledSlave">><<set $killChoice = 2>><</link>>
+ <<else>>
+ <br>//You must allow lethal fights in $pitName to have $activeSlave.slaveName fight your bodyguard for $his life//
+ <</if>>
<</if>>
-<</if>>
-<br><br>
\ No newline at end of file
+ <br><br>
+<<else>>
+ You abruptly cut $his begging short as you realize $slaveFightingBG.slaveName is already fighting your bodyguard $Bodyguard.slaveName for <<if $slaveFightingBG.genes == "XX">>her<<else>>his<</if>> life this week. [[Cancel the fight|KillSlave][$killChoice = -1]]
+<</if>>
\ No newline at end of file
diff --git a/src/pregmod/killedSlave.tw b/src/pregmod/killedSlave.tw
index bdbe7aeedf27d1f6dbf19a86ed7599348f0f3028..15ee8a867c67352677f59fff97a8098642bf8727 100644
--- a/src/pregmod/killedSlave.tw
+++ b/src/pregmod/killedSlave.tw
@@ -1,6 +1,6 @@
:: KilledSlave [nobr]
-<<if $killChoice == 0>>
+<<if $killChoice <= 0>>
<<set _qualifiedFS = []>>
<<if $arcologies[0].FSRomanRevivalist != "unset">>
@@ -129,7 +129,7 @@ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you p
/* TODO: this will DEFINTELY need balancing */
<<elseif $killChoice == 1>>
- You make a show of considering sparing $his life, then, with a heavy sigh, unbuckle your pants and sit down at your desk. You beckon to $him, and $he just about trips over $himself as $he hastily makes $his way over to you. $His blowjob isn't the best you've ever had, $him @@.gold;sobbing@@ as much as $he is; though $his enthusiasm more than makes up for it. After you finish deep in $his throat, $he sits back and wipes away $his tears, sniffling and @@.hotpink;thanking you again@@ for giving $him another chance.
+ You make a show of considering sparing $his life, then, with a heavy sigh, unbuckle your pants and sit down at your desk. You beckon to $him, and $he just about trips over $himself as $he hastily makes $his way over to you. $His blowjob isn't the best you've ever had, $him @@.gold;sobbing@@ as much as $he is; but $his enthusiasm more than makes up for it. After you finish deep in $his throat, $he sits back and wipes away $his tears, sniffling and @@.hotpink;thanking you again@@ for giving $him another chance.
<<if $activeSlave.devotion <= 30>>
<<set $activeSlave.devotion = 30>>
<<else>>
@@ -145,5 +145,5 @@ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you p
$He nods $his head and straightens up, as though mentally preparing $himself for the fight for $his life.
<</if>>
- <<set $slaveFightingBG = $activeSlave>>
+ <<set $slaveFightingBG = $activeSlave, $pitAnimal = 0>>
<</if>>
\ No newline at end of file
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 3a03a66eaf45e52c53a134906f42587863d10567..ec00f44cb53f28ec21eeb4a15ce6108895fbddf2 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1397,7 +1397,7 @@ There is a horrible crash from the shower. You rush in to see <<EventNameLink $a
<<if !canTalk($activeSlave)>>
$He points to $his pussy and comically pantomimes having sex, and then uses gestures to ask if $he can serve you with $his pussy.
<<else>>
- $He <<say>>s, "<<Master>>, I want to know what it'<<s>> like to have a cock in my virgin pu<<ss>>y. <<S>>eeing <<s>>o many of the other <<s>>lave<<s>> getting fucked looks like so much fun. I'm <<s>>o turned on by it. I can't be a proper <<s>>e<<x>> <<s>>lave without u<<s>>ing my pu<<ss>>y. Plea<<s>>e take my virginity, <<Master>>."
+ $He <<say>>s, "<<= capFirstChar($titleEnunciate)>>, I want to know what it'<<s>> like to have a cock in my virgin pu<<ss>>y. <<S>>eeing <<s>>o many of the other <<s>>lave<<s>> getting fucked looks like so much fun. I'm <<s>>o turned on by it. I can't be a proper <<s>>e<<x>> <<s>>lave without u<<s>>ing my pu<<ss>>y. Plea<<s>>e take my virginity, <<Master>>."
<</if>>
$He spreads $his legs <<if $activeSlave.belly >= 10000>>carefully and cocks $his hips<<else>>and cocks $his hips suggestively<</if>> at you.
@@ -1407,7 +1407,7 @@ $He spreads $his legs <<if $activeSlave.belly >= 10000>>carefully and cocks $his
<<if !canTalk($activeSlave)>>
$He comically pantomimes anal sex, and then uses gestures to ask if $he can serve you anally.
<<else>>
- $He <<say>>s, "<<Master>>, I <<s>>ee <<s>>o many of the other <<s>>lave<<s>> getting buttfucked. I think it'<<s>> hot <<s>>eeing them take it up the a<<ss>>, and I feel almo<<s>>t incomplete <<s>>in<<c>>e I don't take cock in every hole. Plea<<s>>e take my butt virginity, <<Master>>."
+ $He <<say>>s, "<<= capFirstChar($titleEnunciate)>>, I <<s>>ee <<s>>o many of the other <<s>>lave<<s>> getting buttfucked. I think it'<<s>> hot <<s>>eeing them take it up the a<<ss>>, and I feel almo<<s>>t incomplete <<s>>in<<c>>e I don't take cock in every hole. Plea<<s>>e take my butt virginity, <<Master>>."
<</if>>
$He<<if $activeSlave.belly >= 10000>> carefully turns and spreads $his legs, allowing $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>> belly space as $he bends over, to wiggle<<else>> turns around and wiggles<</if>> $his posterior indicatively.
diff --git a/src/uncategorized/pit.tw b/src/uncategorized/pit.tw
index bc4877a1cea828c2aa0e1986144b2d47f15ef4c6..86777cbb9edd7747dfe47e3a839648a362cf53da 100644
--- a/src/uncategorized/pit.tw
+++ b/src/uncategorized/pit.tw
@@ -38,100 +38,79 @@ $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 || (_CL > 0 && $activeCanine != 0) || (_HL > 0 && $activeHooved != 0) || (_FL > 0 && $activeFeline != 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 $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>>
+<<if $killChoice != 2>>
+ <<if $Bodyguard != 0 || (_CL > 0 && $activeCanine != 0) || (_HL > 0 && $activeHooved != 0) || (_FL > 0 && $activeFeline != 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 $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>>
- 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>>
+ 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>>
- <<else>>
- 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>>
-<br>
-<<if $pitLethal == 1>>
- <<if $pitAnimal == 1>>
- The fighter will be armed with a sword and will fight to the death.
- <<if $killChoice != 2>>
- [[Nonlethal|Pit][$pitLethal = 0]]
+ <br>
+ <<if $pitLethal == 1>>
+ <<if $pitAnimal == 1>>
+ The fighter will be armed with a sword and will fight to the death. [[Nonlethal|Pit][$pitLethal = 0]]
<<else>>
- //You have scheduled a fight to the death this week// [[Cancel|Pit][$killChoice = 0]]
+ Fighters will be armed with swords, and fights will be to the death. [[Nonlethal|Pit][$pitLethal = 0]]
<</if>>
<<else>>
- Fighters will be armed with swords, and fights will be to the death.
- <<if $killChoice != 2>>
- [[Nonlethal|Pit][$pitLethal = 0]]
+ <<if $pitAnimal == 0>>
+ Fighters will use their fists and feet, and fights will be to submission. [[Lethal|Pit][$pitLethal = 1]]
+
+ <br>
+ <<if $pitVirginities == 0>>
+ ''No'' virginities of the loser will be respected.
+ [[Vaginal|Pit][$pitVirginities = 1]] |
+ [[Anal|Pit][$pitVirginities = 2]] |
+ [[All|Pit][$pitVirginities = 3]]
+ <<elseif $pitVirginities == 1>>
+ ''Vaginal'' virginity of the loser will be respected.
+ [[Neither|Pit][$pitVirginities = 0]] |
+ [[Anal|Pit][$pitVirginities = 2]] |
+ [[All|Pit][$pitVirginities = 3]]
+ <<elseif $pitVirginities == 2>>
+ ''Anal'' virginity of the loser will be respected.
+ [[Neither|Pit][$pitVirginities = 0]] |
+ [[Vaginal|Pit][$pitVirginities = 1]] |
+ [[All|Pit][$pitVirginities = 3]]
+ <<elseif $pitVirginities == 3>>
+ ''All'' virginities of the loser will be respected.
+ [[Neither|Pit][$pitVirginities = 0]] |
+ [[Vaginal|Pit][$pitVirginities = 1]] |
+ [[Anal|Pit][$pitVirginities = 2]]
+ <</if>>
+
<<else>>
- //You have scheduled a fight to the death this week// [[Cancel|Pit][$killChoice = 0]]
+ The slave will be restrained and will try to avoid being used by the animal. [[Lethal|Pit][$pitLethal = 1]]
<</if>>
<</if>>
-<<else>>
- <<if $pitAnimal == 0>>
- Fighters will use their fists and feet, and fights will be to submission. [[Lethal|Pit][$pitLethal = 1]]
-
- <br>
- <<if $pitVirginities == 0>>
- ''No'' virginities of the loser will be respected.
- [[Vaginal|Pit][$pitVirginities = 1]] |
- [[Anal|Pit][$pitVirginities = 2]] |
- [[All|Pit][$pitVirginities = 3]]
- <<elseif $pitVirginities == 1>>
- ''Vaginal'' virginity of the loser will be respected.
- [[Neither|Pit][$pitVirginities = 0]] |
- [[Anal|Pit][$pitVirginities = 2]] |
- [[All|Pit][$pitVirginities = 3]]
- <<elseif $pitVirginities == 2>>
- ''Anal'' virginity of the loser will be respected.
- [[Neither|Pit][$pitVirginities = 0]] |
- [[Vaginal|Pit][$pitVirginities = 1]] |
- [[All|Pit][$pitVirginities = 3]]
- <<elseif $pitVirginities == 3>>
- ''All'' virginities of the loser will be respected.
- [[Neither|Pit][$pitVirginities = 0]] |
- [[Vaginal|Pit][$pitVirginities = 1]] |
- [[Anal|Pit][$pitVirginities = 2]]
- <</if>>
- <<else>>
- The slave will be restrained and will try to avoid being used by the animal. [[Lethal|Pit][$pitLethal = 1]]
- <</if>>
-<</if>>
+ <<if $activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0>>
-<<if $activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0>>
+ <<switch $activeCanine.breed>>
+ <<case "French Bulldog" "Beagle" "Poodle" "Yorkshire Terrier">>
+ <<set _animalEligible = 0>>
+ <<default>>
+ <<set _animalEligible = 1>>
+ <</switch>>
-<<switch $activeCanine.breed>>
-<<case "French Bulldog" "Beagle" "Poodle" "Yorkshire Terrier">>
- <<set _animalEligible = 0>>
-<<default>>
- <<set _animalEligible = 1>>
-<</switch>>
-
-<<if $pitAnimal == 1>>
- <br>
- <<if $pitLethal == 1>>
- <<if $pitAnimalType == $activeCanine.type>>
- <<if $activeCanine.species != "dog">>
- Your slave will fight a ''$activeCanine.species''.
- $activeCanine.speciesCap
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
- <<if _FL > 0>> |
- <<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
- <<else>>
- //House cats are too small for your slave to fight//
- <</if>>
- <</if>>
- <<else>>
- <<if _animalEligible == 1>>
- Your slave will fight a ''$activeCanine.breed''.
- $activeCanine.breed
+ <<if $pitAnimal == 1>>
+ <br>
+ <<if $pitLethal == 1>>
+ <<if $pitAnimalType == $activeCanine.type>>
+ <<if $activeCanine.species != "dog">>
+ Your slave will fight a ''$activeCanine.species''.
+ $activeCanine.speciesCap
<<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
<<if _FL > 0>> |
<<if $activeFeline.species != "cat">>
@@ -141,199 +120,216 @@ $pitNameCaps is clean and ready,
<</if>>
<</if>>
<<else>>
- //<<print $activeCanine.breed>>s are too small for your slave to fight//
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
- <<if _FL > 0>> |
- <<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
- <<else>>
- //House cats are too small for your slave to fight//
+ <<if _animalEligible == 1>>
+ Your slave will fight a ''$activeCanine.breed''.
+ $activeCanine.breed
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
+ <<if _FL > 0>> |
+ <<if $activeFeline.species != "cat">>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ <<else>>
+ //House cats are too small for your slave to fight//
+ <</if>>
+ <</if>>
+ <<else>>
+ //<<print $activeCanine.breed>>s are too small for your slave to fight//
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
+ <<if _FL > 0>> |
+ <<if $activeFeline.species != "cat">>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ <<else>>
+ //House cats are too small for your slave to fight//
+ <</if>>
<</if>>
<</if>>
<</if>>
- <</if>>
- <<elseif $pitAnimalType == $activeHooved.type>>
- Your slave will fight a ''$activeHooved.species''.
- <<if _CL > 0>>
- <<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]] |
- <<else>>
- <<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]] |
+ <<elseif $pitAnimalType == $activeHooved.type>>
+ Your slave will fight a ''$activeHooved.species''.
+ <<if _CL > 0>>
+ <<if $activeCanine.species != "dog">>
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]] |
<<else>>
- //<<print $activeCanine.breed>>s are too small for your slave to fight// |
+ <<if _animalEligible == 1>>
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]] |
+ <<else>>
+ //<<print $activeCanine.breed>>s are too small for your slave to fight// |
+ <</if>>
<</if>>
<</if>>
- <</if>>
- $activeHooved.speciesCap
- <<if _FL > 0>> |
- <<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
- <<else>>
- //House cats are too small for your slave to fight//
- <</if>>
- <</if>>
- <<elseif $pitAnimalType == $activeFeline.type>>
- <<if $activeFeline.species != "cat">>
- Your slave will fight a ''$activeFeline.species''.
- <<else>>
- //House cats are too small for your slave to fight//
- <</if>>
- <<if _CL > 0>>
- <<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
- <<else>>
- <<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
+ $activeHooved.speciesCap
+ <<if _FL > 0>> |
+ <<if $activeFeline.species != "cat">>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
<<else>>
- //<<print $activeCanine.breed>>s are too small for your slave to fight//
+ //House cats are too small for your slave to fight//
<</if>>
<</if>>
- <</if>>
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]] | <</if>>
- <<if $activeFeline.species != "cat">>
- $activeFeline.speciesCap
+ <<elseif $pitAnimalType == $activeFeline.type>>
+ <<if $activeFeline.species != "cat">>
+ Your slave will fight a ''$activeFeline.species''.
<<else>>
- //House cats are too small for your slave to fight//
+ //House cats are too small for your slave to fight//
<</if>>
- <<else>>
- Select an animal for your slave to fight.
- <<if _CL > 0>>
- <<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
- <<else>>
- <<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
+ <<if _CL > 0>>
+ <<if $activeCanine.species != "dog">>
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
<<else>>
- //<<print $activeCanine.breed>>s are too small for your slave to fight//
+ <<if _animalEligible == 1>>
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
+ <<else>>
+ //<<print $activeCanine.breed>>s are too small for your slave to fight//
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <<if (_CL > 0 && _HL > 0) || (_CL > 0 && _FL > 0) || (_HL > 0 && _FL > 0)>> | <</if>>
- <<if _HL > 0>>
- [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]
- <</if>>
- <<if (_HL > 0 && _FL > 0)>> | <</if>>
- <<if _FL > 0>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]] | <</if>>
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ $activeFeline.speciesCap
<<else>>
//House cats are too small for your slave to fight//
<</if>>
- <</if>>
-
- <</if>>
- <<elseif $pitLethal == 0>>
- <<if $pitAnimalType == $activeCanine.type>>
- <<if $activeCanine.species != "dog">>
- Your slave will try to avoid being used by a ''$activeCanine.species''.
- $activeCanine.speciesCap
<<else>>
- <<if _animalEligible == 1>>
- Your slave will try to avoid being used by a ''$activeCanine.breed''.
- $activeCanine.breed
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
- <<if _FL > 0>> |
- <<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
- <<else>>
- //House cats are too small to use your slave//
- <</if>>
- <</if>>
- <<else>>
- //<<print $activeCanine.breed>>s are too small to use your slave//
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
- <<if _FL > 0>> |
- <<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ Select an animal for your slave to fight.
+ <<if _CL > 0>>
+ <<if $activeCanine.species != "dog">>
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
+ <<else>>
+ <<if _animalEligible == 1>>
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
<<else>>
- //House cats are too small to use your slave//
+ //<<print $activeCanine.breed>>s are too small for your slave to fight//
<</if>>
<</if>>
<</if>>
- <</if>>
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
- <<if _FL > 0>> |
- <<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
- <<else>>
- //House cats are too small to use your slave//
+ <<if (_CL > 0 && _HL > 0) || (_CL > 0 && _FL > 0) || (_HL > 0 && _FL > 0)>> | <</if>>
+ <<if _HL > 0>>
+ [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]
<</if>>
+ <<if (_HL > 0 && _FL > 0)>> | <</if>>
+ <<if _FL > 0>>
+ <<if $activeFeline.species != "cat">>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ <<else>>
+ //House cats are too small for your slave to fight//
+ <</if>>
+ <</if>>
+
<</if>>
- <<elseif $pitAnimalType == $activeHooved.type>>
- Your slave will try to avoid being used by a ''$activeHooved.species''.
- <<if _CL > 0>>
+ <<elseif $pitLethal == 0>>
+ <<if $pitAnimalType == $activeCanine.type>>
<<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]] |
+ Your slave will try to avoid being used by a ''$activeCanine.species''.
+ $activeCanine.speciesCap
<<else>>
<<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]] |
+ Your slave will try to avoid being used by a ''$activeCanine.breed''.
+ $activeCanine.breed
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
+ <<if _FL > 0>> |
+ <<if $activeFeline.species != "cat">>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ <<else>>
+ //House cats are too small to use your slave//
+ <</if>>
+ <</if>>
<<else>>
- //<<print $activeCanine.breed>>s are too small for your slave to fight// |
+ //<<print $activeCanine.breed>>s are too small to use your slave//
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
+ <<if _FL > 0>> |
+ <<if $activeFeline.species != "cat">>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ <<else>>
+ //House cats are too small to use your slave//
+ <</if>>
+ <</if>>
<</if>>
<</if>>
- <</if>>
- $activeHooved.speciesCap
- <<if _FL > 0>> |
- <<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
- <<else>>
- //House cats are too small to use your slave//
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]<</if>>
+ <<if _FL > 0>> |
+ <<if $activeFeline.species != "cat">>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ <<else>>
+ //House cats are too small to use your slave//
+ <</if>>
<</if>>
- <</if>>
- <<elseif $pitAnimalType == $activeFeline.type>>
- <<if $activeFeline.species != "cat">>
- Your slave will try to avoid being used by a ''$activeFeline.species''.
- <<else>>
- //House cats are too small to use your slave//
- <</if>>
- <<if _CL > 0>>
- <<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
- <<else>>
- <<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
+ <<elseif $pitAnimalType == $activeHooved.type>>
+ Your slave will try to avoid being used by a ''$activeHooved.species''.
+ <<if _CL > 0>>
+ <<if $activeCanine.species != "dog">>
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]] |
<<else>>
- //<<print $activeCanine.breed>>s are too small for your slave to fight//
+ <<if _animalEligible == 1>>
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]] |
+ <<else>>
+ //<<print $activeCanine.breed>>s are too small for your slave to fight// |
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]] | <</if>>
- <<if $activeFeline.species != "cat">>
- $activeFeline.speciesCap
+ $activeHooved.speciesCap
+ <<if _FL > 0>> |
+ <<if $activeFeline.species != "cat">>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ <<else>>
+ //House cats are too small to use your slave//
+ <</if>>
+ <</if>>
+ <<elseif $pitAnimalType == $activeFeline.type>>
+ <<if $activeFeline.species != "cat">>
+ Your slave will try to avoid being used by a ''$activeFeline.species''.
<<else>>
- //House cats are too small to use your slave//
+ //House cats are too small to use your slave//
<</if>>
- <<else>>
- Select an animal for your slave to try to avoid.
- <<if _CL > 0>>
- <<if $activeCanine.species != "dog">>
- [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
- <<else>>
- <<if _animalEligible == 1>>
- [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
+ <<if _CL > 0>>
+ <<if $activeCanine.species != "dog">>
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
<<else>>
- //<<print $activeCanine.breed>>s are too small for your slave to fight//
+ <<if _animalEligible == 1>>
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
+ <<else>>
+ //<<print $activeCanine.breed>>s are too small for your slave to fight//
+ <</if>>
<</if>>
<</if>>
- <</if>>
- <<if (_CL > 0 && _HL > 0) || (_CL > 0 && _FL > 0) || (_HL > 0 && _FL > 0)>> | <</if>>
- <<if _HL > 0>>
- [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]
- <</if>>
- <<if (_HL > 0 && _FL > 0)>> | <</if>>
- <<if _FL > 0>>
+ <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]] | <</if>>
<<if $activeFeline.species != "cat">>
- [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ $activeFeline.speciesCap
<<else>>
//House cats are too small to use your slave//
<</if>>
+ <<else>>
+ Select an animal for your slave to try to avoid.
+ <<if _CL > 0>>
+ <<if $activeCanine.species != "dog">>
+ [["" + $activeCanine.speciesCap + ""|Pit][$pitAnimalType = "canine"]]
+ <<else>>
+ <<if _animalEligible == 1>>
+ [["" + $activeCanine.breed + ""|Pit][$pitAnimalType = "canine"]]
+ <<else>>
+ //<<print $activeCanine.breed>>s are too small for your slave to fight//
+ <</if>>
+ <</if>>
+ <</if>>
+ <<if (_CL > 0 && _HL > 0) || (_CL > 0 && _FL > 0) || (_HL > 0 && _FL > 0)>> | <</if>>
+ <<if _HL > 0>>
+ [["" + $activeHooved.speciesCap + ""|Pit][$pitAnimalType = "hooved"]]
+ <</if>>
+ <<if (_HL > 0 && _FL > 0)>> | <</if>>
+ <<if _FL > 0>>
+ <<if $activeFeline.species != "cat">>
+ [["" + $activeFeline.speciesCap + ""|Pit][$pitAnimalType = "feline"]]
+ <<else>>
+ //House cats are too small to use your slave//
+ <</if>>
+ <</if>>
<</if>>
<</if>>
+ <<else>> /* if animal fight is unselected */
+ <<set $pitAnimalType = 0>>
<</if>>
-<<else>> /* if animal fight is unselected */
- <<set $pitAnimalType = 0>>
-<</if>>
+ <</if>>
+
+<<else>> /* if $killChoice != 2 */
+ <br>
+ You have scheduled a fight to the death this week. [[Cancel it|Pit][$killChoice = -1]]
<</if>>
<<if _DL > 0>>
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index 0bcf4ff2c1b50b489f68eb3f6f16b708327ee175..aca0f54f049e1db676214dca0d9e7fb81c306b9f 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -20,7 +20,7 @@
<<goto "Nonrandom Event">>
<</if>>
<<else>>
- <<switch $pitAnimalType.type>>
+ <<switch $pitAnimalType>>
<<case "canine">>
<<set _animal = $activeCanine>>
<<case "hooved">>
@@ -649,7 +649,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<<set _winner.fetishKnown = 1>>
<</if>>
<</if>>
-<<elseif _animal != "undefined">> /*if fighting an animal*/
+<<else>> /*if fighting an animal*/
<<if _winner == _fighterOne>> /*if slave wins*/
<<if !canSee(_winner)>>
_winner.slaveName centers $himself and hones in on the _animal.species's rapid breath. $He readies herself, knowing $he has a single chance to live. With heavy steps, the _animal.species rushes at $him, fully prepared to slaughter the helpless combatant. _winner.slaveName gambles everything on a single high slash, a slash that cuts the _animal.species's undefended neck wide open. _winner.slaveName collapses to the ground, fully aware of the _animal.species's final gurgles and the @@.red;deep scratches in her side.@@ $He lived this time, barely, but $he doubts $he can do it again.
@@ -661,8 +661,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
The audience is @@.green;awestruck@@ by the blind girl's triumph.
<<set $rep += 2000>>
<</if>>
- <</if>>
- <<if (_winner.muscles > 30)>>
+ <<elseif (_winner.muscles > 30)>>
_winner.slaveName is so massively muscular that she's actually impeded by her lack of speed and flexibility. The _animal.species is suitably cautious, and it does its best to avoid $his sword. The two go back and forth for a while -- the slave slashing and swinging, the animal leaping out of the way. $activeSlave.slaveName finally manages to get the better of the _animal.species, though, and manages to catch the tip of $his sword on the animal's leg. With a loud <<switch _animal.type>><<case "canine">>yelp<<case "hooved">>whinny<<case "feline">>howl<</switch>>, the _animal.species stumbles back, giving the slave a chance to bring $his sword down in an overhead swing, nearly removing the _animal.species's head.
<<if $pitAudience == "paid">>
The audience is reasonably impressed by the show of strength, and your @@.yellowgreen;cut of the betting@@ is reasonable.
@@ -683,35 +682,14 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
The audience is @@.red;annoyed@@ by this waste of a fight.
<<set $rep -= 20>>
<</if>>
- <</if>>
- <<if (_winnerDeadliness > _loserDeadliness+3)>>
- <<if (_loser.combatSkill > 0)>>
- _loser.slaveName is reasonably confident in $his fighting abilities, but $he isn't sure how to go about attacking the _animal.species. $He decides to open with a series of wide horizontal slashes, but the beast manages to stay out of range of $his sword. Realizing this isn't working, $he lunges at the animal, leaving $his side exposed. The _animal.species sees this and <<switch _animal.type>><<case "canine" "feline">>leaves some @@.red;deep claw marks in $his side.@@ Bleeding<<case "hooved">>headbutts $him as hard as it can, sending $him flying into the side of $pitName. Battered<</switch>> and unable to stand, $activeSlave.slaveName can do little to stop the _animal.species from finishing $him off with a <<switch _animal.type>><<case "canine" "feline">>ferocious swipe of its claws to $his throat.<<case "hooved">>swift kick to the head.<</switch>>
- <<set _winner.health -= 20>>
- <<if $pitAudience == "paid">>
- The audience is reasonably impressed by the blood, and your @@.yellowgreen;cut of the betting@@ is reasonable.
- <<set $cash += 4000>>
- <<elseif $pitAudience == "free">>
- The audience is @@.green;reasonably impressed@@ by the blood.
- <<set $rep += 200>>
- <</if>>
+ <<elseif (_winnerDeadliness <= _loserDeadliness+3)>>
+ <<if _loser.combatSkill > 0>>
+ _loser.slaveName is fairly confident in $his fighting abilities, and $he knows that this fight is fairly evenly matched.
<<else>>
- <<switch _animal.type>>
- <<case "canine" "feline">>
- _loser.slaveName doesn't stand a chance, and $he knows it. $He comes in with a furious overhead slash, which the _animal.species dodges with ease. It also dodges the next few slashes before coming to a standstill. With a furious growl, it runs around $him, just out of reach of $his sword, before jumping at the wall of $pitName and launching itself off. Its claws connect with _loser.slaveName's throat, completely severing $his windpipe. $He falls to his knees, eyes wide and clutching $his throat, before completely collapsing.
- <<case "hooved">>
- The _animal.species paws at the ground for a few seconds before launching itself at $activeSlave.slaveName. $He just barely manages to get out of the way, and the _animal.species has to backpedal to avoid smashing into the wall. $activeSlave.slaveName isn't out of danger just yet, though -- $he is still standing directly behind the _animal.species. $He realizes this too late, as both of the its hooves connect with $his jaw. With a sickening //crunch//, $he flies backwards, $his body slamming into the other wall of $pitName.
- <</switch>>
- <<if $pitAudience == "paid">>
- The audience is reasonably impressed by the violence, and your @@.yellowgreen;cut of the betting@@ is reasonable.
- <<set $cash += 4000>>
- <<elseif $pitAudience == "free">>
- The audience is @@.green;reasonably impressed@@ by the violence.
- <<set $rep += 200>>
- <</if>>
+ _loser.slaveName doesn't know how to handle a sword, but $he feels fairly confident in $his chances all the same.
<</if>>
- <</if>>
- <<if (_loser.belly >= 300000)>>
+ $He doesn't know how to go about attacking an animal, though, so $he decides to play it safe and keep the _animal.species at sword's length. The _animal.species make a few false lunges at the slave, all the while keeping out of reach. After a few minutes of this, though, it's evident that _loser.slaveName is beginning to tire: $his sword is beginning to swing slower and slower, and $his stance isn't as straight. The animal seems to sense this, and, spotting an opening, makes a final lunge. Its <<switch _animal.type>><<case "canine" "feline">>teeth sink into $his throat<<case "hooved">>hooves connect with $his skull<</switch>>, ending $his life almost immediately.
+ <<elseif (_loser.belly >= 300000)>>
_loser.slaveName's belly is too big to possibly defend, so $he can't help but watch in horror as the _animal.species lunges at $him, <<switch _animal.type>><<case "canine" "feline">>fangs and claws out<<case "hooved">>headfirst<</switch>>. _loser.slaveName's belly ruptures like a popped water balloon, showering the animal with
<<if _loser.pregType > 0>>
blood. _loser.slaveName collapses into the pile of organs and babies released from her body.
@@ -720,8 +698,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<<else>>
blood and <<print _loser.inflationType>>. _loser.slaveName collapses into the pool of organs and fluid released from her body.
<</if>>
- <</if>>
- With a <<switch _animal.type>><<case "canine" "feline">>growl<<case "hooved">>snort<</switch>>, the _animal.species quickly finishes $him off <<if _animal.type == "hooved">>with a kick to the head<</if>>.
+ With a <<switch _animal.type>><<case "canine" "feline">>growl<<case "hooved">>snort<</switch>>, the _animal.species quickly finishes $him off<<if _animal.type == "hooved">> with a kick to the head<</if>>.
<<if $pitAudience == "paid">>
The audience is not very impressed by this easy kill, and your @@.yellowgreen;cut of the betting@@ is unimpressive.
<<set $cash += 2000>>
@@ -729,7 +706,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
the audience is @@.green;not very impressed@@ by this easy kill.
<<set $rep += 100>>
<</if>>
- <<if (_loser.boobs > 1200)>>
+ <<elseif (_loser.boobs > 1200)>>
_loser.slaveName's tits are too big to possibly defend, so $he can't help but watch in horror as the _animal.species lunges at $him, <<switch _animal.type>><<case "canine" "feline">>fangs and claws out<<case "hooved">>headfirst<</switch>>. _loser.slaveName's reflexively drops her sword to clasp her hands over her ruined breasts, gushing blood<<if _loser.boobsImplant > 400>> and implant fluid<</if>>. The _animal.species follows up with a <<switch _animal.type>><<case "canine" "feline">>fierce bite to one of $his legs, causing $him to collapse. A second later, the animal has finished $him off.<<case "hooved">>swift kick to the head, causing $him to drop like a rock. Another blow to the head finishes $him off.<</switch>>
<<if $pitAudience == "paid">>
The audience is not very impressed by this easy kill, and your @@.yellowgreen;cut of the betting@@ is unimpressive.
@@ -738,10 +715,36 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
The audience is @@.green;not very impressed@@ by this easy kill.
<<set $rep += 100>>
<</if>>
+ <<else>> /* if none of the above conditions are met */
+ <<if (_loser.combatSkill > 0)>>
+ _loser.slaveName is reasonably confident in $his fighting abilities, but $he isn't sure how to go about attacking the _animal.species. $He decides to open with a series of wide horizontal slashes, but the beast manages to stay out of range of $his sword. Realizing this isn't working, $he lunges at the animal, leaving $his side exposed. The _animal.species sees this and <<switch _animal.type>><<case "canine" "feline">>leaves some @@.red;deep claw marks in $his side.@@ Bleeding<<case "hooved">>headbutts $him as hard as it can, sending $him flying into the side of $pitName. Battered<</switch>> and unable to stand, $activeSlave.slaveName can do little to stop the _animal.species from finishing $him off with a <<switch _animal.type>><<case "canine">>fierce bite of its fangs to $his throat.<<case "feline">>ferocious swipe of its claws to $his throat.<<case "hooved">>swift kick to the head.<</switch>>
+ <<set _winner.health -= 20>>
+ <<if $pitAudience == "paid">>
+ The audience is reasonably impressed by the blood, and your @@.yellowgreen;cut of the betting@@ is reasonable.
+ <<set $cash += 4000>>
+ <<elseif $pitAudience == "free">>
+ The audience is @@.green;reasonably impressed@@ by the blood.
+ <<set $rep += 200>>
+ <</if>>
+ <<else>>
+ <<switch _animal.type>>
+ <<case "canine" "feline">>
+ _loser.slaveName doesn't stand a chance, and $he knows it. $He comes in with a furious overhead slash, which the _animal.species dodges with ease. It also dodges the next few slashes before coming to a standstill. With a furious growl, it runs around $him, just out of reach of $his sword, before jumping at the wall of $pitName and launching itself off. Its claws connect with _loser.slaveName's throat, completely severing $his windpipe. $He falls to his knees, eyes wide and clutching $his throat, before completely collapsing.
+ <<case "hooved">>
+ The _animal.species paws at the ground for a few seconds before launching itself at $activeSlave.slaveName. $He just barely manages to get out of the way, and the _animal.species has to backpedal to avoid smashing into the wall. $activeSlave.slaveName isn't out of danger just yet, though -- $he is still standing directly behind the _animal.species. $He realizes this too late, as both of the its hooves connect with $his jaw. With a sickening //crunch//, $he flies backwards, $his body slamming into the other wall of $pitName.
+ <</switch>>
+ <<if $pitAudience == "paid">>
+ The audience is reasonably impressed by the violence, and your @@.yellowgreen;cut of the betting@@ is reasonable.
+ <<set $cash += 4000>>
+ <<elseif $pitAudience == "free">>
+ The audience is @@.green;reasonably impressed@@ by the violence.
+ <<set $rep += 200>>
+ <</if>>
+ <</if>>
<</if>>
<</if>>
- <br><br>
+ <br><br> /* TODO: would it make sense for slaves to feel so much remorse over killing an animal? */
<<if _winner == _fighterOne>>
You let the winner _winner.slaveName, shaking as $he comes off the adrenaline, drugs, and the fear, exit the pit.
@@ -750,21 +753,21 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<<elseif _winner.devotion > 95>>
$He is so worshipful of you that $he does not see killing an animal as special in $his own internal listing of things that $he has willingly done and would willingly do again on your behalf.
<<elseif _winner.devotion > 80>>
- $He will never forget having killed an animal with $his own hands. The only way $he will be able to live with $hisself is to @@.hotpink;subsume $his will to yours,@@ telling $himself that the killing was to serve and obey you.
+ $He will never forget having killed an animal with $his own hands. The only way $he will be able to live with $himself is to @@.hotpink;subsume $his will to yours,@@ telling $himself that the killing was to serve and obey you.
<<set _winner.devotion += 10>>
<<elseif (_winner.fetishKnown == 1) && (_winner.fetishStrength > 60) && (_winner.fetish == "sadist")>>
$He has sunk even deeper into cruelty, callousness, and a total disregard of the value of other lives. Going forward, $he's even @@.hotpink;less likely to question@@ even the most abominable commands.
<<set _winner.devotion += 4>>
<<elseif _winner.devotion > 50>>
- $He will never forget having killed an animal with $his own hands. The only way $he will be able to live with $hisself is to tell $himself that the killing was done on your orders.
+ $He will never forget having killed an animal with $his own hands. The only way $he will be able to live with $himself is to tell $himself that the killing was done on your orders.
<<else>>
- $He will never forget having killed an animal with $his own hands. The only way $he will be able to live with $hisself is to @@.mediumorchid;blame you,@@ telling $himself that the killing was the only choice you gave $his if $he wanted to live.
+ $He will never forget having killed an animal with $his own hands. The only way $he will be able to live with $himself is to @@.mediumorchid;blame you,@@ telling $himself that the killing was the only choice you gave $his if $he wanted to live.
<<set _winner.devotion -= 10>>
<</if>>
<<if (_winner.fetish != "sadist")>>
<<if random(1,100) > 50>>
- Cruelty and callousness seeps its way into $his sexuality; $He has become a @@.lightcoral;bloody sadist.@@
+ Cruelty and callousness seeps its way into $his sexuality; $he has become a @@.lightcoral;bloody sadist.@@
<<set _winner.fetish = "sadist">>
<<set _winner.fetishKnown = 1>>
<<set _winner.fetishStrength = 65>>
@@ -775,7 +778,7 @@ In any case, <<if $pitAnimal == 0>>both of the slaves have<<else>>the slave and
<</if>>
<</if>>
-<<set $slaveFightingBG = 0, $killChoice = 0>>
+<<set $slaveFightingBG = 0, $killChoice = -1>>
<<if _winner != _animal>>
<<if (_winner.combatSkill == 0)>>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index 5388d7e862400a363d4d66b54f161d7f91b4b1f0..dfda8561560ed8786f444cfb29d500a504dd45cf 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -15,7 +15,7 @@
<<goto "Nonrandom Event">>
<</if>>
<<else>>
- <<switch $pitAnimalType.type>>
+ <<switch $pitAnimalType>>
<<case "canine">>
<<set _animal = $activeCanine>>
<<case "hooved">>
@@ -1060,7 +1060,7 @@
<</if>>
<<else>>
<<set _minutesLasted = random(1,5)>>
- <<if _canRun == 1>>
+ <<if _canRun == 1>> /* FIXME: clean this mess up */
$activeSlave.slaveName is quick, but not quick enough. $He manages to last almost <<if _minutesLasted == 1>>a full minute<<else>><<if _minutesLasted == 2>>two<<elseif _minutesLasted == 3>>three<<elseif _minutesLasted == 4>>four<<elseif _minutesLasted == 5>>five<</if>> full minutes<</if>> before the _animal.species finally catches $him.
<<elseif _canRun == 0>>
$activeSlave.slaveName isn't quick enough to avoid the beast, and $he only manages to last a pitiful thirty seconds before the _animal.species catches $him.
@@ -1072,7 +1072,9 @@
The audience is @@.green;not very impressed@@ by this mediocre display.
<<set $rep += 25>>
<</if>>
- It <<if _animal.type != "hooved">>swipes at $his legs<<else>>headbutts $him<</if>>, causing $him to go down hard. It doesn't waste a moment, and mounts $him quicker than you thought would have been possible for a _animal.species. It takes a few tries, but it finally manages to find $his _orifice, causing <<if $audience != "none">>the crowd to go wild and<</if>> $activeSlave.slaveName to give a long, drawn-out <<if _agree == 1>>moan<<else>>scream<</if>> as its _animal.dickSize fills $his _orifice. Without hesitation, it begins to steadily thrust, pounding $him harder and harder as it grows closer and closer to climax. After several minutes, you see the animal finally stop thrusting as the barely-there slave gives a loud <<if _agree == 1>>moan<<else>>groan<</if>>. <<if $audience != "none">>The crowd gives a loud cheer as the<<else>>The<</if>> animal pulls out, leaving the thouroughly fucked-out $activeSlave.slaveName lying there, cum streaming out of $his _orifice.
+ /* TODO: rewrite this to account for more variables (and to clean this whole mess up) */
+ It <<if _animal.type != "hooved">>swipes at $his legs<<else>>headbutts $him<</if>>, causing $him to go down hard. It doesn't waste a moment, and mounts $him quicker than you thought would have been possible for a _animal.species. It takes a few tries, but it finally manages to find $his _orifice, causing <<if $audience != "none">>the crowd to go wild and<</if>> $activeSlave.slaveName to give a long, drawn-out <<if _agree == 1>>moan<<else>>scream<</if>> as its _animal.dickSize cock <<if (_orifice == "pussy" && $activeSlave.vagina == 0) || (_orifice == "asshole" && $activeSlave.anus == 0)>>@@.limegreen;breaks in@@<<else>>fills<</if>> $his _orifice. Without hesitation, it begins to steadily thrust, pounding $him harder and harder as it grows closer and closer to climax. After several minutes, you see the animal finally stop thrusting as the barely-there slave gives a loud <<if _agree == 1>>moan<<else>>groan<</if>>. <<if $audience != "none">>The crowd gives a loud cheer as the<<else>>The<</if>> animal pulls out, leaving the thouroughly fucked-out $activeSlave.slaveName lying there, cum streaming out of $his _orifice.
+ /* TODO: write an ending / post-fight message */
<</if>>
<<set $slaves[$slaveIndices[_fighterOne.ID]] = _fighterOne>>
<<set $fighterIDs.push(_fighterOne.ID)>>