From d9d6c4aecc6c06986b6e249dd72f80927aedcd34 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Fri, 8 Dec 2017 05:43:04 +1300 Subject: [PATCH] Enable the new content and make adding easier. --- src/uncategorized/SFMBarracks.tw | 133 ++++++++------------ src/uncategorized/securityForceEOWReport.tw | 2 +- 2 files changed, 56 insertions(+), 79 deletions(-) diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index f282a802323..739cbbdadcd 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -13,49 +13,12 @@ <<set $Env = _N3, $EnvCash2 = 550, $EnvCash3 = 300, $EnvCash4 = 200, $EnvProsp = 7, _BaseDiscount = _BaseDiscount+.005>> <</if>> -/* The upgrades are currently ordered as: - Barracks(16) - securityForceArcologyUpgrades(16) - FacilitySupport(1) - Armory(11) - securityForceInfantryPower(11) - Stimulant Lab(9) - securityForceStimulantPower(9) - <<if $securityForceArcologyUpgrades >= 1>>Garage(10) - securityForceVehiclePower(7) - securityForceHeavyBattleTank(3) - <</if>> - <<if $securityForceArcologyUpgrades >= 4>>Hangar(32) - securityForceAircraftPower(10) - securityForceSpacePlanePower(11) - securityForceFortressZeppelin(3) - securityForceAC130(5) - securityForceHeavyTransport(3) - <</if>> - <<if $securityForceArcologyUpgrades >= 2>>Drone Bay(7) - securityForceDronePower(7) - <</if>> - <<if $securityForceArcologyUpgrades >= 4>>Launch Bay(32) - securityForceSatellitePower(18) - securityForceGiantRobot(11) - securityForceMissileSilo(3) - <</if>> - securityForceX - -<<if $terrain == "oceanic" || $terrain == "marine">> - <<if $securityForceArcologyUpgrades >= 4>>Launch Bay(18) - securityForceSatellitePower(18) - <</if>> -<</if>> - Naval Yard (15) - securityForceAircraftCarrier(4) - securityForceSubmarine(6) - securityForceHeavyAmphibiousTransport (5) -securityForceX */ - <<set _Barracks = $securityForceArcologyUpgrades>> <<set _BarracksMax = 16>> +<<set _FacilitySupport = $FacilitySupport>> +<<set _FacilitySupportMax = 1>> + <<set _Armoury = $securityForceInfantryPower>> <<set _ArmouryMax = 11>> @@ -64,21 +27,34 @@ securityForceX */ <<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>> <<set _GarageMax = 10>> + <<set _L&M-MAX = 7>> + <<set _HBTMax = 3>> <<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>> -<<set _HangarMax = 32>> + <<set _HangarMax = 32>> + <<set _AirMax = 10>> + <<set _SPMax = 11>> + <<set _FZMax = 3>> + <<set _AC13Max = 5>> + <<set _HTMax = 3>> <<set _DroneBay = $securityForceDronePower>> <<set _DroneBayMax = 7>> <<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>> <<set _LaunchBayNOMax = 32>> + <<set _SATMax = 18>> + <<set _GRBMax = 11>> + <<set _MSMax = 3>> + <<set _LaunchBayO = $securityForceSatellitePower>> -<<set _LaunchBayOMax = 17>> +<<set _LaunchBayOMax = 18>> + <<set _SATMax = 18>> -<<set _FacilitySupport = $FacilitySupport>> -<<set _FacilitySupportMax = 1>> <<set _NavalYardMax = 15>> + <<set _ACMax = 4>> + <<set _SMax = 6>> + <<set _HATMax = 5>> <<set _maxNO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax+_FacilitySupportMax>> <<set _maxO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayOMax+_NavalYardMax+_FacilitySupportMax>> @@ -91,7 +67,6 @@ securityForceX */ <<set _NavalYardMax = 0>> <<elseif $terrain == "oceanic" || $terrain == "marine">> <<set _NavalYard = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>> - <<set _NavalYardMax = 12>> <<set $SFO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard+_FacilitySupport>> <<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayOMax+_FacilitySupportMax>> <<set $SFNO = 0>> @@ -712,7 +687,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= 100000*$Env>> <</replace>> <</link>> // Costs ¤<<print 100000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades < 16 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades < _BarracksMax && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5>> <<if $securityForceArcologyUpgrades == 5>> <<set _arcCost = 15000000>> <<elseif $securityForceArcologyUpgrades == 6>> @@ -757,7 +732,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print _arcCost*$Env>> // <</if>> - <<if _Barracks == 5 || _Barracks == 16>> + <<if _Barracks == 5 || _Barracks == _BarracksMax>> <br>//$securityForceName has fully upgraded the barracks to support it's activities// <</if>> @@ -777,7 +752,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceInfantryPower++, $cash -= 40000*$Env>> <</replace>> <</link>> // Costs ¤<<print 40000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && _Armoury > 5 && _Armoury < 11 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5>> + <<elseif $securityForceUpgradeToken == 0 && _Armoury > 5 && _Armoury < _ArmouryMax && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5>> <br><<link "Armoury">> <<replace "#resultX">><br><br> "Sure, boss." she says, nodding. "The boys'll like having some new guns and armour to help them out there." She laughs. "Don't think the poor bastards they'll be shooting will thank you though." She picks up a tablet and taps a few commands on it. "I'll get right on it." @@ -785,7 +760,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print 4500000*$Env>> // <</if>> - <<if _Armoury == 5 || _Armoury == 11>> + <<if _Armoury == 5 || _Armoury == _ArmouryMax>> <br>//$securityForceName has fully upgraded the armoury to support it's activities.// <</if>> @@ -796,7 +771,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= 40000*$Env>> <</replace>> <</link>> // Costs ¤<<print 40000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && _StimulantLab > 5 && _StimulantLab < 9 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5>> + <<elseif $securityForceUpgradeToken == 0 && _StimulantLab > 5 && _StimulantLab < _StimulantLabMax && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5>> <<if _StimulantLab == 6>> <<set _drugCost = 2265000>> <<elseif _StimulantLab == 7>> @@ -818,7 +793,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print _drugCost*$Env>> // <</if>> - <<if _StimulantLab == 5 || _StimulantLab == 9>> + <<if _StimulantLab == 5 || _StimulantLab == _StimulantLabMax>> <br>//$securityForceName has fully upgraded the stimulant lab to support it's activities.// <</if>> @@ -838,7 +813,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceVehiclePower++, $cash -= 60000*$Env>> <</replace>> <</link>>// Costs ¤<<print 60000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceVehiclePower < 7 && _Barracks >= 5 && $securityForceAircraftPower >= 5 && _DroneBay >= 5 && _StimulantLab >= 5 && _Armoury >= 5>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceVehiclePower < _L&M-MAX && _Barracks >= 5 && $securityForceAircraftPower >= 5 && _DroneBay >= 5 && _StimulantLab >= 5 && _Armoury >= 5>> <<if $securityForceVehiclePower < 6>> <<set _vehCost = 2500000>> <<elseif $securityForceVehiclePower == 6>> @@ -851,7 +826,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print _vehCost*$Env>> // <</if>> - <<if $securityForceVehiclePower == 5 || $securityForceVehiclePower == 7>> + <<if $securityForceVehiclePower == 5 || $securityForceVehiclePower == _L&M-MAX >> <br>//$securityForceName has fully upgraded the vehicle fleet to support it's activities.// <<else>> <br>//More barracks infrastructure upgrades are needed before the vehicle fleet can be expanded.// @@ -864,7 +839,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceHeavyBattleTank++, $cash -= 60000000*$Env>> <</replace>> <</link>>// Costs ¤<<print 60000000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank >= 1 && $securityForceHeavyBattleTank < 3>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank >= 1 && $securityForceHeavyBattleTank < _HBTMax>> <<if $securityForceHeavyBattleTank < 2>> <<set _hbtCost = 75000000>> <<elseif $securityForceHeavyBattleTank == 2>> @@ -877,7 +852,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print _hbtCost*$Env>> // <</if>> - <<if $securityForceHeavyBattleTank == 3>> + <<if $securityForceHeavyBattleTank == _HBTMax>> <br>//$securityForceName has fully upgraded the heavy battle tank to support it's activities.// <</if>> @@ -903,7 +878,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceAircraftPower++, $cash -= 70000*$Env>> <</replace>> <</link>> // Costs ¤<<print 70000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftPower < 8 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftPower < 10 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5>> <<if $securityForceAircraftPower == 5>> <<set _airCost = 2750000>> <<elseif $securityForceAircraftPower == 6>> @@ -935,7 +910,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= 4750000*$Env>> <</replace>> <</link>> // Costs ¤<<print 4750000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < 11>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < _SPMax>> <<if $securityForceSpacePlanePower < 4>> <<set _spCost = 50000000>> <<elseif $securityForceSpacePlanePower == 4>> @@ -960,7 +935,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print _spCost*$Env>> // <</if>> - <<if $securityForceSpacePlanePower == 11>> + <<if $securityForceSpacePlanePower == _SPMax>> <br>//$securityForceName has fully upgraded the space plane to support it's activities.// <</if>> @@ -970,7 +945,7 @@ securityForceX */ "Sure, boss." she says, nodding. "A fortress zeppelin would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 30000000*$Env>> <</replace>><</link>> // Costs ¤<<print 30000000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceFortressZeppelin >= 1 && $securityForceFortressZeppelin < 3>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceFortressZeppelin >= 1 && $securityForceFortressZeppelin < _FZMax>> <<link "Fortress zeppelin">> <<replace "#resultY">><br><br> "Sure, boss." she says, nodding. "Upgrading the Fortress Zeppelin, 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." @@ -978,7 +953,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print 20000000*$Env>> // <</if>> - <<if $securityForceFortressZeppelin == 3>> + <<if $securityForceFortressZeppelin == _FZMax>> <br>//$securityForceName has fully upgraded the fortress zeppelin to support it's activities.// <</if>> @@ -989,7 +964,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 35000000*$Env>> <</replace>> <</link>> // Costs ¤<<print 35000000*$Env>> // - <<elseif $securityForceAC130 > 1 && $securityForceAC130 < 5>> + <<elseif $securityForceAC130 > 1 && $securityForceAC130 < _AC13Max>> <br><<link "AC-130">> <<replace "#resultY">><br><br> "Sure, boss." she says, nodding. "Upgrading the AC-130, 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." @@ -997,7 +972,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print 25000000*$Env>> // <</if>> - <<if $securityForceAC130 == 5>> + <<if $securityForceAC130 == _AC13Max>> <br>//$securityForceName has fully upgraded the AC-130 to support it's activities.// <</if>> @@ -1007,7 +982,7 @@ securityForceX */ "Sure, boss." she says, nodding. "A heavy transport would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceHeavyTransport++, $cash -= 40000000*$Env>> <</replace>><</link>> // Costs ¤<<print 40000000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceHeavyTransport >= 1 && $securityForceHeavyTransport < 3>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceHeavyTransport >= 1 && $securityForceHeavyTransport < _HTMax>> <br><<link "Heavy transport">> <<replace "#resultY">><br><br> "Sure, boss." she says, nodding. "Upgrading the heavy transport, 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." @@ -1015,7 +990,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print 30000000*$Env>> // <</if>> - <<if $securityForceHeavyTransport == 3>> + <<if $securityForceHeavyTransport == _HTMax>> <br>//$securityForceName has fully upgraded the heavy transport to support it's activities.// <</if>> @@ -1032,7 +1007,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*$Env>> <</replace>> <</link>> // Costs ¤<<print 45000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && _DroneBay < 6 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5>> + <<elseif $securityForceUpgradeToken == 0 && _DroneBay < _DroneBayMax && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5>> <br><<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." @@ -1063,7 +1038,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= 3750000*$Env>> <</replace>> <</link>> // Costs ¤<<print 3750000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower >= 1 && $securityForceSatellitePower < 17>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower >= 1 && $securityForceSatellitePower < _SATMax>> <<if $securityForceSatellitePower < 11>> <<set _satCost = 2350000>> <<elseif $securityForceSatellitePower == 11>> @@ -1078,6 +1053,8 @@ securityForceX */ <<set _satCost = 190000000>> <<elseif $securityForceSatellitePower == 16>> <<set _satCost = 250000000000>> + <<elseif $securityForceSatellitePower == 17>> + <<set _satCost = 250000000000>> <</if>> <br><<link "Satellite">> <<replace "#resultZ">><br><br> @@ -1086,7 +1063,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print _satCost*$Env>> // <</if>> - <<if $securityForceSatellitePower == 17>> + <<if $securityForceSatellitePower == _SATMax>> <br>//$securityForceName has fully upgraded the Satellite to support it's activities.// <</if>> @@ -1097,7 +1074,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env>> <</replace>> <</link>> // Costs ¤<<print 50000000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < 10>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GRBMax>> <<if $securityForceGiantRobot < 3>> <<set _robCost = 25000000>> <<elseif $securityForceGiantRobot == 3>> @@ -1124,7 +1101,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print _robCost*$Env>> // <</if>> - <<if $securityForceGiantRobot == 9 || $securityForceGiantRobot == 10 && ($terrain != "oceanic" && $terrain != "marine")>> + <<if $securityForceGiantRobot == 9 || $securityForceGiantRobot == _GRBMax && ($terrain != "oceanic" && $terrain != "marine")>> <br>//$securityForceName has fully upgraded the giant robot to support it's activities.// <</if>> @@ -1135,7 +1112,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= 200000000*$Env>> <</replace>> <</link>> // Costs ¤<<print 200000000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceMissileSilo >= 1 && $securityForceMissileSilo < 3>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceMissileSilo >= 1 && $securityForceMissileSilo < _MSMax>> <<if $securityForceMissileSilo == 1>> <<set _msCost = 250000000>> <<elseif $securityForceMissileSilo == 2>> @@ -1148,7 +1125,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print _msCost*$Env>> // <</if>> - <<if $securityForceMissileSilo == 3 && ($terrain != "oceanic" && $terrain != "marine")>><br>//$securityForceName has fully upgraded the missile silo to support it's activities.//<</if>> + <<if $securityForceMissileSilo == _MSMax && ($terrain != "oceanic" && $terrain != "marine")>><br>//$securityForceName has fully upgraded the missile silo to support it's activities.//<</if>> </span> <</replace>> @@ -1173,7 +1150,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 1500000*$Env>> <</replace>> <</link>> // Costs ¤<<print 1500000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier >= 1 && $securityForceAircraftCarrier < 4>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier >= 1 && $securityForceAircraftCarrier < _ACMax>> <br><<link "Aircraft carrier">> <<replace "#resultA">><br><br> "Sure, boss." she says, nodding. "Upgrading the aircraft carrier 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." @@ -1181,7 +1158,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print 25000000*$Env>> // <</if>> - <<if $securityForceAircraftCarrier == 4 && ($terrain == "oceanic" || $terrain == "marine")>> + <<if $securityForceAircraftCarrier == _ACMax && ($terrain == "oceanic" || $terrain == "marine")>> <br>//$securityForceName has fully upgraded the aircraft carrier to support it's activities.// <</if>> @@ -1192,7 +1169,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= 1500000*$Env>> <</replace>> <</link>> // Costs ¤<<print 1500000*$Env>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine >= 1 && $securityForceSubmarine < 5>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine >= 1 && $securityForceSubmarine < _SMax>> <<if $securityForceSubmarine < 4>> <<set _subCost = 25000000>> <<elseif $securityForceSubmarine == 4>> @@ -1205,7 +1182,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print _subCost*$Env>> // <</if>> - <<if $securityForceSubmarine == 5 && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the submarine to support it's activities.//<</if>> + <<if $securityForceSubmarine == _SMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the submarine to support it's activities.//<</if>> <<if $securityForceUpgradeToken == 0 && $securityForceHeavyAmphibiousTransport < 1>> <br><<link "A heavy amphibious transport">> @@ -1214,7 +1191,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceHeavyAmphibiousTransport++, $cash -= 1500000*$Env>> <</replace>> <</link>> // Costs ¤<<print 1500000*$Env>> // - <<elseif $securityForceUpgradeToken == 0&& $securityForceHeavyAmphibiousTransport >= 1 && $securityForceHeavyAmphibiousTransport < 3>> + <<elseif $securityForceUpgradeToken == 0&& $securityForceHeavyAmphibiousTransport >= 1 && $securityForceHeavyAmphibiousTransport < _HATMax>> <<if $securityForceHeavyAmphibiousTransport == 1>> <<set _hatCost = 150000000>> <<elseif $securityForceHeavyAmphibiousTransport == 2>> @@ -1222,7 +1199,7 @@ securityForceX */ <<elseif $securityForceHeavyAmphibiousTransport == 3>> <<set _hatCost = 300000000>> <<elseif $securityForceHeavyAmphibiousTransport == 4>> - <<set _hatCost = 300000000>> + <<set _hatCost = 350000000>> <</if>> <br><<link "Heavy amphibious transport">> <<replace "#resultA">><br><br> @@ -1231,7 +1208,7 @@ securityForceX */ <</replace>> <</link>> // Costs ¤<<print _hatCost*$Env>> // <</if>> - <<if $securityForceHeavyAmphibiousTransport == 5 && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the heavy amphibious transport to support it's activities.//<</if>> + <<if $securityForceHeavyAmphibiousTransport == _HATMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the heavy amphibious transport to support it's activities.//<</if>> </span> <</replace>> diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index 679c0f9d8dd..85255e3f241 100644 --- a/src/uncategorized/securityForceEOWReport.tw +++ b/src/uncategorized/securityForceEOWReport.tw @@ -37,7 +37,7 @@ The upgrades are currently ordered as: Naval Yard (15) securityForceAircraftCarrier(4) securityForceSubmarine(6) - securityForceHeavyAmphibiousTransport (4) + securityForceHeavyAmphibiousTransport (5) securityForceX <<set $SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO+_FacilitySupport>> -- GitLab