From 504562db37974b677f995983ae112b2c1c009952 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Tue, 8 May 2018 19:43:41 -0400
Subject: [PATCH] Fixes and Updates

---
 src/init/dummy.tw                           |   1 -
 src/init/storyInit.tw                       |   5 +-
 src/uncategorized/BackwardsCompatibility.tw |  10 +-
 src/uncategorized/futureSociety.tw          |   2 +-
 src/uncategorized/seLethalPit.tw            | 362 ++++++++++----------
 src/uncategorized/seNonlethalPit.tw         | 336 +++++++++---------
 src/uncategorized/surgeryDegradation.tw     |   1 -
 7 files changed, 356 insertions(+), 361 deletions(-)

diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index d9144fb9c5d..a130edbea9c 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -5,7 +5,6 @@ Do not uncomment anything!
 
 $showBestiality
 $ageMode
-$servantMilkersJobs
 $youngCareers, $educatedCareers, $uneducatedCareers, $gratefulCareers, $menialCareers, $entertainmentCareers, $whoreCareers, $HGCareers, $madamCareers, $DJCareers, $bodyguardCareers, $wardenessCareers, $nurseCareers, $attendantCareers, $milkmaidCareers, $stewardessCareers, $schoolteacherCareers
 $whiteAmericanSlaveNames, $africanAmericanSlaveNames, $asianAmericanSlaveNames, $latinaSlaveNames, $russianSlaveNames, $egyptianSlaveNames, $brazilianSlaveNames, $chineseSlaveNames, $koreanSlaveNames, $indianSlaveNames, $indonesianSlaveNames, $bangladeshiSlaveNames, $japaneseSlaveNames, $nigerianSlaveNames, $pakistaniSlaveNames, $mexicanSlaveNames, $filipinaSlaveNames, $ethiopianSlaveNames, $germanSlaveNames, $saudiSlaveNames, $turkishSlaveNames, $colombianSlaveNames, $argentinianSlaveNames, $vietnameseSlaveNames, $iranianSlaveNames, $congoleseSlaveNames, $frenchSlaveNames, $thaiSlaveNames, $britishSlaveNames, $italianSlaveNames, $spanishSlaveNames, $kenyanSlaveNames, $ukrainianSlaveNames, $canadianSlaveNames, $peruvianSlaveNames, $venezuelanSlaveNames, $irishSlaveNames, $icelandicSlaveNames, $finnishSlaveNames, $newZealanderSlaveNames, $polishSlaveNames, $greekSlaveNames, $israeliSlaveNames, $armenianSlaveNames, $moroccanSlaveNames, $romanianSlaveNames, $swedishSlaveNames, $lithuanianSlaveNames, $bolivianSlaveNames, $haitianSlaveNames, $cubanSlaveNames, $whiteSouthAfricanSlaveNames, $blackSouthAfricanSlaveNames, $chileanSlaveNames, $belgianSlaveNames, $danishSlaveNames, $norwegianSlaveNames, $hungarianSlaveNames, $estonianSlaveNames, $slovakSlaveNames, $kazakhSlaveNames, $zimbabweanSlaveNames, $ugandanSlaveNames, $tanzanianSlaveNames, $dutchSlaveNames, $austrianSlaveNames, $swissSlaveNames, $puertoRicanSlaveNames, $czechSlaveNames, $portugueseSlaveNames, $jamaicanSlaveNames, $malaysianSlaveNames, $guatemalanSlaveNames, $ghananSlaveNames, $serbianSlaveNames, $australianSlaveNames, $burmeseSlaveNames, $algerianSlaveNames, $sudaneseSlaveNames, $iraqiSlaveNames, $uzbekSlaveNames, $nepaleseSlaveNames, $afghanSlaveNames, $yemeniSlaveNames, $lebaneseSlaveNames, $tunisianSlaveNames, $emiratiSlaveNames, $libyanSlaveNames, $jordanianSlaveNames, $omaniSlaveNames, $malianSlaveNames, $sammarineseSlaveNames, $marshalleseSlaveNames, $syrianSlaveNames, $bermudianSlaveNames, $uruguayanSlaveNames, $monegasqueSlaveNames, $montenegrinSlaveNames, $cambodianSlaveNames, $cameroonianSlaveNames, $gaboneseSlaveNames, $djiboutianSlaveNames, $greenlandicSlaveNames, $tuvaluanSlaveNames, $zambianSlaveNames, $albanianSlaveNames, $bruneianSlaveNames, $singaporeanSlaveNames
 $cowSlaveNames, $chattelReligionistSlaveNames, $romanSlaveNames, $aztecSlaveNames, $ancientEgyptianSlaveNames, $edoSlaveNames
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 08a3fa64f61..31b5029813f 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -387,7 +387,7 @@ You should have received a copy of the GNU General Public License along with thi
 
 <<set $boomerangSlave = 0, $boomerangWeeks = 0, $boomerangBuyer = 0>>
 
-<<set $bioreactorPerfectedID = []>>
+<<set $bioreactorPerfectedID = 0>>
 
 <<set $independenceDay = 0>>
 <<set $invasionVictory = 0>>
@@ -545,8 +545,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
 <<set $HGSuiteEquality = 0>>
 <<set $HGSuiteName = "the Head Girl Suite">>
 <<set $HGSuiteNameCaps = "The Head Girl Suite">>
-<<set $fighterOne = 0>>
-<<set $fighterTwo = 0>>
 <<set $fighterIDs = []>>
 <<set $pitBG = 0>>
 <<set $pitAudience = "none">>
@@ -566,7 +564,6 @@ DairyRestraintsSetting($dairyRestraintsSetting)
 <<set $boobAccessibility = 0>>
 <<set $servantMilkers = 0>>
 <<set $servantMilkersMultiplier = 1>>
-<<set $servantMilkersJobs = ["be a servant", "work as a servant", "take classes", "please you", "be a subordinate slave", "stay confined", "recruit girls", "rest"]>>
 <<set $foodCost = 25>>
 
 <<set $legendaryWhoreID = 0>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 4f4986dc424..056a3aecbef 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -33,8 +33,8 @@
 	<<unset $drugs, $harshCollars, $shoes, $bellyAccessories, $vaginalAccessories, $dickAccessories, $buttplugs>>
 <</if>>
 
-<<if def $servantMilkerJobs>>
-	<<unset $servantMilkerJobs>>
+<<if def $servantMilkersJobs>>
+	<<unset $servantMilkersJobs>>
 <</if>>
 
 <<if def $fakeBellies>>
@@ -172,6 +172,12 @@
 <<if def $oralCount || def $vaginalCount || def $analCount>>
 	<<unset $oralCount, $vaginalCount, $analCount>>
 <</if>>
+<<if def $fighterOne || def $fighterTwo>>
+	<<unset $fighterOne, $fighterTwo>>
+<</if>>
+<<if def $fighterOneDeadliness || def $fighterTwoDeadliness>>
+	<<unset $fighterOneDeadliness, $fighterTwoDeadliness>>
+<</if>>
 
 /* pregmod stuff */
 
diff --git a/src/uncategorized/futureSociety.tw b/src/uncategorized/futureSociety.tw
index d5bd589f9f8..f4104ce27de 100644
--- a/src/uncategorized/futureSociety.tw
+++ b/src/uncategorized/futureSociety.tw
@@ -623,7 +623,7 @@ You are spending <<print cashFormat($FSSpending)>> each week to support your soc
 
 <<if $arcologies[0].FSSubjugationist != "unset">>
 	<br>''You are pursuing'' $arcologies[0].FSSubjugationistRace inferiority. //<<link [[Abandon|Future Society]]>><<set $arcologies[0].FSSubjugationist = "unset", $arcologies[0].FSSubjugationistDecoration = 20, $arcologies[0].FSSubjugationistLawME = 0, $arcologies[0].FSSubjugationistSMR = 0, $FSCredits += 1>><<ClearFacilityDecorations>><</link>>//<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	<<FSChangeDecoration "FSSupremacist">>
+	<<FSChangeDecoration "FSSubjugationist">>
 	<<if $PAPublic == 1>>
 	<<if ($assistantAppearance == "businesswoman") || ($assistantAppearance == "amazon") || ($assistantAppearance == "imp")>>
 	With her $assistantAppearance appearance, $assistantName is a good public mascot for this goal.
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index d3a73a8fd29..0882b86b1fb 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -2,17 +2,17 @@
 
 <<nobr>>
 
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $pitFought = 1, $fighterOne = 0, $fighterTwo = 0>>
+<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $pitFought = 1, _fighterOne = 0, _fighterTwo = 0>>
 
 <<if $pitBG == 0>>
-	<<set $fighterOne = $fighterIDs.pluck()>> /* .pluck() removes the element from the array, preventing $fighterTwo from also choosing this ID */
-	<<set $fighterOne = getSlave($fighterOne)>>
+	<<set _fighterOne = $fighterIDs.pluck()>> /* .pluck() removes the element from the array, preventing _fighterTwo from also choosing this ID */
+	<<set _fighterOne = getSlave(_fighterOne)>>
 <<else>>
-	<<set $fighterOne = getSlave($Bodyguard.ID)>>
+	<<set _fighterOne = getSlave($Bodyguard.ID)>>
 <</if>>
-<<set $fighterTwo = $fighterIDs.pluck()>>
-<<set $fighterTwo = getSlave($fighterTwo)>>
-<<if ndef $fighterOne || ndef $fighterTwo || ($fighterOne == 0) || ($fighterTwo == 0)>>
+<<set _fighterTwo = $fighterIDs.pluck()>>
+<<set _fighterTwo = getSlave(_fighterTwo)>>
+<<if ndef _fighterOne || ndef _fighterTwo || (_fighterOne == 0) || (_fighterTwo == 0)>>
 	<<goto "Nonrandom Event">>
 <</if>>
 
