Merge branch 'pregmod-master' into 'pregmod-master'

SFMBarracks fix

See merge request pregmodfan/fc-pregmod!1071

src/uncategorized/SFMBarracks.tw

 :: SFM Barracks [nobr]
+
 <<if ndef $securityForceUpgradeTokenReset>>
 	<<set $securityForceUpgradeTokenReset = 0>>
 <</if>>
@@ -81,14 +82,13 @@ securityForceX */
 <<set _LaunchBayO = $securityForceSatalitePower>>
 <<set _LaunchBayOMax = 17>>
 
-<<if $terrain != "oceanic" || $terrain != "marine">>
+<<if $terrain != "oceanic" && $terrain != "marine">>
 	<<set _SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO>>
 	<<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax>>
 	<<set _SFO = 0>>
 	<<set _NavalYard = 0>>
 	<<set _NavalYardMax = 0>>
-<</if>>
-<<if $terrain == "oceanic" || $terrain == "marine">>
+<<elseif $terrain == "oceanic" || $terrain == "marine">>
 	<<set _NavalYard = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>>
 	<<set _NavalYardMax = 12>>
 	<<set _SFO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard>>
@@ -338,7 +338,7 @@ securityForceX */
 		Modernized the heavy transport's armor.
 	<<elseif $securityForceHeavyTransport == 3>>
 		Modernized the armor and engines of the heavy transport.
-<</if>>
+	<</if>>
 <</if>>
 <</if>>
 
@@ -629,8 +629,7 @@ securityForceX */
 
 <<if $securityForceUpgradeToken == 1 && (_SFNO < _max || _SFO < _max)>>
 //_Name is working to improve $securityForceName this week.//
-<</if>>
-<<if _SFNO >= _max || _SFO >= _max>>
+<<elseif _SFNO >= _max || _SFO >= _max>>
 //$securityForceName is fully equipped and upgraded - nothing else can be done.//
 <</if>>
 
@@ -643,7 +642,7 @@ securityForceX */
 
 <<set _securityForceUpgradeResetTokenCurrentCost = $cash*.05>>
 <<if $securityForceUpgradeToken == 1 && $securityForceUpgradeTokenReset >= 0>>
-	<br><br>_Name "says certainly <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, it is possible to upgrade $securityForceName more than once per week however it will cost you."
+	<br><br>_Name "says certainly <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, it is possible to upgrade $securityForceName more than once per week, however, it will cost you."
 	<br>
 	<<link "Would you like to discus upgrading $securityForceName again?">>
 		<<set $securityForceUpgradeToken = 0>>
@@ -1151,7 +1150,7 @@ securityForceX */
 					<</if>>
 					<br><<link "Submarine">>
 						<<replace "#resultA">><br><br>
-						"Sure, boss." she says, nodding. "Upgrading the submarine, should help us gain a massive 	advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
+						"Sure, boss." she says, nodding. "Upgrading the submarine, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
 						<<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*_Env>>
 						<</replace>>
 					<</link>> // Costs ¤<<print _subCost*_Env>> //