From 7be6e601fefc848bbd3b377b1e985c89839caf6f Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Tue, 12 Dec 2017 23:52:37 +1300 Subject: [PATCH] Reformatting. --- .../SpecialForceBarracksFlavourText.tw | 2 +- .../SecForceEX/SpecialForceUpgradeDec.tw | 2 +- .../SecForceEX/SpecialForceUpgradeOptions.tw | 40 +++++++++---------- .../SecForceEX/SpecialForceUpgradeTree.tw | 6 +++ src/uncategorized/SFMBarracks.tw | 3 +- 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw b/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw index f815dedad67..431fbd97f4b 100644 --- a/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw +++ b/src/pregmod/SecForceEX/SpecialForceBarracksFlavourText.tw @@ -1,4 +1,4 @@ -:: SpecialForceBarracksFlavourText +:: SpecialForceBarracksFlavourText [nobr] //You continue towards the common area, the soldiers you pass nodding respectfully, saluting, or giving slight bows, as they please, to you. You pass the briefing areas, the officers and sergeants of the force are conferring over planning tables and display screens regarding their upcoming deployments.// diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw index 49518fe4eac..2ee6ffe7a8c 100644 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw @@ -385,7 +385,7 @@ <<elseif $securityForceAircraftCarrier == 4>> Modernized the aircraft carrier's electronics, weaponry and armour. <<elseif $securityForceAircraftCarrier == 5>> - Modernized the aircraft carrier's electronics, weaponry and armour. Added a EMP generator. + Modernized the aircraft carrier's electronics, weaponry and armour. Added an EMP generator. <</if>> <</if>> <<if $securityForceSubmarine > 0>> diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw index 6e2ae9eef10..f3b7e8ce228 100644 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw @@ -1,10 +1,9 @@ -:: SpecialForceUpgradeOptions +:: SpecialForceUpgradeOptions [nobr] -<<nobr>> -<<if ( $SFAO < _max) && $securityForceUpgradeToken == 0>> +<<if ($SFAO < _max) && $securityForceUpgradeToken == 0>> <span id="resultX"> +<<switch $UpgradeOptions>> <br><br>Which facility or equipment do you wish _Name to upgrade this week? -<<switch UpgradeOptions>> <<case "Barracks">> <<if $securityForceUpgradeToken == 0 && _Barracks < 5>> @@ -128,11 +127,11 @@ <</if>> <<case "Garage">> - <<switch GarageUpgrades>> - <<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && _Garage < _GarageMax>> - <br><<link "Garage">> - <<replace "#resultX">> - <span id="resultB"> + <<switch $GarageUpgrades>> + <<if $securityForceUpgradeToken == 0 && _Barracks >= 1 && _Garage < _GarageMax>> + <br><<link "Garage">> + <<replace "#resultX">> + <span id="resultB"> <br><br>"Which unit do you wish to upgrade or 'borrow'?" <<link "Go back">> <<goto "SFM Barracks">> @@ -190,15 +189,15 @@ <br>//$securityForceName has fully upgraded the heavy battle tank to support it's activities.// <</if>> - </span> - <</replace>> - <</link>> - <</if>> - <</switch>> + </span> + <</replace>> + <</link>> + <</if>> + <</switch>> <<if _Garage >= _GarageMax>>//<br>$securityForceName has fully upgraded the garage to support it's activities.//<</if>> <<case "Hangar">> - <<switch LaunchBayUpgrades>> + <<switch $LaunchBayUpgrades>> <<if $securityForceUpgradeToken == 0 && _Barracks >= 4 && _Hangar < _HangarMax>> <br><<link "Hangar">> <<replace "#resultX">> @@ -366,7 +365,7 @@ <</if>> <<case "Launch Bay">> - <<switch LaunchBayUpgrades>> + <<switch $LaunchBayUpgrades>> <<if _Barracks >= 4>> <<if $securityForceUpgradeToken == 0 && _LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayNOMax>> <br><<link "Launch Bay">> @@ -488,9 +487,10 @@ <</switch>> <<if _LaunchBayNO >= _LaunchBayNOMax || _LaunchBayO >= _LaunchBayNOMax>>//<br>$securityForceName has fully upgraded the launch bay to support it's activities.//<</if>> + <<if ($terrain == "oceanic" || $terrain == "marine")>> <<case "Naval Yard">> - <<switch NavalYardUpgrades>> - <<if $securityForceUpgradeToken == 0 && ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard < _NavalYardMax)>> + <<switch $NavalYardUpgrades>> + <<if $securityForceUpgradeToken == 0 && (_NavalYard < _NavalYardMax)>> <br><<link "Naval Yard">> <<replace "#resultX">> <span id="resultA"> @@ -576,9 +576,9 @@ <</link>> <</if>> <</switch>> - <<if ($terrain == "oceanic" || $terrain == "marine") && (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>> + <<if (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>> + <</if>> <</switch>> </span> <</if>> -<</nobr>> diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw index a0265b29fe1..1b922ee9317 100644 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw @@ -14,11 +14,13 @@ <<set _StimulantLabMax = 9>> <<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>> +<<set $GarageUpgrades = $securityForceVehiclePower+$securityForceHeavyBattleTank>> <<set _GarageMax = 10>> <<set _LightAndMediumVehiclesMax = 7>> <<set _HeavyBattleTankMax = 3>> <<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>> +<<set $LaunchBayUpgrades = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>> <<set _HangarMax = 33>> <<set _AircraftMax = 10>> <<set _SpacePlaneMax = 11>> @@ -30,6 +32,7 @@ <<set _DroneBayMax = 8>> <<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>> +<<set $LaunchBayUpgrades = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>> <<set _LaunchBayNOMax = 34>> <<set _SatelliteMax = 19>> <<set _GiantRobotMax = 12>> @@ -49,13 +52,16 @@ <<if $terrain != "oceanic" && $terrain != "marine">> <<set $SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO+_FacilitySupport>> + <<set $UpgradeOptions = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO+_FacilitySupport>> <<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax+_FacilitySupportMax>> <<set $SFO = 0>> <<set _NavalYard = 0>> <<set _NavalYardMax = 0>> <<elseif $terrain == "oceanic" || $terrain == "marine">> <<set _NavalYard = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>> + <<set $NavalYardUpgrades = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>> <<set $SFO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard+_FacilitySupport>> + <<set $UpgradeOptions = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard+_FacilitySupport>> <<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayOMax+_FacilitySupportMax>> <<set $SFNO = 0>> <</if>> diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index 8c6b91c7430..d56e863f8d5 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -41,6 +41,7 @@ <<include "SpecialForceBarracksFlavourText">> +<br> <<if $securityForceGiftToken == 0>> <br> <span id="result"> @@ -129,7 +130,6 @@ <<include "SpecialForceUpgradeOptions">> -<<nobr>> <<if $securityForceColonelToken == 0 && $securityForceSexedColonelToken == 0 && $CurrentTradeShowAttendance == 0>> <br><br> <span id="result3"> @@ -576,4 +576,3 @@ <</link>> </span> <</if>> -<</nobr>> -- GitLab