From 67631d6f598adab21df0652ee683edeb2d2c44a2 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Mon, 25 Dec 2017 13:36:48 +1300 Subject: [PATCH] Gneral fixes and new content. --- .../SecForceEX/SpecialForceUpgradeDec.tw | 28 ++++++++----- .../SecForceEX/SpecialForceUpgradeOptions.tw | 40 +++++++++++++------ .../SecForceEX/SpecialForceUpgradeTree.tw | 19 +++++---- src/uncategorized/securityForceEOWReport.tw | 2 +- 4 files changed, 56 insertions(+), 33 deletions(-) diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw index 4a38fe5025a..8c6e7b33bb3 100644 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw @@ -208,15 +208,17 @@ <<case 6>> Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel. <<case 7>> - Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag. + Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag. <<case 8>> - Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time. + Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time. <<case 9>> - Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable. + Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable. <<case 10>> - Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.Replaced the skin of $securityForceName Space Plane with a basic optical illusion kit. + Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable.Replaced the skin of $securityForceName Space Plane with a basic optical illusion kit. <<case 11>> - Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making $securityForceName Space Plane untouchable.Replaced the skin of $securityForceName Space Plane with an advanced optical illusion kit. + Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable.Replaced the skin of $securityForceName Space Plane with an advanced optical illusion kit. + <<case 12>> + Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added VTOL capabilites into an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable.Replaced the skin of $securityForceName Space Plane with an advanced optical illusion kit. <</switch>> <</if>> <<if $securityForceFortressZeppelin > 0>> @@ -245,6 +247,8 @@ Modernized the armor, weaponry and electronics. <<case 5>> Modernized the armor, weaponry, electronics and crew seating. + <<case 6>> + Modernized the armor, weaponry, electronics and crew seating. Increased the speed and moverability. <</switch>> <</if>> <<if $securityForceHeavyTransport > 0>> @@ -355,13 +359,19 @@ <<case 8>> Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link. <<case 9>> - Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time. + Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time. <<case 10>> - Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with a basic optical illusion kit. + Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with a basic optical illusion kit. <<case 11>> - Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. + Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. <<case 12>> - Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted nanite rather than electromagnetic cannons and the amount of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. + Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. + <<case 13>> + Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites. + <<case 14>> + Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons and a massive wrist mounted shield. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites. + <<case 15>> + Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons,a massive wrist mounted shield and eletric fists. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites. <</switch>> <</if>> <<if $securityForceMissileSilo > 0>> diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw index f93707e5ba3..c91953c2282 100644 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw @@ -1,7 +1,7 @@ :: SpecialForceUpgradeOptions <<nobr>> -<<if ( $SFAO < _max) && $securityForceUpgradeToken == 0>> +<<if ($SFAO < _max) && $securityForceUpgradeToken == 0>> <span id="resultX"> <br><br>Which facility or equipment do you wish _Name to upgrade this week? @@ -107,6 +107,8 @@ <<set _drugCost = 200000000000>> <<case 8>> <<set _drugCost = 250000000000>> + <<case 9>> + <<set _drugCost = 350000000000>> <</switch>> <br><<link "Stimulant Lab">> <<replace "#resultX">><br><br> @@ -259,6 +261,10 @@ <<set _spCost = 250000000>> <<elseif $securityForceSpacePlanePower == 10>> <<set _spCost = 350000000>> + <<elseif $securityForceSpacePlanePower == 10>> + <<set _spCost = 650000000>> + <<elseif $securityForceSpacePlanePower == 11>> + <<set _spCost = 950000000>> <</if>> <br><<link "Space plane">> <<replace "#resultY">><br><br> @@ -278,7 +284,7 @@ <<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 30000000*$Env>> <</replace>><</link>> // Costs <<print cashFormat(30000000*$Env)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceFortressZeppelin >= 1 && $securityForceFortressZeppelin < _FortressZeppelinMax>> - <<link "Fortress zeppelin">> + <br><<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." <<set $securityForceUpgradeToken = 1, $securityForceFortressZeppelin++, $cash -= 20000000*$Env>> @@ -414,25 +420,33 @@ <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GiantRobotMax>> <<if $securityForceGiantRobot < 3>> <<set _robCost = 25000000>> - <<elseif $securityForceGiantRobot == 3>> + <<elseif $securityForceGiantRobot == 9 && $securityForceInfantryPower >= 10>> + <<set _robCost = 2750000000>> + <</if>> + <<switch $securityForceGiantRobot>> + <<case 3>> <<set _robCost = 45000000>> - <<elseif $securityForceGiantRobot == 4>> + <<case 4>> <<set _robCost = 45000000>> - <<elseif $securityForceGiantRobot == 5>> + <<case 5>> <<set _robCost = 65000000>> - <<elseif $securityForceGiantRobot == 6>> + <<case 6>> <<set _robCost = 85000000>> - <<elseif $securityForceGiantRobot == 7>> + <<case 7>> <<set _robCost = 95000000>> - <<elseif $securityForceGiantRobot == 8>> + <<case 8>> <<set _robCost = 105000000>> - <<elseif $securityForceGiantRobot == 9 && $securityForceInfantryPower >= 10>> - <<set _robCost = 2750000000>> - <<elseif $securityForceGiantRobot == 10>> + <<case 10>> <<set _robCost = 3150000000>> - <<elseif $securityForceGiantRobot == 11>> + <<case 11>> <<set _robCost = 3200000000>> - <</if>> + <<case 12>> + <<set _robCost = 4550000000>> + <<case 13>> + <<set _robCost = 6550000000>> + <<case 14>> + <<set _robCost = 8550000000>> + <</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." diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw index 924bf21bde6..b1678b99323 100644 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw @@ -14,35 +14,34 @@ <<set _StimulantLabMax = 10>> <<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>> -<<set _GarageMax = 11>> <<set _LightAndMediumVehiclesMax = 8>> <<set _HeavyBattleTankMax = 3>> +<<set _GarageMax = _LightAndMediumVehiclesMax+_HeavyBattleTankMax>> <<set _Hangar = $securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceAC130+$securityForceHeavyTransport>> -<<set _HangarMax = 34>> <<set _AircraftMax = 10>> - <<set _SpacePlaneMax = 11>> - <<set _ForceFortressZeppelinMax = 4>> - <<set _AC10Max = 5>> + <<set _SpacePlaneMax = 12>> + <<set _FortressZeppelinMax = 4>> + <<set _AC130Max = 6>> <<set _heavyTransportMax = 4>> +<<set _HangarMax = _AircraftMax+_SpacePlaneMax+_FortressZeppelinMax+_AC130Max+_heavyTransportMax>> <<set _DroneBay = $securityForceDronePower>> <<set _DroneBayMax = 8>> <<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>> -<<set _LaunchBayNOMax = 35>> <<set _SatelliteMax = 20>> - <<set _GiantRobotMax = 12>> + <<set _GiantRobotMax = 15>> <<set _MissileSiloMax = 3>> +<<set _LaunchBayNOMax = _SatelliteMax+_GiantRobotMax+_MissileSiloMax>> <<set _LaunchBayO = $securityForceSatellitePower>> <<set _LaunchBayOMax = 20>> - <<set _SatelliteMax = 20>> -<<set _NavalYardMax = 18>> <<set _AircraftCarrierMax = 6>> <<set _SubmarineMax = 6>> <<set _HeavyAmphibiousTransportMax = 6>> +<<set _NavalYardMax = _AircraftCarrierMax+_SubmarineMax+_HeavyAmphibiousTransportMax>> <<set _maxNO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax+_FacilitySupportMax>> <<set _maxO = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayOMax+_NavalYardMax+_FacilitySupportMax>> @@ -54,7 +53,7 @@ <<elseif $terrain == "oceanic" || $terrain == "marine">> <<set _NavalYard = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>> <<set $SFO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard+_FacilitySupport>> - <<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayOMax+_FacilitySupportMax>> + <<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayOMax+_NavalYardMax+_FacilitySupportMax>> <<set $SFNO = 0>> <</if>> <</silently>> diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index b6df81f60dd..6a1c165d382 100644 --- a/src/uncategorized/securityForceEOWReport.tw +++ b/src/uncategorized/securityForceEOWReport.tw @@ -401,7 +401,7 @@ <<elseif $OverallTradeShowAttendance >= 2>> <br>Thank you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>sir<<else>>ma'am<</if>> for letting me to go back to it, hopefully <<if $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> has been doing her job <<else>> that nothing serious happened while I was away.<</if>> <br>While at the recent TradeShow, <<print cashFormat($TradeShowIncome)>> was made selling generic scematics and $TradeShowHelots menial slaves were sent as a bonus. - Overal <<print cashFormat($TotalTradeShowIncome)>> has been made and $TotalTradeShowHelots menial slaves have been acquired during the $OverallTradeShowAttendance TradeShow's I have attended. + Overal <<print cashFormat($TotalTradeShowIncome)>> has been made and <<print commaNum($TotalTradeShowHelots)>> menial slaves have been acquired during the $OverallTradeShowAttendance TradeShow's I have attended. <</if>> //Current facilities status:// <<include "SpecialForceUpgradeDec">> -- GitLab