Merge branch 'ITTBugFixes' into 'pregmod-master'

Fix TierTwoUnlock and formatting.

See merge request !1492

src/SecExp/weaponsManufacturing.tw

@@ -369,7 +369,7 @@ __Upgrades__:
 		You fully upgraded your human troops.
 	<<elseif $humanUpgrade.attack >= 2 || $humanUpgrade.hp >= 2 || $humanUpgrade.morale >= 20 || $humanUpgrade.defense >= 2>>
 		You fully upgraded your human troops.
-		<<if $securityForceCreate == 1 && ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4)>>
+		<<if $securityForceCreate == 1 && ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4) && (($SFSupportLevel >= 2 && $securityForceArcologyUpgrades >= 7) || ($SFSupportLevel >= 4 && $securityForceStimulantPower >= 8) || ($SFSupportLevel >= 5))>>
 			With support from $securityForceName, however, we may be able to further upgrade our troops.
 		<</if>>
 	<<elseif $weapLab < 3>>

src/uncategorized/SFMBarracks.tw

@@ -12,11 +12,7 @@
 	<<set $Env = _N3, $EnvCash2 = 550, $EnvCash3 = 300, $EnvCash4 = 200, $EnvProsp = 7, _BaseDiscount = _BaseDiscount+.005>>
 <</if>>
 
-<<set $TierTwoUnlock = 0>>
-<<if _StimulantLab == 5 && _Barracks == 5 && $securityForceVehiclePower == 5 && _Armoury == 5 && _DroneBay == 5 && $securityForceAircraftPower == 5>>
-	<<set $TierTwoUnlock = 1>>
-<</if>>
-
+<<if ndef $TierTwoUnlock>> <<set $TierTwoUnlock = 0>> <</if>>
 <<include "SpecialForceUpgradeTree">>
 
 <<if $SFNO > 0>>
@@ -127,9 +123,9 @@
 <</if>>
 
 <<if $TierTwoUnlock == 0>>
-	<br>You have <<print (30-$SFAO)>> upgrades left before you can move unlock the next tier. ''StimulantLab:'' _StimulantLab/5 ''_Barracks:'' _Barracks/5 ''Garage:'' $securityForceVehiclePower/5 ''Armoury:'' _Armoury/5 ''DroneBay:'' _DroneBay/5 ''Airforce:'' $securityForceAircraftPower/5
+	<br>You have <<print (30-$SFAO)>> upgrades left before you can move unlock the next tier. ''StimulantLab:'' _StimulantLab/5 ''Barracks:'' _Barracks/5 ''Garage:'' $securityForceVehiclePower/5 ''Armoury:'' _Armoury/5 ''DroneBay:'' _DroneBay/5 ''Airforce:'' $securityForceAircraftPower/5
+	<<if $securityForceVehiclePower == 5>> <<set _T1FullUpgradesGarage = "True">> <</if>> <<if $securityForceAircraftPower == 5>> <<set _T1FullUpgradesAirforce = "True">> <</if>> <<if 30-$SFAO == 0>> <<set $TierTwoUnlock = 1>> <</if>>
 <</if>>
-
 <<if $securityForceGiftToken == 1>>
 	<br>//_Name has already provided you with extra tribute this week.//
 <</if>>