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

Pregmod v1021-64

See merge request pregmodfan/fc-pregmod!870

src/uncategorized/SFMBarracks.tw

@@ -176,9 +176,11 @@
 	<<if $securityForceSexedColonelToken == 1>><br>//You have already he Colonel has already spent time with you this week or is unable able to find time in her busy week to relax with you.//<</if>>
 	
 <<if $securityForceArcologyUpgrades+$securityForceInfantryPower+$securityForceStimulantPower+$securityForceVehiclePower+$securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceDronePower+$securityForceSatalitePower+$securityForceGiantRobot >= 79>>
+	//The $securityForceName is fully equipped and upgraded - nothing else can be done.//
 <<elseif $terrain == "oceanic" && $securityForceArcologyUpgrades+$securityForceInfantryPower+$securityForceStimulantPower+$securityForceVehiclePower+$securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceDronePower+$securityForceSatalitePower+$securityForceAircraftCarrier+$securityForceSubmarine >= 79>>
-		//The $securityForceName is fully equipped and upgraded - nothing else can be done.//
-	<<elseif $securityForceUpgradeToken == 0>><</if>>
+	//The $securityForceName is fully equipped and upgraded - nothing else can be done.//
+<<elseif $securityForceUpgradeToken == 0>>
+<</if>>
 
 <br><<if $securityForceUpgradeToken == 0>>Which facility or equipement do you wish The Colonel to upgrade this week?<</if>><span id="resultX">
 			<<if $securityForceArcologyUpgrades < 5 && $securityForceUpgradeToken == 0>>
@@ -341,21 +343,31 @@
 	</span><</replace>><</link>>
 	<</if>>
 	
-			<<if $securityForceDronePower < 5 && $securityForceArcologyUpgrades >= 2 && $securityForceUpgradeToken == 0>><<link "Drone Bay">><<replace "#resultX">>
-			"Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
-						<<set $securityForceUpgradeToken = 1>>
-						<<set $securityForceDronePower += 1>>
-						<<set $cash -= 45000>>
-					<</replace>><</link>> // Costs ¤45000 //<br>
+			<<if $securityForceDronePower < 5 && $securityForceArcologyUpgrades >= 2 && $securityForceUpgradeToken == 0>>
+				<<link "Drone Bay">>
+				<<replace "#resultX">>
+					"Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
+					<<set $securityForceUpgradeToken = 1>>
+					<<set $securityForceDronePower += 1>>
+					<<set $cash -= 45000>>
+				<</replace>>
+				<</link>> // Costs ¤45000 //<br>
 			<<elseif $securityForceDronePower < 6 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5 && $securityForceArcologyUpgrades >= 5 && $securityForceVehiclePower >= 5 && $securityForceInfantryPower >= 5>>
-					<<link "Drone Bay">>"Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
-						<<set $securityForceUpgradeToken = 1>>
-						<<set $securityForceDronePower += 1>>
-						<<set $cash -= 2000000>>
-					<</link>> // Costs ¤2000000 //
-			<<elseif $securityForceDronePower == 5 || $securityForceDronePower == 6>><br>//The $securityForceName drone fleet is fully upgraded.//<<else>>//More barracks infrastructure upgrades are needed before the drone fleet can be expanded.//<</replace>><</link>><</if>>
+				<<link "Drone Bay">>
+				<<replace "#resultX">>
+					"Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
+					<<set $securityForceUpgradeToken = 1>>
+					<<set $securityForceDronePower += 1>>
+					<<set $cash -= 2000000>>
+				<</replace>>
+				<</link>> // Costs ¤2000000 //
+			<<elseif $securityForceDronePower == 5 || $securityForceDronePower == 6>>
+				<br>//The $securityForceName drone fleet is fully upgraded.//
+			<<else>>
+				//More barracks infrastructure upgrades are needed before the drone fleet can be expanded.//
+			<</if>>
 
-	<<if $securityForceArcologyUpgrades >=4 && $securityForceUpgradeToken == 0>><br><<link "Launch Bay">><<replace "#resultX">><span id="resultY">
+	<<if $securityForceArcologyUpgrades >= 4 && $securityForceUpgradeToken == 0>><br><<link "Launch Bay">><<replace "#resultX">><span id="resultY">
 			<<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5 && $securityForceArcologyUpgrades >= 5 && $securityForceVehiclePower >= 5 && $securityForceDronePower >= 5 && $securityForceInfantryPower >= 5 && $securityForceSatalitePower < 1>>
 				<br><<link "Ask The Colonel to 'borrow' a Satalite">><<replace "#resultY">>"Sure, boss." she says, nodding. "A Satalite should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
 						<<set $securityForceUpgradeToken = 1>>