More killSlave bugfixes

src/pregmod/killSlave.tw

@@ -64,19 +64,19 @@
 	to which $he still doesn't respond.
 <</if>>
 
-/* TODO: rework this into one passage */
 <<if $killChoice == -1>>
 	<br>
-	<br><<link "Kill $him" "KilledSlave">><<set $killChoice = 0>><</link>>
-	<br><<link "Have mercy on $him" "KilledSlave">><<set $killChoice = 1>><</link>>
+	<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

@@ -128,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>>
@@ -139,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.
@@ -148,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>>