Merge branch 'hotfixes' into 'pregmod-master'

KillSlave Bugfixes

Closes #702

See merge request pregmodfan/fc-pregmod!4411

src/init/storyInit.tw

@@ -334,6 +334,7 @@ You should have received a copy of the GNU General Public License along with thi
 	<<set $useSlaveSummaryTabs = 0>>
 	<<set $useSlaveSummaryOverviewTab = 0>>
 	<<set $useSlaveListInPageJSNavigation = 0>>
+	<<set $killChoice = -1>>
 
 	/* master suite reporting and alternate descriptions */
 	<<set $verboseDescriptions = 0>>

src/pregmod/killSlave.tw

@@ -66,16 +66,17 @@
 
 <<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)>>
+	<span id="killScene">
+	<br><<link "Kill $him">><<set $killChoice = 0>><<replace "#killScene">><<include "KilledSlave">><</replace>><</link>>
+	<br><<link "Have mercy on $him">><<set $killChoice = 1>><<replace "#killScene">><<include "KilledSlave">><</replace>><</link>>
+	<<if $activeSlave.assignment != "guard you" && $pit && $Bodyguard>>
 		<<if ($pitLethal == 1)>>
-			<br><<link "Let $him win $his life in combat" "KilledSlave">><<set $killChoice = 2>><</link>>
+			<br><<link "Let $him win $his life in combat">><<set $killChoice = 2>><<replace "#killScene">><<include "KilledSlave">><</replace>><</link>>
 		<<else>>
 			<br>//You must allow lethal fights in $pitName to have $activeSlave.slaveName fight your bodyguard for $his life//
 		<</if>>
 	<</if>>
-	<br><br>
+	</span>
 <<else>>
 	You abruptly cut $his begging short as you realize $slaveFightingBG.slaveName is already fighting your bodyguard $Bodyguard.slaveName for $his life this week. [[Cancel the fight|KillSlave][$killChoice = -1]]
 <</if>>
\ No newline at end of file

src/pregmod/killedSlave.tw

 :: KilledSlave [nobr]
 
 <<if $killChoice <= 0>>
-<<setLocalPronouns $Bodyguard 2>>
+<<if $Bodyguard>>
+	<<setLocalPronouns $Bodyguard 2>>
+<</if>>
 
 <<set _qualifiedFS = []>>
 <<if $arcologies[0].FSRomanRevivalist != "unset">>
@@ -126,7 +128,7 @@ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you p
 		<</if>>
 
 		<<= removeActiveSlave() >>
-		<<set $nextLink = "AS Dump">>
+		<<set $nextLink = "Main", $killChoice = -1>>
 
 /* TODO: this will DEFINTELY need balancing */
 <<elseif $killChoice == 1>>
@@ -137,6 +139,7 @@ $activeSlave.slaveName gives an audible sigh of relief and begins to thank you p
 		<<set $activeSlave.devotion += 20>>
 	<</if>>
 	<<set $activeSlave.trust = -100>>
+	<<set $killChoice = -1>>
 
 <<elseif $killChoice == 2>>
 	You tell $him that you'll let your bodyguard $Bodyguard.slaveName decide $his fate — if $he wants to live, $he'll have to beat _him2 in hand-to-hand combat in $pitName.
@@ -146,5 +149,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, $pitAnimal = 0>>
+	<<set $slaveFightingBG = $activeSlave, $pitAnimal = 0, $killChoice = -1>>
 <</if>>

src/uncategorized/BackwardsCompatibility.tw

@@ -664,6 +664,9 @@
 <<if ndef $freshPC>>
 	<<set $freshPC = 0>>
 <</if>>
+<<if ndef $killChoice>>
+	<<set $killChoice = -1>>
+<</if>>
 <<if ndef $incubator>>
 	<<set $incubator = 0>>
 <</if>>