From dc3394a79997bbacae138b75ef3b84c3c08d4b98 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Tue, 30 Jan 2018 16:41:20 +1300 Subject: [PATCH] Inital changes. --- src/SecExp/propagandaHub.tw | 8 +-- src/SecExp/riotControlCenter.tw | 8 +-- src/SecExp/secBarracks.tw | 8 +-- src/SecExp/securityHQ.tw | 72 +++++++++---------- src/SecExp/weaponsManufacturing.tw | 16 ++--- src/init/storyInit.tw | 2 + src/js/utilJS.tw | 44 +++++------- .../SecForceEX/SpecialForceUpgradeOptions.tw | 72 +++++++++---------- src/uncategorized/BackwardsCompatibility.tw | 4 +- src/uncategorized/brothel.tw | 2 +- src/uncategorized/clinic.tw | 12 ++-- src/uncategorized/manageArcology.tw | 12 ++-- src/uncategorized/personalAssistantOptions.tw | 14 ++-- 13 files changed, 135 insertions(+), 139 deletions(-) diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw index 734f9ea22d9..2b51eb8b216 100644 --- a/src/SecExp/propagandaHub.tw +++ b/src/SecExp/propagandaHub.tw @@ -79,13 +79,13 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the <<if $propCampaign < 5>> <<link "Invest more resources in the propaganda machine">> <<set $propCampaign += 1>> - <<set $cash -= 5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$TechnicianSkillEffect>> + <<set $cash -= 5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$technicianSkillCheck>> <<set $PC.engineering += 1, $PC.technician += 1>> <<set $propHubUpkeep += $upgradeUpkeep>> <<goto "propagandaHub">> <</link>> <br>Invest more resources into the project to increase its effectiveness. - <br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$TechnicianSkillEffect))>>. Will provide more of the focused resource each week, but increases reputation upkeep.// + <br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$technicianSkillCheck))>>. Will provide more of the focused resource each week, but increases reputation upkeep.// <<else>> You upgraded your propaganda machine to its limits. <</if>> @@ -134,13 +134,13 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the <<if $controlLeaks == 0>> <<link "Institute controlled leaks protocols">> <<set $controlLeaks = 1>> - <<set $cash -= 10000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect>> + <<set $cash -= 10000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck>> <<set $PC.technician += 1>> <<set $propHubUpkeep += $upgradeUpkeep>> <<goto "propagandaHub">> <</link>> <br>Institute a system able to release erroneous, but plausible, information about your business, leading your competitors to prepared financial traps. - <br>//Costs <<print cashFormat(Math.trunc(10000 * $upgradeMultiplierArcology * _HistoryDiscount*$TechnicianSkillEffect))>>. The authenticity dept. now slightly increases prosperity each week as well as authority, but increases upkeep.// + <br>//Costs <<print cashFormat(Math.trunc(10000 * $upgradeMultiplierArcology * _HistoryDiscount*$technicianSkillCheck))>>. The authenticity dept. now slightly increases prosperity each week as well as authority, but increases upkeep.// <<else>> You have instituted controlled leaks protocols, able to create fabricated leaks of sensible information. <</if>> diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw index 9b9991575ae..5ce9abe279f 100644 --- a/src/SecExp/riotControlCenter.tw +++ b/src/SecExp/riotControlCenter.tw @@ -24,13 +24,13 @@ The riot control center opens its guarded doors to you. The great chamber inside <<if $riotUpgrades.freeMedia < 5>> <<link "Invest more resources in the free media project">> <<set $riotUpgrades.freeMedia += 1>> - <<set $cash -= ((5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1)*$TechnicianSkillEffect))>> + <<set $cash -= ((5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1)*$technicianSkillCheck))>> <<set $PC.engineering += 1, $PC.technician += 1>> <<set $riotUpkeep += $upgradeUpkeep>> <<goto "riotControlCenter">> <</link>> <br>Invest more resources into the project to increase its effectiveness. - <br>//Costs <<print cashFormat(Math.trunc((5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1)*$TechnicianSkillEffect))>>. Will accelerate the tension decay, but will increase upkeep costs.// + <br>//Costs <<print cashFormat(Math.trunc((5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1)*$technicianSkillCheck))>>. Will accelerate the tension decay, but will increase upkeep costs.// <<else>> You upgraded your free media scheme to its limits. <</if>> @@ -153,13 +153,13 @@ The riot control center opens its guarded doors to you. The great chamber inside <<elseif $brainImplantProject < 5>> <<link "Invest more resources in the brain implant project">> <<set $brainImplantProject += 1>> - <<set $cash -= 50000 * $upgradeMultiplierArcology * $brainImplantProject*$TechnicianSkillEffect>> + <<set $cash -= 50000 * $upgradeMultiplierArcology * $brainImplantProject*$technicianSkillCheck>> <<set $PC.engineering += 1, $PC.technician += 1>> <<set $riotUpkeep += $upgradeUpkeep * 100>> <<goto "riotControlCenter">> <</link>> <br>Invest more resources into the project to increase its speed. - <br>//Costs <<print cashFormat(Math.trunc(50000 * $upgradeMultiplierArcology * $brainImplantProject*$TechnicianSkillEffect))>>. Will shorten the time required to complete the project.// + <br>//Costs <<print cashFormat(Math.trunc(50000 * $upgradeMultiplierArcology * $brainImplantProject*$technicianSkillCheck))>>. Will shorten the time required to complete the project.// <<else>> You sped up the project to its maximum. <</if>> diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw index 4d216954610..10edf3a120d 100644 --- a/src/SecExp/secBarracks.tw +++ b/src/SecExp/secBarracks.tw @@ -79,11 +79,11 @@ While this a sore sight for many citiens of $arcologies[0].name, the barracks st <<elseif $secBarracksUpgrades.luxury == 2>> <<link "Further increase the quality of life of your soldiers by providing high speed, free access to digital media">> <<set $secBarracksUpgrades.luxury += 1>> - <<set $cash -= 10000*($TechnicianSkillEffect)>> + <<set $cash -= 10000*($technicianSkillCheck)>> <<set $secBarracksUpkeep += $upgradeUpkeep>> <<goto "secBarracks">> <</link>> - <br>//Costs <<print cashFormat(10000*($TechnicianSkillEffect))>> and will provide a 5% bonus to morale, for a total of +15%.// + <br>//Costs <<print cashFormat(10000*($technicianSkillCheck))>> and will provide a 5% bonus to morale, for a total of +15%.// <<elseif $secBarracksUpgrades.luxury == 3>> <<link "Further increase the quality of life of your soldiers by adding and staffing an exclusive brothel to the structure">> <<set $secBarracksUpgrades.luxury += 1>> @@ -157,7 +157,7 @@ __Security Drones__ <<if $secBots.troops < $secBots.maxTroops>> | <<link "Replenish the unit">> - <<set $cash -= ($secBots.maxTroops - $secBots.troops) * $secBotsCost*($TechnicianSkillEffect)>> + <<set $cash -= ($secBots.maxTroops - $secBots.troops) * $secBotsCost*($technicianSkillCheck)>> <<set $secBots.troops = $secBots.maxTroops>> <<goto "secBarracks">> <</link>> @@ -165,7 +165,7 @@ __Security Drones__ <<else>> You have lost too many security drones to be able to field them again. <<link "Reform the unit">> - <<set $cash -= $secBots.maxTroops * $secBotsCost*($TechnicianSkillEffect)>> + <<set $cash -= $secBots.maxTroops * $secBotsCost*($technicianSkillCheck)>> <<set $secBots.troops = $secBots.maxTroops>> <<set $secBots.active = 1>> <<goto "secBarracks">> diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw index 0fa28986301..80822b6ff6d 100644 --- a/src/SecExp/securityHQ.tw +++ b/src/SecExp/securityHQ.tw @@ -111,30 +111,30 @@ Considering the current upgrades the resting level for security is <<print $secR <br> <<if $secUpgrades.nanoCams == 0>> - [[Install a nano-camera system |securityHQ][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect)), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] - <br>//Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// + [[Install a nano-camera system |securityHQ][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck)), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] + <br>//Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed all across the arcology closed circuit nano-cameras to keep the arcology under your watchful eye. <</if>> <br> <<if $secUpgrades.cyberBots == 0>> - [[Buy cybersecurity algorithms|securityHQ][$cash -= Math.trunc((7500*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect)), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] - <br>//Costs <<print cashFormat(Math.trunc((7500*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// + [[Buy cybersecurity algorithms|securityHQ][$cash -= Math.trunc((7500*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck)), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] + <br>//Costs <<print cashFormat(Math.trunc((7500*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have bought advanced cybersecurity algorithms that will defend your arcology against hack attempts or cyber frauds. <</if>> <br> <<if $rep > 10000>> <<if $secUpgrades.eyeScan == 0>> - [[Install invisible eye scanners|securityHQ][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect)), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]] - <br>//Costs <<print cashFormat(Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// + [[Install invisible eye scanners|securityHQ][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck)), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]] + <br>//Costs <<print cashFormat(Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed numerous hidden eye scanners that accurately register the movements of everyone inside the arcology. <</if>> <br> <<if $secUpgrades.cryptoAnalyzer == 0>> - [[Buy and install crypto analyzers|securityHQ][$cash -= Math.trunc((15000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect)), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]] - <br>//Costs <<print cashFormat(Math.trunc((15000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// + [[Buy and install crypto analyzers|securityHQ][$cash -= Math.trunc((15000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck)), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]] + <br>//Costs <<print cashFormat(Math.trunc((15000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have bought and employed sophisticated crypto analyzing software to accurately track and archive every financial movement or transaction made inside the walls of your arcology. <</if>> @@ -163,30 +163,30 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap <br> <<if $crimeUpgrades.advForensic == 0>> - [[Install advanced forensic equipment|securityHQ][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect)), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// + [[Install advanced forensic equipment|securityHQ][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck)), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed advanced forensic equipment, able to extract every bit of precious information from any clue. <</if>> <br> <<if $crimeUpgrades.autoArchive == 0>> - [[Install auto-curating archiver|securityHQ][$cash -= Math.trunc((7500*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect)), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((7500*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// + [[Install auto-curating archiver|securityHQ][$cash -= Math.trunc((7500*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck)), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((7500*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed auto-curating archiver software, which will update in real time your data archives with any new relevant information on criminals residing in your arcology. <</if>> <br> <<if $rep > 10000>> <<if $crimeUpgrades.autoTrial == 0>> - [[Install automated trials software|securityHQ][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect)), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// + [[Install automated trials software|securityHQ][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck)), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed advanced legal algorithms that allows the handling of legal matters much quicker and much more accurately. <</if>> <br> <<if $crimeUpgrades.worldProfiler == 0>> - [[Install worldwide profilers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*(($TechnicianSkillEffect)), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*(($TechnicianSkillEffect)))>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// + [[Install worldwide profilers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*(($technicianSkillCheck)), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*(($technicianSkillCheck)))>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed advanced profiler software, which will constantly scour every known data archive on the globe (legally or not) to gather as much information as possible on dangerous criminals. <</if>> @@ -213,23 +213,23 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap <br> <<if $intelUpgrades.sensors == 0>> - [[Install perimeter sensors|securityHQ][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect)), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will increase recon capabilites, but will require 5 extra slaves in the headquarters and increases upkeep.// + [[Install perimeter sensors|securityHQ][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck)), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will increase recon capabilites, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed perimeter seismic sensors able to detect movement with high accuracy. <</if>> <br> <<if $intelUpgrades.signalIntercept == 0>> - [[Create signal interception hub|securityHQ][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*(($TechnicianSkillEffect))), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep.// + [[Create signal interception hub|securityHQ][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*(($technicianSkillCheck))), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed advanced signal interception equipment. <</if>> <br> <<if $rep > 10000>> <<if $intelUpgrades.radar == 0>> - [[Install advanced radar equipment|securityHQ][$cash -= Math.trunc((15000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect)), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((15000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will increase recon capabilities, but will require 10 extra slaves in the headquarters and increases upkeep.// + [[Install advanced radar equipment|securityHQ][$cash -= Math.trunc((15000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck)), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((15000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will increase recon capabilities, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed sophisticated radar equipment. <</if>> @@ -295,36 +295,36 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap <<if $secUpgrades.coldstorage == 6 && $rep >= 19500 && $reqHelots > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of two years. <br> - [[Expand the cold storage facility to increase data retention to three years|securityHQ][$cash -= Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*(($TechnicianSkillEffect)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((2400000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// + [[Expand the cold storage facility to increase data retention to three years|securityHQ][$cash -= Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*(($technicianSkillCheck)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((2400000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// <<elseif $secUpgrades.coldstorage == 5 && $rep >= 19500 && $reqHelots > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of one year. <br> - [[Expand the cold storage facility to increase data retention to two years|securityHQ][$cash -= Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*(($TechnicianSkillEffect)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc(((1200000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect)))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// + [[Expand the cold storage facility to increase data retention to two years|securityHQ][$cash -= Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*(($technicianSkillCheck)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc(((1200000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck)))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// <<elseif $secUpgrades.coldstorage == 4 && $rep >= 19500 && $reqHelots > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of nine months. <br> - [[Expand the cold storage facility to increase data retention to one year|securityHQ][$cash -= Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*(($TechnicianSkillEffect)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((900000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// + [[Expand the cold storage facility to increase data retention to one year|securityHQ][$cash -= Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*(($technicianSkillCheck)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((900000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// <<elseif $secUpgrades.coldstorage == 3 && $rep > 18000 && $reqHelots > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of six months. <br> - [[Expand the cold storage facility to increase data retention to nine months|securityHQ][$cash -= Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*(($TechnicianSkillEffect)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((600000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// + [[Expand the cold storage facility to increase data retention to nine months|securityHQ][$cash -= Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*(($technicianSkillCheck)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((600000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// <<elseif $secUpgrades.coldstorage == 2 && $rep > 16000 && $reqHelots > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of three months. <br> - [[Expand the cold storage facility to increase data retention to six months|securityHQ][$cash -= Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*(($TechnicianSkillEffect)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((300000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// + [[Expand the cold storage facility to increase data retention to six months|securityHQ][$cash -= Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*(($technicianSkillCheck)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((300000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// <<elseif $secUpgrades.coldstorage == 1 && $rep > 14000 && $reqHelots > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of one month. <br> - [[Expand the cold storage facility to increase data retention to three months|securityHQ][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*(($TechnicianSkillEffect)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((100000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// + [[Expand the cold storage facility to increase data retention to three months|securityHQ][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*(($technicianSkillCheck)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((100000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.// <<elseif $secUpgrades.coldstorage == 0 && $rep > 12000 && $reqHelots > 10>> - [[Install a cold storage facility|securityHQ][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*(($TechnicianSkillEffect)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] - <br>//Costs <<print cashFormat(Math.trunc((50000*$upgradeMultiplierArcology*_HistoryDiscount*$TechnicianSkillEffect))>>. Will lower the amount of required slaves by 10, but will increases upkeep.// + [[Install a cold storage facility|securityHQ][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*(($technicianSkillCheck)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.technician += 1]] + <br>//Costs <<print cashFormat(Math.trunc((50000*$upgradeMultiplierArcology*_HistoryDiscount*$technicianSkillCheck))>>. Will lower the amount of required slaves by 10, but will increases upkeep.// <<elseif $secUpgrades.coldstorage > 6>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of three years. <<elseif $reqHelots <= 10>> diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw index 9a371c6649b..525aa42a6f0 100644 --- a/src/SecExp/weaponsManufacturing.tw +++ b/src/SecExp/weaponsManufacturing.tw @@ -197,10 +197,10 @@ __Upgrades__: unit: 0, type: "attack", time: _time}>> - <<set $cash -= 10000*$TechnicianSkillEffect>> + <<set $cash -= 10000*$technicianSkillCheck>> <<goto "weaponsManufacturing">> <</link>> - <br>//Will take _time weeks, cost <<print cashFormat(10000*$TechnicianSkillEffect)>> and will increase the base attack value of the security drones.// + <br>//Will take _time weeks, cost <<print cashFormat(10000*$technicianSkillCheck)>> and will increase the base attack value of the security drones.// <<elseif !$completedUpgrades.includes(-2) && $weapLab >= 2>> <<link "Develop adaptive armored frames">> <<set $currentUpgrade = { @@ -299,10 +299,10 @@ __Upgrades__: unit: 1, type: "attackAndDefense", time: _time}>> - <<set $cash -= 120000*$TechnicianSkillEffect>> + <<set $cash -= 120000*$technicianSkillCheck>> <<goto "weaponsManufacturing">> <</link>> - <br>//Will take _time weeks, cost <<print cashFormat(120000*$TechnicianSkillEffect)>> and will increase the base attack and "defense" values of human troops.// + <br>//Will take _time weeks, cost <<print cashFormat(120000*$technicianSkillCheck)>> and will increase the base attack and "defense" values of human troops.// <</if>> <<if !$completedUpgrades.includes(5) && $weapLab >= 3>> <br> @@ -313,10 +313,10 @@ __Upgrades__: unit: 1, type: "hpAndMorale", time: _time}>> - <<set $cash -= 120000*$TechnicianSkillEffect>> + <<set $cash -= 120000*$technicianSkillCheck>> <<goto "weaponsManufacturing">> <</link>> - <br>//Will take _time weeks, cost <<print cashFormat(120000*$TechnicianSkillEffect)>> and will increase the base hp and morale values of human troops.// + <br>//Will take _time weeks, cost <<print cashFormat(120000*$technicianSkillCheck)>> and will increase the base hp and morale values of human troops.// <</if>> <br> <<if $securityForceCreate == 1>> @@ -356,10 +356,10 @@ __Upgrades__: unit: 1, type: "all", time: _time}>> - <<set $cash -= 1000000*$TechnicianSkillEffect>> + <<set $cash -= 1000000*$technicianSkillCheck>> <<goto "weaponsManufacturing">> <</link>> - <br>//Will take _time weeks, cost <<print cashFormat(1000000*$TechnicianSkillEffect)>> and will increase all base stats of human troops.// + <br>//Will take _time weeks, cost <<print cashFormat(1000000*$technicianSkillCheck)>> and will increase all base stats of human troops.// <</if>> <</if>> <<if $securityForceCreate == 1 && ($humanUpgrade.attack >= 4 || $humanUpgrade.hp >= 4 || $humanUpgrade.morale >= 40 || $humanUpgrade.defense >= 4)>> diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index ecc04fd4ee6..3c41824b622 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1295,3 +1295,5 @@ erectileImplant: 0 <<include "secInit">> <<goto "Alpha disclaimer">> + +<<set $PC.technician = technicianSkillCheck()>> \ No newline at end of file diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw index d7966b206c6..72f1dd18e4a 100644 --- a/src/js/utilJS.tw +++ b/src/js/utilJS.tw @@ -433,30 +433,24 @@ if(typeof Categorizer === 'function') { */ jQuery(document).trigger('categorizer.ready'); -if(Story.variables.PC.technician <= -100) { - return (Story.variables.TechnicianSkillEffect = 1.5); +window.TechnicianSkill = function(PC) { +if(PC.technician <= -100) { + return 1.5; +} else if(PC.technician >= -75) { + return 1.35; +} else if(PC.technician >= -50) { + return 1.25; +} else if(PC.technician >= -25) { + return 1.15; +} else if(PC.technician <= 25) { + return 1; +} else if(PC.technician >= 25) { + return .95; +} else if(PC.technician >= 50) { + return .75; +} else if(PC.technician >= 75) { + return .65; +} else if(PC.technician >= 100) { + return .5; } -if(Story.variables.PC.technician >= -75) { - return (Story.variables.TechnicianSkillEffect = 1.35); -} -if(Story.variables.PC.technician >= -50) { - )return tory.variables.TechnicianSkillEffect = 1.25); -} -if(Story.variables.PC.technician >= -25) { - return (Story.variables.TechnicianSkillEffect = 1.15); -} -if(Story.variables.PC.technician <= 25) { - return (Story.variables.TechnicianSkillEffect = 1); -} -if(Story.variables.PC.technician >= 25) { - return (Story.variables.TechnicianSkillEffect = .95); -} -if(Story.variables.PC.technician >= 50) { - return (Story.variables.TechnicianSkillEffect = .75); -} -if(Story.variables.PC.technician >= 75) { - return (Story.variables.TechnicianSkillEffect = .65); -} -if(Story.variables.PC.technician >= 100) { - return (Story.variables.TechnicianSkillEffect = .5); } \ No newline at end of file diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw index 3aa2d365282..60a1b54ef69 100755 --- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw +++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw @@ -47,9 +47,9 @@ <br><<link "Barracks">> <<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, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(_arcCost*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(_arcCost*$Env*$technicianSkillCheck)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades == 13>> <br><<link "Barracks">> <<replace "#resultX">><br><br> @@ -241,9 +241,9 @@ <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." - <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= 4750000*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= 4750000*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(4750000*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(4750000*$Env*$technicianSkillCheck)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < _SpacePlaneMax>> <<if $securityForceSpacePlanePower < 4>> <<set _spCost = 50000000>> @@ -269,9 +269,9 @@ <br><<link "Space plane">> <<replace "#resultY">><br><br> "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 -= _spCost*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= _spCost*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(_spCost*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(_spCost*$Env*$technicianSkillCheck)>> // <</if>> <<if $securityForceSpacePlanePower == _SpacePlaneMax>> <br>//$securityForceName has fully upgraded the space plane to support it's activities.// @@ -299,16 +299,16 @@ <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." - <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 35000000*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 35000000*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(35000000*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(35000000*$Env*$technicianSkillCheck)>> // <<elseif $securityForceAC130 > 1 && $securityForceAC130 < _AC130Max>> <br><<link "AC-130">> <<replace "#resultY">><br><br> "Sure, boss." she says, nodding. "Upgrading the AC-130, 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, $securityForceAC130++, $cash -= 25000000*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 25000000*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(25000000*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(25000000*$Env*$technicianSkillCheck)>> // <</if>> <<if $securityForceAC130 == _AC130Max>> <br>//$securityForceName has fully upgraded the AC-130 to support it's activities.// @@ -342,16 +342,16 @@ <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." - <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(45000*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(45000*$Env*$technicianSkillCheck)>> // <<elseif $securityForceUpgradeToken == 0 && _DroneBay < _DroneBayMax && $securityForceAircraftPower >= 5 && _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5>> <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." - <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 2000000*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 2000000*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(2000000*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(2000000*$Env*$technicianSkillCheck)>> // <</if>> <<if _DroneBay == 5 || _DroneBay == _DroneBayMax>> <br>//$securityForceName has fully upgraded the drone bay to support it's activities.// @@ -373,9 +373,9 @@ <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." - <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= 3750000*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= 3750000*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(3750000*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(3750000*$Env*$technicianSkillCheck)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower >= 1 && $securityForceSatellitePower < _SatelliteMax>> <<switch $securityForceSatellitePower>> <<case 11>> @@ -404,16 +404,16 @@ <br><<link "Satellite">> <<replace "#resultZ">><br><br> "Sure, boss." she says, nodding. "Upgrading the 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." - <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(_satCost*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(_satCost*$Env*$technicianSkillCheck)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower == 20 && $PC.technician >= 75>> <br><<link "Satellite">> <<replace "#resultZ">><br><br> "Sure, boss." she says, nodding. "Upgrading the 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." - <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(_satCost*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(_satCost*$Env*$technicianSkillCheck)>> // <</if>> <<if $securityForceSatellitePower == 20 || $securityForceSatellitePower == _SatelliteMax>> <br>//$securityForceName has fully upgraded the Satellite to support it's activities.// @@ -423,9 +423,9 @@ <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." - <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(50000000*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(50000000*$Env*$technicianSkillCheck)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GiantRobotMax>> <<if $securityForceGiantRobot < 3>> <<set _robCost = 25000000>> @@ -459,9 +459,9 @@ <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." - <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(_robCost*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(_robCost*$Env*$technicianSkillCheck)>> // <</if>> <<if $securityForceGiantRobot == 9 || $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>> <br>//$securityForceName has fully upgraded the giant robot to support it's activities.// @@ -471,9 +471,9 @@ <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." - <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= 200000000*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= 200000000*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(200000000*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(200000000*$Env*$technicianSkillCheck)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceMissileSilo >= 1 && $securityForceMissileSilo < _MissileSiloMax>> <<if $securityForceMissileSilo == 1>> <<set _msCost = 250000000>> @@ -483,9 +483,9 @@ <br><<link "Missile silo">> <<replace "#resultZ">><br><br> "Sure, boss." she says, nodding. "Upgrading the missile silo, 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*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= _msCost*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(_msCost*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(_msCost*$Env*$technicianSkillCheck)>> // <</if>> <<if $securityForceMissileSilo == _MissileSiloMax && ($terrain != "oceanic" && $terrain != "marine")>><br>//$securityForceName has fully upgraded the missile silo to support it's activities.//<</if>> @@ -509,16 +509,16 @@ <br><<link "An aircraft carrier">> <<replace "#resultA">><br><br> "Sure, boss." she says, nodding. "An aircraft carrier 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, $securityForceAircraftCarrier++, $cash -= 1500000*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 1500000*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(1500000*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(1500000*$Env*$technicianSkillCheck)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier >= 1 && $securityForceAircraftCarrier < _AircraftCarrierMax>> <br><<link "Aircraft carrier">> <<replace "#resultA">><br><br> "Sure, boss." she says, nodding. "Upgrading the aircraft carrier 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, $securityForceAircraftCarrier++, $cash -= 25000000*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 25000000*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(25000000*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(25000000*$Env*$technicianSkillCheck)>> // <</if>> <<if $securityForceAircraftCarrier == _AircraftCarrierMax && ($terrain == "oceanic" || $terrain == "marine")>> <br>//$securityForceName has fully upgraded the aircraft carrier to support it's activities.// @@ -528,9 +528,9 @@ <br><<link "A submarine">> <<replace "#resultA">><br><br> "Sure, boss." she says, nodding. "A submarine 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, $securityForceSubmarine++, $cash -= 1500000*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= 1500000*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(1500000*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(1500000*$Env*$technicianSkillCheck)>> // <<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine >= 1 && $securityForceSubmarine < _SubmarineMax>> <<if $securityForceSubmarine < 4>> <<set _subCost = 25000000>> @@ -540,9 +540,9 @@ <br><<link "Submarine">> <<replace "#resultA">><br><br> "Sure, boss." she says, nodding. "Upgrading the submarine, 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, $securityForceSubmarine++, $cash -= _subCost*$Env*$TechnicianSkillEffect>> + <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*$Env*$technicianSkillCheck>> <</replace>> - <</link>> // Costs <<print cashFormat(_subCost*$Env*$TechnicianSkillEffect)>> // + <</link>> // Costs <<print cashFormat(_subCost*$Env*$technicianSkillCheck)>> // <</if>> <<if $securityForceSubmarine == _SubmarineMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the submarine to support it's activities.//<</if>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 095b476e55f..0596c42837b 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -238,8 +238,8 @@ <<if ndef $PC.technician>> <<set $PC.technician = 0>> <</if>> -<<if ndef $TechnicianSkillEffect>> - <<set $TechnicianSkillEffect = 1>> +<<if ndef $technicianSkillCheck>> + <<set $technicianSkillCheck = 1>> <</if>> <<if ndef $universalRulesImmobileSlavesMaintainMuscles>> diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw index b81020918e8..996c50b99e6 100644 --- a/src/uncategorized/brothel.tw +++ b/src/uncategorized/brothel.tw @@ -157,7 +157,7 @@ $brothelNameCaps <<elseif $brothelUpgradeDrugs == 0.1>> It has been upgraded with aphrodisiac injection systems that monitor the whores and adjust dosage to keep them healthy but desperately horny and hopelessly addicted. The systems are currently disabled. [[Enable them|Brothel][$brothelUpgradeDrugs = 1]] //Will increase upkeep costs// <<else>> - <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$TechnicianSkillEffect)>> + <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$technicianSkillCheck)>> It is a standard brothel. [[Upgrade the brothel with aphrodisiac injection systems|Brothel][$cash -= _Tmult1, $brothelUpgradeDrugs = 0.1, $PC.technician += 1]] //Costs <<print cashFormat(_Tmult1)>> and will increase upkeep costs// <</if>> diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw index 062fc702575..3faba6103bd 100644 --- a/src/uncategorized/clinic.tw +++ b/src/uncategorized/clinic.tw @@ -78,16 +78,16 @@ $clinicNameCaps <<if $clinicUpgradeScanner == 1>> $clinicNameCaps's scanners have been upgraded with a sampling system that can estimate carcinogenic damage to a slave's genome. <<else>> - <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$TechnicianSkillEffect)>> + <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$technicianSkillCheck)>> It mounts powerful medical scanning technology. [[Upgrade the scanners to help detect genomic damage|Clinic][$cash -= _Tmult1, $clinicUpgradeScanner = 1]] //Costs <<print cashFormat(_Tmult1)>>// <</if>> <br> <<if $clinicUpgradeFilters == 1>> -<<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology*$TechnicianSkillEffect)>> -<<set _Tmult4 = Math.trunc(1500000*$upgradeMultiplierArcology*$TechnicianSkillEffect)>> -<<set _Tmult5 = Math.trunc(15000000*$upgradeMultiplierArcology*$TechnicianSkillEffect)>> -<<set _Tmult6 = Math.trunc(150000000*$upgradeMultiplierArcology*$TechnicianSkillEffect)>> +<<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology*$technicianSkillCheck)>> +<<set _Tmult4 = Math.trunc(1500000*$upgradeMultiplierArcology*$technicianSkillCheck)>> +<<set _Tmult5 = Math.trunc(15000000*$upgradeMultiplierArcology*$technicianSkillCheck)>> +<<set _Tmult6 = Math.trunc(150000000*$upgradeMultiplierArcology*$technicianSkillCheck)>> <<if $clinicUpgradePurge == 4>> The entire floor beneath $clinicName is occupied by a huge even more overclocked filtration plant that constantly cycles out the patients' blood to remove impurities. <<elseif $clinicUpgradePurge == 3*$PC.technician >= 100>> @@ -103,7 +103,7 @@ $clinicNameCaps <br>However, without a nurse in attendance, the blood treatment equipment remains idle. <</if>> <<else>> - <<set _Tmult2 = Math.trunc(50000*$upgradeMultiplierArcology*$TechnicianSkillEffect)>> + <<set _Tmult2 = Math.trunc(50000*$upgradeMultiplierArcology*$technicianSkillCheck)>> It includes standard dialysis equipment. [[Install advanced blood treatment equipment to help address drug side effects|Clinic][$cash -= _Tmult2, $clinicUpgradeFilters = 1]] //Costs <<print cashFormat(_Tmult2)>>// <</if>> diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw index 2d2660c41ed..48dc82285bc 100644 --- a/src/uncategorized/manageArcology.tw +++ b/src/uncategorized/manageArcology.tw @@ -73,8 +73,8 @@ __Construction__ <br> <<if ($receiverAvailable == 1) && ($FCTVenable != 0) && ($FCTVreceiver == 0)>> - You have not installed an FCTV receiver. Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology*(($TechnicianSkillEffect)))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc((20000*$upgradeMultiplierArcology*$TechnicianSkillEffect))>>. You can also have them heavily subsidize installation, they will be upset about it, but it will only cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*(($TechnicianSkillEffect)))>>. - [[No subsidy|Manage Arcology][$cash -= Math.trunc((25000*$upgradeMultiplierArcology*$TechnicianSkillEffect)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1, $PC.technician += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc((20000*$upgradeMultiplierArcology*$TechnicianSkillEffect)), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1, $PC.technician += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*$TechnicianSkillEffect)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1, $PC.technician += 1]] + You have not installed an FCTV receiver. Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology*(($technicianSkillCheck)))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc((20000*$upgradeMultiplierArcology*$technicianSkillCheck))>>. You can also have them heavily subsidize installation, they will be upset about it, but it will only cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*(($technicianSkillCheck)))>>. + [[No subsidy|Manage Arcology][$cash -= Math.trunc((25000*$upgradeMultiplierArcology*$technicianSkillCheck)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1, $PC.technician += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc((20000*$upgradeMultiplierArcology*$technicianSkillCheck)), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1, $PC.technician += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*$technicianSkillCheck)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1, $PC.technician += 1]] <<elseif ($FCTVreceiver == 3)>> You have installed the FCTV receiver and have access to the full range of FCTV's programs. High viewership rates amongst your citizens makes it easier to pursue your societal goals. <<elseif ($FCTVreceiver == 2)>> @@ -89,8 +89,8 @@ __Construction__ __Security__ <<if $propHub == 0>> <br> - [[Set up the propaganda Hub|Manage Arcology][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*$TechnicianSkillEffect)), $propHub = 1, $PC.engineering += 1, $PC.technician += 1]] - //Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*$TechnicianSkillEffect))>>.// + [[Set up the propaganda Hub|Manage Arcology][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*$technicianSkillCheck)), $propHub = 1, $PC.engineering += 1, $PC.technician += 1]] + //Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*$technicianSkillCheck))>>.// <br>//Building specialized in the management of authority.// <<else>> <br> @@ -98,8 +98,8 @@ __Construction__ <</if>> <<if $secHQ == 0>> <br> - [[Set up the security headquarters|Manage Arcology][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*$TechnicianSkillEffect)), $secHQ = 1, $PC.engineering += 1, $PC.technician += 1]] - //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$TechnicianSkillEffect))>>.// + [[Set up the security headquarters|Manage Arcology][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*$technicianSkillCheck)), $secHQ = 1, $PC.engineering += 1, $PC.technician += 1]] + //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$technicianSkillCheck))>>.// <br>//Building specialized in the management of security and crime.// <<else>> <br> diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw index 8a02913ff92..41244f58a33 100644 --- a/src/uncategorized/personalAssistantOptions.tw +++ b/src/uncategorized/personalAssistantOptions.tw @@ -30,11 +30,11 @@ __Computer Core Upgrades__ <br> <<if $assistantPower == 0>> - //The first upgrade needed is a switch to a holographic memory core to store the immense quantity of data $assistantName gathers. This upgrade will cost <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*(($TechnicianSkillEffect)))>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc((20000*$upgradeMultiplierArcology*$TechnicianSkillEffect)), $assistantPower += 1, $PC.engineering += 1, $PC.technician += 1]] + //The first upgrade needed is a switch to a holographic memory core to store the immense quantity of data $assistantName gathers. This upgrade will cost <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*(($technicianSkillCheck)))>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc((20000*$upgradeMultiplierArcology*$technicianSkillCheck)), $assistantPower += 1, $PC.engineering += 1, $PC.technician += 1]] <<elseif $assistantPower == 1>> - //The second upgrade needed is a transition to optical RAM. This huge project will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*$TechnicianSkillEffect))>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*$TechnicianSkillEffect), $assistantPower += 1, $PC.engineering += 1, $PC.technician += 1]] + //The second upgrade needed is a transition to optical RAM. This huge project will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*$technicianSkillCheck))>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*$technicianSkillCheck), $assistantPower += 1, $PC.engineering += 1, $PC.technician += 1]] <<elseif $PC.technician >= 75 && $PC.engineering >= 75>> - //The final upgrade is to overclock <<if $assistant == 0>>it<<else>>she<</if>>. This massive project will cost <<print cashFormat(Math.trunc(150000000*$upgradeMultiplierArcology*$TechnicianSkillEffect))>>.// [[Overclock|Personal assistant options][$cash -= Math.trunc(150000000*$upgradeMultiplierArcology*$TechnicianSkillEffect), $assistantPower += 1, $PC.engineering += 1, $PC.technician += 1]] + //The final upgrade is to overclock <<if $assistant == 0>>it<<else>>she<</if>>. This massive project will cost <<print cashFormat(Math.trunc(150000000*$upgradeMultiplierArcology*$technicianSkillCheck))>>.// [[Overclock|Personal assistant options][$cash -= Math.trunc(150000000*$upgradeMultiplierArcology*$technicianSkillCheck), $assistantPower += 1, $PC.engineering += 1, $PC.technician += 1]] <<else>> //The arcology's computer core is fully upgraded.// <</if>> @@ -816,16 +816,16 @@ __Downloadable Appearances:__ <br> /* <<if $assistantExtra1 == 0>> - [[Purchase a set of monstergirl appearances|Assistant Events][$event = "", $cash -= Math.trunc((6000*$upgradeMultiplier)*($TechnicianSkillEffect)), $assistantExtra1 = 1]] - //Costs <<print cashFormat(Math.trunc((6000*$upgradeMultiplier)*$TechnicianSkillEffect))>>// + [[Purchase a set of monstergirl appearances|Assistant Events][$event = "", $cash -= Math.trunc((6000*$upgradeMultiplier)*($technicianSkillCheck)), $assistantExtra1 = 1]] + //Costs <<print cashFormat(Math.trunc((6000*$upgradeMultiplier)*$technicianSkillCheck))>>// <<else>>You have downloaded a set of monstergirl appearances for your avatar. <</if>> */ <<if $assistantExtra2 == 0>> <<link "Purchase a set of heaven and hell themed appearances">> - <<set $cash -= Math.trunc((10000*$upgradeMultiplierArcology)*$TechnicianSkillEffect), $assistantExtra2 = 1, $nextLink = "Personal assistant options">> + <<set $cash -= Math.trunc((10000*$upgradeMultiplierArcology)*$technicianSkillCheck), $assistantExtra2 = 1, $nextLink = "Personal assistant options">> <<goto "Assistant Appearance Pack Two">> - <</link>> //Costs <<print cashFormat(Math.trunc((10000*$upgradeMultiplierArcology)*$TechnicianSkillEffect))>>// + <</link>> //Costs <<print cashFormat(Math.trunc((10000*$upgradeMultiplierArcology)*$technicianSkillCheck))>>// <<else>>You have downloaded a set of heavenly and hellish appearances for your avatar. <</if>> <</if>> -- GitLab