@@ -20,7 +20,7 @@
 \
 <<nobr>>
 
-This week's pit fight is between $fighterOne.slaveName and $fighterTwo.slaveName. <<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 _fighterTwo.slaveName. <<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 $arcologies[0].FSRomanRevivalist != "unset">>
 	They @@.green;passionately approve@@ of your hosting lethal combat between slaves; this advances ideas from antiquity about what public events should be.
@@ -37,147 +37,147 @@ You review the rules - the combatants will use their choice of swords, and the f
 
 <<nobr>>
 
-<<Deadliness $fighterOne>>
-<<set $fighterOneDeadliness = $deadliness>>
-
-<<if $fighterOne.fetish == "mindbroken">>
-	$fighterOne.slaveName is too broken to care about whether she lives or dies;
-<<elseif $fighterOneDeadliness > 5>>
-	$fighterOne.slaveName seems very confident;
-<<elseif $fighterOneDeadliness > 3>>
-	$fighterOne.slaveName seems nervous, but steels herself;
-<<elseif $fighterOneDeadliness > 1>>
-	$fighterOne.slaveName seems hesitant and unsure;
+<<Deadliness _fighterOne>>
+<<set _fighterOneDeadliness = $deadliness>>
+
+<<if _fighterOne.fetish == "mindbroken">>
+	_fighterOne.slaveName is too broken to care about whether she lives or dies;
+<<elseif _fighterOneDeadliness > 5>>
+	_fighterOne.slaveName seems very confident;
+<<elseif _fighterOneDeadliness > 3>>
+	_fighterOne.slaveName seems nervous, but steels herself;
+<<elseif _fighterOneDeadliness > 1>>
+	_fighterOne.slaveName seems hesitant and unsure;
 <<else>>
-	$fighterOne.slaveName is obviously terrified, and might flee if there were a way out of the pit;
+	_fighterOne.slaveName is obviously terrified, and might flee if there were a way out of the pit;
 <</if>>
 
-<<if $fighterOne.fetish == "mindbroken">>
+<<if _fighterOne.fetish == "mindbroken">>
 	she is indifferent to the prospect of killing, as well.
-<<elseif $fighterOne.devotion > 95>>
+<<elseif _fighterOne.devotion > 95>>
 	she is clearly willing to do her best to kill for you.
-<<elseif ($fighterOne.fetish == "sadist") && ($fighterOne.fetishKnown == 1) && ($fighterOne.fetishStrength > 60)>>
+<<elseif (_fighterOne.fetish == "sadist") && (_fighterOne.fetishKnown == 1) && (_fighterOne.fetishStrength > 60)>>
 	the prospect of killing does not seem to concern her.
-<<elseif $fighterOne.devotion > 50>>
+<<elseif _fighterOne.devotion > 50>>
 	she obviously does not want to kill, but will do as you order.
-<<elseif $fighterOne.devotion >= -20>>
+<<elseif _fighterOne.devotion >= -20>>
 	she is clearly unhappy at the prospect of killing, but knows that the alternative is death.
 <<else>>
 	she knows that it's kill or be killed, and puts aside her hatred of you in an effort to live.
 <</if>>
 
-<<if $fighterOne.combatSkill > 0>>
+<<if _fighterOne.combatSkill > 0>>
 	Her grip on her sword is sure and easy.
 <</if>>
 
-<<if $fighterOne.muscles > 95>>
+<<if _fighterOne.muscles > 95>>
 	She is wielding a massive two-handed blade few others could even heft.
-<<elseif $fighterOne.muscles > 30>>
+<<elseif _fighterOne.muscles > 30>>
 	She is strong enough to handle a bastard sword.
-<<elseif $fighterOne.muscles > 5>>
+<<elseif _fighterOne.muscles > 5>>
 	She has selected a longsword suited to her strength.
-<<elseif $fighterOne.muscles < -95>>
+<<elseif _fighterOne.muscles < -95>>
 	She has selected a meager dagger; even then she can barely wield it.
-<<elseif $fighterOne.muscles < -30>>
+<<elseif _fighterOne.muscles < -30>>
 	She has selected a dagger, the heaviest weapon she can manage.
-<<elseif $fighterOne.muscles < -5>>
+<<elseif _fighterOne.muscles < -5>>
 	She has selected a short sword, despite being able to barely lift it.
 <<else>>
 	She has selected a short sword, the heaviest weapon she can manage.
 <</if>>
 
-<<if $fighterOne.height >= 170>>
+<<if _fighterOne.height >= 170>>
 	Her height gives her a reach advantage.
 <</if>>
 
-<<if $fighterOne.health > 50>>
+<<if _fighterOne.health > 50>>
 	Her shining health makes her a better fighter.
 <</if>>
 
-<<if $fighterOne.weight > 190>>
+<<if _fighterOne.weight > 190>>
 	Her extreme weight nearly immobilizes her. She struggles to move let alone fight.
-<<elseif $fighterOne.weight > 160>>
+<<elseif _fighterOne.weight > 160>>
 	Her extreme weight limits her mobility and range of motion making her an easy target.
-<<elseif $fighterOne.weight > 130>>
+<<elseif _fighterOne.weight > 130>>
 	Her extreme weight holds her back as a pit fighter.
-<<elseif $fighterOne.weight > 30>>
+<<elseif _fighterOne.weight > 30>>
 	Her heavy weight is an impediment as a pit fighter.
-<<elseif $fighterOne.weight < -10>>
+<<elseif _fighterOne.weight < -10>>
 	Her light weight is an impediment as a pit fighter.
 <</if>>
 
-<<if $fighterOne.health < -50>>
+<<if _fighterOne.health < -50>>
 	Her poor health makes her a weaker combatant.
 <</if>>
 
-<<if $fighterOne.pregKnown == 1 || $fighterOne.bellyPreg >= 1500>>
-	<<if $fighterOne.bellyPreg >= 750000>>
+<<if _fighterOne.pregKnown == 1 || _fighterOne.bellyPreg >= 1500>>
+	<<if _fighterOne.bellyPreg >= 750000>>
 		Her monolithic pregnancy guarantees her and her many, many children's deaths; not only is she on the verge of splitting open, but it is an unmissable, indefensible target. She has no hope of attacking around the straining mass, let alone stopping her opponent. She is damned.
-	<<elseif $fighterOne.bellyPreg >= 600000>>
+	<<elseif _fighterOne.bellyPreg >= 600000>>
 		Her titanic pregnancy is practically a death sentence; not only does she risk bursting, but it is an unmissable, indefensible target. She can barely keep it together while thinking about the lives of her brood.
-	<<elseif $fighterOne.bellyPreg >= 450000>>
+	<<elseif _fighterOne.bellyPreg >= 450000>>
 		Her gigantic pregnancy practically damns her; it presents an unmissable, indefensible target for her adversary. She can barely keep it together while thinking about the lives of her brood.
-	<<elseif $fighterOne.bellyPreg >= 300000>>
+	<<elseif _fighterOne.bellyPreg >= 300000>>
 		Her massive pregnancy obstructs her movement and greatly hinders her. She struggles to think of how she could even begin to defend it from harm.
-	<<elseif $fighterOne.bellyPreg >= 150000>>
+	<<elseif _fighterOne.bellyPreg >= 150000>>
 		Her giant pregnancy obstructs her movement and greatly slows her down. She tries not to think of how many lives are depending on her.
-	<<elseif $fighterOne.bellyPreg >= 100000>>
+	<<elseif _fighterOne.bellyPreg >= 100000>>
 		Her giant belly gets in her way and weighs her down. She is terrified for the lives of her many children.
-	<<elseif $fighterOne.bellyPreg >= 10000>>
-		Her huge belly gets in her way and weighs her down. She is terrified for the <<if $fighterOne.pregType > 1>>lives of her children<<else>>life of her child<</if>>.
-	<<elseif $fighterOne.bellyPreg >= 5000>>
+	<<elseif _fighterOne.bellyPreg >= 10000>>
+		Her huge belly gets in her way and weighs her down. She is terrified for the <<if _fighterOne.pregType > 1>>lives of her children<<else>>life of her child<</if>>.
+	<<elseif _fighterOne.bellyPreg >= 5000>>
 		Her advanced pregnancy makes her much less effective, not to mention terrified for her child.
-	<<elseif $fighterOne.bellyPreg >= 1500>>
+	<<elseif _fighterOne.bellyPreg >= 1500>>
 		Her growing pregnancy distracts her with concern over the life growing within her.
 	<<else>>
 		The life just beginning to grow inside her distracts her from the fight.
 	<</if>>
