diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index 342a3d6df0a0b44b00d6a73c72d7e4dd745312af..bf1692ad72446c21b8efc7c214322e9688ab1a83 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*$upgradeMultiplierTechncian>>
+ <<set $cash -= 5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*($PC.techncian/10)>>
<<set $PC.engineering += 1, $PC.techncian += 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*$upgradeMultiplierTechncian))>>. Will provide more of the focused resource each week, but increases reputation upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian>>
+ <<set $cash -= 10000*$upgradeMultiplierArcology*_HistoryDiscount*($PC.techncian/10)>>
<<set $PC.techncian += 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*$upgradeMultiplierTechncian))>>. 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*($PC.techncian/10)))>>. 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 02027b4565d1337888bbca4c7860bee8086040b3..627d26cd3bf751d9cbda82738074e89ae5bda2f7 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) *$upgradeMultiplierTechncian>>
+ <<set $cash -= ((5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1))*($PC.techncian/10))>>
<<set $PC.engineering += 1, $PC.techncian += 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) *$upgradeMultiplierTechncian))>>. Will accelerate the tension decay, but will increase upkeep costs.//
+ <br>//Costs <<print cashFormat(Math.trunc((5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1))*($PC.techncian/10)))>>. 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 *$upgradeMultiplierTechncian>>
+ <<set $cash -= ((50000 * $upgradeMultiplierArcology * $brainImplantProject)*($PC.techncian/10))>>
<<set $PC.engineering += 1, $PC.techncian += 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*$upgradeMultiplierTechncian))>>. Will shorten the time required to complete the project.//
+ <br>//Costs <<print cashFormat(Math.trunc((50000 * $upgradeMultiplierArcology * $brainImplantProject)*($PC.techncian/10)))>>. Will shorten the time required to complete the project.//
<<else>>
You sped up the project to its maximum.
<</if>>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index 4995a1982f3971de7fc20eaf286d537bb4eb5c6e..b93028d4bd743885034857f3e2a05f2d9960ffe3 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*$upgradeMultiplierTechncian), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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)*($PC.techncian/10)), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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)*($PC.techncian/10)), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc((7500*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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)*($PC.techncian/10)), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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)*($PC.techncian/10)), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc((15000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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)*($PC.techncian/10)), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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)*($PC.techncian/10)), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc((7500*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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)*($PC.techncian/10)), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc((10000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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*($PC.techncian/10)), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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)*($PC.techncian/10))), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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*($PC.techncian/10)), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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)*($PC.techncian/10))), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc((15000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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*($PC.techncian/10)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc((2400000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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*($PC.techncian/10)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(((1200000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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*($PC.techncian/10)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc((900000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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*($PC.techncian/10)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc((600000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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*($PC.techncian/10)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc((300000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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*($PC.techncian/10)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc((100000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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*($PC.techncian/10)), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.techncian += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc((50000*$upgradeMultiplierArcology*_HistoryDiscount)*($PC.techncian/10)))>>. 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 3963f7d41c4080985a98717554be6b0043965ea7..ada58242595ab04bf63112e9ddf94dafa017fdc0 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*$upgradeMultiplierTechncian>>
+ <<set $cash -= 10000*($PC.techncian/10)>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(10000*$upgradeMultiplierTechncian)>> and will increase the base attack value of the security drones.//
+ <br>//Will take _time weeks, cost <<print cashFormat(10000*($PC.techncian/10))>> 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*$upgradeMultiplierTechncian>>
+ <<set $cash -= 120000*($PC.techncian/10)>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(120000*$upgradeMultiplierTechncian)>> and will increase the base attack and "defense" values of human troops.//
+ <br>//Will take _time weeks, cost <<print cashFormat(120000*($PC.techncian/10))>> 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*$upgradeMultiplierTechncian>>
+ <<set $cash -= 120000*($PC.techncian/10)>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(120000*$upgradeMultiplierTechncian)>> and will increase the base hp and morale values of human troops.//
+ <br>//Will take _time weeks, cost <<print cashFormat(120000*($PC.techncian/10))>> 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*$upgradeMultiplierTechncian>>
+ <<set $cash -= 1000000*($PC.techncian/10)>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(1000000*$upgradeMultiplierTechncian)>> and will increase all base stats of human troops.//
+ <br>//Will take _time weeks, cost <<print cashFormat(1000000*($PC.techncian/10))>> 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/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 37a48a988728d27c1c6ef8a33da0b796d67b20fd..f6ccba3d7074d9e1cacb076397e889bcece9a1b8 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -8,7 +8,6 @@
<<set $upgradeMultiplierArcology = 1>>
<<set $upgradeMultiplierMedicine = 1>>
-<<set $upgradeMultiplierTechncian = 1>>
<<if $PC.career == "wealth">>
<<set $trinkets.push("a collection of diplomas from expensive schools")>>
@@ -42,7 +41,7 @@
<<set $trinkets.push("your favorite handgun, whose sight has instilled fear in many")>>
<<set $minimumSlaveCost -= 1000>>
<<elseif $PC.career == "head techncian">>
- <<set $upgradeMultiplierTechncian = .8, $trinkets.push("your first sucesfuly overclocked CPU in a clear case.")>>
+ <<set $trinkets.push("your first sucesfuly overclocked CPU in a clear case.")>>
<</if>>
<<if $PC.rumor == "wealth">>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index af1fde063ad821b3949b232724e45e540b61befa..1aac893a5f68a0edac498208f85dbc0cbfa69278 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*$upgradeMultiplierTechncian))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian))>>. 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*$upgradeMultiplierTechncian))>>.
- [[No subsidy|Manage Arcology][$cash -= Math.trunc(25000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1, $PC.techncian += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1, $PC.techncian += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1, $PC.techncian += 1]]
+ You have not installed an FCTV receiver. Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology*($PC.techncian/10)))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc((20000*$upgradeMultiplierArcology)*($PC.techncian/10)))>>. 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*($PC.techncian/10)))>>.
+ [[No subsidy|Manage Arcology][$cash -= Math.trunc((25000*$upgradeMultiplierArcology)*($PC.techncian/10)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1, $PC.techncian += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc((20000*$upgradeMultiplierArcology)*($PC.techncian/10)), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1, $PC.techncian += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc((10000*$upgradeMultiplierArcology)*($PC.techncian/10)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1, $PC.techncian += 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*$upgradeMultiplierTechncian), $propHub = 1, $PC.engineering += 1, $PC.techncian += 1]]
- //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian))>>.//
+ [[Set up the propaganda Hub|Manage Arcology][$cash -= Math.trunc((5000*$upgradeMultiplierArcology)*($PC.techncian/10)), $propHub = 1, $PC.engineering += 1, $PC.techncian += 1]]
+ //Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology)*($PC.techncian/10)))>>.//
<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*$upgradeMultiplierTechncian), $secHQ = 1, $PC.engineering += 1, $PC.techncian += 1]]
- //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology**$upgradeMultiplierTechncian))>>.//
+ [[Set up the security headquarters|Manage Arcology][$cash -= Math.trunc((5000*$upgradeMultiplierArcology)*($PC.techncian/10)), $secHQ = 1, $PC.engineering += 1, $PC.techncian += 1]]
+ //Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology)*($PC.techncian/10)))>>.//
<br>//Building specialized in the management of security and crime.//
<<else>>
<br>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 05f8e50360112572c93aec9eea878c80d0a36b84..05223c6cac090635c53a5bbcf998260c87943bd0 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3860,7 +3860,7 @@ You remind yourself that success in this conflict will not be defined by the tra
<br> //This option is available due to your @@.springgreen;societal connections,@@ and will economically devastate your rival//
<</if>>
<</if>>
-<<if ($PC.career == "mercenary") || ($PC.career == "arcology owner") || ($PC.warfare >= 100)>>
+<<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>
<<if $mercenaries >= 3 || $securityForceActive == 1>>
<br><<link "Your peers will tolerate an attack if it's covert">>
<<replace "#result">>
@@ -3911,9 +3911,7 @@ You remind yourself that success in this conflict will not be defined by the tra
<</if>>
<</if>>
-geany events/intro/pcExperienceIntro.tw events/intro/introSummary.tw uncategorized/personalAssistantOptions.tw uncategorized/BackwardsCompatibility.tw init/storyInit.tw init/setupVars.tw uncategorized/nonRandomEvent.tw uncategorized/pRivalryActions.tw
-
-<<if $PC.techncian >= 100 (($PC.career == "mercenary") || ($PC.career == "arcology owner") || ($PC.warfare >= 100))>>
+<<if $PC.techncian >= 100 && (($PC.career == "mercenary") || ($PC.career == "arcology owner")>>
<<if $mercenaries >= 3 || $securityForceActive == 1>>
<br><<link "Trap your rival in their own archology and then extract them">>
<<replace "#result">>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index b241c2c9671a42ec900d53eeb1f40ffd2e13f8fb..4396ce9bfa186474de1b346a7f40bf16f6c312dc 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -30,9 +30,9 @@ __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*$upgradeMultiplierTechncian))>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $assistantPower += 1, $PC.engineering += 1, $PC.techncian += 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*($PC.techncian/10)))>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc((20000*$upgradeMultiplierArcology)*($PC.techncian/10)), $assistantPower += 1, $PC.engineering += 1, $PC.techncian += 1]]
<<elseif $assistantPower == 1>>
- //The final upgrade needed is a transition to optical RAM. This huge project will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian))>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $assistantPower += 1, $PC.engineering += 1, $PC.techncian += 1]]
+ //The final upgrade needed is a transition to optical RAM. This huge project will cost <<print cashFormat(Math.trunc((50000*$upgradeMultiplierArcology)*($PC.techncian/10)))>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc((50000*$upgradeMultiplierArcology)*($PC.techncian/10)), $assistantPower += 1, $PC.engineering += 1, $PC.techncian += 1]]
<<else>>
//The arcology's computer core is fully upgraded.//
<</if>>