From 0e2a14211e692b34e88e14a8780e97beb2b79fd1 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Fri, 23 Feb 2018 23:14:17 +1300 Subject: [PATCH] More SF passages to move. --- .../SecForceEX/SpecialForceUpgradeOptions.tw | 101 ++++++------------ .../SecForceEX/SpecialForceUpgradeTree.tw | 27 ++--- 2 files changed, 42 insertions(+), 86 deletions(-) diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw index 5ff0b0d48b4..d4d810f3d36 100755 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw @@ -1,5 +1,5 @@ :: SpecialForceUpgradeOptions -<<HSM>> + <<nobr>> <<if ($SFAO < _max) && $securityForceUpgradeToken == 0>> <span id="resultX"> @@ -240,9 +240,9 @@ <br><<link "A space plane">> <<replace "#resultY">><br><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>> + <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= 4750000*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(4750000*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(4750000*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < _SpacePlaneMax>> <<if $securityForceSpacePlanePower < 4>> <<set _spCost = 50000000>> @@ -268,9 +268,9 @@ <br><<link "Space plane">> <<replace "#resultY">><br><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>> + <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= _spCost*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(_spCost*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(_spCost*$Env)>> // <</if>> <<if $securityForceSpacePlanePower == _SpacePlaneMax>> <br>//$securityForceName has fully upgraded the space plane to support it's activities.// @@ -298,16 +298,16 @@ <br><<link "An AC-130">> <<replace "#resultY">><br><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>> + <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 35000000*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(35000000*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(35000000*$Env)>> // <<elseif $securityForceAC130 > 1 && $securityForceAC130 < _AC130Max>> <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." - <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 25000000*$Env*$HackingSkillMultiplier>> + <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 25000000*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(25000000*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(25000000*$Env)>> // <</if>> <<if $securityForceAC130 == _AC130Max>> <br>//$securityForceName has fully upgraded the AC-130 to support it's activities.// @@ -341,22 +341,22 @@ <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." - <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*$Env*$HackingSkillMultiplier>> + <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(45000*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(45000*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && _DroneBay < _DroneBayMax && $TierTwoUnlock == 1>> <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." - <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 2000000*$Env*$HackingSkillMultiplier>> + <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 2000000*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(2000000*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat( 2000000*$Env)>> // <</if>> <<if _DroneBay == _DroneBayMax>> <br>//$securityForceName has fully upgraded the drone bay to support it's activities.// <</if>> - <<if $securityForceUpgradeToken == 0 && (_LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayOMax) && $TierTwoUnlock == 1>> + <<if $securityForceUpgradeToken == 0 && (_LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayNOMax) && $TierTwoUnlock == 1>> <br><<link "Launch Bay">> <<replace "#resultX">> <span id="resultZ"> @@ -369,9 +369,9 @@ <br><<link "A Satellite">> <<replace "#resultZ">><br><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>> + <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= 3750000*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(3750000*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(3750000*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower >= 1 && $securityForceSatellitePower < _SatelliteMax>> <<switch $securityForceSatellitePower>> <<case 11>> @@ -392,24 +392,15 @@ <<set _satCost = 300000000000>> <<case 19>> <<set _satCost = 450000000000>> - <<case 20 && $PC.hacking >= 75>> - <<set _satCost = 550000000000>> <<default>> <<set _satCost = 2350000>> <</switch>> <br><<link "Satellite">> <<replace "#resultZ">><br><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> - "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>> + <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(_satCost*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(_satCost*$Env)>> // <</if>> <<if $securityForceSatellitePower == _SatelliteMax>> <br>//$securityForceName has fully upgraded the Satellite to support it's activities.// @@ -419,9 +410,9 @@ <br><<link "A giant robot">> <<replace "#resultZ">><br><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>> + <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(50000000*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(50000000*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GiantRobotMax>> <<if $securityForceGiantRobot < 3>> <<set _robCost = 25000000>> @@ -441,8 +432,6 @@ <<set _robCost = 95000000>> <<case 8>> <<set _robCost = 105000000>> - <<case 9 && $securityForceInfantryPower >= 10>> - <<set _robCost = 255000000>> <<case 10>> <<set _robCost = 3150000000>> <<case 11>> @@ -453,24 +442,15 @@ <<set _robCost = 6550000000>> <<case 14>> <<set _robCost = 8550000000>> - <<case 15 $PC.hacking >= 75>> - <<set _robCost = 9550000000>> <</switch>> <br><<link "Giant robot">> <<replace "#resultZ">><br><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>> + <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(_robCost*$Env*$HackingSkillMultiplier)>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot == 15 && $PC.hacking >= 75>> - <br><<link "Giant robot">> - <<replace "#resultZ">><br><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)>> // + <</link>> // Costs <<print cashFormat(_robCost*$Env)>> // <</if>> - <<if $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>> + <<if $securityForceGiantRobot == 9 || $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>> <br>//$securityForceName has fully upgraded the giant robot to support it's activities.// <</if>> @@ -478,9 +458,9 @@ <br><<link "A missile silo">> <<replace "#resultZ">><br><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>> + <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= 200000000*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(200000000*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(200000000*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceMissileSilo >= 1 && $securityForceMissileSilo < _MissileSiloMax>> <<if $securityForceMissileSilo == 1>> <<set _msCost = 250000000>> @@ -490,9 +470,9 @@ <br><<link "Missile silo">> <<replace "#resultZ">><br><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>> + <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= _msCost*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(_msCost*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(_msCost*$Env)>> // <</if>> <<if $securityForceMissileSilo == _MissileSiloMax && ($terrain != "oceanic" && $terrain != "marine")>><br>//$securityForceName has fully upgraded the missile silo to support it's activities.//<</if>> @@ -515,16 +495,16 @@ <br><<link "An aircraft carrier">> <<replace "#resultA">><br><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>> + <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 1500000*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(1500000*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(1500000*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier >= 1 && $securityForceAircraftCarrier < _AircraftCarrierMax>> <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." - <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 25000000*$Env*$HackingSkillMultiplier>> + <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 25000000*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(25000000*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(25000000*$Env)>> // <</if>> <<if $securityForceAircraftCarrier == _AircraftCarrierMax && ($terrain == "oceanic" || $terrain == "marine")>> <br>//$securityForceName has fully upgraded the aircraft carrier to support it's activities.// @@ -534,32 +514,21 @@ <br><<link "A submarine">> <<replace "#resultA">><br><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>> + <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= 1500000*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(1500000*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(1500000*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine >= 1 && $securityForceSubmarine < _SubmarineMax>> <<if $securityForceSubmarine < 4>> <<set _subCost = 25000000>> <<elseif $securityForceSubmarine == 4>> <<set _subCost = 85000000>> - <<elseif $securityForceSubmarine == 5>> - <<set _subCost = 86500000>> - <<elseif $securityForceSubmarine == 6 && $PC.hacking >= 75>> - <<set _subCost = 87800000>> <</if>> <br><<link "Submarine">> <<replace "#resultA">><br><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> - "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>> + <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*$Env>> <</replace>> - <</link>> // Costs <<print cashFormat(_subCost*$Env*$HackingSkillMultiplier)>> // + <</link>> // Costs <<print cashFormat(_subCost*$Env)>> // <</if>> <<if $securityForceSubmarine == _SubmarineMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the submarine to support it's activities.//<</if>> diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw index 971b6e54252..b1678b99323 100644 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw @@ -29,30 +29,17 @@ <<set _DroneBay = $securityForceDronePower>> <<set _DroneBayMax = 8>> -/* Launch Bay */ - <<if $PC.hacking >= 75>> - <<set _SatelliteMax = 21>> - <<set _GiantRobotMax = 16>> - <<else>> - <<set _SatelliteMax = 20>> - <<set _GiantRobotMax = 15>> - <</if>> +<<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>> + <<set _SatelliteMax = 20>> + <<set _GiantRobotMax = 15>> <<set _MissileSiloMax = 3>> - <<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo, _LaunchBayNOMax = _SatelliteMax+_GiantRobotMax+_MissileSiloMax>> +<<set _LaunchBayNOMax = _SatelliteMax+_GiantRobotMax+_MissileSiloMax>> - <<set _LaunchBayO = $securityForceSatellitePower>> - <<if $PC.hacking >= 75>> - <<set _LaunchBayOMax = 21>> - <<else>> - <<set _LaunchBayOMax = 20>> - <</if>> +<<set _LaunchBayO = $securityForceSatellitePower>> + <<set _LaunchBayOMax = 20>> <<set _AircraftCarrierMax = 6>> - <<if $PC.hacking >= 75>> - <<set _SubmarineMax = 7>> - <<else>> - <<set _SubmarineMax = 6>> - <</if>> + <<set _SubmarineMax = 6>> <<set _HeavyAmphibiousTransportMax = 6>> <<set _NavalYardMax = _AircraftCarrierMax+_SubmarineMax+_HeavyAmphibiousTransportMax>> -- GitLab