diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index a61c1de4d6f31354b419aecffa7cc9ac14b174b2..f4e99725f497c1c48e25f7de437e9b43ecf9e8fb 100644 --- a/src/init/storyInit.tw +++ b/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>> diff --git a/src/pregmod/killSlave.tw b/src/pregmod/killSlave.tw index 9a3ae0d62977831e9a0a27cc99699c2f9b8cc99b..a26c347f1356d1ed23d5869763b2754c6d0b5dd8 100644 --- a/src/pregmod/killSlave.tw +++ b/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 diff --git a/src/pregmod/killedSlave.tw b/src/pregmod/killedSlave.tw index 9933056df25b2d9f01e587b5c1b9316ab38505e8..8a6b82fbeb6b837a00ec3d87d5a7bd8ba6cecc4f 100644 --- a/src/pregmod/killedSlave.tw +++ b/src/pregmod/killedSlave.tw @@ -1,7 +1,9 @@ :: 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>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 5bc5ad339abb59aefcfc6de6c2c2bf8e8d1f4000..38b17d7fe27e54431d0a8d3b4d1c3a5a7e1ff00f 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/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>>