-<<elseif $fighterOne.bellyImplant >= 1500>>
-	<<if $fighterOne.bellyImplant >= 750000>>
-		Her monolithic, <<print $fighterOne.bellyImplant>>cc implant filled belly guarantees her death; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent.
-	<<elseif $fighterOne.bellyImplant >= 600000>>
-		Her titanic, <<print $fighterOne.bellyImplant>>cc implant filled belly is practically a guaranteed death; she can barely stand let alone fight. Not only is it crippling heavy, unwieldy and an easy target, but she can feel it straining to hold the sheer amount of filler forced into it.
-	<<elseif $fighterOne.bellyImplant >= 450000>>
-		Her gigantic, <<print $fighterOne.bellyImplant>>cc implant filled belly is nearly a guaranteed death; it presents an unmissable, indefensible target for her adversary.
-	<<elseif $fighterOne.bellyImplant >= 300000>>
-		Her massive, <<print $fighterOne.bellyImplant>>cc implant filled belly is extremely heavy, unwieldy and an easy target, practically damning her in combat.
-	<<elseif $fighterOne.bellyImplant >= 150000>>
-		Her giant, <<print $fighterOne.bellyImplant>>cc implant filled belly obstructs her movement and greatly slows her down.
-	<<elseif $fighterOne.bellyImplant >= 100000>>
-		Her giant, <<print $fighterOne.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
-	<<elseif $fighterOne.bellyImplant >= 10000>>
-		Her huge, <<print $fighterOne.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
-	<<elseif $fighterOne.bellyImplant >= 5000>>
-		Her large, <<print $fighterOne.bellyImplant>>cc implant filled belly is heavy and unwieldy, rendering her less effective.
-	<<elseif $fighterOne.bellyImplant >= 1500>>
-		Her swollen, <<print $fighterOne.bellyImplant>>cc implant filled belly is heavy and makes her less effective.
+<<elseif _fighterOne.bellyImplant >= 1500>>
+	<<if _fighterOne.bellyImplant >= 750000>>
+		Her monolithic, <<print _fighterOne.bellyImplant>>cc implant filled belly guarantees her death; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent.
+	<<elseif _fighterOne.bellyImplant >= 600000>>
+		Her titanic, <<print _fighterOne.bellyImplant>>cc implant filled belly is practically a guaranteed death; she can barely stand let alone fight. Not only is it crippling heavy, unwieldy and an easy target, but she can feel it straining to hold the sheer amount of filler forced into it.
+	<<elseif _fighterOne.bellyImplant >= 450000>>
+		Her gigantic, <<print _fighterOne.bellyImplant>>cc implant filled belly is nearly a guaranteed death; it presents an unmissable, indefensible target for her adversary.
+	<<elseif _fighterOne.bellyImplant >= 300000>>
+		Her massive, <<print _fighterOne.bellyImplant>>cc implant filled belly is extremely heavy, unwieldy and an easy target, practically damning her in combat.
+	<<elseif _fighterOne.bellyImplant >= 150000>>
+		Her giant, <<print _fighterOne.bellyImplant>>cc implant filled belly obstructs her movement and greatly slows her down.
+	<<elseif _fighterOne.bellyImplant >= 100000>>
+		Her giant, <<print _fighterOne.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
+	<<elseif _fighterOne.bellyImplant >= 10000>>
+		Her huge, <<print _fighterOne.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
+	<<elseif _fighterOne.bellyImplant >= 5000>>
+		Her large, <<print _fighterOne.bellyImplant>>cc implant filled belly is heavy and unwieldy, rendering her less effective.
+	<<elseif _fighterOne.bellyImplant >= 1500>>
+		Her swollen, <<print _fighterOne.bellyImplant>>cc implant filled belly is heavy and makes her less effective.
 	<</if>>
 <</if>>
-<<if $fighterOne.labor == 1>>
-	She's feeling labor pains. Her child<<if $fighterOne.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will mean the death of <<if $fighterOne.pregType > 1>>their<<else>>its<</if>> mother.
-<<elseif $fighterOne.preg >= 40 && $fighterOne.pregControl != "labor supressors">>
+<<if _fighterOne.labor == 1>>
+	She's feeling labor pains. Her child<<if _fighterOne.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will mean the death of <<if _fighterOne.pregType > 1>>their<<else>>its<</if>> mother.
+<<elseif _fighterOne.preg >= 40 && _fighterOne.pregControl != "labor supressors">>
 	She'll be going into labor any time now and she knows it. She's terrified of the thought of her water breaking during the fight.
 <</if>>
 
-<<if $fighterOne.bellyFluid >= 10000>>
-	Her hugely bloated, <<print $fighterOne.inflationType>>-filled belly is taut and painful, hindering her ability to fight.
-<<elseif $fighterOne.bellyFluid >= 5000>>
-	Her bloated, <<print $fighterOne.inflationType>>-stuffed belly is constantly jiggling and moving, distracting her and throwing off her weight.
-<<elseif $fighterOne.bellyFluid >= 2000>>
-	Her distended, <<print $fighterOne.inflationType>>-belly is uncomfortable and heavy, distracting her.
+<<if _fighterOne.bellyFluid >= 10000>>
+	Her hugely bloated, <<print _fighterOne.inflationType>>-filled belly is taut and painful, hindering her ability to fight.
+<<elseif _fighterOne.bellyFluid >= 5000>>
+	Her bloated, <<print _fighterOne.inflationType>>-stuffed belly is constantly jiggling and moving, distracting her and throwing off her weight.
+<<elseif _fighterOne.bellyFluid >= 2000>>
+	Her distended, <<print _fighterOne.inflationType>>-belly is uncomfortable and heavy, distracting her.
 <</if>>
 
-<<if !canSee($fighterOne)>>
+<<if !canSee(_fighterOne)>>
 	Her lack of eyesight is certain death.
-<<elseif (($fighterOne.eyes == -1) && ($fighterOne.eyewear != "corrective glasses") && ($fighterOne.eyewear != "corrective contacts")) || ($fighterOne.eyes == 1 && ($fighterOne.eyewear == "blurring glasses" || $fighterOne.eyewear == "blurring contacts"))>>
+<<elseif ((_fighterOne.eyes == -1) && (_fighterOne.eyewear != "corrective glasses") && (_fighterOne.eyewear != "corrective contacts")) || (_fighterOne.eyes == 1 && (_fighterOne.eyewear == "blurring glasses" || _fighterOne.eyewear == "blurring contacts"))>>
 	Her poor eyesight makes her a weaker combatant.
 <</if>>
 
-<<if $fighterOne.amp < 0>>
+<<if _fighterOne.amp < 0>>
 	The pit lights gleam on her P-Limbs.
-	<<if $fighterOne.amp == -4>>
+	<<if _fighterOne.amp == -4>>
 		Their integral weapons are fully uncaged.
-	<<elseif $fighterOne.amp == -5>>
+	<<elseif _fighterOne.amp == -5>>
 		The limits on her cybernetic limbs have been lifted, turning them deadly.
 	<</if>>
 <</if>>
@@ -186,147 +186,147 @@ You review the rules - the combatants will use their choice of swords, and the f
 
 <<nobr>>
 
-<<Deadliness $fighterTwo>>
-<<set $fighterTwoDeadliness = $deadliness>>
-
-<<if $fighterTwo.fetish == "mindbroken">>
-	$fighterTwo.slaveName is too broken to care about whether she lives or dies;
-<<elseif $fighterTwoDeadliness > 5>>
-	$fighterTwo.slaveName seems very confident;
-<<elseif $fighterTwoDeadliness > 3>>
-	$fighterTwo.slaveName seems nervous, but steels herself;
-<<elseif $fighterTwoDeadliness > 1>>
-	$fighterTwo.slaveName seems hesitant and unsure;
+<<Deadliness _fighterTwo>>
+<<set _fighterTwoDeadliness = $deadliness>>
+
+<<if _fighterTwo.fetish == "mindbroken">>
+	_fighterTwo.slaveName is too broken to care about whether she lives or dies;
+<<elseif _fighterTwoDeadliness > 5>>
+	_fighterTwo.slaveName seems very confident;
+<<elseif _fighterTwoDeadliness > 3>>
+	_fighterTwo.slaveName seems nervous, but steels herself;
+<<elseif _fighterTwoDeadliness > 1>>
+	_fighterTwo.slaveName seems hesitant and unsure;
 <<else>>
-	$fighterTwo.slaveName is obviously terrified, and might flee if there were a way out of the pit;
+	_fighterTwo.slaveName is obviously terrified, and might flee if there were a way out of the pit;
 <</if>>
 
-<<if $fighterTwo.fetish == "mindbroken">>
+<<if _fighterTwo.fetish == "mindbroken">>
 	she is indifferent to the prospect of killing, as well.
-<<elseif $fighterTwo.devotion > 95>>
+<<elseif _fighterTwo.devotion > 95>>
 	she is clearly willing to do her best to kill for you.
-<<elseif ($fighterTwo.fetish == "sadist") && ($fighterTwo.fetishKnown == 1) && ($fighterTwo.fetishStrength > 60)>>
+<<elseif (_fighterTwo.fetish == "sadist") && (_fighterTwo.fetishKnown == 1) && (_fighterTwo.fetishStrength > 60)>>
 	the prospect of killing does not seem to concern her.
-<<elseif $fighterTwo.devotion > 50>>
+<<elseif _fighterTwo.devotion > 50>>
 	she obviously does not want to kill, but will do as you order.
-<<elseif $fighterTwo.devotion >= -20>>
+<<elseif _fighterTwo.devotion >= -20>>
 	she is clearly unhappy at the prospect of killing, but knows that the alternative is death.
 <<else>>
 	she knows that it's kill or be killed, and puts aside her hatred of you in an effort to live.
 <</if>>
 
-<<if $fighterTwo.combatSkill > 0>>
+<<if _fighterTwo.combatSkill > 0>>
 	Her grip on her sword is sure and easy.
 <</if>>
 
-<<if $fighterTwo.muscles > 95>>
+<<if _fighterTwo.muscles > 95>>
 	She is wielding a massive two-handed blade few others could even heft.
-<<elseif $fighterTwo.muscles > 30>>
+<<elseif _fighterTwo.muscles > 30>>
 	She is strong enough to handle a bastard sword.
-<<elseif $fighterTwo.muscles > 5>>
+<<elseif _fighterTwo.muscles > 5>>
 	She has selected a longsword suited to her strength.
-<<elseif $fighterTwo.muscles < -95>>
+<<elseif _fighterTwo.muscles < -95>>
 	She has selected a meager dagger; even then she can barely wield it.
-<<elseif $fighterTwo.muscles < -30>>
+<<elseif _fighterTwo.muscles < -30>>
 	She has selected a dagger, the heaviest weapon she can manage.
