SFOverhual-SecExp - II

src/SecExp/attackHandler.tw

@@ -1125,7 +1125,7 @@ __Army__:
 <br>slaves morale modifier: <<if _slaveMod > 0>>+<</if>>_slaveMod%
 <br>mercenaries morale modifier: <<if _mercMod > 0>>+<</if>>_mercMod%
 <<if $SF.Toggle && $SF.Active && $SFIntervention>>
-<br>security force morale modifier: <<if _SFMod > 0>>+<</if>>_SFMod%
+<br>special force morale modifier: <<if _SFMod > 0>>+<</if>>_SFMod%
 <</if>>
 <<if $secBarracksUpgrades.luxury >= 1>>
 <br>Barracks bonus morale modifier: +<<print _barracksBonus>>%

src/SecExp/attackOptions.tw

@@ -391,29 +391,29 @@ Units about to be deployed:
 	<</for>>
 <</if>>
 
-<<if $SF.Toggle && $SF.Active && $majorBattle == 1>>
+<<if $SF.Toggle && $SF.Active && $majorBattle>>
 	<br>
 	<br>
-	The size of the incoming attack warrants the intervention of the security force in its full force. They will <span id="SFI">not intervene</span>.
+	The size of the incoming attack warrants the intervention of the special force in its full force. They will <span id="SFI">not intervene</span>.
 	<br>
-	<<if $SFIntervention == 0>>
-		<<link "Let the Security force intervene" "attackOptions">>
+	<<if !$SFIntervention>>
+		<<link "Let $SF.lower intervene" "attackOptions">>
 			<<set $SFIntervention = 1>>
 			<<replace "#SFI">>
 				intervene
 			<</replace>>
 		<</link>>
-		//The security force will join the battle with all the equipment they can mobilize within a short timeframe//
+		//The special force will join the battle with all the equipment they can mobilize within a short timeframe//
 	<<else>>
-		<<link "Do not let the Security force intervene" "attackOptions">>
+		<<link "Do not let $SF.lower intervene" "attackOptions">>
 			<<set $SFIntervention = 0>>
 			<<replace "#SFI">>
 				not intervene
 			<</replace>>
 		<</link>>
-		//The security force will not join the battle//
+		//The special force will not join the battle//
 	<</if>>
-	<br>//Some upgrades will be able to support the troops even if the security force does not intervene directly in the fight.//
+	<br>//Some upgrades will be able to support the troops even if the special force does not intervene directly in the fight.//
 <</if>>
 
 <br><br>

src/uncategorized/manageArcology.tw

@@ -278,10 +278,10 @@ Your slaves have participated in approximately <<print commaNum($oralTotal+$vagi
 
 <<if $secExp == 1 && $battlesEnabled == 1>>
 <br><br>
-<<if $securityForceCreate == 0>>
+<<if !$SF.Toggle||!$SF.Active>>
 	Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower)>> total soldiers.
-<<else>>
-	Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $securityForcePersonnel)>> total soldiers of which <<print commaNum($securityForcePersonnel)>> under the security force command and the rest under your direct control.
+<<elseif $SF.Toggle && $SF.Active>>>>
+	Your army counts <<print commaNum($militiaEmployedManpower + $slavesEmployedManpower + $mercEmployedManpower + $SFUnit.Troops)>> total soldiers of which <<print commaNum($SFUnit.Troops)>>  under the special force command and the rest under your direct control.
 <</if>>
 <<if $hasFoughtOnce == 1>>
 	Your troops were involved in <<print commaNum($battlesCount)>> battles of which <<print commaNum($majorBattlesCount)>> were major engagements. You won