From 69847d706092f7923b4d13c1755f100d07a1df6b Mon Sep 17 00:00:00 2001 From: DCoded <dsoloha@live.com> Date: Tue, 30 Apr 2019 22:49:15 -0400 Subject: [PATCH] killSlave Bugfixes --- src/init/storyInit.tw | 1 + src/pregmod/killSlave.tw | 3 ++- src/pregmod/killedSlave.tw | 4 +++- src/uncategorized/BackwardsCompatibility.tw | 3 +++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index a61c1de4d6f..f4e99725f49 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 9a3ae0d6297..311b66758a3 100644 --- a/src/pregmod/killSlave.tw +++ b/src/pregmod/killSlave.tw @@ -64,11 +64,12 @@ 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>> - <<if ($activeSlave.assignment != "guard you") && ($pit > 0)>> + <<if $activeSlave.assignment != "guard you" && $pit && $Bodyguard>> <<if ($pitLethal == 1)>> <br><<link "Let $him win $his life in combat" "KilledSlave">><<set $killChoice = 2>><</link>> <<else>> diff --git a/src/pregmod/killedSlave.tw b/src/pregmod/killedSlave.tw index 9933056df25..6b39e8609ce 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">> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 5bc5ad339ab..38b17d7fe27 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>> -- GitLab