-<<elseif $fighterTwo.muscles < -5>>
+<<elseif _fighterTwo.muscles < -5>>
 	She has selected a short sword, despite being able to barely lift it.
 <<else>>
 	She has selected a short sword, the heaviest weapon she can manage.
 <</if>>
 
-<<if $fighterTwo.height >= 170>>
+<<if _fighterTwo.height >= 170>>
 	Her height gives her a reach advantage.
 <</if>>
 
-<<if $fighterTwo.health > 50>>
+<<if _fighterTwo.health > 50>>
 	Her shining health makes her a better fighter.
 <</if>>
 
-<<if $fighterTwo.weight > 190>>
+<<if _fighterTwo.weight > 190>>
 	Her extreme weight nearly immobilizes her. She struggles to move let alone fight.
-<<elseif $fighterTwo.weight > 160>>
+<<elseif _fighterTwo.weight > 160>>
 	Her extreme weight limits her mobility and range of motion making her an easy target.
-<<elseif $fighterTwo.weight > 130>>
+<<elseif _fighterTwo.weight > 130>>
 	Her extreme weight holds her back as a pit fighter.
-<<elseif $fighterTwo.weight > 30>>
+<<elseif _fighterTwo.weight > 30>>
 	Her heavy weight is an impediment as a pit fighter.
-<<elseif $fighterTwo.weight < -10>>
+<<elseif _fighterTwo.weight < -10>>
 	Her light weight is an impediment as a pit fighter.
 <</if>>
 
-<<if $fighterTwo.health < -50>>
+<<if _fighterTwo.health < -50>>
 	Her poor health makes her a weaker combatant.
 <</if>>
 
-<<if $fighterTwo.pregKnown == 1 || $fighterTwo.bellyPreg >= 1500>>
-	<<if $fighterTwo.bellyPreg >= 750000>>
+<<if _fighterTwo.pregKnown == 1 || _fighterTwo.bellyPreg >= 1500>>
+	<<if _fighterTwo.bellyPreg >= 750000>>
 		Her monolithic pregnancy guarantees her and her many, many children's deaths; not only is she on the verge of splitting open, but it is an unmissable, indefensible target. She has no hope of attacking around the straining mass, let alone stopping her opponent. She is damned.
-	<<elseif $fighterTwo.bellyPreg >= 600000>>
+	<<elseif _fighterTwo.bellyPreg >= 600000>>
 		Her titanic pregnancy is practically a death sentence; not only does she risk bursting, but it is an unmissable, indefensible target. She can barely keep it together while thinking about the lives of her brood.
-	<<elseif $fighterTwo.bellyPreg >= 450000>>
+	<<elseif _fighterTwo.bellyPreg >= 450000>>
 		Her gigantic pregnancy practically damns her; it presents an unmissable, indefensible target for her adversary. She can barely keep it together while thinking about the lives of her brood.
-	<<elseif $fighterTwo.bellyPreg >= 300000>>
+	<<elseif _fighterTwo.bellyPreg >= 300000>>
 		Her massive pregnancy obstructs her movement and greatly hinders her. She struggles to think of how she could even begin to defend it from harm.
-	<<elseif $fighterTwo.bellyPreg >= 150000>>
+	<<elseif _fighterTwo.bellyPreg >= 150000>>
 		Her giant pregnancy obstructs her movement and greatly slows her down. She tries not to think of how many lives are depending on her.
-	<<elseif $fighterTwo.bellyPreg >= 100000>>
+	<<elseif _fighterTwo.bellyPreg >= 100000>>
 		Her giant belly gets in her way and weighs her down. She is terrified for the lives of her many children.
-	<<elseif $fighterTwo.bellyPreg >= 10000>>
-		Her huge belly gets in her way and weighs her down. She is terrified for the <<if $fighterTwo.pregType > 1>>lives of her children<<else>>life of her child<</if>>.
-	<<elseif $fighterTwo.bellyPreg >= 5000>>
+	<<elseif _fighterTwo.bellyPreg >= 10000>>
+		Her huge belly gets in her way and weighs her down. She is terrified for the <<if _fighterTwo.pregType > 1>>lives of her children<<else>>life of her child<</if>>.
+	<<elseif _fighterTwo.bellyPreg >= 5000>>
 		Her advanced pregnancy makes her much less effective, not to mention terrified for her child.
-	<<elseif $fighterTwo.bellyPreg >= 1500>>
+	<<elseif _fighterTwo.bellyPreg >= 1500>>
 		Her growing pregnancy distracts her with concern over the life growing within her.
 	<<else>>
 		The life just beginning to grow inside her distracts her from the fight.
 	<</if>>
-<<elseif $fighterTwo.bellyImplant >= 1500>>
-	<<if $fighterTwo.bellyImplant >= 750000>>
-		Her monolithic, <<print $fighterTwo.bellyImplant>>cc implant filled belly guarantees her death; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent.
-	<<elseif $fighterTwo.bellyImplant >= 600000>>
-		Her titanic, <<print $fighterTwo.bellyImplant>>cc implant filled belly is practically a guaranteed death; she can barely stand let alone fight. Not only is it crippling heavy, unwieldy and an easy target, but she can feel it straining to hold the sheer amount of filler forced into it.
-	<<elseif $fighterTwo.bellyImplant >= 450000>>
-		Her gigantic, <<print $fighterTwo.bellyImplant>>cc implant filled belly is nearly a guaranteed death; it presents an unmissable, indefensible target for her adversary.
-	<<elseif $fighterTwo.bellyImplant >= 300000>>
-		Her massive, <<print $fighterTwo.bellyImplant>>cc implant filled belly is extremely heavy, unwieldy and an easy target, practically damning her in combat.
-	<<elseif $fighterTwo.bellyImplant >= 150000>>
-		Her giant, <<print $fighterTwo.bellyImplant>>cc implant filled belly obstructs her movement and greatly slows her down.
-	<<elseif $fighterTwo.bellyImplant >= 100000>>
-		Her giant, <<print $fighterTwo.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
-	<<elseif $fighterTwo.bellyImplant >= 10000>>
-		Her huge, <<print $fighterTwo.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
-	<<elseif $fighterTwo.bellyImplant >= 5000>>
-		Her large, <<print $fighterTwo.bellyImplant>>cc implant filled belly is heavy and unwieldy, rendering her less effective.
-	<<elseif $fighterTwo.bellyImplant >= 1500>>
-		Her swollen, <<print $fighterTwo.bellyImplant>>cc implant filled belly is heavy and makes her less effective.
+<<elseif _fighterTwo.bellyImplant >= 1500>>
+	<<if _fighterTwo.bellyImplant >= 750000>>
+		Her monolithic, <<print _fighterTwo.bellyImplant>>cc implant filled belly guarantees her death; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent.
+	<<elseif _fighterTwo.bellyImplant >= 600000>>
+		Her titanic, <<print _fighterTwo.bellyImplant>>cc implant filled belly is practically a guaranteed death; she can barely stand let alone fight. Not only is it crippling heavy, unwieldy and an easy target, but she can feel it straining to hold the sheer amount of filler forced into it.
+	<<elseif _fighterTwo.bellyImplant >= 450000>>
+		Her gigantic, <<print _fighterTwo.bellyImplant>>cc implant filled belly is nearly a guaranteed death; it presents an unmissable, indefensible target for her adversary.
+	<<elseif _fighterTwo.bellyImplant >= 300000>>
+		Her massive, <<print _fighterTwo.bellyImplant>>cc implant filled belly is extremely heavy, unwieldy and an easy target, practically damning her in combat.
+	<<elseif _fighterTwo.bellyImplant >= 150000>>
+		Her giant, <<print _fighterTwo.bellyImplant>>cc implant filled belly obstructs her movement and greatly slows her down.
+	<<elseif _fighterTwo.bellyImplant >= 100000>>
+		Her giant, <<print _fighterTwo.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
+	<<elseif _fighterTwo.bellyImplant >= 10000>>
+		Her huge, <<print _fighterTwo.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
+	<<elseif _fighterTwo.bellyImplant >= 5000>>
+		Her large, <<print _fighterTwo.bellyImplant>>cc implant filled belly is heavy and unwieldy, rendering her less effective.
+	<<elseif _fighterTwo.bellyImplant >= 1500>>
+		Her swollen, <<print _fighterTwo.bellyImplant>>cc implant filled belly is heavy and makes her less effective.
 	<</if>>
 <</if>>
-<<if $fighterTwo.labor == 1>>
-	She's feeling labor pains. Her child<<if $fighterTwo.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will mean the death of <<if $fighterTwo.pregType > 1>>their<<else>>its<</if>> mother.
-<<elseif $fighterTwo.preg >= 40 && $fighterTwo.pregControl != "labor supressors">>
+<<if _fighterTwo.labor == 1>>
+	She's feeling labor pains. Her child<<if _fighterTwo.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will mean the death of <<if _fighterTwo.pregType > 1>>their<<else>>its<</if>> mother.
+<<elseif _fighterTwo.preg >= 40 && _fighterTwo.pregControl != "labor supressors">>
 	She'll be going into labor any time now and she knows it. She's terrified of the thought of her water breaking during the fight.
 <</if>>
 
