From ae353a4849ecdb309a1f2431d0bf344e55645ae3 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Wed, 29 Nov 2017 09:03:22 +1300 Subject: [PATCH] Fixes,reformatting and removal. --- src/init/dummy.tw | 1 - src/uncategorized/SFMBarracks.tw | 141 ++++++++++---------- src/uncategorized/securityForceEOWReport.tw | 28 ++-- 3 files changed, 85 insertions(+), 85 deletions(-) diff --git a/src/init/dummy.tw b/src/init/dummy.tw index 13e4c73bf12..1b460669a09 100644 --- a/src/init/dummy.tw +++ b/src/init/dummy.tw @@ -21,7 +21,6 @@ $belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames $ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence $hare1, $hare2, $hare3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $origin1, $origin2, $origin3, $LurcherSpeed $$i -$SSSlavesIDs, $SSLevel, $Lieutenantcolonel, $FacilitySupportUpgrade, $SSLBSCA, $SSLBCA, $SSLBHC, $SSLBC, $SSLASAST, $SSLASM, $SSLAM, $SSLSLPH, $SSLSLSC, $SSLSLAC, $SSLC, $SSLAAST, $SSLevelGarage, $SSLevelHangar, $SSLevelDroneBay, $SSLevelLaunchBay $activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor $drugs $PC.origRace, $PC.origSkin diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index a3fa53e1943..ea81e4e39a1 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -64,7 +64,7 @@ securityForceX */ <<set _Armoury = $securityForceInfantryPower>> <<set _ArmouryMax = 11>> -<<set _StimulantLab = $securityForceInfantryPower>> +<<set _StimulantLab = $securityForceVehiclePower>> <<set _StimulantLabMax = 9>> <<set _Garage = $securityForceVehiclePower+$securityForceHeavyBattleTank>> @@ -81,13 +81,14 @@ securityForceX */ <<set _LaunchBayO = $securityForceSatalitePower>> <<set _LaunchBayOMax = 17>> -<<if $terrain != "oceanic" || $terrain == "marine">> +<<if $terrain != "oceanic" || $terrain != "marine">> <<set _SFNO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayNO>> <<set _max = _BarracksMax+_ArmouryMax+_StimulantLabMax+_GarageMax+_HangarMax+_DroneBayMax+_LaunchBayNOMax>> <<set _SFO = 0>> <<set _NavalYard = 0>> <<set _NavalYardMax = 0>> -<<elseif $terrain == "oceanic" || $terrain == "marine">> +<</if>> +<<if $terrain == "oceanic" || $terrain == "marine">> <<set _NavalYard = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>> <<set _NavalYardMax = 12>> <<set _SFO = _Barracks+_Armoury+_StimulantLab+_Garage+_Hangar+_DroneBay+_LaunchBayO+_NavalYard>> @@ -363,7 +364,7 @@ securityForceX */ <</if>> <</if>> -<<if _LaunchBayNO > 0 || _LaunchBayO > 0 && $securityForceArcologyUpgrades >= 4>> +<<if (_LaunchBayNO > 0 || _LaunchBayO > 0) && $securityForceArcologyUpgrades >= 4>> <br><br> ''Launch Bay:'' <<if $securityForceSatalitePower > 0>> @@ -443,7 +444,7 @@ securityForceX */ <</if>> <</if>> -<<if _NavalYard > 0 && $terrain == "oceanic" || $terrain == "marine">> +<<if _NavalYard > 0 && ($terrain == "oceanic" || $terrain == "marine")>> <br><br> ''Naval Yard:'' <<if $securityForceAircraftCarrier > 0>> @@ -661,53 +662,53 @@ securityForceX */ <<if _Barracks < 5>> <br><<link "Barracks">> - <<replace "#resultX">> + <<replace "#resultX">><br><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, _Barracks++, $cash -= 100000*_Env>> + <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= 100000*_Env>> <</replace>> <</link>> // Costs ¤<<print 100000*_Env>> // - <<elseif _Barracks < 16 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5>> - <<if _Barracks == 5>> + <<elseif $securityForceArcologyUpgrades < 16 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5>> + <<if $securityForceArcologyUpgrades == 5>> <<set _arcCost = 15000000>> - <<elseif _Barracks == 6>> + <<elseif $securityForceArcologyUpgrades == 6>> <<set _arcCost = 20000000>> - <<elseif _Barracks == 7>> + <<elseif $securityForceArcologyUpgrades == 7>> <<set _arcCost = 35000000>> - <<elseif _Barracks == 8>> + <<elseif $securityForceArcologyUpgrades == 8>> <<set _arcCost = 55000000>> - <<elseif _Barracks == 9>> + <<elseif $securityForceArcologyUpgrades == 9>> <<set _arcCost = 125000000>> - <<elseif _Barracks == 10>> + <<elseif $securityForceArcologyUpgrades == 10>> <<set _arcCost = 350000000>> - <<elseif _Barracks == 11>> + <<elseif $securityForceArcologyUpgrades == 11>> <<set _arcCost = 600000000>> - <<elseif _Barracks == 12>> + <<elseif $securityForceArcologyUpgrades == 12>> <<set _arcCost = 2500000000>> - <<elseif _Barracks == 13>> + <<elseif $securityForceArcologyUpgrades == 13>> <<set _arcCost = 5000000000>> - <<elseif _Barracks == 14>> + <<elseif $securityForceArcologyUpgrades == 14>> <<set _arcCost = 6000000000>> - <<elseif _Barracks == 15>> + <<elseif $securityForceArcologyUpgrades == 15>> <<set _arcCost = 16000000000>> <</if>> <br><<link "Barracks">> - <<replace "#resultX">> + <<replace "#resultX">><br><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, _Barracks++, $cash -= _arcCost*_Env>> + <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*_Env>> <</replace>> <</link>> // Costs ¤<<print _arcCost*_Env>> // - <<elseif _Barracks == 12 && _Armoury >= 11 && _StimulantLab >= 7 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatalitePower >= 16>> + <<elseif $securityForceArcologyUpgrades == 12 && _Armoury >= 11 && _StimulantLab >= 7 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatalitePower >= 16>> <br><<link "Barracks">> - <<replace "#resultX">> + <<replace "#resultX">><br><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, _Barracks++, $cash -= _arcCost*_Env>> + <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*_Env>> <</replace>> <</link>> // Costs ¤<<print _arcCost*_Env>> // - <<elseif _Barracks == 13>> + <<elseif $securityForceArcologyUpgrades == 13>> <br><<link "Barracks">> - <<replace "#resultX">> + <<replace "#resultX">><br><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, _Barracks++, $cash -= _arcCost*_Env>> + <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*_Env>> <</replace>> <</link>> // Costs ¤<<print _arcCost*_Env>> // <</if>> @@ -716,9 +717,9 @@ securityForceX */ <</if>> /* - <<if $FacilitySupport == 0>> + <<if _Barracks >= 1 && $FacilitySupport == 0>> <br><<link "Facility Support">> - <<replace "#resultX">> + <<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." <<set $securityForceUpgradeToken = 1, _Armoury++, $cash -= 150000000*_Env*(_SFNO/100 || _SFO/100)>> <</replace>> @@ -728,16 +729,16 @@ securityForceX */ <<if _Armoury < 5>> <br><<link "Armoury">> - <<replace "#resultX">> + <<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." - <<set $securityForceUpgradeToken = 1, _Armoury++, $cash -= 40000*_Env>> + <<set $securityForceUpgradeToken = 1, $securityForceInfantryPower++, $cash -= 40000*_Env>> <</replace>> - <</link>> // Costs ¤<<print 40000*_Env>> //<br> - <<elseif _Armoury < 11 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5>> + <</link>> // Costs ¤<<print 40000*_Env>> // + <<elseif _Armoury > 5 && _Armoury < 11 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5>> <br><<link "Armoury">> - <<replace "#resultX">> + <<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." - <<set $securityForceUpgradeToken = 1, _Armoury++, $cash -= 4500000*_Env>> + <<set $securityForceUpgradeToken = 1, $securityForceInfantryPower++, $cash -= 4500000*_Env>> <</replace>> <</link>> // Costs ¤<<print 4500000*_Env>> // <</if>> @@ -746,12 +747,13 @@ securityForceX */ <</if>> <<if _StimulantLab < 5>> - <br><<link "Stimulant Lab">> - <<replace "#resultX">> + <br> + <<link "Stimulant Lab">> + <<replace "#resultX">><br><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, _StimulantLab++, $cash -= 40000*_Env>> + <<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= 40000*_Env>> <</replace>> - <</link>> // Costs ¤<<print 40000*_Env>> //<br> + <</link>> // Costs ¤<<print 40000*_Env>> // <<elseif _StimulantLab > 5 && _StimulantLab < 9 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5>> <<if _StimulantLab == 6>> <<set _drugCost = 2265000>> @@ -760,27 +762,27 @@ securityForceX */ <<elseif _StimulantLab == 8>> <<set _drugCost = 250000000000>> <</if>> - <br><<link "Stimulant Lab">> - <<replace "#resultX">> + <<link "Stimulant Lab">> + <<replace "#resultX">><br><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, _StimulantLab++, $cash -= _drugCost*_Env>> + <<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= _drugCost*_Env>> <</replace>> <</link>> // Costs ¤<<print _drugCost*_Env>> // <<elseif _StimulantLab == 7 && _Armoury >= 11 && $securityForceVehiclePower >= 7 && $securityForceAircraftPower >= 8 && $securityForceSpacePlanePower >= 11 && $securityForceFortressZeppelin >= 3 && $securityForceAC130 >= 5 && _DroneBay >= 6 && $securityForceSatalitePower >= 16 && _Barracks >= 13>> - <br><<link "Stimulant Lab">> - <<replace "#resultX">> + <<link "Stimulant Lab">> + <<replace "#resultX">><br><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, _StimulantLab++, $cash -= _drugCost*_Env>> + <<set $securityForceUpgradeToken = 1, $securityForceStimulantPower++, $cash -= _drugCost*_Env>> <</replace>> <</link>> // Costs ¤<<print _drugCost*_Env>> // <</if>> <<if _StimulantLab == 5 || _StimulantLab == 9>> - <br>//$securityForceName has fully upgraded the stimulant lab to support it's activities.// + //$securityForceName has fully upgraded the stimulant lab to support it's activities.// <</if>> - <<if _Barracks >= 1>> - <<if _Garage < _GarageMax>> - <br><<link "Garage">> + <<if _Barracks >= 1 && _Garage < _GarageMax>> + <br> + <<link "Garage">> <<replace "#resultX">> <span id="resultB"> <br><br>"Which unit do you wish to upgrade or 'borrow'?" @@ -789,8 +791,9 @@ securityForceX */ <</link>> <<if $securityForceVehiclePower < 5>> - <br><<link "Light and medium vehicles">> - <<replace "#resultB">> + <br> + <<link "Light and medium vehicles">> + <<replace "#resultB">><br><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>> @@ -802,21 +805,22 @@ securityForceX */ <<set _vehCost = 3000000>> <</if>> <br><<link "Light and medium vehicles">> - <<replace "#resultX">> + <<replace "#resultB">><br><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>> <</link>> // Costs ¤<<print _vehCost*_Env>> // <</if>> <<if $securityForceVehiclePower == 5 || $securityForceVehiclePower == 7>> - <br>//$securityForceName has fully upgraded the vehicle fleet to support it's activities.// + //$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.// + //More barracks infrastructure upgrades are needed before the vehicle fleet can be expanded.// <</if>> <<if $securityForceHeavyBattleTank < 1 && $securityForceVehiclePower >= 7>> - <br><<link "A heavy battle tank">> - <<replace "#resultB">> + <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." <<set $securityForceUpgradeToken = 1, $securityForceHeavyBattleTank++, $cash -= 60000000*_Env>> <</replace>> @@ -827,8 +831,8 @@ securityForceX */ <<elseif $securityForceHeavyBattleTank == 2>> <<set _hbtCost = 8500000>> <</if>> - <br><<link "heavy battle tank">> - <<replace "#resultB">> + <<link "heavy battle tank">> + <<replace "#resultB">><br><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>> @@ -842,12 +846,11 @@ securityForceX */ <</replace>> <</link>> <</if>> - <</if>> <<if _Garage >= _GarageMax>>//<br>$securityForceName has fully upgraded the garage to support it's activities.//<</if>> - <<if _Barracks >= 4>> - <<if _Hangar < _HangarMax>> - <br><<link "Hangar">> + <<if _Barracks >= 4 && _Hangar < _HangarMax>> + <br> + <<link "Hangar">> <<replace "#resultX">> <span id="resultY"> <br><br>"Which unit do you wish to upgrade or 'borrow'?" @@ -856,7 +859,8 @@ securityForceX */ <</link>> <<if $securityForceAircraftPower < 5>> - <br><<link "Light and medium aircraft">> + <br> + <<link "Light and medium aircraft">> <<replace "#resultY">><br><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>> @@ -870,7 +874,7 @@ securityForceX */ <<elseif $securityForceAircraftPower == 7>> <<set _airCost = 5750000>> <</if>> - <br><<link "Light and medium aircraft">> + <<link "Light and medium aircraft">> <<replace "#resultY">><br><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>> @@ -878,9 +882,9 @@ securityForceX */ <</link>> // Costs ¤<<print _airCost*_Env>> // <</if>> <<if $securityForceAircraftPower == 5 || $securityForceAircraftPower == 8>> - <br>$securityForceName has fully upgraded the air fleet to support it's activities.// + $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.// + //More barracks infrastructure upgrades are needed before the air fleet can be expanded.// <</if>> <<if $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _DroneBay >= 5 && _Armoury >= 5 && $securityForceSpacePlanePower < 1>> @@ -978,7 +982,6 @@ securityForceX */ <</replace>> <</link>> <</if>> - <</if>> <<if _Hangar >= _HangarMax>>//<br>$securityForceName has fully upgraded the hangar to support it's activities.//<</if>> <<if _DroneBay < 5 && _Barracks >= 2>> @@ -1111,7 +1114,7 @@ securityForceX */ <</if>> <<if _LaunchBayNO >= _LaunchBayNOMax || _LaunchBayO >= _LaunchBayNOMax>>//<br>$securityForceName has fully upgraded the launch bay to support it's activities.//<</if>> - <<if _NavalYard < _NavalYardMax>> + <<if $terrain == "oceanic" || $terrain == "marine" && (_NavalYard < _NavalYardMax)>> <br> <<link "Naval Yard">> <<replace "#resultX">> @@ -1194,7 +1197,7 @@ securityForceX */ <</replace>> <</link>> <</if>> - <<if _NavalYard >= _NavalYardMax>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>> + <<if $terrain == "oceanic" || $terrain == "marine" && (_NavalYard >= _NavalYardMax)>><br>$securityForceName has fully upgraded the naval yard to support it's activities.//<</if>> </span> <</if>> diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index 9ebf8a64b83..557dbd58e7f 100644 --- a/src/uncategorized/securityForceEOWReport.tw +++ b/src/uncategorized/securityForceEOWReport.tw @@ -47,7 +47,7 @@ securityForceX <<set _DroneBay = $securityForceDronePower>> <<set _LaunchBayNO = $securityForceSatalitePower+$securityForceGiantRobot+$securityForceMissileSilo>> <<set _LaunchBayO = $securityForceSatalitePower>> -<<if $terrain == "oceanic">> +<<if $terrain == "oceanic" || $terrain == "marine">> <<set _NavalYard = $securityForceAircraftCarrier+$securityForceSubmarine+$securityForceHeavyAmphibiousTransport>> <</if>> @@ -215,20 +215,19 @@ securityForceX <<if $securityForceArcologyUpgrades >= 4>> <<if $securityForceSatalitePower > 0>> <<set $securityForceTrade += (0.25*($securityForceSatalitePower))>> <</if>> - <<if $securityForceGiantRobot > 0 && $terrain != "oceanic">> + <<if $securityForceGiantRobot > 0 && $terrain != "oceanic" || $terrain != "marine">>>> <<set $securityForceTrade += (0.25*($securityForceGiantRobot))>> <</if>> - <<if $securityForceMissileSilo > 0 && $terrain != "oceanic">> + <<if $securityForceMissileSilo > 0 && $terrain != "oceanic" || $terrain != "marine">>>> <<set $securityForceTrade += (0.25*($securityForceMissileSilo))>> <</if>> <</if>> - <<if $terrain == "oceanic">> + <<if $terrain == "oceanic" || $terrain == "marine">> <<if $securityForceAircraftCarrier > 0>> <<set $securityForceTrade += (0.25*($securityForceAircraftCarrier))>> <</if>> <<if $securityForceSubmarine > 0>> <<set $securityForceTrade += (0.25*($securityForceSubmarine))>> <</if>> <<if $securityForceHeavyAmphibiousTransport > 0>> - <<set $securityForceTrade += (0.25*($securityForceHeavyAmphibiousTransport))>> - <</if>> + <<set $securityForceTrade += (0.25*($securityForceHeavyAmphibiousTransport))>> <</if>> <</if>> /* Manpower effects - extra 0.5% per 100-gate in terms of manpower. Kicks in at over 200, since some of the SF is on overhead, logistics, repairs, rest, etc. */ @@ -301,7 +300,7 @@ securityForceX <<if $securityForceArcologyUpgrades >= 1>> <<if $securityForceVehiclePower > 0>> <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceVehiclePower*_RaidingEfficienyPercentage))>> <</if>> - <<if $securityForceHeavyBattleTank > 0>> /* (3) */ + <<if $securityForceHeavyBattleTank > 0>> <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceHeavyBattleTank*_RaidingEfficienyPercentage))>> <</if>> <</if>> @@ -324,13 +323,13 @@ securityForceX <<if $securityForceArcologyUpgrades >= 4>> <<if $securityForceSatalitePower > 0>> <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceSatalitePower*_RaidingEfficienyPercentage)))>> <</if>> - <<if $securityForceGiantRobot > 0 && $terrain != "oceanic">> + <<if $securityForceGiantRobot > 0 && $terrain != "oceanic" || $terrain != "marine">> <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceGiantRobot*_RaidingEfficienyPercentage))>> <</if>> - <<if $securityForceMissileSilo > 0 && $terrain != "oceanic">> + <<if $securityForceMissileSilo > 0 && $terrain != "oceanic" || $terrain != "marine">> <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceMissileSilo*_RaidingEfficienyPercentage))>> <</if>> <</if>> - <<if $terrain == "oceanic">> + <<if $terrain == "oceanic" || $terrain == "marine">> <<if $securityForceAircraftCarrier > 0>> <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*($securityForceAircraftCarrier*_RaidingEfficienyPercentage))>> <</if>> <<if $securityForceSubmarine > 0>> @@ -350,15 +349,13 @@ securityForceX <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($OverallTradeShowAttendance*_RaidingEfficienyPercentage))>> <</if>> - /*LieutenantColonel and Facility Support */ - /* + LieutenantColonel and Facility Support <<if $LieutenantColonel == 1>> <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($LieutenantColonel*_RaidingEfficienyPercentage)))>> <</if>> <<if $FacilitySupportEfficiency > 1>> <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+$FacilitySupportEfficiency*_RaidingEfficienyPercentage))>> <</if>> - */ /* Apply the efficiency boost to the booty. Lets hope that meth made them better at ripping out some poor bastard's gold teeth */ <<set $securityForceBooty = ($securityForceBooty*$securityForceMissionEfficiency)>> @@ -691,6 +688,7 @@ securityForceX Modernized the armor and engines of the heavy transport. <</if>> <</if>> +<</if>> <<if $securityForceArcologyUpgrades >= 2>> <br><br> @@ -714,7 +712,7 @@ securityForceX <</if>> <</if>> -<<if _LaunchBayNO > 0 || _LaunchBayO > 0 && $securityForceArcologyUpgrades >= 4>> +<<if (_LaunchBayNO > 0 || _LaunchBayO > 0) && $securityForceArcologyUpgrades >= 4>> <br><br> ''Launch Bay:'' <<if $securityForceSatalitePower > 0>> @@ -794,7 +792,7 @@ securityForceX <</if>> <</if>> -<<if _NavalYard > 0 && $terrain == "oceanic" || $terrain == "marine">> +<<if _NavalYard > 0 && ($terrain == "oceanic" || $terrain == "marine")>> <br><br> ''Naval Yard:'' <<if $securityForceAircraftCarrier > 0>> -- GitLab