Tweaking VIII

src/SecExp/attackHandler.tw

@@ -104,13 +104,13 @@
 		<<if $SFUnit.GunS >= 1>>
 			<<set _defMod += $SFUnit.GunS * 0.05>>
 		<</if>>
-		<<if $SFUnit.Satellite >= 5>>
+		<<if $SFUnit.Satellite >= 5 && $SatLaunched > 0>>
 			<<set _atkMod += ($SFUnit.Satellite - 5) * 0.05>>
 		<</if>>
 		<<if $SFUnit.GiantRobot >= 6>>
 			<<set _defMod += ($SFUnit.GiantRobot - 5) * 0.05>>
 		<</if>>
-		<<if $SFUnit.MissileSilo >= 1>>
+		<<if $SFUnit.MissileSilo >= 1 && $SatLaunched > 0>>
 			<<set _atkMod += $SFUnit.MissileSilo * 0.05>>
 			<<set _defMod += $SFUnit.MissileSilo * 0.05>>
 		<</if>>

src/SecExp/attackReport.tw

@@ -1429,7 +1429,7 @@
 		<<if $SFUnit.GunS >= 1>>
 			The gunship gave our troops an undeniable advantage in recon capabilities, air superiority and fire support.
 		<</if>>
-		<<if $SFUnit.Satellite >= 5>>
+		<<if $SFUnit.Satellite >= 5 && $SatLaunched > 0>>
 			The $SF.Lower satellite's devastating power was employed with great efficiency against the enemy.
 		<</if>>
 		<<if $SFUnit.GiantRobot >= 6>>

src/SecExp/widgets/battleWidgets.tw

@@ -3,7 +3,7 @@
 <<widget "calcSFStatistics">>
 	<<if $slaveRebellion != 1 || $citizenRebellion != 1>>
 		/* atk, def */
-		<<set _upgradesSum = $SFUnit.Armoury + $SFUnit.Drugs + $SFUnit.AirForce + $SFUnit.Vehicles>>
+		<<set _upgradesSum = $SFUnit.Armoury + $SFUnit.Drugs + ($SFUnit.AA+$SFUnit.TA < 1) + ($SFUnit.AV+$SFUnit.TV)>>
 		<<if !isInt(_upgradesSum)>>
 			<<set _upgradesSum = random(10,15)>>
 		<</if>>
@@ -22,7 +22,7 @@
 		<</if>>
 	<<else>>
 		/* atk, def */
-		<<set _upgradesSum = $SFUnit.Armoury + $SFUnit.Drugs + $SFUnit.AirForce + $SFUnit.Vehicles>>
+		<<set _upgradesSum = $SFUnit.Armoury + $SFUnit.Drugs + ($SFUnit.AA+$SFUnit.TA < 1) + ($SFUnit.AV+$SFUnit.TV)>>
 		<<if !isInt(_upgradesSum)>>
 			<<set _upgradesSum = random(10,15)>>
 		<</if>>