-<<if $fighterTwo.bellyFluid >= 10000>>
-	Her hugely bloated, <<print $fighterTwo.inflationType>>-filled belly is taut and painful, hindering her ability to fight.
-<<elseif $fighterTwo.bellyFluid >= 5000>>
-	Her bloated, <<print $fighterTwo.inflationType>>-stuffed belly is constantly jiggling and moving, distracting her and throwing off her weight.
-<<elseif $fighterTwo.bellyFluid >= 2000>>
-	Her distended, <<print $fighterTwo.inflationType>>-belly is uncomfortable and heavy, distracting her.
+<<if _fighterTwo.bellyFluid >= 10000>>
+	Her hugely bloated, <<print _fighterTwo.inflationType>>-filled belly is taut and painful, hindering her ability to fight.
+<<elseif _fighterTwo.bellyFluid >= 5000>>
+	Her bloated, <<print _fighterTwo.inflationType>>-stuffed belly is constantly jiggling and moving, distracting her and throwing off her weight.
+<<elseif _fighterTwo.bellyFluid >= 2000>>
+	Her distended, <<print _fighterTwo.inflationType>>-belly is uncomfortable and heavy, distracting her.
 <</if>>
 
-<<if !canSee($fighterTwo)>>
+<<if !canSee(_fighterTwo)>>
 	Her lack of eyesight is certain death.
-<<elseif (($fighterTwo.eyes == -1) && ($fighterTwo.eyewear != "corrective glasses") && ($fighterTwo.eyewear != "corrective contacts")) || ($fighterTwo.eyes == 1 && ($fighterTwo.eyewear == "blurring glasses" || $fighterTwo.eyewear == "blurring contacts"))>>
+<<elseif ((_fighterTwo.eyes == -1) && (_fighterTwo.eyewear != "corrective glasses") && (_fighterTwo.eyewear != "corrective contacts")) || (_fighterTwo.eyes == 1 && (_fighterTwo.eyewear == "blurring glasses" || _fighterTwo.eyewear == "blurring contacts"))>>
 	Her poor eyesight makes her a weaker combatant.
 <</if>>
 
-<<if $fighterTwo.amp < 0>>
+<<if _fighterTwo.amp < 0>>
 	The pit lights gleam on her P-Limbs.
-	<<if $fighterTwo.amp == -4>>
+	<<if _fighterTwo.amp == -4>>
 		Their integral weapons are fully uncaged.
-	<<elseif $fighterTwo.amp == -5>>
+	<<elseif _fighterTwo.amp == -5>>
 		The limits on her cybernetic limbs have been lifted, turning them deadly.
 	<</if>>
 <</if>>
@@ -337,26 +337,26 @@ In any case, both of the slaves have been dosed with aggression enhancers and in
 
 <<nobr>>
 
-<<if $fighterTwoDeadliness > $fighterOneDeadliness>>
-	<<set _winner = $fighterTwo>>
-	<<set _winnerDeadliness = $fighterTwoDeadliness>>
-	<<set _loser = $fighterOne>>
-	<<set _loserDeadliness = $fighterOneDeadliness>>
-<<elseif $fighterTwoDeadliness < $fighterOneDeadliness>>
-	<<set _loser = $fighterTwo>>
-	<<set _loserDeadliness = $fighterTwoDeadliness>>
-	<<set _winner = $fighterOne>>
-	<<set _winnerDeadliness = $fighterOneDeadliness>>
+<<if _fighterTwoDeadliness > _fighterOneDeadliness>>
+	<<set _winner = _fighterTwo>>
+	<<set _winnerDeadliness = _fighterTwoDeadliness>>
+	<<set _loser = _fighterOne>>
+	<<set _loserDeadliness = _fighterOneDeadliness>>
+<<elseif _fighterTwoDeadliness < _fighterOneDeadliness>>
+	<<set _loser = _fighterTwo>>
+	<<set _loserDeadliness = _fighterTwoDeadliness>>
+	<<set _winner = _fighterOne>>
+	<<set _winnerDeadliness = _fighterOneDeadliness>>
 <<elseif random(1,100) > 50>>
-	<<set _winner = $fighterTwo>>
-	<<set _winnerDeadliness = $fighterTwoDeadliness>>
-	<<set _loser = $fighterOne>>
-	<<set _loserDeadliness = $fighterOneDeadliness>>
+	<<set _winner = _fighterTwo>>
+	<<set _winnerDeadliness = _fighterTwoDeadliness>>
+	<<set _loser = _fighterOne>>
+	<<set _loserDeadliness = _fighterOneDeadliness>>
 <<else>>
-	<<set _loser = $fighterTwo>>
-	<<set _loserDeadliness = $fighterTwoDeadliness>>
-	<<set _winner = $fighterOne>>
-	<<set _winnerDeadliness = $fighterOneDeadliness>>
+	<<set _loser = _fighterTwo>>
+	<<set _loserDeadliness = _fighterTwoDeadliness>>
+	<<set _winner = _fighterOne>>
+	<<set _winnerDeadliness = _fighterOneDeadliness>>
 <</if>>
 
 <<if !canSee(_winner) && !canSee(_loser)>>
@@ -624,12 +624,6 @@ You let the winner _winner.slaveName, shaking as she comes off the adrenaline, d
 <<set _winner.pitKills += 1>>
 <<set $pitKillsTotal += 1>>
 
-<<if _loser.ID == $fighterOne.ID>>
-	<<set $fighterOne = 0>>
-<<elseif _loser.ID == $fighterTwo.ID>>
-	<<set $fighterTwo = 0>>
-<</if>>
-
 <<set $slaves[$slaveIndices[_winner.ID]] = _winner>>
 <<if $pitBG == 0 || ($Bodyguard.ID != _winner.ID)>>
 	<<set $fighterIDs.push(_winner.ID)>>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index a66e127a828..47e9351d67e 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -1,20 +1,20 @@
 :: SE nonlethal pit [nobr]
 
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $pitFought = 1, $fighterOne = 0, $fighterTwo = 0>>
+<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $pitFought = 1, _fighterOne = 0, _fighterTwo = 0>>
 
 <<if $pitBG == 0>>
-	<<set $fighterOne = $fighterIDs.pluck()>> /* .pluck() removes the element from the array, preventing $fighterTwo from also choosing this ID */
-	<<set $fighterOne = getSlave($fighterOne)>>
+	<<set _fighterOne = $fighterIDs.pluck()>> /* .pluck() removes the element from the array, preventing _fighterTwo from also choosing this ID */
+	<<set _fighterOne = getSlave(_fighterOne)>>
 <<else>>
-	<<set $fighterOne = getSlave($Bodyguard.ID)>>
+	<<set _fighterOne = getSlave($Bodyguard.ID)>>
 <</if>>
-<<set $fighterTwo = $fighterIDs.pluck()>>
-<<set $fighterTwo = getSlave($fighterTwo)>>
-<<if ndef $fighterOne || ndef $fighterTwo || ($fighterOne == 0) || ($fighterTwo == 0)>>
+<<set _fighterTwo = $fighterIDs.pluck()>>
+<<set _fighterTwo = getSlave(_fighterTwo)>>
+<<if ndef _fighterOne || ndef _fighterTwo || (_fighterOne == 0) || (_fighterTwo == 0)>>
 	<<goto "Nonrandom Event">>
 <</if>>
 
-This week's pit fight is between $fighterOne.slaveName and $fighterTwo.slaveName. 
+This week's pit fight is between _fighterOne.slaveName and _fighterTwo.slaveName. 
 
 <<if $pitAudience == "none">>You are alone above $pitName, left to watch them square off in private.<<elseif $pitAudience == "free">>Your guests line the rim of $pitName, joking and betting.<<else>>The attendees line the rim of $pitName, betting and arguing.<</if>>
 
@@ -38,296 +38,296 @@ and earn two complete days of rest. You take a moment to look over your girls be
 
 <br><br>
 
-<<Deadliness $fighterOne>>
-<<set $fighterOneDeadliness = $deadliness>>
+<<Deadliness _fighterOne>>
+<<set _fighterOneDeadliness = $deadliness>>
 
-<<if $fighterOneDeadliness > 5>>
-	$fighterOne.slaveName seems very confident, even eager to win a break.
-<<elseif $fighterOneDeadliness > 3>>
-	$fighterOne.slaveName seems nervous, but steels herself to fight for time off.
-<<elseif $fighterOneDeadliness > 1>>
-	$fighterOne.slaveName seems hesitant and unsure.
+<<if _fighterOneDeadliness > 5>>
+	_fighterOne.slaveName seems very confident, even eager to win a break.
+<<elseif _fighterOneDeadliness > 3>>
+	_fighterOne.slaveName seems nervous, but steels herself to fight for time off.
+<<elseif _fighterOneDeadliness > 1>>
+	_fighterOne.slaveName seems hesitant and unsure.
 <<else>>
-	$fighterOne.slaveName is obviously terrified, and might flee if there were a way out of the pit.
+	_fighterOne.slaveName is obviously terrified, and might flee if there were a way out of the pit.
 <</if>>
 
-<<if $fighterOne.combatSkill > 0>>
+<<if _fighterOne.combatSkill > 0>>
 	Her stance is obviously well-practiced.
 <</if>>
 
-<<if $fighterOne.muscles > 95 && $fighterOne.height >= 185>>
+<<if _fighterOne.muscles > 95 && _fighterOne.height >= 185>>
 	Her huge muscles are an intimidating sight and, despite their massive size, she is tall enough to not be hindered by them.
-<<elseif $fighterOne.muscles > 95>>
+<<elseif _fighterOne.muscles > 95>>
 	Her huge muscles are an intimidating sight, but may hinder her flexibility.
-<<elseif $fighterOne.muscles > 30>>
+<<elseif _fighterOne.muscles > 30>>
 	Her muscles are a trim and powerful sight.
-<<elseif $fighterOne.muscles < -95>>
+<<elseif _fighterOne.muscles < -95>>
 	She can barely stand, let alone defend herself.
-<<elseif $fighterOne.muscles < -30>>
+<<elseif _fighterOne.muscles < -30>>
 	She is very weak; a single punch will likely floor her.
