From d3ae729b2525ed1e3ac83871422a5054b3ba6f0f Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Thu, 12 Oct 2017 23:12:01 -0400 Subject: [PATCH] Fixes --- devNotes/AnatomyOfAFreeCitiesEvent | 18 +++ src/init/storyInit.tw | 3 +- src/uncategorized/BackwardsCompatibility.tw | 5 +- src/uncategorized/SFMBarracks.tw | 156 +++++++++++++++----- src/uncategorized/securityForceEOWReport.tw | 114 +++++++------- 5 files changed, 201 insertions(+), 95 deletions(-) diff --git a/devNotes/AnatomyOfAFreeCitiesEvent b/devNotes/AnatomyOfAFreeCitiesEvent index 684a09ec29b..f7fc0426ea8 100644 --- a/devNotes/AnatomyOfAFreeCitiesEvent +++ b/devNotes/AnatomyOfAFreeCitiesEvent @@ -30,6 +30,24 @@ Immediate effects Every event can have immediate effects, which happen when the event gets chosen. For most events, those are what should happen if the player ignores the event (by hitting "Continue" or the space bar on the keyboard). Choice effects (see below) can override or roll back those. + reRecuit (4-19) + <<if Array.isArray($recruit)>> + <<if $cheatMode == 1>> + <<set $nextButton = "Back", $nextLink = "Nonrandom Event", $returnTo = "Nonrandom Event">> /* if user just clicks spacebar */ + ''A random recruit event would have been selected from the following:'' + <br> + <<for _i = 0; _i < $recruit.length; _i++>> + <<print "[[$recruit[_i]|RE recruit][$recruit = $recruit[" + _i + "]]]">> + <br> + <</for>> + <br><br>[[Go Back to Random Nonindividual Event|Random Nonindividual Event][$eventSlave = 0]] + <<else>> + <<set $recruit = $recruit.random()>> + <<goto "RE recruit">> + <</if>> + <<else>> + + If cheat mode is enabled and the user presses the space bar go back to the start. Main event text The bulk of the writing will be in the main event text. There are quite a few rules to deal with here. diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index bb9af175f13..c7a1e1fdd83 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1172,12 +1172,13 @@ FertilityAge($fertilityAge) <<set $securityForceAircraftPower = 0>> /* How many aircraft upgrades has the player bought? */ <<set $securityForceSpacePlanePower = 0>> /* Has the SF found a busted down spaceplane begging for work? */ <<set $securityForceFortressZeppelin = 0>> /* Has the SF found a busted down fortress zeppelin begging for work? */ - <<set $securityForceAC130 = 0>> /* Has the SF found a busted down AC-130 begging for work? */ + <<set $securityForceAC130 = 0>> /* Has the SF found a busted down AC-130 begging for work? */ <<set $SSLevelDroneBay = 0>> /* Has the player sent any slaves to 'help out' in the Drone Bay */ <<set $securityForceDronePower = 0>> /* How many drone upgrades has the player bought? */ <<set $SSLevelLaunchBay = 0>> /* Has the player sent any slaves to 'help out' in the Launch Bay */ <<set $securityForceSatalitePower = 0>> /* Has the SF commendeered a satelite relay? */ <<set $securityForceGiantRobot = 0>> /* Has the player assembled a makeshift giant robot */ + <<set $securityForceMissileSilo = 0>> /* Has the SF found a disused missile silo in need of reassignement?*/ <<set $SSLevelNavalYard = 0>> /* Has the player sent any slaves to 'help out' in the Naval Yard */ <<set $securityForceAircraftCarrier = 0>> /* Has the SF found a busted down aircraft carrier begging for work? */ <<set $securityForceSubmarine = 0>> /* Has the SF found a busted down submarine begging for work? */ diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 20360c197bd..03787c5a5c0 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -554,7 +554,7 @@ <<set $cheatModeM = 1>> <</if>> -/* SF anon stuff */ +/* SF anon additional variables for the SF Personnel/Gear */ <<if ndef $securityForceColonelToken>> <<set $securityForceColonelToken = 0>> <</if>> @@ -594,6 +594,9 @@ <<if ndef $securityForceGiantRobot>> <<set $securityForceGiantRobot = 0>> <</if>> +<<if ndef $securityForceMissileSilo>> + <<set $securityForceMissileSilo = 0>> +<</if>> <<if ndef $SSLevelNavalYard && $terrain == "oceanic">> <<set $SSLevelNavalYard = 0>> <</if>> diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index 8ee6938a4a5..55f3843e007 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -1,22 +1,23 @@ :: SFM Barracks [nobr] -/* SFAnon, check your upgrade numbers. Satellite in particular. */ /* The upgrades are currently ordered as: -securityForceArcologyUpgrades(9) +securityForceArcologyUpgrades(10) securityForceInfantryPower(11) securityForceStimulantPower(7) securityForceVehiclePower(7) securityForceAircraftPower(7) -ssecurityForceSpacePlanePower(8) +ssecurityForceSpacePlanePower(9) securityForceFortressZeppelin(3) securityForceAC130(5) ecurityForceDronePower(6) securityForceSatalitePower(16) securityForceGiantRobot(9) +securityForceMissileSilo(3) ($terrain = "oceanic" - securityForceAircraftCarrier(4) - securityForceSubmarine(5) - -securityForceGiantRobot) + +securityForceAircraftCarrier(4) + +securityForceSubmarine(5) + -securityForceGiantRobot(9) + -securityForceMissileSilo(3) securityForceX */ <<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Barracks">> @@ -48,6 +49,8 @@ securityForceX */ The barracks has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful aracolgy wide electromagnetic forcefield has been installed, giving the $securityForceName an immense superiority in local firepower. <<elseif $securityForceArcologyUpgrades == 9>> The barracks has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 140 inch pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful aracolgy wide electromagnetic forcefield has been installed, giving the $securityForceName an immense superiority in local firepower. +<<elseif $securityForceArcologyUpgrades == 10>> + The barracks has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 160 inch pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful aracolgy wide electromagnetic forcefield has been installed, giving the $securityForceName an immense superiority in local firepower. <</if>> <br><br> @@ -187,6 +190,8 @@ securityForceX */ Reduced Space Plane's weight and reworked the body to reduce drag. <<elseif $securityForceSpacePlanePower == 8>> Increased the SpacePlane's crew comfort and life support systems to increase operational time. + <<elseif $securityForceSpacePlanePower == 9>> + Added an additional engine per wing wich greatly increases acceleration and rases the top speed to mach 15, making $securityForceName's Space Plane untouchable. <</if>> <</if>> <<if $securityForceFortressZeppelin > 0>> @@ -248,11 +253,11 @@ securityForceX */ <<if $securityForceSatalitePower == 1>> A basic satalite 'borrowed' from the old world. <<elseif $securityForceSatalitePower == 2>> - Modernised the satalite's elecontrics. + Modernised the satalite's eletronics. <<elseif $securityForceSatalitePower == 3>> - Installed a basic localised communications jammer to the satalite (excludes your own frequencies with little to no leway) that will "slightly" anger locals untill it is deactivated. + Modernised the satalite's wiring and circuitry. <<elseif $securityForceSatalitePower == 4>> - //Missing description, please notify SFanon// + Installed a basic localised communications jammer to the satalite (excludes your own frequencies with little to no leway) that will "slightly" anger locals untill it is deactivated. <<elseif $securityForceSatalitePower == 5>> An advanced communications jammer is installed in the satalite, increasing the AO localisation, reducing the number of effected equipement. <<elseif $securityForceSatalitePower == 6>> @@ -302,6 +307,17 @@ securityForceX */ Improved the life support systems, allowing for longer operational time. <</if>> <</if>> +<<if $securityForceMissileSilo > 0>> + <br> + /* 3 upgrades */ + <<if $securityForceMissileSilo == 1>> + A basic Missile Silo has been 'borrowed' from the old world. + <<elseif $securityForceMissileSilo == 2>> + Modernised Missile Silo's lauching elentroics. + <<elseif $securityForceMissileSilo == 3>> + Modernised Missile Silo's lauching wiring and circuitry. + <</if>> +<</if>> <</if>> <<if $terrain == "oceanic">> @@ -447,7 +463,7 @@ securityForceX */ <</replace>> <</link>> <<if $rep < 15000>> - <br><<link "Ask The Colonel to put in a good word for you with her contacts">><br> + <<link "Ask The Colonel to put in a good word for you with her contacts">><br> <<replace "#result">> <<if random(1,100) > 50>> <<if random(1,100) > 50>> @@ -464,7 +480,7 @@ securityForceX */ <</link>> <</if>> <<if $arcologies[0].prosperity < 30>> - <br><<link "Ask The Colonel to use her contacts to help the arcology's business community">><br> + <<link "Ask The Colonel to use her contacts to help the arcology's business community">><br> <<replace "#result">> <<if random(1,100) > 50>> <<if random(1,100) > 50>> @@ -493,9 +509,9 @@ securityForceX */ <br> -<<if $securityForceArcologyUpgrades+$securityForceInfantryPower+$securityForceStimulantPower+$securityForceVehiclePower+$securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceDronePower+$securityForceSatalitePower+$securityForceGiantRobot >= 79>> +<<if $securityForceArcologyUpgrades+$securityForceInfantryPower+$securityForceStimulantPower+$securityForceVehiclePower+$securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceDronePower+$securityForceSatalitePower+$securityForceGiantRobot+$securityForceMissileSilo >= 93>> <br>//The $securityForceName is fully equipped and upgraded - nothing else can be done.// -<<elseif $terrain == "oceanic" && $securityForceArcologyUpgrades+$securityForceInfantryPower+$securityForceStimulantPower+$securityForceVehiclePower+$securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceDronePower+$securityForceSatalitePower+$securityForceAircraftCarrier+$securityForceSubmarine >= 79>> +<<elseif $terrain == "oceanic" && $securityForceArcologyUpgrades+$securityForceInfantryPower+$securityForceStimulantPower+$securityForceVehiclePower+$securityForceAircraftPower+$securityForceSpacePlanePower+$securityForceFortressZeppelin+$securityForceDronePower+$securityForceSatalitePower+$securityForceAircraftCarrier+$securityForceSubmarine >= 90>> <br>//The $securityForceName is fully equipped and upgraded - nothing else can be done.// <<elseif $securityForceUpgradeToken == 1>> <br>//The Colonel is working to improve the $securityForceName this week.// @@ -511,12 +527,14 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= 100000>> <</replace>> <</link>> // Costs ¤100000 // - <<elseif $securityForceArcologyUpgrades < 9 && $securityForceVehiclePower >= 5 && $securityForceInfantryPower >= 5 && $securityForceDronePower >= 5 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5>> - <<if $securityForceArcologyUpgrades == 7>> - <<set _arcCost = 5500000>> + <<elseif $securityForceArcologyUpgrades < 10 && $securityForceVehiclePower >= 5 && $securityForceInfantryPower >= 5 && $securityForceDronePower >= 5 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5>> + <<if $securityForceArcologyUpgrades == 6>> + <<set _arcCost = 20000000>> + <<elseif $securityForceArcologyUpgrades == 7>> + <<set _arcCost = 35000000>> <<elseif $securityForceArcologyUpgrades == 8>> - <<set _arcCost = 3500000>> - <<else>> + <<set _arcCost = 55000000>> + <<elseif $securityForceArcologyUpgrades == 9>> <<set _arcCost = 125000000>> <</if>> <br><<link "Barracks">> @@ -525,7 +543,7 @@ securityForceX */ <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost>> <</replace>> <</link>> // Costs ¤<<print _arcCost>> // - <<elseif $securityForceArcologyUpgrades == 5 || $securityForceArcologyUpgrades == 9>> + <<elseif $securityForceArcologyUpgrades == 5 || $securityForceArcologyUpgrades == 10>> <br>//$securityForceName's barracks has been fully upgraded to support its activities.// <</if>> @@ -575,7 +593,7 @@ securityForceX */ <<elseif $securityForceVehiclePower < 7 && $securityForceArcologyUpgrades >= 5 && $securityForceAircraftPower >= 5 && $securityForceDronePower >= 5 && $securityForceStimulantPower >= 5 && $securityForceInfantryPower >= 5>> <<if $securityForceVehiclePower < 6>> <<set _vehCost = 2500000>> - <<else>> + <<elseif $securityForceVehiclePower == 6>> <<set _vehCost = 3000000>> <</if>> <br><<link "Garage">> @@ -625,12 +643,25 @@ securityForceX */ <</replace>> <</link>> // Costs ¤4750000 // <<elseif $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < 9>> + <<if $securityForceSpacePlanePower < 4>> + <<set _spCost = 50000000>> + <<elseif $securityForceSpacePlanePower == 4>> + <<set _spCost = 75000000>> + <<elseif $securityForceSpacePlanePower == 5>> + <<set _spCost = 85000000>> + <<elseif $securityForceSpacePlanePower == 6>> + <<set _spCost = 95000000>> + <<elseif $securityForceSpacePlanePower == 7>> + <<set _spCost = 125000000>> + <<elseif $securityForceSpacePlanePower == 8>> + <<set _spCost = 175000000>> + <</if>> <br><<link "Ask The Colonel to upgrade the SpacePlane">> <<replace "#resultX">> "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 -= 3750000>> + <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= _spCost>> <</replace>> - <</link>> // Costs ¤3750000 // + <</link>> // Costs ¤<<print _spCost>> // <<elseif $securityForceSpacePlanePower == 9>> <br>//The $securityForceName's SpacePlane is fully upgraded.// <</if>> @@ -728,10 +759,20 @@ securityForceX */ <</replace>> <</link>> // Costs ¤50000000 // <<elseif $securityForceGiantRobot > 0 && $securityForceGiantRobot < 8>> - <<if $securityForceGiantRobot < 8>> + <<if $securityForceGiantRobot < 3>> <<set _robCost = 25000000>> - <<elseif $securityForceGiantRobot == 8>> + <<elseif $securityForceGiantRobot == 3>> + <<set _robCost = 45000000>> + <<elseif $securityForceGiantRobot == 4>> + <<set _robCost = 45000000>> + <<elseif $securityForceGiantRobot == 5>> + <<set _robCost = 65000000>> + <<elseif $securityForceGiantRobot == 6>> + <<set _robCost = 85000000>> + <<elseif $securityForceGiantRobot == 7>> <<set _robCost = 95000000>> + <<elseif $securityForceGiantRobot == 8>> + <<set _robCost = 105000000>> <</if>> <br><<link "Ask The Colonel to upgrade the Giant Robot">> <<replace "#resultX">> @@ -743,6 +784,29 @@ securityForceX */ <br>//The $securityForceName has fully upgraded the GiantRobot to support its activities.// <</if>> + <<if $securityForceVehiclePower >= 5 && $securityForceInfantryPower >= 5 && $securityForceDronePower >= 5 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5 && $securityForceArcologyUpgrades >= 5 && $securityForceMissileSilo < 1 && $terrain != "oceanic">> + <br><<link "Ask The Colonel to 'borrow' a Missile Silo">> + <<replace "#resultX">> + "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>> + <</replace>> + <</link>> // Costs ¤200000000 // + <<elseif $securityForceMissileSilo > 0 && $securityForceMissileSilo < 3>> + <<if $securityForceMissileSilo == 1>> + <<set _msCost = 150000000>> + <<elseif $securityForceMissileSilo == 2>> + <<set _msCost = 195000000>> + <</if>> + <br><<link "Ask The Colonel to upgrade the Missile Silo">> + <<replace "#resultX">> + "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, $securityForceMissileSilo++, $cash -= _msCost>> + <</replace>> + <</link>> // Costs ¤<<print _msCost>> // + <<elseif $securityForceMissileSilo == 3>> + <br>//The $securityForceName has fully upgraded the MissileSilo to support its activities.// + <</if>> + <<if $terrain == "oceanic" && $securityForceVehiclePower >= 5 && $securityForceInfantryPower >= 5 && $securityForceDronePower >= 5 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5 && $securityForceArcologyUpgrades >= 5 && $securityForceAircraftCarrier < 1>> <br><<link "Ask The Colonel to 'borrow' an aircraft carrier">> <<replace "#resultX">> @@ -871,43 +935,55 @@ securityForceX */ <span id="result4"> <<link " field medicine, ">> <<replace "#result4">> - <<set $PC.medicine + 3>> - //<<if $PC.engineering < 10>>Hopefully now, you are less likely to cut yourself on the sharp things.<</if>>// + <<set $PC.medicine += 4>> + <<if $PC.medicine < 20>> + //Yes that is a bandage, good job. + <<elseif $PC.medicine < 10>> + //Hopefully now, you are less likely to cut yourself on the sharp things. + <</if>> <</replace>> <</link>> <<link "trading, ">> <<replace "#result4">> - <<set $PC.trading + 2>> - //<<if $PC.trading < 10>>Congragulations you have just passed economics 101, "black and red should balance".<</if>>// + <<set $PC.trading += 3>> + <<if $PC.trading < 10>> + //Congragulations you have just passed economics 101, "black and red should balance". + <</if>> <</replace>> <</link>> <<link "slaving, ">> <<replace "#result4">> - <<set $PC.slaving + 2>> - //<<if $PC.slaving < 10>>Yes, the rope normally goes around the wrist first and no where near the mouth.<</if>>// + <<set $PC.slaving += 3>> + //<<if $PC.slaving < 10>>Yes, the rope normally goes around the wrist first and no where near the mouth. + <</if>> <</replace>> <</link>> <<link "combat engineering, ">> <<replace "#result4">> - <<set $PC.engineering + 2>> - //<<if $PC.engineering < 10>>Good job you know what a hammer now looks like.<</if>>// + <<set $PC.engineering += 3>> + <<if $PC.engineering < 10>> + //Good job you know what a hammer now looks like. + <</if>> <</replace>> <</link>> <<link "general skills, ">> <<replace "#result4">> - <<set $PC.engineering + 1>> - <<set $PC.slaving + 1>> - <<set $PC.trading + 1>> - <<set $PC.warfare + 1>> - <<set $PC.medicine + 1>> + <<set $PC.engineering + 2>> + <<set $PC.slaving += 2>> + <<set $PC.trading += 2>> + <<set $PC.warfare += 2>> + <<set $PC.medicine += 2>> //Hopefully this general education I could provide may be of use. <</replace>> <</link>> <<link "or tell some war stories.">> <<replace "#result4">> - <<set $PC.warfare + 5>> - //<<if $PC.warfare < 10>>There, now you hopefully can hit the broad side of a barn. What am I kidding you still suck. - <<elseif $PC.warfare >= 10>>Slightly better but you still have a long way to go.<</if>>// + <<set $PC.warfare += 5>> + <<if $PC.warfare < 10>> + //There, now you hopefully can hit the broad side of a barn. What am I kidding you still suck. + <<elseif $PC.warfare >= 10>> + //Slightly better but you still have a long way to go. + <</if>> <</replace>> <</link>> </span> diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index d8b91e7bf4c..2e6e27a47fe 100644 --- a/src/uncategorized/securityForceEOWReport.tw +++ b/src/uncategorized/securityForceEOWReport.tw @@ -1,11 +1,11 @@ :: Security Force EOW Report /* The upgrades are currently ordered as: -securityForceArcologyUpgrades(9) +securityForceArcologyUpgrades(10) securityForceInfantryPower(11) securityForceStimulantPower(7) securityForceVehiclePower(7) securityForceAircraftPower(7) -ssecurityForceSpacePlanePower(8) +ssecurityForceSpacePlanePower(9) securityForceFortressZeppelin(3) securityForceAC130(5) ecurityForceDronePower(6) @@ -194,57 +194,60 @@ securityForceX */ <<set $securityForceBooty = ($securityForceBooty+(3500*Math.trunc($securityForcePersonnel/100)))>> <</if>> - /* Raiding Efficiency Modifier Calculations - 15% per force upgrade (45-165% per tree), up to 105% final multiplier (after upgrade considerations) for stims. With all upgrades for a total of 1350%, after all other raiding calculations but excluding Colonel or SSLevel's (drugs make them better at everything, but especially much better at raiding - much easier to murder and pillage when you're fucked out of your mind on a mix of meth, pcp, and lsd). Having an effective CIC (Combat Infomation Centre) at the barracks,airforce, satalite,AC-130 and slave support at facilities massivey improves raiding efficency. If we are dealing with an oceanic aracolgy the sub and carrier massively improve efficency. */ + /* Raiding Efficiency Modifier Calculations - 20% per force upgrade (60-320% per tree), up to 140% final multiplier (after upgrade considerations) for stims. With all upgrades for a total of 1,60%, after all other raiding calculations but excluding Colonel or SSLevel's (drugs make them better at everything, but especially much better at raiding - much easier to murder and pillage when you're fucked out of your mind on a mix of meth, pcp, and lsd). Having an effective CIC (Combat Infomation Centre) at the barracks,airforce, satalite,AC-130 and slave support at facilities massivey improves raiding efficency. If we are dealing with an oceanic aracolgy the sub and carrier massively improve efficency. */ /* Facilities and assoicated upgrades/equipement */ -<<if $SSLevelBarracks != 0>> - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelBarracks*0.15)))>><</if>> -<<if $securityForceArcologyUpgrades != 0>> /* (9) 135% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceArcologyUpgrades*0.15)))>><</if>> -<<if $SSLevelArmoury != 0>> - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelArmoury*0.15)))>><</if>> -<<if $securityForceInfantryPower != 0>> /* (11) 165% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceInfantryPower*0.15))>><</if>> -<<if $SSLevelStimulantLab != 0>> - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelStimulantLab*0.15)))>><</if>> -<<if $securityForceStimulantPower != 0>> /* (7) 105% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+(1+($securityForceStimulantPower*0.15)))>><</if>> -<<if $SSLevelGarage != 0>> - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelGarage*0.15)))>><</if>> -<<if $securityForceVehiclePower != 0>> /* (7) 105% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceVehiclePower*0.15))>><</if>> -<<if $SSLevelHangar != 0>> - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelHangar*0.15)))>><</if>> -<<if $securityForceAircraftPower != 0>> /* (7) 105% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+(1+($securityForceAircraftPower*0.15)))>><</if>> -<<if $securityForceSpacePlanePower != 0>> /* (8) 120% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*($securityForceSpacePlanePower*0.15))>><</if>> -<<if $securityForceFortressZeppelin != 0>> /* (3) 45 */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*($securityForceFortressZeppelin*0.15))>><</if>> -<<if $securityForceAC130 != 0>> /* (5) 75% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceAC130*0.15)))>><</if>> -<<if $SSLevelDroneBay != 0>> - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelDroneBay*0.15)))>><</if>> -<<if $securityForceDronePower != 0>> /* (7) 105% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceDronePower*0.15))>><</if>> -<<if $SSLevelLaunchBay != 0>> - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+(1+($SSLevelLaunchBay*0.15)))>><</if>> -<<if $securityForceSatalitePower != 0>> /* (16) 240% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceSatalitePower*0.15)))>><</if>> -<<if $securityForceGiantRobot != 0>> /* (9) 135% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*($securityForceGiantRobot*0.15))>><</if>> -<<if $SSLevelNavalYard !=0 && $terrain == "oceanic">> - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+(1+($SSLevelNavalYard*0.15)))>><</if>> -<<if $securityForceAircraftCarrier !=0 && $terrain == "oceanic">> /* (4) 60% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceAircraftCarrier*0.15)))>><</if>> -<<if $securityForceSubmarine !=0 && $terrain == "oceanic">> /* (5) 75% */ - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceSubmarine*0.15)))>><</if>> +<<if $SSLevelBarracks > 0>> + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelBarracks*0.2)))>> <</if>> +<<if $securityForceArcologyUpgrades > 0>> /* (10) 200% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceArcologyUpgrades*0.2)))>> <</if>> +<<if $SSLevelArmoury > 0>> + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelArmoury*0.2)))>> <</if>> +<<if $securityForceInfantryPower > 0>> /* (11) 220% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceInfantryPower*0.2))>> <</if>> +<<if $SSLevelStimulantLab > 0>> + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelStimulantLab*0.2)))>> <</if>> +<<if $securityForceStimulantPower > 0>> /* (7) 140% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceStimulantPower*0.2)))>> <</if>> +<<if $SSLevelGarage > 0>> + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelGarage*0.2)))>> <</if>> +<<if $securityForceVehiclePower > 0>> /* (7) 140% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceVehiclePower*0.2))>> <</if>> +<<if $SSLevelHangar > 0>> + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelHangar*0.2)))>> <</if>> +<<if $securityForceAircraftPower > 0>> /* (7) 140% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceAircraftPower*0.2)))>> <</if>> +<<if $securityForceSpacePlanePower > 0>> /* (9) 180% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceSpacePlanePower*0.2))>> <</if>> +<<if $securityForceFortressZeppelin > 0>> /* (3) 60% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceFortressZeppelin*0.2))>> <</if>> +<<if $securityForceAC130 > 0>> /* (5) 100% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceAC130*0.2)))>> <</if>> +<<if $SSLevelDroneBay > 0>> + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelDroneBay*0.2)))>> <</if>> +<<if $securityForceDronePower > 0>> /* (7) 140% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceDronePower*0.2))>> <</if>> +<<if $SSLevelLaunchBay > 0>> + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelLaunchBay*0.2)))>> <</if>> +<<if $securityForceSatalitePower > 0>> /* (16) 320% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceSatalitePower*0.2)))>> <</if>> +<<if $securityForceGiantRobot > 0>> /* (9) 180% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceGiantRobot*0.2))>> <</if>> +<<if $securityForceMissileSilo > 0>> /* (3) 60% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceMissileSilo*0.2))>> <</if>> +<<if $SSLevelNavalYard > 0 && $terrain == "oceanic">> + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($SSLevelNavalYard*0.2)))>> <</if>> +<<if $securityForceAircraftCarrier > 0 && $terrain == "oceanic">> /* (4) 80% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceAircraftCarrier*0.2)))>> <</if>> +<<if $securityForceSubmarine > 0 && $terrain == "oceanic">> /* (5) 100% */ + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(1+($securityForceSubmarine*0.2)))>> <</if>> /* Colonel stuff */ /* <<switch $ColonelCore>> <<case "warmonger">> - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(0.15))>> + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*(0.2))>> <</switch>> - <<if $securityForceSexedColonel != 0>> - <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency*($securityForceSexedColonel*0.15))>><</if>> */ + <<if $securityForceSexedColonel > 0>> + <<set $securityForceMissionEfficiency = ($securityForceMissionEfficiency+($securityForceSexedColonel*0.2))>> <</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)>> @@ -319,7 +322,7 @@ securityForceX */ Rules of Engagement: <span id="roe"><<if $securityForceRulesOfEngagement == "hold">>''Hold Fire''<<elseif $securityForceRulesOfEngagement == "limited">>''Limited Fire''<<else>>''Free Fire''<</if>></span>. <<link "Hold Fire">><<set $securityForceRulesOfEngagement = "hold">><<replace "#roe">>''Hold Fire''<</replace>><</link>> | <<link "Limited Fire">><<set $securityForceRulesOfEngagement = "limited">><<replace "#roe">>''Limited Fire''<</replace>><</link>> | <<link "Free Fire">><<set $securityForceRulesOfEngagement = "free">><<replace "#roe">>''Free Fire''<</replace>><</link>> Accountability: <span id="accountability"><<if $securityForceAccountability == "strict">>''Strict Accountability''<<elseif $securityForceAccountability == "some">>''Some Accountability''<<else>>''No Accountability''<</if>></span>. <<link "Strict Accountability">><<set $securityForceAccountability = "strict">><<replace "#accountability">>''Strict Accountability''<</replace>><</link>> | <<link "Some Accountability">><<set $securityForceAccountability = "some">><<replace "#accountability">>''Some Accountability''<</replace>><</link>> | <<link "No Accountability">><<set $securityForceAccountability = "none">><<replace "#accountability">>''No Accountability''<</replace>><</link>> <br> //Current Status:// - ''Barracks:'' +<<nobr>> ''Barracks:'' <br> /* 9 upgrades */ <<if $securityForceArcologyUpgrades == 0>> @@ -342,6 +345,8 @@ securityForceX */ The barracks has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful aracolgy wide electromagnetic forcefield has been installed, giving the $securityForceName an immense superiority in local firepower. <<elseif $securityForceArcologyUpgrades == 9>> The barracks has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 140 inch pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful aracolgy wide electromagnetic forcefield has been installed, giving the $securityForceName an immense superiority in local firepower. +<<elseif $securityForceArcologyUpgrades == 10>> + The barracks has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, electromagnetic railgun artillery 160 inch pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful aracolgy wide electromagnetic forcefield has been installed, giving the $securityForceName an immense superiority in local firepower. <</if>> <br><br> @@ -465,6 +470,8 @@ securityForceX */ Reduced Space Plane's weight and reworked the body to reduce drag. <<elseif $securityForceSpacePlanePower == 8>> Increased the SpacePlane's crew comfort and life support systems to increase operational time. + <<elseif $securityForceSpacePlanePower == 9>> + Added an additional engine per wing wich greatly increases acceleration and rases the top speed to mach 15, making $securityForceName's Space Plane untouchable. <</if>> <</if>> <<if $securityForceFortressZeppelin > 0>> @@ -526,11 +533,11 @@ securityForceX */ <<if $securityForceSatalitePower == 1>> A basic satalite 'borrowed' from the old world. <<elseif $securityForceSatalitePower == 2>> - Modernised the satalite's elecontrics. + Modernised the satalite's eletronics. <<elseif $securityForceSatalitePower == 3>> - Installed a basic localised communications jammer to the satalite (excludes your own frequencies with little to no leway) that will "slightly" anger locals untill it is deactivated. + Modernised the satalite's wiring and circuitry. <<elseif $securityForceSatalitePower == 4>> - //Missing description, please notify SFanon// + Installed a basic localised communications jammer to the satalite (excludes your own frequencies with little to no leway) that will "slightly" anger locals untill it is deactivated. <<elseif $securityForceSatalitePower == 5>> An advanced communications jammer is installed in the satalite, increasing the AO localisation, reducing the number of effected equipement. <<elseif $securityForceSatalitePower == 6>> @@ -613,4 +620,5 @@ securityForceX */ Upgraded the Submarine's air srubbers, allowing the sub be submerged for longer. <</if>> <</if>> -<</if>> \ No newline at end of file +<</if>> +<</nobr>> \ No newline at end of file -- GitLab