From d00eda6e777761a42cfd0a0707c526e14d7545cc Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 10 Apr 2018 17:36:21 -0400 Subject: [PATCH] fixes --- src/SecExp/attackOptions.tw | 40 ++++++++++++++++++++------ src/uncategorized/main.tw | 1 + src/uncategorized/masterSuiteReport.tw | 2 ++ src/uncategorized/seWedding.tw | 2 +- 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw index 5667b8777e2..dccd671610c 100644 --- a/src/SecExp/attackOptions.tw +++ b/src/SecExp/attackOptions.tw @@ -184,51 +184,75 @@ approximately <strong><<print $estimatedMen>> men</strong> are coming, they seem __Battle Plan__: <br> +<<switch $leadingTroops>> +<<case "PC">> + <<set _leader = $PC.name>> +<<case "assistant">> + <<set _leader = $assistantName>> +<<case "bodyguard">> + <<set _leader = $Bodyguard.slaveName>> +<<case "headGirl">> + <<set _leader = $HeadGirl.slaveName>> +<<case "citizen">> + <<set _leader = "The citizens' militia commander">> +<<case "mercenary">> + <<set _leader = "The mercenary commander">> +<<case "colonel">> + <<set _leader = $securityForceName +"'s Colonel">> +<</switch>> + /* leader assignment */ -<span id="leader"><strong><<print $assistantName>></strong></span> will lead your troops. +<span id="leader"><strong><<print _leader>></strong></span> will lead your troops. <br> <<link "Personally join the battle">> <<set $leadingTroops = "PC">> - <<replace "#leader">><strong><<print $PC.name>></strong><</replace>> + <<set _leader = $PC.name>> + <<replace "#leader">><strong><<print _leader>></strong><</replace>> <</link>> | <<link "Let $assistantName lead the troops">> <<set $leadingTroops = "assistant">> - <<replace "#leader">><strong><<print $assistantName>></strong><</replace>> + <<set _leader = $assistantName>> + <<replace "#leader">><strong><<print _leader>></strong><</replace>> <</link>> <<if $Bodyguard != 0 && $slavesOfficers == 1>> | <<link "Let your bodyguard lead your troops">> <<set $leadingTroops = "bodyguard">> - <<replace "#leader">><strong><<print $Bodyguard.slaveName>></strong><</replace>> + <<set _leader = $Bodyguard.slaveName>> + <<replace "#leader">><strong><<print _leader>></strong><</replace>> <</link>> <</if>> <<if $HeadGirl != 0 && $slavesOfficers == 1>> | <<link "Let your head girl lead your troops">> <<set $leadingTroops = "headGirl">> - <<replace "#leader">><strong><<print $HeadGirl.slaveName>></strong><</replace>> + <<set _leader = $HeadGirl.slaveName>> + <<replace "#leader">><strong><<print _leader>></strong><</replace>> <</link>> <</if>> <<if $militiaFounded == 1>> | <<link "Let the citizens' militia officers lead the troops">> <<set $leadingTroops = "citizen">> - <<replace "#leader">><strong>The citizens' militia commander</strong><</replace>> + <<set _leader = "The citizens' militia commander">> + <<replace "#leader">><strong><<print _leader>></strong><</replace>> <</link>> <</if>> <<if $mercenaries > 0>> | <<link "Let the mercenary officers lead the troops">> <<set $leadingTroops = "mercenary">> - <<replace "#leader">><strong>The mercenary commander</strong><</replace>> + <<set _leader = "The mercenary commander">> + <<replace "#leader">><strong><<print _leader>></strong><</replace>> <</link>> <</if>> <<if $securityForceCreate == 1>> | <<link "Let The Colonel lead the troops">> <<set $leadingTroops = "colonel">> - <<replace "#leader">><strong>$securityForceName's colonel</strong><</replace>> + <<set _leader = $securityForceName +"'s Colonel">> + <<replace "#leader">><strong><<print _leader>></strong><</replace>> <</link>> <</if>> diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw index d490f979ba2..5a8beb734bc 100644 --- a/src/uncategorized/main.tw +++ b/src/uncategorized/main.tw @@ -116,6 +116,7 @@ __''MAIN MENU''__ //[[Summary Options]]// <<if $positionMainLinks >= 0>> <<MainLinks>> <</if>> + <<set _j = "Back", _k = "AS Dump", _l = "Main">> <<CreateSimpleTabs>> <body> diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw index 61b3a8d0779..9b95f162b40 100644 --- a/src/uncategorized/masterSuiteReport.tw +++ b/src/uncategorized/masterSuiteReport.tw @@ -386,6 +386,8 @@ <<set $Concubine = $slaves[_FLs], _dump = $MastSiIDs.deleteAt(0), _DL-->> <</if>> + <br><br> + <<if $arcologies[0].FSRestart != "unset" && $propOutcome != 1 && _masterSuitePregnantSlaves > 0>> The Societal Elite know what you are doing with your bedslaves. @@.red;They do not approve.@@ <<set $failedElite += 5*_masterSuitePregnantSlaves>> diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw index eb36f2eee50..af2109ce2be 100644 --- a/src/uncategorized/seWedding.tw +++ b/src/uncategorized/seWedding.tw @@ -388,7 +388,7 @@ <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>> The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again. Not only is she to be blessed with your child, but she's to take your surname as well. <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>> - The new Mrs. $activeSlave.slaveSurname hears this, of course, and scoffs audibly. Just another burden for her to carry; just like the child soon to be growing in her womb. + The new Mrs. $activeSlave.slaveSurname hears this, of course, and scoffs audibly. Just another burden for her to carry; like the child soon to be growing in her womb. <<elseif $activeSlave.devotion < -20>> The new Mrs. $activeSlave.slaveSurname hears this, of course, and breaks down again. Not only are you binding her to you with your child, but with your name as well. <<else>> -- GitLab