From 0223933a68d265ea5067e6005883484ddb8eef64 Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Sun, 4 Feb 2018 13:54:24 +1300
Subject: [PATCH] Adding costs options and renaming.
---
src/SecExp/propagandaHub.tw | 12 +--
src/SecExp/riotControlCenter.tw | 12 +--
src/SecExp/secBarracks.tw | 8 +-
src/SecExp/securityHQ.tw | 72 ++++++-------
src/SecExp/weaponsManufacturing.tw | 16 +--
src/events/intro/introSummary.tw | 2 +-
src/init/storyInit.tw | 8 +-
src/js/economyJS.tw | 2 +
src/js/utilJS.tw | 42 ++++----
.../SecForceEX/SpecialForceUpgradeDec.tw | 16 +--
.../SecForceEX/SpecialForceUpgradeOptions.tw | 101 +++++++++++-------
.../SecForceEX/SpecialForceUpgradeTree.tw | 27 +++--
src/pregmod/managePersonalAffairs.tw | 22 ++--
src/uncategorized/BackwardsCompatibility.tw | 4 +-
src/uncategorized/SFMBarracks.tw | 33 +++---
src/uncategorized/brothel.tw | 4 +-
src/uncategorized/clinic.tw | 12 +--
src/uncategorized/costs.tw | 2 +-
src/uncategorized/costsReport.tw | 4 +-
src/uncategorized/manageArcology.tw | 16 +--
src/uncategorized/pRivalryActions.tw | 16 +--
src/uncategorized/persBusiness.tw | 36 +++----
src/uncategorized/personalAssistantOptions.tw | 12 +--
src/uncategorized/personalAttentionSelect.tw | 31 +++---
24 files changed, 279 insertions(+), 231 deletions(-)
diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index 736f57a170d..4ad2db9a42d 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*$TechnicianSkillCheck>>
- <<set $PC.engineering += 1, $PC.technician += 1>>
+ <<set $cash -= 5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier>>
+ <<set $PC.engineering += 1, $PC.NetworkThreatSpecialist += 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*$TechnicianSkillCheck))>>. Will provide more of the focused resource each week, but increases reputation upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$TechnicianSkillCheck>>
- <<set $PC.technician += 1>>
+ <<set $cash -= 10000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier>>
+ <<set $PC.NetworkThreatSpecialist += 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*$TechnicianSkillCheck))>>. 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*$NetworkThreatSpecialistSkillMultiplier))>>. 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. [[Shut down leak protocols|propagandaHub][$controlLeaks = 0, $propHubUpkeep -= $upgradeUpkeep]]
<</if>>
diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw
index 07843cc6c77..bbc529d0766 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)*$TechnicianSkillCheck))>>
- <<set $PC.engineering += 1, $PC.technician += 1>>
+ <<set $cash -= ((5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1)*$NetworkThreatSpecialistSkillMultiplier))>>
+ <<set $PC.engineering += 1, $PC.NetworkThreatSpecialist += 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)*$TechnicianSkillCheck))>>. Will accelerate the tension decay, but will increase upkeep costs.//
+ <br>//Costs <<print cashFormat(Math.trunc((5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1)*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$TechnicianSkillCheck>>
- <<set $PC.engineering += 1, $PC.technician += 1>>
+ <<set $cash -= 50000 * $upgradeMultiplierArcology * $brainImplantProject*$NetworkThreatSpecialistSkillMultiplier>>
+ <<set $PC.engineering += 1, $PC.NetworkThreatSpecialist += 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*$TechnicianSkillCheck))>>. Will shorten the time required to complete the project.//
+ <br>//Costs <<print cashFormat(Math.trunc(50000 * $upgradeMultiplierArcology * $brainImplantProject*$NetworkThreatSpecialistSkillMultiplier))>>. 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 2e75e3e54fc..6667c334f8b 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*$TechnicianSkillCheck>>
+ <<set $cash -= 10000*$NetworkThreatSpecialistSkillMultiplier>>
<<set $secBarracksUpkeep += $upgradeUpkeep>>
<<goto "secBarracks">>
<</link>>
- <br>//Costs <<print cashFormat(10000*$TechnicianSkillCheck)>> and will provide a 5% bonus to morale, for a total of +15%.//
+ <br>//Costs <<print cashFormat(10000*$NetworkThreatSpecialistSkillMultiplier)>> 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*$TechnicianSkillCheck>>
+ <<set $cash -= ($secBots.maxTroops - $secBots.troops) * $secBotsCost*$NetworkThreatSpecialistSkillMultiplier>>
<<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*$TechnicianSkillCheck>>
+ <<set $cash -= $secBots.maxTroops * $secBotsCost*$NetworkThreatSpecialistSkillMultiplier>>
<<set $secBots.troops = $secBots.maxTroops>>
<<set $secBots.active = 1>>
<<goto "secBarracks">>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index 7c37c709c88..43301b68d3f 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -113,30 +113,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*$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.//
+ [[Install a nano-camera system |securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Buy cybersecurity algorithms|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Install invisible eye scanners|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Buy and install crypto analyzers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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>>
@@ -165,30 +165,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*$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.//
+ [[Install advanced forensic equipment|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Install auto-curating archiver|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Install automated trials software|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Install worldwide profilers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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>>
@@ -215,23 +215,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*$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.//
+ [[Install perimeter sensors|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Create signal interception hub|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Install advanced radar equipment|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. Will increase recon capabilities, but will require 10 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have installed sophisticated radar equipment.
<</if>>
@@ -297,36 +297,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*$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.//
+ [[Expand the cold storage facility to increase data retention to three years|securityHQ][$cash -= Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Expand the cold storage facility to increase data retention to two years|securityHQ][$cash -= Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Expand the cold storage facility to increase data retention to one year|securityHQ][$cash -= Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Expand the cold storage facility to increase data retention to nine months|securityHQ][$cash -= Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Expand the cold storage facility to increase data retention to six months|securityHQ][$cash -= Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Expand the cold storage facility to increase data retention to three months|securityHQ][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$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.//
+ [[Install a cold storage facility|securityHQ][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier, $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.NetworkThreatSpecialist += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$NetworkThreatSpecialistSkillMultiplier))>>. 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 d9d0124ed69..bd180774c79 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -199,10 +199,10 @@ __Upgrades__:
unit: 0,
type: "attack",
time: _time}>>
- <<set $cash -= 10000*$TechnicianSkillCheck>>
+ <<set $cash -= 10000*$NetworkThreatSpecialistSkillMultiplier>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(10000*$TechnicianSkillCheck)>> and will increase the base attack value of the security drones.//
+ <br>//Will take _time weeks, cost <<print cashFormat(10000*$NetworkThreatSpecialistSkillMultiplier)>> and will increase the base attack value of the security drones.//
<<elseif !$completedUpgrades.includes(-2) && $weapLab >= 2>>
<<link "Develop adaptive armored frames">>
<<set $currentUpgrade = {
@@ -301,10 +301,10 @@ __Upgrades__:
unit: 1,
type: "attackAndDefense",
time: _time}>>
- <<set $cash -= 120000*$TechnicianSkillCheck>>
+ <<set $cash -= 120000*$NetworkThreatSpecialistSkillMultiplier>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(120000*$TechnicianSkillCheck)>> and will increase the base attack and "defense" values of human troops.//
+ <br>//Will take _time weeks, cost <<print cashFormat(120000*$NetworkThreatSpecialistSkillMultiplier)>> and will increase the base attack and "defense" values of human troops.//
<</if>>
<<if !$completedUpgrades.includes(5) && $weapLab >= 3>>
<br>
@@ -315,10 +315,10 @@ __Upgrades__:
unit: 1,
type: "hpAndMorale",
time: _time}>>
- <<set $cash -= 120000*$TechnicianSkillCheck>>
+ <<set $cash -= 120000*$NetworkThreatSpecialistSkillMultiplier>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(120000*$TechnicianSkillCheck)>> and will increase the base hp and morale values of human troops.//
+ <br>//Will take _time weeks, cost <<print cashFormat(120000*$NetworkThreatSpecialistSkillMultiplier)>> and will increase the base hp and morale values of human troops.//
<</if>>
<br>
<<if $securityForceCreate == 1>>
@@ -358,10 +358,10 @@ __Upgrades__:
unit: 1,
type: "all",
time: _time}>>
- <<set $cash -= 1000000*$TechnicianSkillCheck>>
+ <<set $cash -= 1000000*$NetworkThreatSpecialistSkillMultiplier>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(1000000*$TechnicianSkillCheck)>> and will increase all base stats of human troops.//
+ <br>//Will take _time weeks, cost <<print cashFormat(1000000*$NetworkThreatSpecialistSkillMultiplier)>> 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/introSummary.tw b/src/events/intro/introSummary.tw
index 6339fcfaaf9..6bdc025c1e4 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -992,7 +992,7 @@ __''Mods''__
<<case "medicine">>
<<set $PC.medicine = 100>>
<<case "arcology owner">>
- <<set $PC.trading = 100, $PC.warfare = 100, $PC.technician = 100, $PC.slaving = 100, $PC.engineering = 100, $PC.medicine = 100>>
+ <<set $PC.trading = 100, $PC.warfare = 100, $PC.NetworkThreatSpecialist = 100, $PC.slaving = 100, $PC.engineering = 100, $PC.medicine = 100>>
<<case "escort">>
<<set $PC.trading = 50, $PC.warfare = -100, $PC.slaving = -100, $PC.engineering = -100, $PC.medicine = 10>>
<<case "servant">>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index be3d0f6a086..6d61c6104a9 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -241,7 +241,7 @@ You should have received a copy of the GNU General Public License along with thi
<<if $saveImported == 0>>
<<set $cheater = 0>>
-<<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, technician: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>>
+<<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, NetworkThreatSpecialist: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>>
<<set $cash = 10000>>
<<set $normalizedEvents = 0>>
<<set $autosave = 1>>
@@ -342,7 +342,7 @@ You should have received a copy of the GNU General Public License along with thi
<</if>>
<<set $cash = Math.clamp(1000*Math.trunc($cash/100000), 5000, 1000000)>>
<<if $retainCareer == 0>>
- <<set $PC.career = "arcology owner", $PC.trading = 100, $PC.warfare = 100, $PC.technician = 100, $PC.slaving = 100, $PC.engineering = 100, $PC.medicine = 100>>
+ <<set $PC.career = "arcology owner", $PC.trading = 100, $PC.warfare = 100, $PC.NetworkThreatSpecialist = 100, $PC.slaving = 100, $PC.engineering = 100, $PC.medicine = 100>>
<</if>>
<<if $PC.mother > 0>>
<<set $PC.mother += 1200000>>
@@ -357,7 +357,7 @@ You should have received a copy of the GNU General Public License along with thi
<<else>>
<<set $cheater = 0>>
<<set $cash = 10000>>
- <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, technician: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>>
+ <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, NetworkThreatSpecialist: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>>
<</if>>
<</if>>
@@ -1297,4 +1297,4 @@ erectileImplant: 0
<<goto "Alpha disclaimer">>
-<<set $TechnicianSkillCheck = window.technicianSkill()>>
+<<set $NetworkThreatSpecialistSkillMultiplier = NetworkThreatSpecialistSkill($PC)>>
\ No newline at end of file
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 6a49f2af962..0f11ee41376 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -269,6 +269,8 @@ window.getCost = function(array) {
costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
} else if(State.variables.personalAttention === PersonalAttention.MEDICINE) {
costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
+ } else if(State.variables.personalAttention === PersonalAttention.NetworkThreatSpecialist) {
+ costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
}
}
diff --git a/src/js/utilJS.tw b/src/js/utilJS.tw
index 70cf4a2db9c..5eb08b7aa9a 100644
--- a/src/js/utilJS.tw
+++ b/src/js/utilJS.tw
@@ -433,24 +433,26 @@ if(typeof Categorizer === 'function') {
*/
jQuery(document).trigger('categorizer.ready');
-window.technicianSkill = function(PC) {
-if(PC.technician <= -100) {
- return PC === 1.5;
-} else if(PC.technician >= -75) {
- return PC === 1.35;
-} else if(PC.technician >= -50) {
- return PC === 1.25;
-} else if(PC.technician >= -25) {
- return PC === 1.15;
-} else if(PC.technician <= 25) {
- return PC === 1;
-} else if(PC.technician >= 25) {
- return PC === .95;
-} else if(PC.technician >= 50) {
- return PC === .75;
-} else if(PC.technician >= 75) {
- return PC === .65;
-} else if(PC.technician >= 100) {
- return PC === .5;
+/*
+NetworkThreatSpecialistSkill($PC) = {
+if(PC.NetworkThreatSpecialist < -100) {
+ return 1.5;
+} else if(PC.NetworkThreatSpecialist < -75) {
+ return 1.35;
+} else if(PC.NetworkThreatSpecialist < -50) {
+ return 1.25;
+} else if(PC.NetworkThreatSpecialist < -25) {
+ return 1.15;
+} else if(PC.NetworkThreatSpecialist < 25) {
+ return 1;
+} else if(PC.NetworkThreatSpecialist < 25) {
+ return .95;
+} else if(PC.NetworkThreatSpecialist < 50) {
+ return .75;
+} else if(PC.NetworkThreatSpecialist < 75) {
+ return .65;
+} else if(PC.NetworkThreatSpecialist < 100) {
+ return .5;
+}
}
-}
\ No newline at end of file
+*/
\ No newline at end of file
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
index 72eb21836db..b69f7745070 100755
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
@@ -374,6 +374,8 @@
Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons and a massive wrist mounted shield. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites.
<<case 15>>
Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons,a massive wrist mounted shield and eletric fists. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites.
+ <<case 16>>
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons,a massive wrist mounted shield and eletric fists. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites. Overclocked the movement systems allowing for greater mobility.
<</switch>>
<</if>>
<<if $securityForceMissileSilo > 0>>
@@ -413,17 +415,19 @@
<br>''Submarine:''
<<switch $securityForceSubmarine>>
<<case 1>>
- A basic submarine has been 'borrowed' from the old world.
+ A basic submarine has been 'borrowed' from the old world.
<<case 2>>
- Modernized the engines for speed.
+ Modernized the engines for speed.
<<case 3>>
- Modernized the engines for speed and silence.
+ Modernized the engines for speed and silence.
<<case 4>>
- Modernized the engines for speed and silence.Upgraded the hull for silence.
+ Modernized the engines for speed and silence.Upgraded the hull for silence.
<<case 5>>
- Modernized the engines for speed and silence.Upgraded the hull for silence and weaponry.
+ Modernized the engines for speed and silence.Upgraded the hull for silence and weaponry.
<<case 6>>
- Modernized the engines for speed and silence.Upgraded the hull for silence, weaponry and air scrubbers, allowing it to stay submerged for longer.
+ Modernized the engines for speed and silence.Upgraded the hull for silence, weaponry and air scrubbers, allowing it to stay submerged for longer.
+ <<case 7>>
+ Modernized the engines for speed and silence.Upgraded the hull for silence, weaponry and air scrubbers, allowing it to stay submerged for longer. Overclocked the sonar, increasing it's ping speed.
<</switch>>
<</if>>
<<if $securityForceHeavyAmphibiousTransport > 0>>
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
index b16923a26ef..4e810d1258a 100755
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
@@ -48,9 +48,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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_arcCost*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(_arcCost*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades == 13>>
<br><<link "Barracks">>
<<replace "#resultX">><br><br>
@@ -240,9 +240,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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= 4750000*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(4750000*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(4750000*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < _SpacePlaneMax>>
<<if $securityForceSpacePlanePower < 4>>
<<set _spCost = 50000000>>
@@ -268,9 +268,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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= _spCost*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_spCost*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(_spCost*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<</if>>
<<if $securityForceSpacePlanePower == _SpacePlaneMax>>
<br>//$securityForceName has fully upgraded the space plane to support it's activities.//
@@ -298,16 +298,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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 35000000*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(35000000*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(35000000*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<<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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 25000000*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(25000000*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(25000000*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<</if>>
<<if $securityForceAC130 == _AC130Max>>
<br>//$securityForceName has fully upgraded the AC-130 to support it's activities.//
@@ -341,22 +341,22 @@
<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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(45000*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(45000*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && _DroneBay < _DroneBayMax && $TierTwoUnlock == 1>>
<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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 2000000*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(2000000*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(2000000*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<</if>>
<<if _DroneBay == _DroneBayMax>>
<br>//$securityForceName has fully upgraded the drone bay to support it's activities.//
<</if>>
- <<if $securityForceUpgradeToken == 0 && (_LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayNOMax) && $TierTwoUnlock == 1>>
+ <<if $securityForceUpgradeToken == 0 && (_LaunchBayNO < _LaunchBayNOMax || _LaunchBayO < _LaunchBayOMax) && $TierTwoUnlock == 1>>
<br><<link "Launch Bay">>
<<replace "#resultX">>
<span id="resultZ">
@@ -369,9 +369,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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= 3750000*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(3750000*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(3750000*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower >= 1 && $securityForceSatellitePower < _SatelliteMax>>
<<switch $securityForceSatellitePower>>
<<case 11>>
@@ -392,7 +392,7 @@
<<set _satCost = 300000000000>>
<<case 19>>
<<set _satCost = 450000000000>>
- <<case 20>>
+ <<case 20 && $PC.NetworkThreatSpecialist >= 75>>
<<set _satCost = 550000000000>>
<<default>>
<<set _satCost = 2350000>>
@@ -400,16 +400,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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_satCost*$Env*$TechnicianSkillCheck)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower == 20 && $PC.technician >= 75>>
+ <</link>> // Costs <<print cashFormat(_satCost*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower == 20 && $PC.NetworkThreatSpecialist >= 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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_satCost*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(_satCost*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<</if>>
<<if $securityForceSatellitePower == _SatelliteMax>>
<br>//$securityForceName has fully upgraded the Satellite to support it's activities.//
@@ -419,9 +419,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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(50000000*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(50000000*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GiantRobotMax>>
<<if $securityForceGiantRobot < 3>>
<<set _robCost = 25000000>>
@@ -441,6 +441,8 @@
<<set _robCost = 95000000>>
<<case 8>>
<<set _robCost = 105000000>>
+ <<case 9 && $securityForceInfantryPower >= 10>>
+ <<set _robCost = 255000000>>
<<case 10>>
<<set _robCost = 3150000000>>
<<case 11>>
@@ -451,15 +453,24 @@
<<set _robCost = 6550000000>>
<<case 14>>
<<set _robCost = 8550000000>>
+ <<case 15 $PC.NetworkThreatSpecialist >= 75>>
+ <<set _robCost = 9550000000>>
<</switch>>
<br><<link "Giant robot">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "Upgrading the giant robot, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_robCost*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(_robCost*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot == 15 && $PC.NetworkThreatSpecialist >= 75>>
+ <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*$NetworkThreatSpecialistSkillMultiplier>>
+ <</replace>>
+ <</link>> // Costs <<print cashFormat(_robCost*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<</if>>
- <<if $securityForceGiantRobot == 9 || $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>>
+ <<if $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>>
<br>//$securityForceName has fully upgraded the giant robot to support it's activities.//
<</if>>
@@ -467,9 +478,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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= 200000000*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(200000000*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(200000000*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceMissileSilo >= 1 && $securityForceMissileSilo < _MissileSiloMax>>
<<if $securityForceMissileSilo == 1>>
<<set _msCost = 250000000>>
@@ -479,9 +490,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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= _msCost*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_msCost*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(_msCost*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<</if>>
<<if $securityForceMissileSilo == _MissileSiloMax && ($terrain != "oceanic" && $terrain != "marine")>><br>//$securityForceName has fully upgraded the missile silo to support it's activities.//<</if>>
@@ -504,16 +515,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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 1500000*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(1500000*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(1500000*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<<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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 25000000*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(25000000*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(25000000*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<</if>>
<<if $securityForceAircraftCarrier == _AircraftCarrierMax && ($terrain == "oceanic" || $terrain == "marine")>>
<br>//$securityForceName has fully upgraded the aircraft carrier to support it's activities.//
@@ -523,21 +534,31 @@
<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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= 1500000*$Env*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(1500000*$Env*$TechnicianSkillCheck)>> //
+ <</link>> // Costs <<print cashFormat(1500000*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine >= 1 && $securityForceSubmarine < _SubmarineMax>>
<<if $securityForceSubmarine < 4>>
<<set _subCost = 25000000>>
<<elseif $securityForceSubmarine == 4>>
<<set _subCost = 85000000>>
+ <<elseif $securityForceSubmarine == 5>>
+ <<set _subCost = 86500000>>
+ <<elseif $securityForceSubmarine == 6 && $PC.NetworkThreatSpecialist >= 75>>
+ <<set _subCost = 87800000>>
<</if>>
<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*$TechnicianSkillCheck>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*$Env*$NetworkThreatSpecialistSkillMultiplier>>
+ <</replace>>
+ <</link>> // Costs <<print cashFormat(_subCost*$Env*$NetworkThreatSpecialistSkillMultiplier)>> //
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine == 6 && $PC.NetworkThreatSpecialist >= 75>>
+ <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*$NetworkThreatSpecialistSkillMultiplier>>
<</replace>>
- <</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/pregmod/SecForceEX/SpecialForceUpgradeTree.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
index e573228132a..8c0d087f0e2 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
@@ -29,17 +29,30 @@
<<set _DroneBay = $securityForceDronePower>>
<<set _DroneBayMax = 8>>
-<<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo>>
- <<set _SatelliteMax = 21>>
- <<set _GiantRobotMax = 15>>
+/* Launch Bay */
+ <<if $PC.NetworkThreatSpecialist >= 75>>
+ <<set _SatelliteMax = 21>>
+ <<set _GiantRobotMax = 16>>
+ <<else>>
+ <<set _SatelliteMax = 20>>
+ <<set _GiantRobotMax = 15>>
+ <</if>>
<<set _MissileSiloMax = 3>>
-<<set _LaunchBayNOMax = _SatelliteMax+_GiantRobotMax+_MissileSiloMax>>
+ <<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo, _LaunchBayNOMax = _SatelliteMax+_GiantRobotMax+_MissileSiloMax>>
-<<set _LaunchBayO = $securityForceSatellitePower>>
- <<set _LaunchBayOMax = 21>>
+ <<set _LaunchBayO = $securityForceSatellitePower>>
+ <<if $PC.NetworkThreatSpecialist >= 75>>
+ <<set _LaunchBayOMax = 21>>
+ <<else>>
+ <<set _LaunchBayOMax = 20>>
+ <</if>>
<<set _AircraftCarrierMax = 6>>
- <<set _SubmarineMax = 6>>
+ <<if $PC.NetworkThreatSpecialist >= 75>>
+ <<set _SubmarineMax = 7>>
+ <<else>>
+ <<set _SubmarineMax = 6>>
+ <</if>>
<<set _HeavyAmphibiousTransportMax = 6>>
<<set _NavalYardMax = _AircraftCarrierMax+_SubmarineMax+_HeavyAmphibiousTransportMax>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index b7d0d006e36..36b148db9b1 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -209,26 +209,26 @@ You ponder what skills may be useful in running your arcology.
Alcohol makes pain go away, right?
<</if>>
-<br>technician:
-<<if $PC.technician >= 100>>
+<br>NetworkThreatSpecialist:
+<<if $PC.NetworkThreatSpecialist >= 100>>
You are a master of technology.
-<<elseif $PC.technician >= 80>>
+<<elseif $PC.NetworkThreatSpecialist >= 80>>
You are an expert at technology.
-<<elseif $PC.technician >= 60>>
+<<elseif $PC.NetworkThreatSpecialist >= 60>>
You are skilled in technology.
-<<elseif $PC.technician >= 40>>
+<<elseif $PC.NetworkThreatSpecialist >= 40>>
You know some things about technology.
-<<elseif $PC.technician >= 20>>
+<<elseif $PC.NetworkThreatSpecialist >= 20>>
You are a beginner in technology.
-<<elseif $PC.technician >= 0>>
+<<elseif $PC.NetworkThreatSpecialist >= 0>>
You know only the basics of technology.
-<<elseif $PC.technician >= -20>>
+<<elseif $PC.NetworkThreatSpecialist >= -20>>
You know how to click a mouse.
-<<elseif $PC.technician >= -40>>
+<<elseif $PC.NetworkThreatSpecialist >= -40>>
Enter does something?
-<<elseif $PC.technician >= -60>>
+<<elseif $PC.NetworkThreatSpecialist >= -60>>
Where is the "any" key?
-<<elseif $PC.warfare >= -80>>
+<<elseif $PC.NetworkThreatSpecialist >= -80>>
You can push the power button button, good job.
<<else>>
This black box thingy is magical.
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 5a0eb991c9b..c1396a148e2 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -235,8 +235,8 @@
<<if ndef $PC.degeneracy>>
<<set $PC.degeneracy = 0>>
<</if>>
-<<if ndef $PC.technician>>
- <<set $PC.technician = 0>>
+<<if ndef $PC.NetworkThreatSpecialist>>
+ <<set $PC.NetworkThreatSpecialist = 0>>
<</if>>
<<if ndef $universalRulesImmobileSlavesMaintainMuscles>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index 29115d12cff..3661a3897f5 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -11,9 +11,11 @@
<<set $Env = _N3, $EnvCash2 = 550, $EnvCash3 = 300, $EnvCash4 = 200, $EnvProsp = 7, _BaseDiscount = _BaseDiscount+.005>>
<</if>>
-<<set $TierTwoUnlock = 0>>
+<<include "SpecialForceUpgradeTree">>
<<if _StimulantLab >= 5 && _Barracks >= 5 && $securityForceVehiclePower >= 5 && _Armoury >= 5 && _DroneBay >= 5 && $securityForceAircraftPower >= 5>>
<<set $TierTwoUnlock = 1>>
+<<else>>
+ <<set $TierTwoUnlock = 0>>
<</if>>
<<include "SpecialForceUpgradeTree">>
@@ -108,21 +110,22 @@
<<set $securityForceGiftToken = 1>>
<<set $arcologies[0].prosperity += $GoodWords2>>
<br>
+ <<if $arcologies[0].prosperity + $GoodWords2 > $AProsperityCap>>
+ <<set $arcologies[0].prosperity = $AProsperityCap>>
+ <</if>>
<</replace>>
<</link>>
- <<if $arcologies[0].prosperity + $GoodWords2 > $AProsperityCap>>
- <<set $arcologies[0].prosperity = $AProsperityCap>>
- <</if>>
<</if>>
</span>
<</if>>
<<if $securityForceUpgradeToken == 1 && ($SFAO < _max)>>
<br>//_Name is working to improve $securityForceName this week.//
-<<elseif $TierTwoUnlock == 1>>
- <br>//You receive a message from The Colonel "there's a trade show coming up with exotic upgrades but I'll get laughed out unless we bring the best gear we can get now?"//
<<elseif $SFAO >= _max>>
- <br>//$securityForceName is fully equipped and upgraded - nothing else can be done.//
+ <br>//$securityForceName is fully equipped and upgraded - <<if $PC.NetworkThreatSpecialist < 75>>nothing else can currently be done, due to your lack of technicial skill <<else>>nothing else can be done<</if>>.//
+<</if>>
+<<if $TierTwoUnlock == 1>>
+ <br>//You receive a message from The Colonel "there's a trade show coming up with exotic upgrades but I'll get laughed out unless we bring the best gear we can get now."//
<</if>>
<<if $securityForceGiftToken == 1>>
@@ -299,19 +302,19 @@
<</replace>>
<</link>>
,
- <<link "technology">>
- <<set $PC.technician += 3>>
+ <<link "network threads">>
+ <<set $PC.NetworkThreatSpecialist += 3>>
<<replace "#result4">>
<br>
- <<if $PC.technician < 10>>
+ <<if $PC.NetworkThreatSpecialist < 10>>
//Good job you know what a on button now does.//
- <<elseif $PC.technician >= 100>>
+ <<elseif $PC.NetworkThreatSpecialist >= 100>>
//Time to for you to out there and tinker with a system.//
- <<elseif $PC.technician >= 60>>
+ <<elseif $PC.NetworkThreatSpecialist >= 60>>
//Feel free to 'plug into' me any time.//
- <<elseif $PC.technician >= 30>>
+ <<elseif $PC.NetworkThreatSpecialist >= 30>>
//Currect srew driver holding procedure acquired.//
- <<elseif $PC.technician >= 10>>
+ <<elseif $PC.NetworkThreatSpecialist >= 10>>
//You can now some what use a mouse.//
<</if>>
<</replace>>
@@ -323,7 +326,7 @@
<<set $PC.trading += 2>>
<<set $PC.warfare += 2>>
<<set $PC.medicine += 2>>
- <<set $PC.technician += 2>>
+ <<set $PC.NetworkThreatSpecialist += 2>>
<<replace "#result4">>
//Hopefully this general education I could provide may be of use.//
<</replace>>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 3e0f48b3d87..719dfcfe993 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -157,8 +157,8 @@ $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*$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//
+ <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier)>>
+ It is a standard brothel. [[Upgrade the brothel with aphrodisiac injection systems|Brothel][$cash -= _Tmult1, $brothelUpgradeDrugs = 0.1, $PC.NetworkThreatSpecialist += 1]] //Costs <<print cashFormat(_Tmult1)>> and will increase upkeep costs//
<</if>>
<br>$brothelNameCaps is
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index 22bf14e3540..9959204b348 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -72,13 +72,13 @@ $clinicNameCaps
<<set _Tmult0 = Math.trunc($clinic*1000*$upgradeMultiplierArcology)>>
<br>$clinicNameCaps has room to support $clinic slaves while they receive treatment. Currently $clinicSlaves slaves are reciving treatement.
-[[Expand the clinic|Clinic][$cash -= _Tmult0, $clinic += 5, $PC.engineering += .1], $PC.technician += 1] //Costs <<print cashFormat(_Tmult0)>>//
+[[Expand the clinic|Clinic][$cash -= _Tmult0, $clinic += 5, $PC.engineering += .1], $PC.NetworkThreatSpecialist += 1] //Costs <<print cashFormat(_Tmult0)>>//
<br>
<<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*$TechnicianSkillCheck)>>
+ <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier)>>
It mounts powerful medical scanning technology. [[Upgrade the scanners to help detect genomic damage|Clinic][$cash -= _Tmult1, $clinicUpgradeScanner = 1]] //Costs <<print cashFormat(_Tmult1)>>//
<</if>>
@@ -87,15 +87,15 @@ $clinicNameCaps
<<if $clinicUpgradePurge == 1>>
The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. The blood is intensely cleaned to greatly decrease the presence of impurities at the cost of compatibility. Patients will likely be ill for the duration of the treatment.
<<else>>
- <<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology*$TechnicianSkillCheck)>>
- The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][$cash -= _Tmult3, $clinicUpgradePurge to 1, $PC.technician += 1]] //Costs <<print cashFormat(_Tmult3)>> and may cause health problems in slaves//
+ <<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier)>>
+ The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][$cash -= _Tmult3, $clinicUpgradePurge to 1, $PC.NetworkThreatSpecialist += 1]] //Costs <<print cashFormat(_Tmult3)>> and may cause health problems in slaves//
<</if>>
<<if $Nurse == 0>>
<br>However, without a nurse in attendance, the blood treatment equipment remains idle.
<</if>>
<<else>>
- <<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, $PC.technician += 1]] //Costs <<print cashFormat(_Tmult2)>>//
+ <<set _Tmult2 = Math.trunc(50000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier)>>
+ It includes standard dialysis equipment. [[Install advanced blood treatment equipment to help address drug side effects|Clinic][$cash -= _Tmult2, $clinicUpgradeFilters = 1, $PC.NetworkThreatSpecialist += 1]] //Costs <<print cashFormat(_Tmult2)>>//
<</if>>
<br>
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 8be656bbfb3..fba270a3363 100644
--- a/src/uncategorized/costs.tw
+++ b/src/uncategorized/costs.tw
@@ -468,7 +468,7 @@
<<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC>>
<<set _cost = 10000*$AgeEffectOnTrainerPricingPC>>
-<<if ($personalAttention == "trading") || ($personalAttention == "warfare") || ($personalAttention == "slaving") || ($personalAttention == "engineering") || ($personalAttention == "medicine")>>
+<<if ($personalAttention == "trading") || ($personalAttention == "warfare") || ($personalAttention == "slaving") || ($personalAttention == "engineering") || ($personalAttention == "medicine") || ($personalAttention == "NetworkThreatSpecialist")>>
<<set $costs += _cost>>
<</if>>
<</if>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index d1bd5c778cb..21b21ca0894 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -212,7 +212,7 @@
<<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC>>
<br>
<br>
-<<if ($personalAttention == "trading") || ($personalAttention == "warfare") || ($personalAttention == "slaving") || ($personalAttention == "engineering") || ($personalAttention == "medicine")>>
+<<if ($personalAttention == "trading") || ($personalAttention == "warfare") || ($personalAttention == "slaving") || ($personalAttention == "engineering") || ($personalAttention == "medicine") || ($personalAttention == "NetworkThreatSpecialist")>>
<<set _cost = 10000*$AgeEffectOnTrainerPricingPC>>
<<switch $personalAttention>>
<br>
@@ -226,6 +226,8 @@
__Engineering__
<<case medicine>>
__Medicine__
+<<case NetworkThreatSpecialist>>
+ __NetworkThreatSpecialist__
<</switch>>
trainer fees: <<print cashFormat(_cost)>>
<br>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 5a3879bd995..00e1d8d9b4c 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -43,14 +43,14 @@ __Construction__
<<set $secBots.troops = 30>>
<<set $secBots.maxTroops = 30>>
<<goto "Manage Arcology">>
- <<if $PC.engineering < 100>><<set $PC.engineering += 1, $PC.technician += 1>><</if>>
+ <<if $PC.engineering < 100>><<set $PC.engineering += 1, $PC.NetworkThreatSpecialist += 1>><</if>>
<</link>>
<<elseif $arcologyUpgrade.hydro != 1>>
//The next major upgrade needed is the installation of a better water reclamation system so your residents will have access to cheaper water and hydroponically grown food. This upgrade will cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>.// [[Upgrade water reclamation system|Manage Arcology][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $arcologyUpgrade.hydro = 1, $PC.engineering += 1]]
<<elseif $arcologyUpgrade.apron != 1>>
//The next major upgrade needed is the installation of a broader apron at the bottom of the arcology to increase its surface area and gather more solar energy. Right now, tenants that use a lot of power have to import it from outside. This upgrade will cost <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>.// [[Install solar apron|Manage Arcology][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $arcologyUpgrade.apron = 1, $PC.engineering += 1]]
<<elseif $arcologyUpgrade.grid != 1>>
- //The next major upgrade needed is an improvement of the arcology's electrical transmission lines to make efficient use of the additional power from the solar apron. This upgrade will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>.// [[Upgrade transmission lines|Manage Arcology][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $arcologyUpgrade.grid = 1, $PC.engineering += 1, $PC.technician += 1]]
+ //The next major upgrade needed is an improvement of the arcology's electrical transmission lines to make efficient use of the additional power from the solar apron. This upgrade will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>.// [[Upgrade transmission lines|Manage Arcology][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $arcologyUpgrade.grid = 1, $PC.engineering += 1, $PC.NetworkThreatSpecialist += 1]]
<<elseif $arcologyUpgrade.spire != 1>>
//The next major upgrade needed is the addition of a spire at the top of the arcology to increase the space available for the wealthiest citizens to own whole floors. This huge project will cost <<print cashFormat(Math.trunc(250000*$upgradeMultiplierArcology))>>.// [[Add spire|Manage Arcology][$cash -= Math.trunc(250000*$upgradeMultiplierArcology), $arcologyUpgrade.spire = 1, $sectors[1].type = "Apartments", $sectors[2].type = "Apartments", $sectors[3].type = "Apartments", $sectors[4].type = "Apartments", $sectors[1].ownership = 1, $sectors[2].ownership = 1, $sectors[3].ownership = 1, $sectors[4].ownership = 1, $PC.engineering += 1]]
<<else>>
@@ -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*$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]]
+ You have not installed an FCTV receiver. Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc((20000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier))>>. 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*$NetworkThreatSpecialistSkillMultiplier))>>.
+ [[No subsidy|Manage Arcology][$cash -= Math.trunc((25000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1, $PC.NetworkThreatSpecialist += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc((20000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1, $PC.NetworkThreatSpecialist += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1, $PC.NetworkThreatSpecialist += 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*$TechnicianSkillCheck)), $propHub = 1, $PC.engineering += 1, $PC.technician += 1]]
- //Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*$TechnicianSkillCheck))>>.//
+ [[Set up the propaganda Hub|Manage Arcology][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier)), $propHub = 1, $PC.engineering += 1, $PC.NetworkThreatSpecialist += 1]]
+ //Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier))>>.//
<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*$TechnicianSkillCheck)), $secHQ = 1, $PC.engineering += 1, $PC.technician += 1]]
- //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$TechnicianSkillCheck))>>.//
+ [[Set up the security headquarters|Manage Arcology][$cash -= Math.trunc((5000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier)), $secHQ = 1, $PC.engineering += 1, $PC.NetworkThreatSpecialist += 1]]
+ //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier))>>.//
<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 a000a4eb940..b7581100a66 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3911,24 +3911,24 @@ You remind yourself that success in this conflict will not be defined by the tra
<</if>>
<</if>>
-<<if $PC.technician >= 100 && (($PC.career == "mercenary") || ($PC.career == "arcology owner")>>
+<<if $PC.NetworkThreatSpecialist >= 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">>
One night, you're working late in your office, $assistantName's avatar glowing companionably beside you. Without preamble, <<if $assistant == 0>>it<<else>>she<</if>> reports to you in <<if $assistant == 0>>its<<else>>her<</if>> normal tones, "Team One reports
- <<if $PC.technician < 10 && random(0,100) > 90>>
+ <<if $PC.NetworkThreatSpecialist < 10 && random(0,100) > 90>>
<<set _Success = 1>>
- <<elseif $PC.technician >= 100 && random(0,100) > 50>>
+ <<elseif $PC.NetworkThreatSpecialist >= 100 && random(0,100) > 50>>
<<set _Success = 1>>
- <<elseif $PC.technician >= 80 && random(0,100) > 55>>
+ <<elseif $PC.NetworkThreatSpecialist >= 80 && random(0,100) > 55>>
<<set _Success = 1>>
- <<elseif $PC.technician >= 60 && random(0,100) > 60>>
+ <<elseif $PC.NetworkThreatSpecialist >= 60 && random(0,100) > 60>>
<<set _Success = 1>>
- <<elseif $PC.technician >= 40 && random(0,100) > 65>>
+ <<elseif $PC.NetworkThreatSpecialist >= 40 && random(0,100) > 65>>
<<set _Success = 1>>
- <<elseif $PC.technician >= 20 && random(0,100) > 75>>
+ <<elseif $PC.NetworkThreatSpecialist >= 20 && random(0,100) > 75>>
<<set _Success = 1>>
- <<elseif $PC.technician >= 10 && random(0,100) > 85>>
+ <<elseif $PC.NetworkThreatSpecialist >= 10 && random(0,100) > 85>>
<<set _Success = 1>>
<</if>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 5f705fd5cfa..85a2788d388 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -459,41 +459,41 @@
<</if>>
<<case "technical accidents">>
- <<set $cash += 25000*$PC.technician*$arcologies[0].prosperity, $crime += random(10,25)>>
- This week you gained <<print cashFormat(25000*$PC.technician*$arcologies[0].prosperity)>> cash <<if random > 50 && $PC.technician < 100>> however as you were traced your authority and rep have taken a hit <<set $authority -= random(100,500), $rep -= random (100,500)>> and crime has @@.red;increased,@@.
+ <<set $cash += 25000*$PC.NetworkThreatSpecialist*$arcologies[0].prosperity, $crime += random(10,25), _X = 0>>
+ This week your technicial accidents for the highest bidder earned you @@.yellowgreen;<<print cashFormat(25000*$PC.NetworkThreatSpecialist*$arcologies[0].prosperity)>>.@@ cash <<if random > 95 && $PC.NetworkThreatSpecialist < 100>> however as you were traced your <<if $secExp == 1>> <<set _X = 1>> @@.red;authority.@@, <<set $authority -= random(100,500)>> @@.red;crime rate.@@ <<set $crime += random(10,20)>> and<</if>> @@.red;reputation.@@ <<set $rep -= random (100,500)>> <<if _X != 1>> has <<else>> have<</if>> been effected.
-<<case "technician">>
- <<set _oldSkill = $PC.technician>>
+<<case "NetworkThreatSpecialist">>
+ <<set _oldSkill = $PC.NetworkThreatSpecialist>>
<<if _X == 1>>
- <<set $PC.technician += _Cal>>
+ <<set $PC.NetworkThreatSpecialist += _Cal>>
<<else>>
- <<set $PC.technician -= _Cal>>
+ <<set $PC.NetworkThreatSpecialist -= _Cal>>
<</if>>
<<if _oldSkill <= 10>>
- <<if $PC.technician > 10>>
- You now have @@.green;basic knowledge@@ about how to be a technician.
+ <<if $PC.NetworkThreatSpecialist > 10>>
+ You now have @@.green;basic knowledge@@ about how to be a NetworkThreatSpecialist.
<<else>>
- You have made progress towards a basic knowledge of technician work.
+ You have made progress towards a basic knowledge of NetworkThreatSpecialist work.
<</if>>
<<elseif _oldSkill <= 30>>
- <<if $PC.technician > 30>>
- You now have @@.green;some skill@@ as a technician.
+ <<if $PC.NetworkThreatSpecialist > 30>>
+ You now have @@.green;some skill@@ as a NetworkThreatSpecialist.
<<else>>
- You have made progress towards being skilled in technician work.
+ You have made progress towards being skilled in NetworkThreatSpecialist work.
<</if>>
<<elseif _oldSkill <= 60>>
- <<if $PC.technician > 60>>
- You are now an @@.green;expert technician.@@
+ <<if $PC.NetworkThreatSpecialist > 60>>
+ You are now an @@.green;expert NetworkThreatSpecialist.@@
<<else>>
- You have made progress towards being an expert in technician work.
+ You have made progress towards being an expert in NetworkThreatSpecialist work.
<</if>>
<<else>>
- <<if $PC.technician >= 100>>
+ <<if $PC.NetworkThreatSpecialist >= 100>>
<<set $personalAttention = "sex">>
- You are now a @@.green;master technician.@@
+ You are now a @@.green;master NetworkThreatSpecialist.@@
<<else>>
- You have made progress towards mastering technician work.
+ You have made progress towards mastering NetworkThreatSpecialist work.
<</if>>
<</if>>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index 1cb6cd54f1b..a26ad329ae3 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*$TechnicianSkillCheck))>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$TechnicianSkillCheck), $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*$NetworkThreatSpecialistSkillMultiplier))>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier), $assistantPower += 1, $PC.engineering += 1, $PC.NetworkThreatSpecialist += 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*$TechnicianSkillCheck))>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*$TechnicianSkillCheck), $assistantPower += 1, $PC.engineering += 1, $PC.technician += 1]]
+ //The final upgrade needed is a transition to optical RAM. This huge project will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier))>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier), $assistantPower += 1, $PC.engineering += 1, $PC.NetworkThreatSpecialist += 1]]
<<else>>
//The arcology's computer core is fully upgraded.//
<</if>>
@@ -822,16 +822,16 @@ __Downloadable Appearances:__
<br>
/*
<<if $assistantExtra1 == 0>>
- [[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))>>//
+ [[Purchase a set of monstergirl appearances|Assistant Events][$event = "", $cash -= Math.trunc(6000*$upgradeMultiplier*$NetworkThreatSpecialistSkillMultiplier), $assistantExtra1 = 1]]
+ //Costs <<print cashFormat(Math.trunc(6000*$upgradeMultiplier*$NetworkThreatSpecialistSkillMultiplier))>>//
<<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*$TechnicianSkillCheck), $assistantExtra2 = 1, $nextLink = "Personal assistant options">>
+ <<set $cash -= Math.trunc(10000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier), $assistantExtra2 = 1, $nextLink = "Personal assistant options">>
<<goto "Assistant Appearance Pack Two">>
- <</link>> //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*$TechnicianSkillCheck))>>//
+ <</link>> //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*$NetworkThreatSpecialistSkillMultiplier))>>//
<<else>>You have downloaded a set of heavenly and hellish appearances for your avatar.
<</if>>
<</if>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index 765dcd1c4ea..01af24b96a1 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -10,8 +10,8 @@
<<if $PC.career == "gang">>
| [[Help people "pass" things around|Main][$personalAttention = "smuggling"]]
<</if>>
- <<if $PC.technician > 0>>
- | [[create technical accidents in $arcologies[0].name for the highest bidder|Main][$personalAttention = "technical accidents", $personalAttentionChanged = 1]]
+ <<if $PC.NetworkThreatSpecialist > 0>>
+ <br>[[Create technical accidents in your arcology for the highest bidder|Main][$personalAttention = "technical accidents", $personalAttentionChanged = 1]]
<</if>>
<</if>>
<<if $HeadGirl != 0>>
@@ -66,20 +66,21 @@
<br>[[Hire a mercenary to train you in warfare|Main][$personalAttention = "warfare"]]
<</if>>
<</if>>
-<<if $PC.technician >= 100>>
- <br>//You are a master technician.//
+<<if $PC.NetworkThreatSpecialist >= 100>>
+ <br>//You are a master NetworkThreatSpecialist.//
<<else>>
- <<if $PC.technician > 60>>
- //You are an expert technician.//
- <<elseif $PC.technician > 30>>
- //You have some skill as a technician.//
- <<elseif $PC.technician > 10>>
- //You have basic knowledge as a technician.//
+<br>
+ <<if $PC.NetworkThreatSpecialist > 60>>
+ //You are an expert NetworkThreatSpecialist.//
+ <<elseif $PC.NetworkThreatSpecialist > 30>>
+ //You have some skill as a NetworkThreatSpecialist.//
+ <<elseif $PC.NetworkThreatSpecialist > 10>>
+ //You have basic knowledge as a NetworkThreatSpecialist.//
<</if>>
- <<if $personalAttention == "technician">>
- <br>You are training in technician.
- <<elseif $PC.technician < 100 && $PC.actualAge < $IsPastPrimePC>>
- <br>[[Hire a technician to train you in technology|Main][$personalAttention = "technician", $personalAttentionChanged = 1]]
+ <<if $personalAttention == "NetworkThreatSpecialist">>
+ You are training in the ways of a NetworkThreatSpecialist.
+ <<elseif $PC.NetworkThreatSpecialist < 100 && $PC.actualAge < $IsPastPrimePC>>
+ [[Hire a network threat specialist to train you in network threats|Main][$personalAttention = "NetworkThreatSpecialist"]]
<</if>>
<</if>>
<<if $PC.slaving >= 100>>
@@ -131,7 +132,7 @@
<</if>>
<</if>>
<</if>>
-<<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC && ($PC.medicine < 100 || $PC.engineering < 100 || $PC.slaving < 100 || $PC.warfare < 100 || $PC.trading < 100)>><br>//<br>//Training will cost <<print cashFormat(_cost)>> per week.//<br><br><<else>><br><br><</if>>
+<<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC && ($PC.medicine < 100 || $PC.engineering < 100 || $PC.slaving < 100 || $PC.warfare < 100 || $PC.trading < 100 || $PC.NetworkThreatSpecialist < 100)>><br>//<br>//Training will cost <<print cashFormat(_cost)>> per week.//<br><br><<else>><br><br><</if>>
<<if typeof $personalAttention != "object" || $personalAttention.length == 0>>
You have not selected a slave for your personal attention.
--
GitLab