-<<elseif $fighterOne.muscles < -5>>
+<<elseif _fighterOne.muscles < -5>>
 	She is rather unfit; she will likely be outmatched by near any real opponent.
 <</if>>
 
-<<if $fighterOne.height >= 170>>
+<<if _fighterOne.height >= 170>>
 	Her height gives her a reach advantage with her fists and feet.
 <</if>>
 
-<<if $fighterOne.weight > 190>>
+<<if _fighterOne.weight > 190>>
 	Her extreme weight nearly immobilizes her. She is essentially a fleshy punching bag.
-<<elseif $fighterOne.weight > 160>>
+<<elseif _fighterOne.weight > 160>>
 	Her extreme weight limits her mobility and range of motion even if she can take punches like nothing.
-<<elseif $fighterOne.weight > 130>>
+<<elseif _fighterOne.weight > 130>>
 	Her extreme weight holds her back as a pit fighter.
-<<elseif $fighterOne.weight > 30>>
+<<elseif _fighterOne.weight > 30>>
 	Her heavy weight is an impediment as a pit fighter.
-<<elseif $fighterOne.weight < -10>>
+<<elseif _fighterOne.weight < -10>>
 	Her light weight is an impediment as a pit fighter.
 <</if>>
 
-<<if $fighterOne.weight < -10>>
+<<if _fighterOne.weight < -10>>
 	Her light weight is an impediment as a pit fighter.
 <</if>>
 
-<<if $fighterOne.health < -50>>
+<<if _fighterOne.health < -50>>
 	Her poor health makes her a weaker combatant.
 <</if>>
 
-<<if $fighterOne.pregKnown == 1 || $fighterOne.bellyPreg >= 1500>>
-	<<if $fighterOne.bellyPreg >= 750000>>
+<<if _fighterOne.pregKnown == 1 || _fighterOne.bellyPreg >= 1500>>
+	<<if _fighterOne.bellyPreg >= 750000>>
 		Her monolithic pregnancy guarantees her loss; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent. The fear of what would happen should her adversary land a hit on her belly also weighs upon her mind.
-	<<elseif $fighterOne.bellyPreg >= 600000>>
+	<<elseif _fighterOne.bellyPreg >= 600000>>
 		Her titanic pregnancy is practically a guaranteed loss; she can barely stand let alone fight. The worry of a solid hit striking her life swollen womb also weighs on her mind.
-	<<elseif $fighterOne.bellyPreg >= 450000>>
+	<<elseif _fighterOne.bellyPreg >= 450000>>
 		Her gigantic pregnancy is nearly a guaranteed loss; it presents an unmissable, indefensible target for her adversary.
-	<<elseif $fighterOne.bellyPreg >= 300000>>
+	<<elseif _fighterOne.bellyPreg >= 300000>>
 		Her massive pregnancy obstructs her movement and greatly hinders her. She struggles to think of how she could even begin to defend her bulk.
-	<<elseif $fighterOne.bellyPreg >= 150000>>
+	<<elseif _fighterOne.bellyPreg >= 150000>>
 		Her giant pregnancy obstructs her movement and greatly slows her down.
-	<<elseif $fighterOne.bellyPreg >= 100000>>
+	<<elseif _fighterOne.bellyPreg >= 100000>>
 		Her giant belly gets in her way and weighs her down.
-	<<elseif $fighterOne.bellyPreg >= 10000>>
+	<<elseif _fighterOne.bellyPreg >= 10000>>
 		Her huge belly is unwieldy and hinders her efforts.
-	<<elseif $fighterOne.bellyPreg >= 5000>>
+	<<elseif _fighterOne.bellyPreg >= 5000>>
 		Her advanced pregnancy makes her much less effective.
-	<<elseif $fighterOne.bellyPreg >= 1500>>
+	<<elseif _fighterOne.bellyPreg >= 1500>>
 		Her growing pregnancy distracts her from the fight.
 	<<else>>
 		The life just beginning to grow inside her distracts her from the fight.
 	<</if>>
-<<elseif $fighterOne.bellyImplant >= 1500>>
-	<<if $fighterOne.bellyImplant >= 750000>>
-		Her monolithic, <<print $fighterOne.bellyImplant>>cc implant filled belly guarantees her defeat; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent.
-	<<elseif $fighterOne.bellyImplant >= 600000>>
-		Her titanic, <<print $fighterOne.bellyImplant>>cc implant filled belly is practically a guaranteed defeat; she can barely stand let alone fight. Not only is it crippling heavy, unwieldy and an easy target, but she can feel it straining to hold the sheer amount of filler forced into it.
-	<<elseif $fighterOne.bellyImplant >= 450000>>
-		Her gigantic, <<print $fighterOne.bellyImplant>>cc implant filled belly is nearly a guaranteed defeat; it presents an unmissable, indefensible target for her adversary.
-	<<elseif $fighterOne.bellyImplant >= 300000>>
-		Her massive, <<print $fighterOne.bellyImplant>>cc implant filled belly is extremely heavy, unwieldy and an easy target, practically damning her in combat.
-	<<elseif $fighterOne.bellyImplant >= 150000>>
-		Her giant, <<print $fighterOne.bellyImplant>>cc implant filled belly obstructs her movement and greatly slows her down.
-	<<elseif $fighterOne.bellyImplant >= 100000>>
-		Her giant, <<print $fighterOne.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
-	<<elseif $fighterOne.bellyImplant >= 10000>>
-		Her huge, <<print $fighterOne.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
-	<<elseif $fighterOne.bellyImplant >= 5000>>
-		Her large, <<print $fighterOne.bellyImplant>>cc implant filled belly is heavy and unwieldy, rendering her less effective.
-	<<elseif $fighterOne.bellyImplant >= 1500>>
-		Her swollen, <<print $fighterOne.bellyImplant>>cc implant filled belly is heavy and makes her less effective.
-	<</if>>
-<</if>>
-<<if $fighterOne.labor == 1>>
-	She's feeling labor pains. Her child<<if $fighterOne.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will put <<if $fighterOne.pregType > 1>>their<<else>>its<</if>> mother at the mercy of her opponent.
-<<elseif $fighterOne.preg >= 40 && $fighterOne.pregControl != "labor supressors">>
+<<elseif _fighterOne.bellyImplant >= 1500>>
+	<<if _fighterOne.bellyImplant >= 750000>>
+		Her monolithic, <<print _fighterOne.bellyImplant>>cc implant filled belly guarantees her defeat; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent.
+	<<elseif _fighterOne.bellyImplant >= 600000>>
+		Her titanic, <<print _fighterOne.bellyImplant>>cc implant filled belly is practically a guaranteed defeat; she can barely stand let alone fight. Not only is it crippling heavy, unwieldy and an easy target, but she can feel it straining to hold the sheer amount of filler forced into it.
+	<<elseif _fighterOne.bellyImplant >= 450000>>
+		Her gigantic, <<print _fighterOne.bellyImplant>>cc implant filled belly is nearly a guaranteed defeat; it presents an unmissable, indefensible target for her adversary.
+	<<elseif _fighterOne.bellyImplant >= 300000>>
+		Her massive, <<print _fighterOne.bellyImplant>>cc implant filled belly is extremely heavy, unwieldy and an easy target, practically damning her in combat.
+	<<elseif _fighterOne.bellyImplant >= 150000>>
+		Her giant, <<print _fighterOne.bellyImplant>>cc implant filled belly obstructs her movement and greatly slows her down.
+	<<elseif _fighterOne.bellyImplant >= 100000>>
+		Her giant, <<print _fighterOne.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
+	<<elseif _fighterOne.bellyImplant >= 10000>>
+		Her huge, <<print _fighterOne.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
+	<<elseif _fighterOne.bellyImplant >= 5000>>
+		Her large, <<print _fighterOne.bellyImplant>>cc implant filled belly is heavy and unwieldy, rendering her less effective.
+	<<elseif _fighterOne.bellyImplant >= 1500>>
+		Her swollen, <<print _fighterOne.bellyImplant>>cc implant filled belly is heavy and makes her less effective.
+	<</if>>
+<</if>>
+<<if _fighterOne.labor == 1>>
+	She's feeling labor pains. Her child<<if _fighterOne.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will put <<if _fighterOne.pregType > 1>>their<<else>>its<</if>> mother at the mercy of her opponent.
+<<elseif _fighterOne.preg >= 40 && _fighterOne.pregControl != "labor supressors">>
 	She'll be going into labor any time now and she knows it. She's terrified of the thought of her water breaking during the fight.
 <</if>>
 
-<<if $fighterOne.bellyFluid >= 10000>>
-	Her hugely bloated, <<print $fighterOne.inflationType>>-filled belly is taut and painful, hindering her ability to fight.
-<<elseif $fighterOne.bellyFluid >= 5000>>
-	Her bloated, <<print $fighterOne.inflationType>>-stuffed belly is constantly jiggling and moving, distracting her and throwing off her weight.
-<<elseif $fighterOne.bellyFluid >= 2000>>
-	Her distended, <<print $fighterOne.inflationType>>-belly is uncomfortable and heavy, distracting her.
+<<if _fighterOne.bellyFluid >= 10000>>
+	Her hugely bloated, <<print _fighterOne.inflationType>>-filled belly is taut and painful, hindering her ability to fight.
+<<elseif _fighterOne.bellyFluid >= 5000>>
+	Her bloated, <<print _fighterOne.inflationType>>-stuffed belly is constantly jiggling and moving, distracting her and throwing off her weight.
+<<elseif _fighterOne.bellyFluid >= 2000>>
+	Her distended, <<print _fighterOne.inflationType>>-belly is uncomfortable and heavy, distracting her.
 <</if>>
 
-<<if !canSee($fighterOne)>>
+<<if !canSee(_fighterOne)>>
 	Her lack of eyesight means certain defeat.
