From 0f076e1deb9cdefe16a6ead503e20dea6a7f1021 Mon Sep 17 00:00:00 2001
From: j <okp57855@psoxs.com>
Date: Sun, 21 Jan 2018 17:12:21 +1300
Subject: [PATCH] inital setup
---
src/SecExp/propagandaHub.tw | 10 +-
src/SecExp/riotControlCenter.tw | 10 +-
src/SecExp/securityHQ.tw | 72 +++++------
src/SecExp/weaponsManufacturing.tw | 16 +--
src/events/intro/initNationalities.tw | 7 +-
src/events/intro/introSummary.tw | 4 +-
src/events/intro/pcExperienceIntro.tw | 2 +
src/init/storyInit.tw | 6 +-
src/pregmod/managePersonalAffairs.tw | 25 ++++
src/uncategorized/SFMBarracks.tw | 21 +++-
src/uncategorized/manageArcology.tw | 16 +--
src/uncategorized/pRivalryActions.tw | 115 +++++++++++++++++-
src/uncategorized/persBusiness.tw | 34 ++++++
src/uncategorized/personalAssistantOptions.tw | 4 +-
src/uncategorized/personalAttentionSelect.tw | 16 +++
15 files changed, 286 insertions(+), 72 deletions(-)
diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index 79b3a617fb4..342a3d6df0a 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -79,12 +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>>
+ <<set $cash -= 5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$upgradeMultiplierTechncian>>
+ <<set $PC.engineering += 1, $PC.techncian += 1>>
<<set $propHubUpkeep += $upgradeUpkeep>>
<<goto "propagandaHub">>
<</link>>
<br>Invest more resources into the project to increase its effectiveness.
- <br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount))>>. Will provide more of the focused resource each week, but increase reputation upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$upgradeMultiplierTechncian))>>. Will provide more of the focused resource each week, but increases reputation upkeep.//
<<else>>
You upgraded your propaganda machine to its limits.
<</if>>
@@ -133,12 +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>>
+ <<set $cash -= 10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian>>
+ <<set $PC.techncian += 1>>
<<set $propHubUpkeep += $upgradeUpkeep>>
<<goto "propagandaHub">>
<</link>>
<br>Institute a system able to release erroneous, but plausible, information about your business, leading your competitors to prepared financial traps.
- <br>//Costs <<print cashFormat(Math.trunc(10000 * $upgradeMultiplierArcology * _HistoryDiscount))>>. 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*$upgradeMultiplierTechncian))>>. The authenticity dept. now slightly increases prosperity each week as well as authority, but increases upkeep.//
<<else>>
You have instituted controlled leaks protocols, able to create fabricated leaks of sensible information.
<</if>>
diff --git a/src/SecExp/riotControlCenter.tw b/src/SecExp/riotControlCenter.tw
index 3a5cd9d746d..02027b4565d 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -24,12 +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)>>
+ <<set $cash -= 5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1) *$upgradeMultiplierTechncian>>
+ <<set $PC.engineering += 1, $PC.techncian += 1>>
<<set $riotUpkeep += $upgradeUpkeep>>
<<goto "riotControlCenter">>
<</link>>
<br>Invest more resources into the project to increase its effectiveness.
- <br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1)))>>. Will accelerate the tension decay, but will increase upkeep costs.//
+ <br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1) *$upgradeMultiplierTechncian))>>. Will accelerate the tension decay, but will increase upkeep costs.//
<<else>>
You upgraded your free media scheme to its limits.
<</if>>
@@ -152,12 +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>>
+ <<set $cash -= 50000 * $upgradeMultiplierArcology * $brainImplantProject *$upgradeMultiplierTechncian>>
+ <<set $PC.engineering += 1, $PC.techncian += 1>>
<<set $riotUpkeep += $upgradeUpkeep * 100>>
<<goto "riotControlCenter">>
<</link>>
<br>Invest more resources into the project to increase its speed.
- <br>//Costs <<print cashFormat(Math.trunc(50000 * $upgradeMultiplierArcology * $brainImplantProject))>>. Will shorten the time required to complete the project.//
+ <br>//Costs <<print cashFormat(Math.trunc(50000 * $upgradeMultiplierArcology * $brainImplantProject*$upgradeMultiplierTechncian))>>. Will shorten the time required to complete the project.//
<<else>>
You sped up the project to its maximum.
<</if>>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index 5e48c89a408..c93a9b4a53a 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -111,30 +111,30 @@ Considering the current upgrades the resting level for security is <<print $secR
<br>
<<if $secUpgrades.nanoCams == 0>>
- [[Install a nano-camera system |securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.//
<<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), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.//
<<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), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.//
<<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), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have bought and employed sophisticated crypto analyzing software to accurately track and archive every financial movement or transaction made inside the walls of your arcology.
<</if>>
@@ -163,30 +163,30 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
<br>
<<if $crimeUpgrades.advForensic == 0>>
- [[Install advanced forensic equipment|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.//
<<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), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.//
<<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), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.//
<<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), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have installed advanced profiler software, which will constantly scour every known data archive on the globe (legally or not) to gather as much information as possible on dangerous criminals.
<</if>>
@@ -213,23 +213,23 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
<br>
<<if $intelUpgrades.sensors == 0>>
- [[Install perimeter sensors|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will increase recon capabilites, but will require 5 extra slaves in the headquarters and increases upkeep.//
<<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), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep.//
<<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), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will increase recon capabilities, but will require 10 extra slaves in the headquarters and increases upkeep.//
<<else>>
You have installed sophisticated radar equipment.
<</if>>
@@ -295,36 +295,36 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
<<if $secUpgrades.coldstorage == 6 && $rep >= 19500 && $reqHelots > 10>>
<br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of two years.
<br>
- [[Expand the cold storage facility to increase data retention to three years|securityHQ][$cash -= Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<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), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<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), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<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), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<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), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<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), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. Will lower the amount of required slaves by a further 10, but will increases upkeep.//
<<elseif $secUpgrades.coldstorage == 0 && $rep > 12000 && $reqHelots > 10>>
- [[Install a cold storage facility|securityHQ][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount))>>. 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*$upgradeMultiplierTechncian), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$upgradeMultiplierTechncian))>>. 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 1b3a190e7d9..3963f7d41c4 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -197,10 +197,10 @@ __Upgrades__:
unit: 0,
type: "attack",
time: _time}>>
- <<set $cash -= 10000>>
+ <<set $cash -= 10000*$upgradeMultiplierTechncian>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(10000)>> and will increase the base attack value of the security drones.//
+ <br>//Will take _time weeks, cost <<print cashFormat(10000*$upgradeMultiplierTechncian)>> and will increase the base attack value of the security drones.//
<<elseif !$completedUpgrades.includes(-2) && $weapLab >= 2>>
<<link "Develop adaptive armored frames">>
<<set $currentUpgrade = {
@@ -299,10 +299,10 @@ __Upgrades__:
unit: 1,
type: "attackAndDefense",
time: _time}>>
- <<set $cash -= 120000>>
+ <<set $cash -= 120000*$upgradeMultiplierTechncian>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(120000)>> and will increase the base attack and "defense" values of human troops.//
+ <br>//Will take _time weeks, cost <<print cashFormat(120000*$upgradeMultiplierTechncian)>> and will increase the base attack and "defense" values of human troops.//
<</if>>
<<if !$completedUpgrades.includes(5) && $weapLab >= 3>>
<br>
@@ -313,10 +313,10 @@ __Upgrades__:
unit: 1,
type: "hpAndMorale",
time: _time}>>
- <<set $cash -= 120000>>
+ <<set $cash -= 120000*$upgradeMultiplierTechncian>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(120000)>> and will increase the base hp and morale values of human troops.//
+ <br>//Will take _time weeks, cost <<print cashFormat(120000*$upgradeMultiplierTechncian)>> and will increase the base hp and morale values of human troops.//
<</if>>
<br>
<<if $securityForceCreate == 1>>
@@ -356,10 +356,10 @@ __Upgrades__:
unit: 1,
type: "all",
time: _time}>>
- <<set $cash -= 1000000>>
+ <<set $cash -= 1000000*$upgradeMultiplierTechncian>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(1000000)>> and will increase all base stats of human troops.//
+ <br>//Will take _time weeks, cost <<print cashFormat(1000000*$upgradeMultiplierTechncian)>> and will increase all base stats of human troops.//
<</if>>
<</if>>
<<if $securityForceCreate == 1 && ($humanUpgrade.attack >= 4 || $humanUpgrade.hp >= 4 || $humanUpgrade.morale >= 40 || $humanUpgrade.defense >= 4)>>
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 594304f73c7..8b6aa47e480 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -8,6 +8,7 @@
<<set $upgradeMultiplierArcology = 1>>
<<set $upgradeMultiplierMedicine = 1>>
+<<set $upgradeMultiplierTechncian = 1>>
<<if $PC.career == "wealth">>
<<set $trinkets.push("a collection of diplomas from expensive schools")>>
@@ -38,8 +39,10 @@
<<elseif $PC.career == "servant">>
<<set $trinkets.push("a framed picture of your late Master")>>
<<elseif $PC.career == "gang">>
-<<set $trinkets.push("your favorite handgun, whose sight has instilled fear in many")>>
-<<set $minimumSlaveCost -= 1000>>
+ <<set $trinkets.push("your favorite handgun, whose sight has instilled fear in many")>>
+ <<set $minimumSlaveCost -= 1000>>
+<<elseif $PC.career = "head techncian">>
+ <<set $upgradeMultiplierTechncian = .8, $trinkets.push("your first sucesfuly overclocked CPU in a clear case.")>>
<</if>>
<<if $PC.rumor == "wealth">>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index ef6201f5f99..d856d0f93a2 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -970,6 +970,8 @@ __''Mods''__
<<set $PC.trading = 100>>
<<case "mercenary">>
<<set $PC.warfare = 100>>
+ <<case "head techncian">>
+ <<set $PC.techncian = 100>>
<<case "slaver">>
<<set $PC.slaving = 100>>
<<case "engineer">>
@@ -977,7 +979,7 @@ __''Mods''__
<<case "medicine">>
<<set $PC.medicine = 100>>
<<case "arcology owner">>
- <<set $PC.trading = 100, $PC.warfare = 100, $PC.slaving = 100, $PC.engineering = 100, $PC.medicine = 100>>
+ <<set $PC.trading = 100, $PC.warfare = 100, $PC.techncian = 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/events/intro/pcExperienceIntro.tw b/src/events/intro/pcExperienceIntro.tw
index c489b08d452..fb6ec0b5349 100644
--- a/src/events/intro/pcExperienceIntro.tw
+++ b/src/events/intro/pcExperienceIntro.tw
@@ -27,6 +27,8 @@ You're a relative unknown in the Free Cities, but it's clear you're already acco
<br> //As an ex-servant, you will find it hard to maintain reputation<<if $showSecExp == 1>> and authority<</if>>. You know how to lower your upkeep, but not conduct business. Your starting slaves will have free trust and devotion.//
<br>[[Gang Leader|PC Rumor Intro][$PC.career = "gang"]]
<br> //As a gang leader, you know how to haggle slaves<<if $showSecExp == 1>> and assert your authority. Plus upgrades in the security HQ will be cheaper<</if>>, but you will find reputation quite hard to maintain. Your starting slaves will be fitter and posses a free level of combat skill.//
+<br>[[Head Technican|PC Rumor Intro][$PC.career = "head techncian"]]
+<br> //As a head techncian, you know how to manage techonology<<if $showSecExp == 1>> and some what assert your authority. Plus some upgrades in the weapons manufacturing and security HQ will be cheaper<</if>>, but you will find reputation quite hard to maintain.//
<</if>>
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index ed6a5887ecd..4d1eb8f93fd 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, 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, techncian: 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>>
@@ -341,7 +341,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.slaving = 100, $PC.engineering = 100, $PC.medicine = 100>>
+ <<set $PC.career = "arcology owner", $PC.trading = 100, $PC.warfare = 100, $PC.techncian = 100, $PC.slaving = 100, $PC.engineering = 100, $PC.medicine = 100>>
<</if>>
<<if $PC.mother > 0>>
<<set $PC.mother += 1200000>>
@@ -356,7 +356,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, 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, techncian: 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>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index bcf672ed685..396ab2e1999 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -355,6 +355,31 @@ You ponder what skills may be useful in running your arcology.
Alcohol makes pain go away, right?
<</if>>
+<br>Techncian:
+<<if $PC.techncian >= 100>>
+ You are a master of techonlogy.
+<<elseif $PC.techncian >= 80>>
+ You are an expert at techonlogy.
+<<elseif $PC.techncian >= 60>>
+ You are skilled in techonlogy.
+<<elseif $PC.techncian >= 40>>
+ You know some things about techonlogy.
+<<elseif $PC.techncian >= 20>>
+ You are a beginner in techonlogy.
+<<elseif $PC.techncian >= 0>>
+ You know only the basics of techonlogy.
+<<elseif $PC.techncian >= -20>>
+ You know how to click a mouse.
+<<elseif $PC.techncian >= -40>>
+ Enter does something?
+<<elseif $PC.techncian >= -60>>
+ Where is the "any" key?
+<<elseif $PC.warfare >= -80>>
+ You can push the power button button, good job.
+<<else>>
+ This black box thingy is magical.
+<</if>>
+
<br><br>
On formal occasions, you are announced as $PCTitle. By slaves, however, you prefer to be called <<if ndef $PC.customTitle>><<if $PC.title == 1>>Master<<else>>Mistress<</if>><<else>>$PC.customTitle, or $PC.customTitleLisp, by those slaves incapable of saying $PC.customTitle correctly<</if>>.
<span id="result">
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index af504655539..ccdcbc2c304 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -282,7 +282,7 @@
<<if $PC.engineering < 10>>
//Good job you know what a hammer now looks like.
<<elseif $PC.engineering >= 100>>
- //Time to for you to out there and building something.
+ //Time to for you to out there and build something.
<<elseif $PC.engineering >= 60>>
//Feel free to 'nail' me any time.
<<elseif $PC.engineering >= 30>>
@@ -293,12 +293,31 @@
<</replace>>
<</link>>
,
+ <<link "technology">>
+ <<set $PC.techncian += 1>>
+ <<replace "#result4">>
+ <br>
+ <<if $PC.techncian < 10>>
+ //Good job you know what a on button now does.
+ <<elseif $PC.techncian >= 100>>
+ //Time to for you to out there and tinker with a system.
+ <<elseif $PC.techncian >= 60>>
+ //Feel free to 'plug into' me any time.
+ <<elseif $PC.techncian >= 30>>
+ //Currect srew driver holding procedure acquired.
+ <<elseif $PC.techncian >= 10>>
+ //You can now some what use a mouse.
+ <</if>>
+ <</replace>>
+ <</link>>
+ ,
<<link "general skills">>
<<set $PC.engineering + 2>>
<<set $PC.slaving += 2>>
<<set $PC.trading += 2>>
<<set $PC.warfare += 2>>
<<set $PC.medicine += 2>>
+ <<set $PC.techncian += 2>>
<<replace "#result4">>
//Hopefully this general education I could provide may be of use.
<</replace>>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 8f098382e05..af1fde063ad 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>><</if>>
+ <<if $PC.engineering < 100>><<set $PC.engineering += 1, $PC.techncian += 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]]
+ //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.techncian += 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))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>. 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))>>.
- [[No subsidy|Manage Arcology][$cash -= Math.trunc(25000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1]]
+ You have not installed an FCTV receiver. Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian))>>. You can also have them heavily subsidize installation, they will be upset about it, but it will only cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian))>>.
+ [[No subsidy|Manage Arcology][$cash -= Math.trunc(25000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1, $PC.techncian += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1, $PC.techncian += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1, $PC.techncian += 1]]
<<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), $propHub = 1, $PC.engineering += 1]]
- //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>.//
+ [[Set up the propaganda Hub|Manage Arcology][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $propHub = 1, $PC.engineering += 1, $PC.techncian += 1]]
+ //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian))>>.//
<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), $secHQ = 1, $PC.engineering += 1]]
- //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology))>>.//
+ [[Set up the security headquarters|Manage Arcology][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $secHQ = 1, $PC.engineering += 1, $PC.techncian += 1]]
+ //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology**$upgradeMultiplierTechncian))>>.//
<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 34ea631982f..1c6d8b9c6a6 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3860,8 +3860,8 @@ You remind yourself that success in this conflict will not be defined by the tra
<br> //This option is available due to your @@.springgreen;societal connections,@@ and will economically devastate your rival//
<</if>>
<</if>>
-<<if ($PC.career == "mercenary") || ($PC.career == "arcology owner")>>
-<<if $mercenaries >= 3>>
+<<if ($PC.career == "mercenary") || ($PC.career == "arcology owner") || ($PC.warfare >= 100)>>
+<<if $mercenaries >= 3 || $securityForceActive == 1>>
<br><<link "Your peers will tolerate an attack if it's covert">>
<<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
@@ -3907,7 +3907,116 @@ You remind yourself that success in this conflict will not be defined by the tra
<</if>>
You go back to your work.
<</replace>>
-<</link>> //This option is available due to your @@.springgreen;military background,@@ and will immediately end the conflict without enslaving your rival//
+<</link>> //This option is available due to your @@.springgreen;military background and skills,@@ and will immediately end the conflict without enslaving your rival//
+<</if>>
+<</if>>
+
+geany events/intro/pcExperienceIntro.tw events/intro/introSummary.tw uncategorized/personalAssistantOptions.tw uncategorized/BackwardsCompatibility.tw init/storyInit.tw init/setupVars.tw uncategorized/nonRandomEvent.tw uncategorized/pRivalryActions.tw
+
+<<if $PC.techncian >= 100 (($PC.career == "mercenary") || ($PC.career == "arcology owner") || ($PC.warfare >= 100))>>
+<<if $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.techncian < 10 && random(0,100) > 90>>
+ <<set _Sucess = 1>>
+ <<elseif $PC.techncian >= 100 && random(0,100) > 50>>
+ <<set _Sucess = 1>>
+ <<elseif $PC.techncian >= 80 && random(0,100) > 55>>
+ <<set _Sucess = 1>>
+ <<elseif $PC.techncian >= 60 && random(0,100) > 60>>
+ <<set _Sucess = 1>>
+ <<elseif $PC.techncian >= 40 && random(0,100) > 65>>
+ <<set _Sucess = 1>>
+ <<elseif $PC.techncian >= 20 && random(0,100) > 75>>
+ <<set _Sucess = 1>>
+ <<elseif $PC.techncian >= 10 && random(0,100) > 85>>
+ <<set _Sucess = 1>>
+ <</if>>
+
+ <<if _Sucess = 1>>
+ <<switch $rivalryFS>>
+ <<case "Racial Subjugationism">>Racemixer
+ <<case "Racial Supremacism">>Miscegenator
+ <<case "Repopulation Focus">>Sterilizer
+ <<case "Eugenics">>Breeder
+ <<case "Gender Radicalism">>Handholder
+ <<case "Gender Fundamentalism">>Sodomite
+ <<case "Paternalism">>Lucifer
+ <<case "Degradationism">>Archangel Prime
+ <<case "Body Purism">>Plastic Surgeon
+ <<case "Transformation Fetishism">>Purist One
+ <<case "Youth Preferentialism">>Cake Eater
+ <<case "Maturity Preferentialism">>Epheb
+ <<case "Slimness Enthusiasm">>Grower
+ <<case "Asset Expansionism">>Flat Lover
+ <<case "Pastoralism">>Gym Rat
+ <<case "Physical Idealism">>Feeder
+ <<case "Hedonistic Decadence">>Gym Rat
+ <<case "Chattel Religionism">>Cultural Marxist
+ <<case "Multiculturalism">>Prophet
+ <<default>>Target One
+ <</switch>>
+ Bag and taged. Confirm, bag and taged. No casualties, team exfiltrating."
+ <<set $rivalOwner = 1, $rivalryPower = 0>>
+ <<if $rivalSet != 0>>
+ <<for _pra = 0; _pra < $arcologies.length; _pra++>>
+ <<if $arcologies[_pra].rival == 1>>
+ <<set $arcologies[_pra].embargo = 0>>
+ <<set $arcologies[_pra].embargoTarget = -1>>
+ <<set $arcologies[_pra].influenceTarget = -1>>
+ <<set $arcologies[_pra].rival = 0>>
+ <<set $arcologies[_pra].government = "direct democracy">>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <<else>>
+ <<switch $rivalryFS>>
+ <<case "Racial Subjugationism">>Racemixer
+ <<case "Racial Supremacism">>Miscegenator
+ <<case "Repopulation Focus">>Sterilizer
+ <<case "Eugenics">>Breeder
+ <<case "Gender Radicalism">>Handholder
+ <<case "Gender Fundamentalism">>Sodomite
+ <<case "Paternalism">>Lucifer
+ <<case "Degradationism">>Archangel Prime
+ <<case "Body Purism">>Plastic Surgeon
+ <<case "Transformation Fetishism">>Purist One
+ <<case "Youth Preferentialism">>Cake Eater
+ <<case "Maturity Preferentialism">>Epheb
+ <<case "Slimness Enthusiasm">>Grower
+ <<case "Asset Expansionism">>Flat Lover
+ <<case "Pastoralism">>Gym Rat
+ <<case "Physical Idealism">>Feeder
+ <<case "Hedonistic Decadence">>Gym Rat
+ <<case "Chattel Religionism">>Cultural Marxist
+ <<case "Multiculturalism">>Prophet
+ <<default>>Target One
+ <</switch>>
+ EKIA. Confirm, E. K. I. A. No other casualties, team exfiltrating."
+ <<set $rivalOwner = 0, $rivalryPower = 0>>
+ <<if $rivalSet != 0>>
+ <<for _pra = 0; _pra < $arcologies.length; _pra++>>
+ <<if $arcologies[_pra].rival == 1>>
+ <<set $arcologies[_pra].embargo = 0>>
+ <<set $arcologies[_pra].embargoTarget = -1>>
+ <<set $arcologies[_pra].influenceTarget = -1>>
+ <<set $arcologies[_pra].rival = 0>>
+ <<set $arcologies[_pra].government = "direct democracy">>
+ <<break>>
+ <</if>>
+ <</for>>
+ <</if>>
+ <</if>>
+
+ <<if $hostageAnnounced == 1>>
+ $assistantName pauses. "Also confirm package is secure."
+ <<set $hostageRescued = 1>>
+ <</if>>
+ You go back to your work.
+ <</replace>>
+<</link>> //This option is available due to your @@.springgreen;military background and skills inaddition to your techncial mastery,@@ . This will immediately end the conflict with a chance of enslaving your rival//
<</if>>
<</if>>
</span>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 6dfe37e1afc..8123f51142a 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -483,6 +483,40 @@
You have made progress towards mastering mercenary work.
<</if>>
<</if>>
+
+<<case techncian>>
+ <<set _oldSkill = $PC.techncian>>
+ <<if _X == 1>>
+ <<set $PC.techncian += _Cal>>
+ <<else>>
+ <<set $PC.techncian -= _Cal>>
+ <</if>>
+ <<if _oldSkill <= 10>>
+ <<if $PC.techncian > 10>>
+ You now have @@.green;basic knowledge@@ about how to be a techncian.
+ <<else>>
+ You have made progress towards a basic knowledge of techncian work.
+ <</if>>
+ <<elseif _oldSkill <= 30>>
+ <<if $PC.techncian > 30>>
+ You now have @@.green;some skill@@ as a mercenary.
+ <<else>>
+ You have made progress towards being skilled in techncian work.
+ <</if>>
+ <<elseif _oldSkill <= 60>>
+ <<if $PC.techncian > 60>>
+ You are now an @@.green;expert mercenary.@@
+ <<else>>
+ You have made progress towards being an expert in techncian work.
+ <</if>>
+ <<else>>
+ <<if $PC.techncian >= 100>>
+ <<set $personalAttention = "sex">>
+ You are now a @@.green;master techncian.@@
+ <<else>>
+ You have made progress towards mastering techncian work.
+ <</if>>
+ <</if>>
<<case slaving>>
<<set _oldSkill = $PC.slaving>>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index 0a016d9daa8..b241c2c9671 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))>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $assistantPower += 1, $PC.engineering += 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*$upgradeMultiplierTechncian))>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $assistantPower += 1, $PC.engineering += 1, $PC.techncian += 1]]
<<elseif $assistantPower == 1>>
- //The final upgrade needed is a transition to optical RAM. This huge project will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $assistantPower += 1, $PC.engineering += 1]]
+ //The final upgrade needed is a transition to optical RAM. This huge project will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian))>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*$upgradeMultiplierTechncian), $assistantPower += 1, $PC.engineering += 1, $PC.techncian += 1]]
<<else>>
//The arcology's computer core is fully upgraded.//
<</if>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index 22be7b5bc41..12a6c38e23e 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -63,6 +63,22 @@
<br>[[Hire a mercenary to train you in warfare|Main][$personalAttention = "warfare", $personalAttentionChanged = 1]]
<</if>>
<</if>>
+<<if $PC.techncian >= 100>>
+ <br>//You are a master techncian.//
+<<else>>
+ <<if $PC.techncian > 60>>
+ //You are an expert techncian.//
+ <<elseif $PC.techncian > 30>>
+ //You have some skill as a techncian.//
+ <<elseif $PC.techncian > 10>>
+ //You have basic knowledge as a techncian.//
+ <</if>>
+ <<if $personalAttention == "techncian">>
+ <br>You are training in techncian.
+ <<elseif $PC.warfare < 100 && $PC.actualAge < $IsPastPrimePC>>
+ <br>[[Hire a techncian to train you in technology|Main][$personalAttention = "techncian", $personalAttentionChanged = 1]]
+ <</if>>
+<</if>>
<<if $PC.slaving >= 100>>
<br>//You are a master slaver.//
<<else>>
--
GitLab