diff --git a/src/Mods/SpecialForce/Firebase.tw b/src/Mods/SpecialForce/Firebase.tw
index 9e5a96b6d74d621d862326690d9a411187c23bdc..0c6badff365ef2eba86ec341c323161047f8e5af 100644
--- a/src/Mods/SpecialForce/Firebase.tw
+++ b/src/Mods/SpecialForce/Firebase.tw
@@ -52,12 +52,13 @@
<div id="Actions" class="tabcontent">
<div class="content">
- <<if $SF.MercCon.CanAttend === 0>>
- <br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SF.Colonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>, back when I was a merc me and a couple of my old friends would have a meetup every several months. Drinking, fucking, drugs... a little poker. It eventually grew into a whole thing, and now we bring our latest and greatest toys to show off, maybe make some money off selling the schematics. I'd like to continue going, for old times' sake."
- <br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1]]
- <br>[[Request she remain on base|Firebase][$SF.MercCon.CanAttend = -2]]<br>
- <<elseif $SF.MercCon.History >= 1 && ((Math.trunc($week/24) === ($week/24)) && $SF.MercCon.CanAttend === -1)>>
- <br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SF.Colonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>, that biannual merc meetup has come around again. You've already gave me leave to attend, but I just wanted to be sure I'm still clear to go."
+ <<if $SF.MercCon.CanAttend === 0 || $SF.MercCon.History >= 1 && ((Math.trunc($week/24) === ($week/24)) && $SF.MercCon.CanAttend === -1)>>
+ Her expression changes as something jogs her memory. "Before we begin <<if $SF.Colonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>
+ <<if $SF.MercCon.CanAttend === 0>>
+ , back when I was a merc me and a couple of my old friends would have a meetup every several months. Drinking, fucking, drugs... a little poker. It eventually grew into a whole thing, and now we bring our latest and greatest toys to show off, maybe make some money off selling the schematics. I'd like to continue going, for old times' sake."
+ <<elseif $SF.MercCon.History >= 1 && ((Math.trunc($week/24) === ($week/24)) && $SF.MercCon.CanAttend === -1)>>
+ , that biannual merc meetup has come around again. You've already gave me leave to attend, but I just wanted to be sure I'm still clear to go."
+ <</if>>
<br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1]]
<br>[[Request she remain on site|Firebase][$SF.MercCon.CanAttend = -2]]<br>
<</if>>
@@ -108,4 +109,4 @@
<div id="FS" class="tabcontent">
<div class="content"> <<= App.SF.fsIntegration()>> </div>
</div>
-<</if>>
\ No newline at end of file
+<</if>>
diff --git a/src/Mods/SpecialForce/Upgrades.tw b/src/Mods/SpecialForce/Upgrades.tw
index 539360722e394426fea40ade9708c406d31a3b4b..bcb3527cc9bdc22e51b333191a9b8a4a7d9efceb 100644
--- a/src/Mods/SpecialForce/Upgrades.tw
+++ b/src/Mods/SpecialForce/Upgrades.tw
@@ -1,9 +1,8 @@
:: Upgrades [nobr]
-<br>Which facility or equipment do you wish to upgrade this week? <br>
+<<set _fullyUpgraded = []>> <br>Which facility or equipment do you wish to upgrade this week? <br>
-<<set _FU = App.SF.upgrades.currentUnitMax('Firebase')>>
-<<if $SF.Squad.Firebase < _FU>>
+<<if $SF.Squad.Firebase < App.SF.upgrades.currentUnitMax('Firebase')>>
<<set _cF = App.SF.UpgradeCost(100000,$SF.Squad.Firebase)>>
<<if $cash >= _cF>> <br>
[[Upgrade Firebase|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.Firebase++, cashX(-(_cF), "specialForces")]]
@@ -11,12 +10,11 @@
//Cannot afford to upgrade the Firebase.//
<</if>>
//Costs @@.red;<<print cashFormat(_cF)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.Firebase)>> </span> <br>
-<<elseif $SF.Squad.Firebase === _FU>>
- //The Firebase has been fully upgraded.// <br>
+<<elseif $SF.Squad.Firebase === 10>>
+ <<set _fullyUpgraded.push('Firebase')>>
<</if>>
-<<set _AU = App.SF.upgrades.currentUnitMax('Armoury')>>
-<<if $SF.Squad.Armoury < _AU>>
+<<if $SF.Squad.Armoury < App.SF.upgrades.currentUnitMax('Armoury')>>
<<set _cA = App.SF.UpgradeCost(40000,$SF.Squad.Armoury)>>
<<if $cash >= _cA>>
[[Upgrade Armory|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.Armoury++, cashX(-(_cA), "specialForces")]]
@@ -24,12 +22,11 @@
//Cannot afford to upgrade the Armory.//
<</if>>
//Costs @@.red;<<print cashFormat(_cA)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.Armoury)>> </span> <br>
-<<elseif $SF.Squad.Armoury === _AU>>
- //The Armory has been fully upgraded.// <br>
+<<elseif $SF.Squad.Armoury === 10>>
+ <<set _fullyUpgraded.push('Armory')>>
<</if>>
-<<set _DrugsU = App.SF.upgrades.currentUnitMax('Drugs')>>
-<<if $SF.Squad.Drugs < _DrugsU>>
+<<if $SF.Squad.Drugs < App.SF.upgrades.currentUnitMax('Drugs')>>
<<set _cDrugs = App.SF.UpgradeCost(40000,$SF.Squad.Drugs)>>
<<if $cash >= _cDrugs>>
[[Upgrade Drug Lab|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.Drugs++, cashX(-(_cDrugs), "specialForces")]]
@@ -37,12 +34,11 @@
//Cannot afford to upgrade the Drug Lab.//
<</if>>
//Costs @@.red;<<print cashFormat(_cDrugs)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.Drugs)>> </span> <br>
-<<elseif $SF.Squad.Drugs === _DrugsU>>
- //The Drug Lab has been fully upgraded.// <br>
+<<elseif $SF.Squad.Drugs === 10>>
+ <<set _fullyUpgraded.push('Drug Lab')>>
<</if>>
-<<set _DU = App.SF.upgrades.currentUnitMax('Drones')>>
-<<if $SF.Squad.Firebase >= 2 && $SF.Squad.Drones < _DU>>
+<<if $SF.Squad.Firebase >= 2 && $SF.Squad.Drones < App.SF.upgrades.currentUnitMax('Drones')>>
<<set _cDrones = App.SF.UpgradeCost(45000,$SF.Squad.Drones)>>
<<if $cash >= _cDrones>>
[[Upgrade Drone Bay|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.Drones++, cashX(-(_cDrones), "specialForces")]]
@@ -50,14 +46,13 @@
//Cannot afford to upgrade the Drone Bay.//
<</if>>
//Costs @@.red;<<print cashFormat(_cDrones)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.Drones)>> </span> <br>
-<<elseif $SF.Squad.Drones === _DU>>
- //The Drone Bay has been fully upgraded.// <br>
+<<elseif $SF.Squad.Drones === 10>>
+ <<set _fullyUpgraded.push('Drone Bay')>>
<</if>>
<<if App.SF.unlocked.garage()>> <br>''Garage''<br>
<div style="margin-left:2em">
- <<set _AVU = App.SF.upgrades.currentUnitMax('AV')>>
- <<if $SF.Squad.AV < _AVU>>
+ <<if $SF.Squad.AV < App.SF.upgrades.currentUnitMax('AV')>>
<<set _cAV = App.SF.UpgradeCost(60000,$SF.Squad.AV)>>
<<if $cash >= _cAV>>
[[Upgrade Attack Vehicle Fleet|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.AV++, cashX(-(_cAV), "specialForces")]]
@@ -65,14 +60,13 @@
//Cannot afford to upgrade the Attack Vehicle Fleet.//
<</if>>
//Costs @@.red;<<print cashFormat(_cAV)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.AV)>> </span> <br>
- <<elseif $SF.Squad.AV === _AVU>>
- //The Attack Vehicle Fleet has been fully upgraded.// <br>
+ <<elseif $SF.Squad.AV === 10>>
+ <<set _fullyUpgraded.push('Attack Vehicle Fleet')>>
<</if>>
</div>
<div style="margin-left:2em">
- <<set _TVU = App.SF.upgrades.currentUnitMax('TV')>>
- <<if $SF.Squad.TV < _TVU>>
+ <<if $SF.Squad.TV < App.SF.upgrades.currentUnitMax('TV')>>
<<set _cTV = App.SF.UpgradeCost(60000,$SF.Squad.TV)>>
<<if $cash >= _cTV>>
[[Upgrade Transport Vehicle Fleet|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.TV++, cashX(-(_cTV), "specialForces")]]
@@ -80,8 +74,8 @@
//Cannot afford to upgrade Transport Vehicle Fleet.//
<</if>>
//Costs @@.red;<<print cashFormat(_cTV)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.TV)>> </span> <br>
- <<elseif $SF.Squad.TV === _TVU>>
- //The Transport Vehicle Fleet has been fully upgraded.// <br>
+ <<elseif $SF.Squad.TV === 10>>
+ <<set _fullyUpgraded.push('Transport Vehicle Fleet')>>
<</if>>
</div>
@@ -98,15 +92,14 @@
<<elseif $SF.Squad.PGT === _PGTU && $PC.skill.warfare < 75>>
//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.PGT)>> </span> <br>
<<elseif $SF.Squad.PGT === _PGTU>>
- //The Prototype Goliath Tank has been fully upgraded.// <br>
+ <<set _fullyUpgraded.push('Prototype Goliath Tank')>>
<</if>>
</div>
<</if>> /*Closes garage.*/
<<if App.SF.unlocked.hangar()>>''Hangar''<br>
<div style="margin-left:2em">
- <<set _AAU = App.SF.upgrades.currentUnitMax('AA')>>
- <<if $SF.Squad.AA < _AAU>>
+ <<if $SF.Squad.AA < App.SF.upgrades.currentUnitMax('AA')>>
<<set _cAA = App.SF.UpgradeCost(70000,$SF.Squad.AA)>>
<<if $cash >= _cAA>>
[[Upgrade Attack Aircraft Fleet|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.AA++, cashX(-(_cAA), "specialForces")]]
@@ -114,14 +107,13 @@
//Cannot afford to upgrade Attack Aircraft Fleet.//
<</if>>
//Costs @@.red;<<print cashFormat(_cAA)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.AA)>> </span> <br>
- <<elseif $SF.Squad.AA === _AAU>>
- //The Attack Aircraft Fleet has been fully upgraded.// <br>
+ <<elseif $SF.Squad.AA === 10>>
+ <<set _fullyUpgraded.push('Attack Aircraft Fleet')>>
<</if>>
</div>
<div style="margin-left:2em">
- <<set _TAU = App.SF.upgrades.currentUnitMax('TA')>>
- <<if $SF.Squad.TA < _TAU>>
+ <<if $SF.Squad.TA < App.SF.upgrades.currentUnitMax('TA')>>
<<set _cTA = App.SF.UpgradeCost(70000,$SF.Squad.TA)>>
<<if $cash >= _cTA>>
[[Upgrade Transport Aircraft Fleet|Firebase][$SF.Upgrade = 1, $SF.Colonel.Talk += 1, $SF.Squad.TA++, cashX(-(_cTA), "specialForces")]]
@@ -129,8 +121,8 @@
//Cannot afford to upgrade the Transport Aircraft Fleet.//
<</if>>
//Costs @@.red;<<print cashFormat(_cTA)>>@@// <span style="float:right;"> <<print App.SF.progress($SF.Squad.TA)>> </span> <br>
- <<elseif $SF.Squad.TA === _TAU>>
- //The Transport Aircraft Fleet has been fully upgraded.// <br>
+ <<elseif $SF.Squad.TA === 10>>
+ <<set _fullyUpgraded.push('Transport Aircraft Fleet')>>
<</if>>
</div>
@@ -147,7 +139,7 @@
<<elseif $SF.Squad.SpacePlane === _SPU && $PC.skill.warfare < 75>>
//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.SpacePlane)>> </span> <br>
<<elseif $SF.Squad.SpacePlane === _SPU>>
- //The Spaceplane has been fully upgraded.// <br>
+ <<set _fullyUpgraded.push('Spaceplane')>>
<</if>>
</div>
@@ -164,7 +156,7 @@
<<elseif $SF.Squad.GunS === _GunSU && $PC.skill.warfare < 75>>
//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.GunS)>> </span> <br>
<<elseif $SF.Squad.GunS === _GunSU>>
- //The Gunship has been fully upgraded.// <br>
+ <<set _fullyUpgraded.push('Gunship')>>
<</if>>
</div>
<</if>> /*Closes hangar.*/
@@ -183,7 +175,7 @@
<<elseif $SF.Squad.Satellite === _SatU && $PC.skill.warfare < 75>>
//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.Satellite)>> </span> <br>
<<else>>
- //The Satellite has been fully upgraded.// <br>
+ <<set _fullyUpgraded.push('Satellite')>>
<</if>>
</div>
@@ -201,7 +193,7 @@
<<elseif $SF.Squad.GiantRobot === _GRU && $PC.skill.warfare < 75>>
//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.GiantRobot)>> </span> <br>
<<else>>
- //The Giant Robot has been fully upgraded.// <br>
+ <<set _fullyUpgraded.push('Giant Robot')>>
<</if>>
</div>
@@ -218,7 +210,7 @@
<<elseif $SF.Squad.MissileSilo === _MSU && $PC.skill.warfare < 75>>
//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.MissileSilo)>> </span> <br>
<<else>>
- //The Cruise Missile has been fully upgraded.// <br>
+ <<set _fullyUpgraded.push('Cruise Missile')>>
<</if>>
</div>
<</if>>
@@ -238,7 +230,7 @@
<<elseif $SF.Squad.AircraftCarrier === _ACU && $PC.skill.warfare < 75>>
//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.AircraftCarrier)>> </span> <br>
<<else>>
- //The Aircraft Carrier has been fully upgraded.// <br>
+ <<set _fullyUpgraded.push('Aircraft Carrier')>>
<</if>>
</div>
@@ -255,7 +247,7 @@
<<elseif $SF.Squad.Sub === _SubU && $PC.skill.warfare < 75>>
//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.Sub)>> </span>
<<else>>
- //The Submarine has been fully upgraded.// <br>
+ <<set _fullyUpgraded.push('Submarine')>>
<</if>>
</div>
@@ -272,7 +264,9 @@
<<elseif $SF.Squad.HAT === _HATU && $PC.skill.warfare < 75>>
//Your warfare skill is not high enough unlock the next upgrade.//<span style="float:right;"> <<print App.SF.progress($SF.Squad.HAT)>> </span> <br>
<<else>>
- //The Amphibious Transport has been fully upgraded.// <br>
+ <<set _fullyUpgraded.push('Amphibious Transport')>>
<</if>>
</div>
-<</if>> /*Closes Naval Yard.*/
\ No newline at end of file
+<</if>> /*Closes Naval Yard.*/
+
+<<if _fullyUpgraded.length > 0>> <br>//The following units are fully upgraded: <<= _fullyUpgraded>>//. <</if>>
\ No newline at end of file