-<<elseif (($fighterOne.eyes == -1) && ($fighterOne.eyewear != "corrective glasses") && ($fighterOne.eyewear != "corrective contacts")) || ($fighterOne.eyes == 1 && ($fighterOne.eyewear == "blurring glasses" || $fighterOne.eyewear == "blurring contacts"))>>
+<<elseif ((_fighterOne.eyes == -1) && (_fighterOne.eyewear != "corrective glasses") && (_fighterOne.eyewear != "corrective contacts")) || (_fighterOne.eyes == 1 && (_fighterOne.eyewear == "blurring glasses" || _fighterOne.eyewear == "blurring contacts"))>>
 	Her poor eyesight makes her a weaker fighter.
 <</if>>
 
-<<if $fighterOne.amp < 0>>
+<<if _fighterOne.amp < 0>>
 	The pit lights gleam on her P-Limbs.
-	<<if $fighterOne.amp == -4>>
+	<<if _fighterOne.amp == -4>>
 		Though their integral weapons are disabled, her upgraded prosthetics are almost as fast as natural limbs, and they can hit much, much harder.
-	<<elseif $fighterOne.amp == -5>>
+	<<elseif _fighterOne.amp == -5>>
 		Her advanced cybernetic limbs are faster than natural limbs, and their force is amplified, so that they can become potent weapons.
 	<</if>>
 <</if>>
 
-<<if $fighterOne.devotion <= 20>>
-<<if $fighterOne.trust < -20>>
+<<if _fighterOne.devotion <= 20>>
+<<if _fighterOne.trust < -20>>
 	She is unwilling to fight, but she knows the punishment for refusing to do so will be even worse.
 <</if>>
 <</if>>
 
 <br><br>
 
-<<Deadliness $fighterTwo>>
-<<set $fighterTwoDeadliness = $deadliness>>
+<<Deadliness _fighterTwo>>
+<<set _fighterTwoDeadliness = $deadliness>>
 
-<<if $fighterTwoDeadliness > 5>>
-	$fighterTwo.slaveName seems very confident, even eager to win a break.
-<<elseif $fighterTwoDeadliness > 3>>
-	$fighterTwo.slaveName seems nervous, but steels herself to fight for time off.
-<<elseif $fighterTwoDeadliness > 1>>
-	$fighterTwo.slaveName seems hesitant and unsure.
+<<if _fighterTwoDeadliness > 5>>
+	_fighterTwo.slaveName seems very confident, even eager to win a break.
+<<elseif _fighterTwoDeadliness > 3>>
+	_fighterTwo.slaveName seems nervous, but steels herself to fight for time off.
+<<elseif _fighterTwoDeadliness > 1>>
+	_fighterTwo.slaveName seems hesitant and unsure.
 <<else>>
-	$fighterTwo.slaveName is obviously terrified, and might flee if there were a way out of the pit.
+	_fighterTwo.slaveName is obviously terrified, and might flee if there were a way out of the pit.
 <</if>>
 
-<<if $fighterTwo.combatSkill > 0>>
+<<if _fighterTwo.combatSkill > 0>>
 	Her stance is obviously well-practiced.
 <</if>>
 
-<<if $fighterTwo.muscles > 95 && $fighterTwo.height >= 185>>
+<<if _fighterTwo.muscles > 95 && _fighterTwo.height >= 185>>
 	Her huge muscles are an intimidating sight and, despite their massive size, she is tall enough to not be hindered by them.
-<<elseif $fighterTwo.muscles > 95>>
+<<elseif _fighterTwo.muscles > 95>>
 	Her huge muscles are an intimidating sight, but may hinder her flexibility.
-<<elseif $fighterTwo.muscles > 30>>
+<<elseif _fighterTwo.muscles > 30>>
 	Her muscles are a trim and powerful sight.
-<<elseif $fighterTwo.muscles < -95>>
+<<elseif _fighterTwo.muscles < -95>>
 	She can barely stand, let alone defend herself.
-<<elseif $fighterTwo.muscles < -30>>
+<<elseif _fighterTwo.muscles < -30>>
 	She is very weak; a single punch will likely floor her.
-<<elseif $fighterTwo.muscles < -5>>
+<<elseif _fighterTwo.muscles < -5>>
 	She is rather unfit; she will likely be outmatched by near any real opponent.
 <</if>>
 
-<<if $fighterTwo.height >= 170>>
+<<if _fighterTwo.height >= 170>>
 	Her height gives her a reach advantage with her fists and feet.
 <</if>>
 
-<<if $fighterTwo.health > 50>>
+<<if _fighterTwo.health > 50>>
 	Her shining health makes her a better fighter.
 <</if>>
 
-<<if $fighterTwo.weight > 190>>
+<<if _fighterTwo.weight > 190>>
 	Her extreme weight nearly immobilizes her. She is essentially a fleshy punching bag.
-<<elseif $fighterTwo.weight > 160>>
+<<elseif _fighterTwo.weight > 160>>
 	Her extreme weight limits her mobility and range of motion even if she can take punches like nothing.
-<<elseif $fighterTwo.weight > 130>>
+<<elseif _fighterTwo.weight > 130>>
 	Her extreme weight holds her back as a pit fighter.
-<<elseif $fighterTwo.weight > 30>>
+<<elseif _fighterTwo.weight > 30>>
 	Her heavy weight is an impediment as a pit fighter.
-<<elseif $fighterTwo.weight < -10>>
+<<elseif _fighterTwo.weight < -10>>
 	Her light weight is an impediment as a pit fighter.
 <</if>>
 
-<<if $fighterTwo.health < -50>>
+<<if _fighterTwo.health < -50>>
 	Her poor health makes her a weaker combatant.
 <</if>>
 
-<<if $fighterTwo.pregKnown == 1 || $fighterTwo.bellyPreg >= 1500>>
-	<<if $fighterTwo.bellyPreg >= 750000>>
+<<if _fighterTwo.pregKnown == 1 || _fighterTwo.bellyPreg >= 1500>>
+	<<if _fighterTwo.bellyPreg >= 750000>>
 		Her monolithic pregnancy guarantees her loss; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent. The fear of what would happen should her adversary land a hit on her belly also weighs upon her mind.
-	<<elseif $fighterTwo.bellyPreg >= 600000>>
+	<<elseif _fighterTwo.bellyPreg >= 600000>>
 		Her titanic pregnancy is practically a guaranteed loss; she can barely stand let alone fight. The worry of a solid hit striking her life swollen womb also weighs on her mind.
-	<<elseif $fighterTwo.bellyPreg >= 450000>>
+	<<elseif _fighterTwo.bellyPreg >= 450000>>
 		Her gigantic pregnancy is nearly a guaranteed loss; it presents an unmissable, indefensible target for her adversary.
-	<<elseif $fighterTwo.bellyPreg >= 300000>>
+	<<elseif _fighterTwo.bellyPreg >= 300000>>
 		Her massive pregnancy obstructs her movement and greatly hinders her. She struggles to think of how she could even begin to defend her bulk.
-	<<elseif $fighterTwo.bellyPreg >= 150000>>
+	<<elseif _fighterTwo.bellyPreg >= 150000>>
 		Her giant pregnancy obstructs her movement and greatly slows her down.
-	<<elseif $fighterTwo.bellyPreg >= 100000>>
+	<<elseif _fighterTwo.bellyPreg >= 100000>>
 		Her giant belly gets in her way and weighs her down.
-	<<elseif $fighterTwo.bellyPreg >= 10000>>
+	<<elseif _fighterTwo.bellyPreg >= 10000>>
 		Her huge belly is unwieldy and hinders her efforts.
-	<<elseif $fighterTwo.bellyPreg >= 5000>>
+	<<elseif _fighterTwo.bellyPreg >= 5000>>
 		Her advanced pregnancy makes her much less effective.
-	<<elseif $fighterTwo.bellyPreg >= 1500>>
+	<<elseif _fighterTwo.bellyPreg >= 1500>>
 		Her growing pregnancy distracts her from the fight.
 	<<else>>
 		The life just beginning to grow inside her distracts her from the fight.
 	<</if>>
