diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw index c91953c2282748a598a195ff5c90b7b3e811b224..bfb45238a6e266b38a980be8cc3a51c96e324f78 100755 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw @@ -4,6 +4,7 @@ <<if ($SFAO < _max) && $securityForceUpgradeToken == 0>> <span id="resultX"> <br><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">> @@ -12,7 +13,7 @@ <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= 100000*$Env>> <</replace>> <</link>> // Costs <<print cashFormat(100000*$Env)>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades < _BarracksMax && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades < _BarracksMax && $TierTwoUnlock == 1>> <<switch _Barracks>> <<case 5>> <<set _arcCost = 15000000>> @@ -58,12 +59,12 @@ <</replace>> <</link>> // Costs <<print cashFormat(_arcCost*$Env)>> // <</if>> - <<if _Barracks == 5 || _Barracks == _BarracksMax>> + <<if _Barracks == _BarracksMax>> <br>//$securityForceName has fully upgraded the barracks to support it's activities// <</if>> /* - <<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && $FacilitySupport == 0>> + <<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $FacilitySupport == 0>> <br><<link "Facility Support">> <<replace "#resultX">><br><br> "Sure, boss." she says, nodding. "Creating a specialised area for any slaves you send to assist us will benefical to everyone." @@ -80,7 +81,7 @@ <<set $securityForceUpgradeToken = 1, $securityForceInfantryPower++, $cash -= 40000*$Env>> <</replace>> <</link>> // Costs <<print cashFormat(40000*$Env)>> // - <<elseif $securityForceUpgradeToken == 0 && _Armoury >= 5 && _Armoury < _ArmouryMax && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5>> + <<elseif $securityForceUpgradeToken == 0 && _Armoury < _ArmouryMax && $TierTwoUnlock == 1>> <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." @@ -88,7 +89,7 @@ <</replace>> <</link>> // Costs <<print cashFormat(4500000*$Env)>> // <</if>> - <<if _Armoury == 5 || _Armoury == _ArmouryMax>> + <<if _Armoury == _ArmouryMax>> <br>//$securityForceName has fully upgraded the armoury to support it's activities.// <</if>> @@ -99,8 +100,10 @@ <<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= 40000*$Env>> <</replace>> <</link>> // Costs <<print cashFormat(40000*$Env)>> // - <<elseif $securityForceUpgradeToken == 0 && _StimulantLab > 5 && _StimulantLab < _StimulantLabMax && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5>> + <<elseif $securityForceUpgradeToken == 0 && _StimulantLab < _StimulantLabMax && $TierTwoUnlock == 1>> <<switch _StimulantLab>> + <<case 5>> + <<set _drugCost = 1265000>> <<case 6>> <<set _drugCost = 2265000>> <<case 7>> @@ -124,7 +127,7 @@ <</replace>> <</link>> // Costs <<print cashFormat(_drugCost*$Env)>> // <</if>> - <<if _StimulantLab == 5 || _StimulantLab == _StimulantLabMax>> + <<if _StimulantLab == _StimulantLabMax>> <br>//$securityForceName has fully upgraded the stimulant lab to support it's activities.// <</if>> @@ -144,7 +147,7 @@ <<set $securityForceUpgradeToken = 1, $securityForceVehiclePower++, $cash -= 60000*$Env>> <</replace>> <</link>>// Costs <<print cashFormat(60000*$Env)>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceVehiclePower < _LightAndMediumVehiclesMax && _Barracks >= 5 && $securityForceAircraftPower >= 5 && _DroneBay >= 5 && _StimulantLab >= 5 && _Armoury >= 5>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceVehiclePower < _LightAndMediumVehiclesMax && $TierTwoUnlock == 1>> <<if $securityForceVehiclePower < 6>> <<set _vehCost = 2500000>> <<elseif $securityForceVehiclePower == 6>> @@ -159,13 +162,11 @@ <</replace>> <</link>> // Costs <<print cashFormat(_vehCost*$Env)>> // <</if>> - <<if $securityForceVehiclePower == 5 || $securityForceVehiclePower == _LightAndMediumVehiclesMax >> + <<if $securityForceVehiclePower == _LightAndMediumVehiclesMax>> <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.// <</if>> - <<if $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank < 1 && $securityForceVehiclePower >= 7>> + <<if $securityForceUpgradeToken == 0 && $securityForceHeavyBattleTank < 1 && $TierTwoUnlock == 1>> <br><<link "A heavy battle tank">> <<replace "#resultB">><br><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." @@ -211,7 +212,7 @@ <<set $securityForceUpgradeToken = 1, $securityForceAircraftPower++, $cash -= 70000*$Env>> <</replace>> <</link>> // Costs <<print cashFormat(70000*$Env)>> // - <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftPower < _AircraftMax && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5>> + <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftPower < _AircraftMax && $TierTwoUnlock == 1>> <<switch $securityForceAircraftPower>> <<case 5>> <<set _airCost = 2750000>> @@ -231,13 +232,11 @@ <</replace>> <</link>> // Costs <<print cashFormat( _airCost*$Env)>> // <</if>> - <<if $securityForceAircraftPower == 5 || $securityForceAircraftPower == _AircraftMax>> + <<if $securityForceAircraftPower == _AircraftMax>> <br>//$securityForceName has fully upgraded the air fleet to support it's activities.// - <<else>> - <br>//More barracks infrastructure upgrades are needed before the air fleet can be expanded.// <</if>> - <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSpacePlanePower < 1>> + <<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $securityForceSpacePlanePower < 1>> <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." @@ -277,7 +276,7 @@ <br>//$securityForceName has fully upgraded the space plane to support it's activities.// <</if>> - <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceFortressZeppelin < 1>> + <<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 $securityForceFortressZeppelin < 1>> <br><<link "A fortress zeppelin">> <<replace "#resultY">><br><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." @@ -295,7 +294,7 @@ <br>//$securityForceName has fully upgraded the fortress zeppelin to support it's activities.// <</if>> - <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceAC130 < 1>> + <<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $securityForceAC130 < 1>> <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." @@ -314,7 +313,7 @@ <br>//$securityForceName has fully upgraded the AC-130 to support it's activities.// <</if>> - <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceHeavyTransport < 1>> + <<if $securityForceUpgradeToken == 0 && $TierTwoUnlock == 1 && $securityForceHeavyTransport < 1>> <br><<link "A heavy transport">> <<replace "#resultY">><br><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." @@ -345,7 +344,7 @@ <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*$Env>> <</replace>> <</link>> // Costs <<print cashFormat(45000*$Env)>> // - <<elseif $securityForceUpgradeToken == 0 && _DroneBay < _DroneBayMax && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5>> + <<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." @@ -353,14 +352,11 @@ <</replace>> <</link>> // Costs <<print cashFormat( 2000000*$Env)>> // <</if>> - <<if _DroneBay == 5 || _DroneBay == _DroneBayMax>> + <<if _DroneBay == _DroneBayMax>> <br>//$securityForceName has fully upgraded the drone bay to support it's activities.// - <<else>> - <br>//More barracks infrastructure upgrades are needed before the drone bay can be expanded.// <</if>> - <<if _Barracks >= 4>> - <<if $securityForceUpgradeToken == 0 && _LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayNOMax>> + <<if $securityForceUpgradeToken == 0 && (_LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayNOMax) && $TierTwoUnlock == 1>> <br><<link "Launch Bay">> <<replace "#resultX">> <span id="resultZ"> @@ -369,7 +365,7 @@ <<goto "SFM Barracks">> <</link>> - <<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSatellitePower < 1>> + <<if $securityForceUpgradeToken == 0 && $securityForceSatellitePower < 1>> <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." @@ -410,7 +406,7 @@ <br>//$securityForceName has fully upgraded the Satellite to support it's activities.// <</if>> - <<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceGiantRobot < 1 && ($terrain != "oceanic" && $terrain != "marine")>> + <<if $securityForceUpgradeToken == 0 && $securityForceGiantRobot < 1 && ($terrain != "oceanic" && $terrain != "marine")>> <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." @@ -458,7 +454,7 @@ <br>//$securityForceName has fully upgraded the giant robot to support it's activities.// <</if>> - <<if $securityForceUpgradeToken == 0 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceMissileSilo < 1 && ($terrain != "oceanic" && $terrain != "marine")>> + <<if $securityForceUpgradeToken == 0 && $securityForceMissileSilo < 1 && ($terrain != "oceanic" && $terrain != "marine")>> <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." @@ -484,10 +480,9 @@ <</replace>> <</link>> <</if>> - <</if>> <<if _LaunchBayNO >= _LaunchBayNOMax || _LaunchBayO >= _LaunchBayNOMax>>//<br>$securityForceName has fully upgraded the launch bay to support it's activities.//<</if>> - <<if $securityForceUpgradeToken == 0 && ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard < _NavalYardMax)>> + <<if $securityForceUpgradeToken == 0 && ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard < _NavalYardMax) && $TierTwoUnlock == 1>> <br><<link "Naval Yard">> <<replace "#resultX">> <span id="resultA"> diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw old mode 100644 new mode 100755 index 1f34770737adb4eff0d0a08ba926125f484e737c..a7a756a69f98219d3ebc2272886fd5793e95cb28 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -11,6 +11,11 @@ <<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>> + <<include "SpecialForceUpgradeTree">> <<if $SFNO > 0>> @@ -112,10 +117,12 @@ </span> <</if>> -<<if $securityForceUpgradeToken == 1 && ( $SFAO < _max)>> -<br>//_Name is working to improve $securityForceName this week.// +<<if $securityForceUpgradeToken == 1 && ($SFAO < _max)>> + <br>//_Name is working to improve $securityForceName this week.// +<<elseif $TierTwoUnlock == 1>> + <br>//You recive a message form The Colonel "there's a trade show coming up with exotic upgrades but I'll get laughed out unless we bring the best gear we can get now?"// <<elseif $SFAO >= _max>> -<br>//$securityForceName is fully equipped and upgraded - nothing else can be done.// + <br>//$securityForceName is fully equipped and upgraded - nothing else can be done.// <</if>> <<if $securityForceGiftToken == 1>> @@ -130,9 +137,7 @@ <br><br>_Name "says certainly <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>>, it is possible to upgrade $securityForceName more than once per week, however, it will cost you." <br> <<link "Would you like to discus upgrading $securityForceName again?">> - <<set $securityForceUpgradeToken = 0>> - <<set $securityForceUpgradeTokenReset += 1>> - <<set $cash -= _securityForceUpgradeResetTokenCurrentCost>> + <<set $securityForceUpgradeToken = 0, $securityForceUpgradeTokenReset += 1, $cash -= _securityForceUpgradeResetTokenCurrentCost>> <<goto "SFM Barracks">> <</link>> <br>It will cost 5% of your currently displayed cash, which is <<print cashFormat(Math.trunc(_securityForceUpgradeResetTokenCurrentCost))>>. <</if>> diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw old mode 100644 new mode 100755 index 6f1971bb590c345f85f4308091d5ba1d8bcf268b..ece8b9b62654798699bec47287a44ee50bd00a28 --- a/src/uncategorized/nonRandomEvent.tw +++ b/src/uncategorized/nonRandomEvent.tw @@ -160,7 +160,7 @@ <<goto "secExpSmilingMan">> <<elseif $rivalOwner == 0 && $smilingManProgress == 3 && $secExp == 1>> <<goto "secExpSmilingMan">> -<<elseif (_effectiveWeek > 84) && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>> +<<elseif $TierTwoUnlock == 1 && ($securityForceCreate == 1) && ($SFMODToggle == 1) && $OverallTradeShowAttendance == 0>> <<goto "securityForceTradeShow">> <<else>> <<if random(1,100) > _effectiveWeek+25>>