Merge branch 'stray-slavei' into 'pregmod-master'

stray slaves[$i]s

Closes #1798

See merge request !6817

src/uncategorized/pePitFight.tw

@@ -11,6 +11,7 @@
 
 <span id="artFrame">
 /* 000-250-006 */
+<<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "no clothing">>
 <<if $seeImages == 1>>
 	<<if $imageChoice == 1>>
 		<div class="imageRef lrgVector"><div class="mask">&nbsp;</div><<= SlaveArt($activeSlave, 2, 0)>></div>
@@ -18,6 +19,7 @@
 		<div class="imageRef lrgRender"><div class="mask">&nbsp;</div><<= SlaveArt($activeSlave, 2, 0)>></div>
 	<</if>>
 <</if>>
+<<set $activeSlave.clothes = _clothesTemp>>
 /* 000-250-006 */
 </span>
 
@@ -134,19 +136,19 @@ Across the ring, $his opponent's owner nods civilly to you and examines $activeS
 	$His distended, <<print $activeSlave.inflationType>>-belly is uncomfortable and heavy, distracting $him.
 <</if>>
 
-<<if $slaves[$i].teeth == "pointy">>
+<<if $activeSlave.teeth == "pointy">>
 	$His sharp teeth add nothing to $his actual effectiveness, but they're certainly intimidating.
 <</if>>
 
-<<if !canSee($slaves[$i])>>
+<<if !canSee($activeSlave)>>
 	$His lack of eyesight means certain death.
-<<elseif !canSeePerfectly($slaves[$i])>>
+<<elseif !canSeePerfectly($activeSlave)>>
 	$His poor eyesight makes $him a weaker fighter.
 <</if>>
 
-<<if !canHear($slaves[$i])>>
+<<if !canHear($activeSlave)>>
 	$His lack of hearing is a major detriment.
-<<elseif (($slaves[$i].hears == -1) && ($slaves[$i].earwear != "hearing aids")) || ($slaves[$i].hears == 0 && ($slaves[$i].earwear == "muffling ear plugs"))>>
+<<elseif (($activeSlave.hears == -1) && ($activeSlave.earwear != "hearing aids")) || ($activeSlave.hears == 0 && ($activeSlave.earwear == "muffling ear plugs"))>>
 	$His lack of hearing is a minor detriment.
 <</if>>
 
@@ -214,6 +216,8 @@ The umpire announces gravely that the fight is to the death and rings a bell.
 
 <<if $activeSlave.health.health < -90>>
 	<<= removeActiveSlave() >>
+	<<set $nextLink = "Random Nonindividual Event">>
+	<<UpdateNextButton>>
 <</if>>
 
 <<set $pitFightsTotal++>>
\ No newline at end of file