-<<elseif $fighterTwo.bellyImplant >= 1500>>
-	<<if $fighterTwo.bellyImplant >= 750000>>
-		Her monolithic, <<print $fighterTwo.bellyImplant>>cc implant filled belly guarantees her defeat; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent.
-	<<elseif $fighterTwo.bellyImplant >= 600000>>
-		Her titanic, <<print $fighterTwo.bellyImplant>>cc implant filled belly is practically a guaranteed defeat; she can barely stand let alone fight. Not only is it crippling heavy, unwieldy and an easy target, but she can feel it straining to hold the sheer amount of filler forced into it.
-	<<elseif $fighterTwo.bellyImplant >= 450000>>
-		Her gigantic, <<print $fighterTwo.bellyImplant>>cc implant filled belly is nearly a guaranteed defeat; it presents an unmissable, indefensible target for her adversary.
-	<<elseif $fighterTwo.bellyImplant >= 300000>>
-		Her massive, <<print $fighterTwo.bellyImplant>>cc implant filled belly is extremely heavy, unwieldy and an easy target, practically damning her in combat.
-	<<elseif $fighterTwo.bellyImplant >= 150000>>
-		Her giant, <<print $fighterTwo.bellyImplant>>cc implant filled belly obstructs her movement and greatly slows her down.
-	<<elseif $fighterTwo.bellyImplant >= 100000>>
-		Her giant, <<print $fighterTwo.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
-	<<elseif $fighterTwo.bellyImplant >= 10000>>
-		Her huge, <<print $fighterTwo.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
-	<<elseif $fighterTwo.bellyImplant >= 5000>>
-		Her large, <<print $fighterTwo.bellyImplant>>cc implant filled belly is heavy and unwieldy, rendering her less effective.
-	<<elseif $fighterTwo.bellyImplant >= 1500>>
-		Her swollen, <<print $fighterTwo.bellyImplant>>cc implant filled belly is heavy and makes her less effective.
-	<</if>>
-<</if>>
-<<if $fighterTwo.labor == 1>>
-	She's feeling labor pains. Her child<<if $fighterTwo.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will put <<if $fighterTwo.pregType > 1>>their<<else>>its<</if>> mother at the mercy of her opponent.
-<<elseif $fighterTwo.preg >= 40 && $fighterTwo.pregControl != "labor supressors">>
+<<elseif _fighterTwo.bellyImplant >= 1500>>
+	<<if _fighterTwo.bellyImplant >= 750000>>
+		Her monolithic, <<print _fighterTwo.bellyImplant>>cc implant filled belly guarantees her defeat; not only is she on the verge of splitting open, but it is an unmissable, indefensible target that threatens to drag her to the ground. She has no hope of attacking around the straining mass, let alone stopping her opponent.
+	<<elseif _fighterTwo.bellyImplant >= 600000>>
+		Her titanic, <<print _fighterTwo.bellyImplant>>cc implant filled belly is practically a guaranteed defeat; she can barely stand let alone fight. Not only is it crippling heavy, unwieldy and an easy target, but she can feel it straining to hold the sheer amount of filler forced into it.
+	<<elseif _fighterTwo.bellyImplant >= 450000>>
+		Her gigantic, <<print _fighterTwo.bellyImplant>>cc implant filled belly is nearly a guaranteed defeat; it presents an unmissable, indefensible target for her adversary.
+	<<elseif _fighterTwo.bellyImplant >= 300000>>
+		Her massive, <<print _fighterTwo.bellyImplant>>cc implant filled belly is extremely heavy, unwieldy and an easy target, practically damning her in combat.
+	<<elseif _fighterTwo.bellyImplant >= 150000>>
+		Her giant, <<print _fighterTwo.bellyImplant>>cc implant filled belly obstructs her movement and greatly slows her down.
+	<<elseif _fighterTwo.bellyImplant >= 100000>>
+		Her giant, <<print _fighterTwo.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
+	<<elseif _fighterTwo.bellyImplant >= 10000>>
+		Her huge, <<print _fighterTwo.bellyImplant>>cc implant filled belly is very heavy and unwieldy, throwing off her weight and making her far less effective.
+	<<elseif _fighterTwo.bellyImplant >= 5000>>
+		Her large, <<print _fighterTwo.bellyImplant>>cc implant filled belly is heavy and unwieldy, rendering her less effective.
+	<<elseif _fighterTwo.bellyImplant >= 1500>>
+		Her swollen, <<print _fighterTwo.bellyImplant>>cc implant filled belly is heavy and makes her less effective.
+	<</if>>
+<</if>>
+<<if _fighterTwo.labor == 1>>
+	She's feeling labor pains. Her child<<if _fighterTwo.pregType > 1>>ren are<<else>> is<</if>> ready to be born, oblivious that it will put <<if _fighterTwo.pregType > 1>>their<<else>>its<</if>> mother at the mercy of her opponent.
+<<elseif _fighterTwo.preg >= 40 && _fighterTwo.pregControl != "labor supressors">>
 	She'll be going into labor any time now and she knows it. She's terrified of the thought of her water breaking during the fight.
 <</if>>
 
-<<if $fighterTwo.bellyFluid >= 10000>>
-	Her hugely bloated, <<print $fighterTwo.inflationType>>-filled belly is taut and painful, hindering her ability to fight.
-<<elseif $fighterTwo.bellyFluid >= 5000>>
-	Her bloated, <<print $fighterTwo.inflationType>>-stuffed belly is constantly jiggling and moving, distracting her and throwing off her weight.
-<<elseif $fighterTwo.bellyFluid >= 2000>>
-	Her distended, <<print $fighterTwo.inflationType>>-belly is uncomfortable and heavy, distracting her.
+<<if _fighterTwo.bellyFluid >= 10000>>
+	Her hugely bloated, <<print _fighterTwo.inflationType>>-filled belly is taut and painful, hindering her ability to fight.
+<<elseif _fighterTwo.bellyFluid >= 5000>>
+	Her bloated, <<print _fighterTwo.inflationType>>-stuffed belly is constantly jiggling and moving, distracting her and throwing off her weight.
+<<elseif _fighterTwo.bellyFluid >= 2000>>
+	Her distended, <<print _fighterTwo.inflationType>>-belly is uncomfortable and heavy, distracting her.
 <</if>>
 
-<<if !canSee($fighterTwo)>>
+<<if !canSee(_fighterTwo)>>
 	Her lack of eyesight means certain defeat.
-<<elseif (($fighterTwo.eyes == -1) && ($fighterTwo.eyewear != "corrective glasses") && ($fighterTwo.eyewear != "corrective contacts")) || ($fighterTwo.eyes == 1 && ($fighterTwo.eyewear == "blurring glasses" || $fighterTwo.eyewear == "blurring contacts"))>>
+<<elseif ((_fighterTwo.eyes == -1) && (_fighterTwo.eyewear != "corrective glasses") && (_fighterTwo.eyewear != "corrective contacts")) || (_fighterTwo.eyes == 1 && (_fighterTwo.eyewear == "blurring glasses" || _fighterTwo.eyewear == "blurring contacts"))>>
 	Her poor eyesight makes her a weaker fighter.
 <</if>>
 
-<<if $fighterTwo.amp < 0>>
+<<if _fighterTwo.amp < 0>>
 	The pit lights gleam on her P-Limbs.
-	<<if $fighterTwo.amp == -4>>
+	<<if _fighterTwo.amp == -4>>
 		Though their integral weapons are disabled, her upgraded prosthetics are almost as fast as natural limbs, and they can hit much, much harder.
-	<<elseif $fighterTwo.amp == -5>>
+	<<elseif _fighterTwo.amp == -5>>
 		Her advanced cybernetic limbs are faster than natural limbs, and their force is amplified, so that they can become potent weapons.
 	<</if>>
 <</if>>
 
-<<if $fighterTwo.devotion <= 20>>
-<<if $fighterTwo.trust < -20>>
+<<if _fighterTwo.devotion <= 20>>
+<<if _fighterTwo.trust < -20>>
 	She is unwilling to fight, but she knows the punishment for refusing to do so will be even worse.
 <</if>>
 <</if>>
 
 <br><br>
 
-<<if $fighterTwoDeadliness > $fighterOneDeadliness>>
-	<<set _winner = $fighterTwo>>
-	<<set _winnerDeadliness = $fighterTwoDeadliness>>
-	<<set _loser = $fighterOne>>
-	<<set _loserDeadliness = $fighterOneDeadliness>>
-<<elseif $fighterTwoDeadliness < $fighterOneDeadliness>>
-	<<set _loser = $fighterTwo>>
-	<<set _loserDeadliness = $fighterTwoDeadliness>>
-	<<set _winner = $fighterOne>>
-	<<set _winnerDeadliness = $fighterOneDeadliness>>
+<<if _fighterTwoDeadliness > _fighterOneDeadliness>>
+	<<set _winner = _fighterTwo>>
+	<<set _winnerDeadliness = _fighterTwoDeadliness>>
+	<<set _loser = _fighterOne>>
+	<<set _loserDeadliness = _fighterOneDeadliness>>
+<<elseif _fighterTwoDeadliness < _fighterOneDeadliness>>
+	<<set _loser = _fighterTwo>>
+	<<set _loserDeadliness = _fighterTwoDeadliness>>
+	<<set _winner = _fighterOne>>
+	<<set _winnerDeadliness = _fighterOneDeadliness>>
 <<elseif random(1,100) > 50>>
-	<<set _winner = $fighterTwo>>
-	<<set _winnerDeadliness = $fighterTwoDeadliness>>
-	<<set _loser = $fighterOne>>
-	<<set _loserDeadliness = $fighterOneDeadliness>>
+	<<set _winner = _fighterTwo>>
+	<<set _winnerDeadliness = _fighterTwoDeadliness>>
+	<<set _loser = _fighterOne>>
+	<<set _loserDeadliness = _fighterOneDeadliness>>
 <<else>>
-	<<set _loser = $fighterTwo>>
-	<<set _loserDeadliness = $fighterTwoDeadliness>>
-	<<set _winner = $fighterOne>>
-	<<set _winnerDeadliness = $fighterOneDeadliness>>
+	<<set _loser = _fighterTwo>>
+	<<set _loserDeadliness = _fighterTwoDeadliness>>
+	<<set _winner = _fighterOne>>
+	<<set _winnerDeadliness = _fighterOneDeadliness>>
 <</if>>
 
 <<if !canSee(_winner) && !canSee(_loser)>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index f0040a71dd3..417cfc0c7b7 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -114,7 +114,6 @@
 	<<case "fuckdoll" "blind" "remove eyes" "amp" "removeLimbs" "amp1" "PLimb interface1" "PLimb interface2" "PLimb interface3">>
 	<<set _ID = $activeSlave.ID>>
 	<<if _ID == $Lurcher.ID>><<set $Lurcher = 0>><</if>>
-	<<if _ID == $fighterTwo.ID>><<set $fighterTwo = 0>><</if>>
 	<<if _ID == $Recruiter.ID>><<set $Recruiter = 0>><</if>>
 	<<if _ID == $HeadGirl.ID>><<set $HeadGirl = 0>><</if>>
 	<<if _ID == $Bodyguard.ID>><<set $Bodyguard = 0>><</if>>
-- 
GitLab