Merge branch 'attackOptionsTweaking-II' into 'pregmod-master'

attackOptionsTweaking-II

See merge request pregmodfan/fc-pregmod!7394

src/Mods/SecExp/attackOptions.tw

@@ -11,12 +11,7 @@
 <<includeDOM _options.render()>>
 
 <br>
-
-<<if $majorBattle == 0>>
-	<strong>Attack Imminent</strong>
-<<else>>
-	<strong>Major Attack Imminent</strong>
-<</if>>
+<strong> <<if $majorBattle == 1>>Major<</if>> Attack Imminent</strong>
 <hr>
 <<if $majorBattle == 0>>
 	<<if $battlesCount > 0>>
@@ -28,8 +23,7 @@
 			<<else>>
 				Some of your citizens saw the disorganized horde of raiders coming towards the city and quickly reported it. To such jackals your arcology surely looks like an appetizing morsel.
 			<</if>>
-			<br>
-			Raiders are roaming gangs of bandits, preying on the vulnerable supply lines of Free Cities and old world nations. They are rarely equipped with decent armaments and even more rarely have any formal military training, but they make up for that with high mobility and numbers.
+			<br>Raiders are roaming gangs of bandits, preying on the vulnerable supply lines of Free Cities and old world nations. They are rarely equipped with decent armaments and even more rarely have any formal military training, but they make up for that with high mobility and numbers.
 		<<elseif $attackType == "free city">>
 			<<if App.SecExp.battle.recon() >= 1>>
 				A menacing column of slavers and hired mercenaries is coming to your city. Another free city is ready to use their best tools to hit a dangerous competitor where it hurts.
@@ -53,8 +47,7 @@
 			<<else>>
 				Some of your citizens saw the disciplined yet dusty, scruffy old world army is approaching the confines of your arcology. There's nothing better than a good war to unite the electorate and your arcology is just the perfect target.
 			<</if>>
-			<br>
-			Old world expeditions are usually sent to secure resources and trade routes for their nation or, more often, to provide their citizens with a bogeyman to be scared of. They are usually decently equipped and trained, which together with their generous numbers make them a tough nut to crack. However, they often lack in mobility.
+			<br>Old world expeditions are usually sent to secure resources and trade routes for their nation or, more often, to provide their citizens with a bogeyman to be scared of. They are usually decently equipped and trained, which together with their generous numbers make them a tough nut to crack. However, they often lack in mobility.
 		<</if>>
 	<<else>>
 		Your assistant interrupted your rest to bring the grim news. You quickly rush to your console, where you can see one of the convoys supplying your arcology has been attacked and looted. It seems a group of desperate looking bandits decided it was a good idea to steal from you.
@@ -64,7 +57,7 @@
 	<<if $majorBattlesCount > 0>>
 		The ominous message dominates the screens of your office, and <<print $assistant.name>> quickly gathers all information available to prepare for the major battle ahead.
 	<<else>>
-		<br><br>Your assistant interrupted your rest to bring the grim news. You quickly rush to your console, where you can see the satellite images coming in of the force about to crash against your arcology. It's not the first time your armies fought for the survival of your empire, but this time it seems it will be a fight for life or death.
+		Your assistant interrupted your rest to bring the grim news. You quickly rush to your console, where you can see the satellite images coming in of the force about to crash against your arcology. It's not the first time your armies fought for the survival of your empire, but this time it seems it will be a fight for life or death.
 	<</if>>
 	<<if $attackType == "raiders">>
 		<<if App.SecExp.battle.recon() >= 1>>
@@ -147,11 +140,9 @@ approximately <strong><<print _estimatedMen>> men</strong> are coming, they seem
 
 <hr>__Battle Plan__:<br>
 <<set _leaderFound = 1>>
-<<if $leadingTroops === "bodyguard" || $leadingTroops === "headGirl">>
-	<<if $BodyguardID === 0 || $HeadGirlID === 0>>
-		@@red;Chosen leader $leadingTroops can not be found be found, please select another.@@
-		<<set _leaderFound = 0>>
-	<</if>>
+<<if $leadingTroops === "bodyguard" && $BodyguardID === 0 || $leadingTroops === "headGirl" && $HeadGirlID === 0>>
+	@@red;Chosen leader $leadingTroops can not be found be found, please select another.@@
+	<<set _leaderFound = 0>>
 <</if>>
 <<switch $leadingTroops>>
 <<case "PC">>
@@ -224,8 +215,7 @@ approximately <strong><<print _estimatedMen>> men</strong> are coming, they seem
 		<<replace "#leader">><strong><<print _leader>></strong><</replace>>
 	<</link>>
 <</if>>
-<br>For this battle you choose to follow <span id="tactic"><strong><<print $chosenTactic>></strong></span> tactics.
-<br>
+<br>For this battle you choose to follow <span id="tactic"><strong><<print $chosenTactic>></strong></span> tactics.<br>
 <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'defensiveTactics')" id="tab defensive tactics">Defensive tactics</button>
 <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'offensiveTactics')" id="tab offensiveTactics">Offensive Tactics</button>