diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw index 3a8aee2dca0fbffd2844379c9c814675e9ae0807..2d9e4321ab66a098043d684ea4860a07ed4869fa 100644 --- a/src/SecExp/weaponsManufacturing.tw +++ b/src/SecExp/weaponsManufacturing.tw @@ -369,7 +369,7 @@ __Upgrades__: You fully upgraded your human troops. <<elseif $humanUpgrade.attack >= 2 || $humanUpgrade.hp >= 2 || $humanUpgrade.morale >= 20 || $humanUpgrade.defense >= 2>> You fully upgraded your human troops. - <<if $securityForceCreate == 1 && ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4)>> + <<if $securityForceCreate == 1 && ($humanUpgrade.attack < 4 || $humanUpgrade.hp < 4 || $humanUpgrade.morale < 40 || $humanUpgrade.defense < 4) && (($SFSupportLevel >= 2 && $securityForceArcologyUpgrades >= 7) || ($SFSupportLevel >= 4 && $securityForceStimulantPower >= 8) || ($SFSupportLevel >= 5))>> With support from $securityForceName, however, we may be able to further upgrade our troops. <</if>> <<elseif $weapLab < 3>> diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw index e51a1acae11ec31dac0fb765a0f1d92795585170..e84e90c5731b4ff0b57c8c5b7ae9c13fda5c1392 100644 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw @@ -4,12 +4,12 @@ <<nobr>> <<if ($SFAO < _max) && $securityForceUpgradeToken == 0>> <span id="resultX"> - <br><br>Which facility or equipment do you wish _Name to upgrade this week? + <br>Which facility or equipment do you wish _Name to upgrade this week? <<if _Barracks < 1 || _Barracks < 2 || _Barracks < 4>><br> More barracks upgrades are required to unlock further options.<</if>> <<if $securityForceUpgradeToken == 0 && _Barracks < 5>> <br><<link "Barracks">> - <<replace "#resultX">><br><br> + <<replace "#resultX">><br> "Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= 100000*$Env>> <</replace>> @@ -40,21 +40,21 @@ <<set _arcCost = 16000000000>> <</switch>> <br><<link "Barracks">> - <<replace "#resultX">><br><br> + <<replace "#resultX">><br> "Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env>> <</replace>> <</link>> // Costs <<print cashFormat(_arcCost*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades == 12 && _Armoury >= 11 && _StimulantLab >= 7 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatellitePower >= 16>> <br><<link "Barracks">> - <<replace "#resultX">><br><br> + <<replace "#resultX">><br> "Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env>> <</replace>> <</link>> // Costs <<print cashFormat(_arcCost*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades == 13>> <br><<link "Barracks">> - <<replace "#resultX">><br><br> + <<replace "#resultX">><br> "Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env>> <</replace>> @@ -67,7 +67,7 @@ /* <<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $FacilitySupport == 0>> <br><<link "Facility Support">> - <<replace "#resultX">><br><br> + <<replace "#resultX">><br> "Sure, boss." she says, nodding. "Creating a specialised area for any slaves you send to assist us will benefical to everyone." <<set $securityForceUpgradeToken = 1, $FacilitySupport++, $cash -= Math.trunc(150000000*(Math.max(0.99,$SFAO)/10)*$Env)>> <</replace>> @@ -77,14 +77,14 @@ <<if $securityForceUpgradeToken == 0 && _Armoury < 5>> <br><<link "Armoury">> - <<replace "#resultX">><br><br> + <<replace "#resultX">><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." <<set $securityForceUpgradeToken = 1, $securityForceInfantryPower++, $cash -= 40000*$Env>> <</replace>> <</link>> // Costs <<print cashFormat(40000*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && _Armoury < _ArmouryMax && $TierTwoUnlock == 1>> <br><<link "Armoury">> - <<replace "#resultX">><br><br> + <<replace "#resultX">><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." <<set $securityForceUpgradeToken = 1, $securityForceInfantryPower++, $cash -= 4500000*$Env>> <</replace>> @@ -96,7 +96,7 @@ <<if $securityForceUpgradeToken == 0 && _StimulantLab < 5>> <br><<link "Stimulant Lab">> - <<replace "#resultX">><br><br> + <<replace "#resultX">><br> "Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= 40000*$Env>> <</replace>> @@ -115,14 +115,14 @@ <<set _drugCost = 350000000000>> <</switch>> <br><<link "Stimulant Lab">> - <<replace "#resultX">><br><br> + <<replace "#resultX">><br> "Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= _drugCost*$Env>> <</replace>> <</link>> // Costs <<print cashFormat(_drugCost*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && _StimulantLab == 7 && _Armoury >= 11 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatellitePower >= 16 && _Barracks >= 13>> <br><<link "Stimulant Lab">> - <<replace "#resultX">><br><br> + <<replace "#resultX">><br> "Sure, boss." she says, nodding. "The boys are going to like hearing that they'll be getting new stims. Some of them can't get enough." She laughs, sweeping her arm at a corner of the throne, where dozens of empty stimulant injectors are piled. "I might be one of them. Either way, the fucks out there aren't going to like us once we're on the new juice." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= _drugCost*$Env>> <</replace>> @@ -132,7 +132,7 @@ <br>//$securityForceName has fully upgraded the stimulant lab to support it's activities.// <</if>> - <<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && _Garage < _GarageMax>> + <<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && _Garage < _GarageMax && (_T1FullUpgradesGarage != "True" || $TierTwoUnlock == 1)>> <br><<link "Garage">> <<replace "#resultX">> <span id="resultB"> @@ -143,7 +143,7 @@ <<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower < 5>> <br><<link "Light and medium vehicles">> - <<replace "#resultB">><br><br> + <<replace "#resultB">><br> "Sure, boss." she says, nodding. "Some new wheels should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceVehiclePower++, $cash -= 60000*$Env>> <</replace>> @@ -157,7 +157,7 @@ <<set _vehCost = 4900000>> <</if>> <br><<link "Light and medium vehicles">> - <<replace "#resultB">><br><br> + <<replace "#resultB">><br> "Sure, boss." she says, nodding. "Some new wheels should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceVehiclePower++, $cash -= _vehCost*$Env>> <</replace>> @@ -169,7 +169,7 @@ <<if $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank < 1 && $TierTwoUnlock == 1>> <br><<link "A heavy battle tank">> - <<replace "#resultB">><br><br> + <<replace "#resultB">><br> "Sure, boss." she says, nodding. "A heavy battle tank should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceHeavyBattleTank++, $cash -= 60000000*$Env>> <</replace>> @@ -181,7 +181,7 @@ <<set _hbtCost = 8500000>> <</if>> <br><<link "heavy battle tank">> - <<replace "#resultB">><br><br> + <<replace "#resultB">><br> "Sure, boss." she says, nodding. "Upgrading the heavy battle tank should help a lot." She laughs. "The scum out there don't seem to like it when we roll up on them in something better than their piece of shit junkers." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceHeavyBattleTank++, $cash -= _hbtCost*$Env>> <</replace>> @@ -197,7 +197,7 @@ <</if>> <<if _Garage >= _GarageMax>>//<br>$securityForceName has fully upgraded the garage to support it's activities.//<</if>> - <<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && _Hangar < _HangarMax>> + <<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && _Hangar < _HangarMax && (_T1FullUpgradesAirforce != "True" || $TierTwoUnlock == 1)>> <br><<link "Hangar">> <<replace "#resultX">> <span id="resultY"> @@ -208,7 +208,7 @@ <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower < 5>> <br><<link "Light and medium aircraft">> - <<replace "#resultY">><br><br> + <<replace "#resultY">><br> "Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceAircraftPower++, $cash -= 70000*$Env>> <</replace>> @@ -227,7 +227,7 @@ <<set _airCost = 7750000>> <</switch>> <br><<link "Light and medium aircraft">> - <<replace "#resultY">><br><br> + <<replace "#resultY">><br> "Sure, boss." she says, nodding. "Some new VTOLs would be great." She laughs. "They're the real multiplier over the scum out there. Not much a looter gang can do against air support." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1, $securityForceAircraftPower++, $cash -= _airCost*$Env>> <</replace>> @@ -239,7 +239,7 @@ <<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $securityForceSpacePlanePower < 1>> <br><<link "A space plane">> - <<replace "#resultY">><br><br> + <<replace "#resultY">><br> "Sure, boss." she says, nodding. "A orbital plane 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, $securityForceSpacePlanePower++, $cash -= 4750000*$Env*$HackingSkillMultiplier>> <</replace>> @@ -267,7 +267,7 @@ <<set _spCost = 950000000>> <</if>> <br><<link "Space plane">> - <<replace "#resultY">><br><br> + <<replace "#resultY">><br> "Sure, boss." she says, nodding. "Upgrading the orbital plane 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, $securityForceSpacePlanePower++, $cash -= _spCost*$Env*$HackingSkillMultiplier>> <</replace>> @@ -279,13 +279,13 @@ <<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $securityForceFortressZeppelin < 1>> <br><<link "A fortress zeppelin">> - <<replace "#resultY">><br><br> + <<replace "#resultY">><br> "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 cashFormat(30000000*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceFortressZeppelin >= 1 && $securityForceFortressZeppelin < _FortressZeppelinMax>> <br><<link "Fortress zeppelin">> - <<replace "#resultY">><br><br> + <<replace "#resultY">><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." <<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 20000000*$Env>> <</replace>> @@ -297,14 +297,14 @@ <<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $securityForceAC130 < 1>> <br><<link "An AC-130">> - <<replace "#resultY">><br><br> + <<replace "#resultY">><br> "Sure, boss." she says, nodding. "An AC-130 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, $securityForceAC130++, $cash -= 35000000*$Env*$HackingSkillMultiplier>> <</replace>> <</link>> // Costs <<print cashFormat(35000000*$Env*$HackingSkillMultiplier)>> // <<elseif $securityForceAC130 > 1 && $securityForceAC130 < _AC130Max>> <br><<link "AC-130">> - <<replace "#resultY">><br><br> + <<replace "#resultY">><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." <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 25000000*$Env*$HackingSkillMultiplier>> <</replace>> @@ -316,13 +316,13 @@ <<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $securityForceHeavyTransport < 1>> <br><<link "A heavy transport">> - <<replace "#resultY">><br><br> + <<replace "#resultY">><br> "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 cashFormat(40000000*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceHeavyTransport >= 1 && $securityForceHeavyTransport < _heavyTransportMax>> <br><<link "Heavy transport">> - <<replace "#resultY">><br><br> + <<replace "#resultY">><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." <<set $securityForceUpgradeToken = 1, $securityForceHeavyTransport++, $cash -= 30000000*$Env>> <</replace>> @@ -368,7 +368,7 @@ <<if $securityForceUpgradeToken == 0 && $securityForceSatellitePower < 1>> <br><<link "A Satellite">> - <<replace "#resultZ">><br><br> + <<replace "#resultZ">><br> "Sure, boss." she says, nodding. "A Satellite 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, $securityForceSatellitePower++, $cash -= 3750000*$Env*$HackingSkillMultiplier>> <</replace>> @@ -399,14 +399,14 @@ <<set _satCost = 2350000>> <</switch>> <br><<link "Satellite">> - <<replace "#resultZ">><br><br> + <<replace "#resultZ">><br> "Sure, boss." she says, nodding. "Upgrading the Satellite 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, $securityForceSatellitePower++, $cash -= _satCost*$Env*$HackingSkillMultiplier>> <</replace>> <</link>> // Costs <<print cashFormat(_satCost*$Env*$HackingSkillMultiplier)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower == 20 && $PC.hacking >= 75>> <br><<link "Satellite">> - <<replace "#resultZ">><br><br> + <<replace "#resultZ">><br> "Sure, boss." she says, nodding. "Upgrading the Satellite 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, $securityForceSatellitePower++, $cash -= _satCost*$Env*$HackingSkillMultiplier>> <</replace>> @@ -418,7 +418,7 @@ <<if $securityForceUpgradeToken == 0 && $securityForceGiantRobot < 1 && ($terrain != "oceanic" && $terrain != "marine")>> <br><<link "A giant robot">> - <<replace "#resultZ">><br><br> + <<replace "#resultZ">><br> "Sure, boss." she says, nodding. "A giant robot 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, $securityForceGiantRobot++, $cash -= 50000000*$Env*$HackingSkillMultiplier>> <</replace>> @@ -458,14 +458,14 @@ <<set _robCost = 9550000000>> <</switch>> <br><<link "Giant robot">> - <<replace "#resultZ">><br><br> + <<replace "#resultZ">><br> "Sure, boss." she says, nodding. "Upgrading the giant robot, 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, $securityForceGiantRobot++, $cash -= _robCost*$Env*$HackingSkillMultiplier>> <</replace>> <</link>> // Costs <<print cashFormat(_robCost*$Env*$HackingSkillMultiplier)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot == 15 && $PC.hacking >= 75>> <br><<link "Giant robot">> - <<replace "#resultZ">><br><br> + <<replace "#resultZ">><br> "Sure, boss." she says, nodding. "Upgrading the giant robot, 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, $securityForceGiantRobot++, $cash -= _robCost*$Env*$HackingSkillMultiplier>> <</replace>> @@ -477,7 +477,7 @@ <<if $securityForceUpgradeToken == 0 && $securityForceMissileSilo < 1 && ($terrain != "oceanic" && $terrain != "marine")>> <br><<link "A missile silo">> - <<replace "#resultZ">><br><br> + <<replace "#resultZ">><br> "Sure, boss." she says, nodding. "A missile silo 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, $securityForceMissileSilo++, $cash -= 200000000*$Env*$HackingSkillMultiplier>> <</replace>> @@ -489,7 +489,7 @@ <<set _msCost = 295000000>> <</if>> <br><<link "Missile silo">> - <<replace "#resultZ">><br><br> + <<replace "#resultZ">><br> "Sure, boss." she says, nodding. "Upgrading the missile silo, 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, $securityForceMissileSilo++, $cash -= _msCost*$Env*$HackingSkillMultiplier>> <</replace>> @@ -514,14 +514,14 @@ <<if $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier < 1>> <br><<link "An aircraft carrier">> - <<replace "#resultA">><br><br> + <<replace "#resultA">><br> "Sure, boss." she says, nodding. "An aircraft carrier 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, $securityForceAircraftCarrier++, $cash -= 1500000*$Env*$HackingSkillMultiplier>> <</replace>> <</link>> // Costs <<print cashFormat(1500000*$Env*$HackingSkillMultiplier)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier >= 1 && $securityForceAircraftCarrier < _AircraftCarrierMax>> <br><<link "Aircraft carrier">> - <<replace "#resultA">><br><br> + <<replace "#resultA">><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." <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 25000000*$Env*$HackingSkillMultiplier>> <</replace>> @@ -533,7 +533,7 @@ <<if $securityForceUpgradeToken == 0 && $securityForceSubmarine < 1>> <br><<link "A submarine">> - <<replace "#resultA">><br><br> + <<replace "#resultA">><br> "Sure, boss." she says, nodding. "A submarine 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, $securityForceSubmarine++, $cash -= 1500000*$Env*$HackingSkillMultiplier>> <</replace>> @@ -549,14 +549,14 @@ <<set _subCost = 87800000>> <</if>> <br><<link "Submarine">> - <<replace "#resultA">><br><br> + <<replace "#resultA">><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." <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*$Env*$HackingSkillMultiplier>> <</replace>> <</link>> // Costs <<print cashFormat(_subCost*$Env*$HackingSkillMultiplier)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine == 6 && $PC.hacking >= 75>> <br><<link "Submarine">> - <<replace "#resultA">><br><br> + <<replace "#resultA">><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." <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*$Env*$HackingSkillMultiplier>> <</replace>> @@ -566,7 +566,7 @@ <<if $securityForceUpgradeToken == 0 && $securityForceHeavyAmphibiousTransport < 1>> <br><<link "A heavy amphibious transport">> - <<replace "#resultA">><br><br> + <<replace "#resultA">><br> "Sure, boss." she says, nodding. "A heavy amphibious 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, $securityForceHeavyAmphibiousTransport++, $cash -= 1500000*$Env>> <</replace>> @@ -585,7 +585,7 @@ <<set _hatCost = 400000000>> <</switch>> <br><<link "Heavy amphibious transport">> - <<replace "#resultA">><br><br> + <<replace "#resultA">><br> "Sure, boss." she says, nodding. "Upgrading the heavy amphibious 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." <<set $securityForceUpgradeToken = 1, $securityForceHeavyAmphibiousTransport++, $cash -= _hatCost*$Env>> <</replace>> diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index 115d80b4887d384f18739a5709a458ff5d78e7cd..c5947215840d57cf069c47ba676a05b5a2655832 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -12,11 +12,7 @@ <<set $Env = _N3, $EnvCash2 = 550, $EnvCash3 = 300, $EnvCash4 = 200, $EnvProsp = 7, _BaseDiscount = _BaseDiscount+.005>> <</if>> -<<set $TierTwoUnlock = 0>> -<<if _StimulantLab == 5 && _Barracks == 5 && $securityForceVehiclePower == 5 && _Armoury == 5 && _DroneBay == 5 && $securityForceAircraftPower == 5>> - <<set $TierTwoUnlock = 1>> -<</if>> - +<<if ndef $TierTwoUnlock>> <<set $TierTwoUnlock = 0>> <</if>> <<include "SpecialForceUpgradeTree">> <<if $SFNO > 0>> @@ -127,9 +123,9 @@ <</if>> <<if $TierTwoUnlock == 0>> - <br>You have <<print (30-$SFAO)>> upgrades left before you can move unlock the next tier. ''StimulantLab:'' _StimulantLab/5 ''_Barracks:'' _Barracks/5 ''Garage:'' $securityForceVehiclePower/5 ''Armoury:'' _Armoury/5 ''DroneBay:'' _DroneBay/5 ''Airforce:'' $securityForceAircraftPower/5 + <br>You have <<print (30-$SFAO)>> upgrades left before you can move unlock the next tier. ''StimulantLab:'' _StimulantLab/5 ''Barracks:'' _Barracks/5 ''Garage:'' $securityForceVehiclePower/5 ''Armoury:'' _Armoury/5 ''DroneBay:'' _DroneBay/5 ''Airforce:'' $securityForceAircraftPower/5 + <<if $securityForceVehiclePower == 5>> <<set _T1FullUpgradesGarage = "True">> <</if>> <<if $securityForceAircraftPower == 5>> <<set _T1FullUpgradesAirforce = "True">> <</if>> <<if 30-$SFAO == 0>> <<set $TierTwoUnlock = 1>> <</if>> <</if>> - <<if $securityForceGiftToken == 1>> <br>//_Name has already provided you with extra tribute this week.// <</if>>