diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index d1bb1c1d3ef8643c48fbaa6b5a999581010af251..927c2a9de33ae63af839facf0785ebd2277b79c5 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -232,6 +232,10 @@ warfare:
your warfare skill
accepts int between -100 and 100
+Hacking:
+your hacking skill
+accepts int between -100 and 100
+
slaving:
your slaving skill
diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index fd9f8973377ee3474924655e13d874d67b0fb099..67abe79d7d4d2a1212f8ebae4aa366320aaee622 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -1,5 +1,5 @@
:: propagandaHub [nobr]
-
+<<HSM>>
<<if $career == "capitalist" || $career == "celebrity" || $career == "wealth">>
<<set _HistoryDiscount = .5>>
<<else>>
@@ -64,7 +64,7 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<<set $propFocus = "recruitment">>
<<goto "propagandaHub">>
<</link>>
- <</if>>
+ <</if>>
<br>
<<if $propFocus == "social engineering">>
You are concentrating your propaganda efforts towards increasing the acceptance of your chosen future societies.
@@ -79,17 +79,18 @@ 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*$HackingSkillMultiplier>>
+ <<set $PC.engineering += 1, $PC.hacking += 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*$HackingSkillMultiplier))>>. Will provide more of the focused resource each week, will increase reputation upkeep.//
<<else>>
You upgraded your propaganda machine to its limits.
<</if>>
-<</if>>
-
+<</if>>
+
<br>
<br>
@@ -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*$HackingSkillMultiplier>>
+ <<set $PC.hacking += 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*$HackingSkillMultiplier))>>. 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 3a5cd9d746d2480770cc2ab8ec5f38a13dbc6237..7b638b31eee08bc6a80d65d45f0a3529d0ea9501 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -1,5 +1,5 @@
:: riotControlCenter [nobr]
-
+<<HSM>>
<<set $nextButton = "Back to Arcology Management", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
Riot Control Center
@@ -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)*$HackingSkillMultiplier))>>
+ <<set $PC.engineering += 1, $PC.hacking += 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)*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier>>
+ <<set $PC.engineering += 1, $PC.hacking += 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*$HackingSkillMultiplier))>>. 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 1b30a2e520821051628ba66cab786f3954fbd3c4..960e39026abb5390ee47af8c18333609d2916524 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -1,5 +1,5 @@
:: securityHQ [nobr]
-
+<<HSM>>
<<if $career == "mercenary" || $career == "gang" || $career == "slaver">>
<<set _HistoryDiscount = .5>>
<<else>>
@@ -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), $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*$HackingSkillMultiplier), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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), $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*$HackingSkillMultiplier), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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), $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*$HackingSkillMultiplier), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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), $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*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier, $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]]
+ <br>//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. 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 7ee5833827fbdbc4e3b3ffbde9e004a0660463a0..b7bc9ea4c23ac2b496f4c94f11dbe3b3f83ffe28 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -1,5 +1,5 @@
:: weaponsManufacturing [nobr]
-
+<<HSM>>
<<set $nextButton = "Back", $nextLink = "Main">>
This sector of the arcology has been dedicated to weapons manufacturing. These factories supply
@@ -199,10 +199,10 @@ __Upgrades__:
unit: 0,
type: "attack",
time: _time}>>
- <<set $cash -= 10000>>
+ <<set $cash -= 10000*$HackingSkillMultiplier>>
<<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*$HackingSkillMultiplier)>> 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>>
+ <<set $cash -= 120000*$HackingSkillMultiplier>>
<<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*$HackingSkillMultiplier)>> 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>>
+ <<set $cash -= 120000*$HackingSkillMultiplier>>
<<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*$HackingSkillMultiplier)>> 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>>
+ <<set $cash -= 1000000*$HackingSkillMultiplier>>
<<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*$HackingSkillMultiplier)>> 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 c6644a15160af15a4ac204c339a4cbc825b8f92b..4d6a5c53ba6314ce6098332999ecadd4d0808ff9 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -994,7 +994,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.hacking = 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 c0672310e9ebe6bbb3845a96375dea5dd1b75c90..989dcb078687690ee78dbac9f5b7126401d9a963 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -353,7 +353,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.hacking = 100, $PC.slaving = 100, $PC.engineering = 100, $PC.medicine = 100>>
<</if>>
<<if $PC.mother > 0>>
<<set $PC.mother += 1200000>>
@@ -369,6 +369,7 @@ You should have received a copy of the GNU General Public License along with thi
<<initPC>>
<<set $cheater = 0>>
<<set $cash = 10000>>
+
<</if>>
<</if>>
@@ -1294,6 +1295,10 @@ ocularImplant: 0,
erectileImplant: 0
} >>
+<<if ndef $PC.hacking>>
+ <<set $PC.hacking = 0>>
+<</if>>
+
/* Security Expansion */
<<set $secExp = 0>>
<<set $showSecExp = 0>>
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 6a49f2af96229a2b1a2865ebd658af0f4d7dfd80..325af134220356c5932c391b7dd55912a8aaf211 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -7,7 +7,7 @@ window.Job = Object.freeze({
SERVANT: 'work as a servant', SERVER: 'be a servant', STEWARD: 'be the Stewardess', CLUB: 'serve in the club', DJ: 'be the DJ',
JAIL: 'be confined in the cellblock', WARDEN: 'be the Wardeness', CLINIC: 'get treatment in the clinic', NURSE: 'be the Nurse',
HGTOY: 'live with your Head Girl', SCHOOL: 'learn in the schoolroom', TEACHER: 'be the Schoolteacher', SPA: 'rest in the spa', ATTEND: 'be the Attendant'});
-window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAVEING: 'slaving', ENGINEERING: 'engineering', MEDICINE: 'medicine', MAID: 'upkeep'});
+window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAVEING: 'slaving', ENGINEERING: 'engineering', MEDICINE: 'medicine', MAID: 'upkeep', HACKING: 'hacking'});
window.getCost = function(array) {
var rulesCost = State.variables.rulesCost;
@@ -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.HACKING) {
+ costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
}
}
diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 997e4b8c0a4ea3cac841982dbfe3574d601c2075..0b74ed8a742a1f59e3975d9220f187282f1edef0 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -1,5 +1,5 @@
:: Incubator [nobr]
-
+
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Incubator">>
<<set $targetAge = Number($targetAge) || $minimumSlaveAge>>
<<set $targetAge = Math.clamp($targetAge, $minimumSlaveAge, 42)>>
@@ -287,7 +287,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<<else>>
immense.
<</if>>
- <<if $tanks[$i].dick > 0>>
+ <<if $tanks[$i].dick > 0>>
<<if $tanks[$i].dick <= 3>>
The latest analysis reported her dick will end up being around the average
<<elseif $tanks[$i].dick >= 4 && $tanks[$i].dick <= 6>>
@@ -372,7 +372,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<</if>>
<</if>>
<<if $cheatMode == 1>>
- <br>''Cheatmode:''
+ <br>''Cheatmode:''
<<link "Retrieve immediately">>
<<set $incubatorOldID = $tanks[$i].ID>>
<<set $readySlave = $tanks.pluck([$i], [$i])>>
@@ -443,7 +443,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<</link>>
<</if>>
<<if $tanks[$i].eyes == -2 && $tankOrgans.eyes != 1>>
- <br>She appears to be blind:
+ <br>She appears to be blind:
<<link "Prepare eyes">>
<<set $cash -= 10000>>
<<set _newOrgan = {type: "eyes", weeksToCompletion: "10", ID: 0}>>
@@ -453,7 +453,7 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
<</link>>
<</if>>
<<if $tanks[$i].voice == 0 && $tankOrgans.voicebox != 1>>
- <br>It appears she was born a mute:
+ <br>It appears she was born a mute:
<<link "Prepare vocal cords">>
<<set $cash -= 5000>>
<<set _newOrgan = {type: "voicebox", weeksToCompletion: "5", ID: 0}>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 3dd539b8f9e944e7982fabca00364b477712928d..c6d3f3cb008b5d2cc9ec428c950e6bbf9a0673a9 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -209,6 +209,31 @@ You ponder what skills may be useful in running your arcology.
Alcohol makes pain go away, right?
<</if>>
+<br>hacking:
+<<if $PC.hacking >= 100>>
+ You are a master of hacking.
+<<elseif $PC.hacking >= 80>>
+ You are an expert at hacking.
+<<elseif $PC.hacking >= 60>>
+ You are skilled in hacking.
+<<elseif $PC.hacking >= 40>>
+ You know some things about hacking.
+<<elseif $PC.hacking >= 20>>
+ You are a beginner in hacking.
+<<elseif $PC.hacking >= 0>>
+ You know only the basics of hacking.
+<<elseif $PC.hacking >= -20>>
+ You know how to click a mouse.
+<<elseif $PC.hacking >= -40>>
+ Enter does something?
+<<elseif $PC.hacking >= -60>>
+ Where is the "any" key?
+<<elseif $PC.hacking >= -80>>
+ You can push the power 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/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index ce0c079f68649ba0bb8a7ec1dd9b0e85bb2e6e1a..c49e54f864688e80cb05ed97a1798f16fd8e8f22 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1,4 +1,4 @@
-:: pregmod widgets [nobr widget]
+:: pregmod widgets [nobr widget]
<<widget "initPC">>
<<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 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}>>
@@ -6,7 +6,7 @@
<<set WombInit($PC)>>
<</widget>>
-
+
<<widget "PMODinit">>
<<set WombInit($args[0])>>
@@ -732,7 +732,7 @@ $activeSlave.slaveName is up for review:
<<case "French">>
and, in keeping with her heritage, a MAS AAT-F1 GPMG
<<case "Korean">>
- and, in keeping with her heritage, a S&T K12 GPMG
+ and, in keeping with her heritage, a S&T K12 GPMG
<<case "South African">>
and, in keeping with her heritage, a Vektor SS-77 GPMG
<<case "Finnish">>
@@ -985,7 +985,7 @@ $activeSlave.slaveName is up for review:
<</switch>>
at her side.
<</if>>
-
+
<</widget>>
/*
@@ -1328,7 +1328,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
<</if>>
<<set $slaves[$i].devotion += 4, $citizenOrphanageTotal +=$slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>>
<</replace>>
- <</link>>
+ <</link>>
//Will cost <<print cashFormat(100)>> weekly//
| <<link 'Have them raised privately'>>
<<replace `"#" + _dispositionId`>>
@@ -1345,7 +1345,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
The remaining child<<if $slaves[$i].pregType > 1>>ren<</if>> will be raised privately, with expert care and tutoring, an expensive proposition.
<<set $slaves[$i].devotion += 6, $privateOrphanageTotal += $slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>>
<</replace>>
- <</link>>
+ <</link>>
//Will cost <<print cashFormat(500)>> weekly//
<</capture>>
<</if>>
@@ -1765,7 +1765,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
<</if>>
<<set $slaves[$i].devotion += 4, $citizenOrphanageTotal +=$slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>>
<</replace>>
- <</link>>
+ <</link>>
//Will cost <<print cashFormat(100)>> weekly//
| <<link 'Have them raised privately'>>
<<replace `"#" + _dispositionId`>>
@@ -1782,7 +1782,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
The remaining child<<if $slaves[$i].pregType > 1>>ren<</if>> will be raised privately, with expert care and tutoring, an expensive proposition.
<<set $slaves[$i].devotion += 6, $privateOrphanageTotal += $slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>>
<</replace>>
- <</link>>
+ <</link>>
//Will cost <<print cashFormat(500)>> weekly//
<</capture>>
<</if>>
@@ -1844,7 +1844,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
/* <<case 7>> */
<<set $AgeTrainingLowerBoundPC = 14, $AgeTrainingUpperBoundPC = 16, $AgeEffectOnTrainerPricingPC = .75, $AgeEffectOnTrainerEffectivenessPC = .75>>
/* <<case 8>> */
- <<set $AgeTrainingLowerBoundPC = 13, $AgeTrainingUpperBoundPC = 15, $AgeEffectOnTrainerPricingPC = .85, $AgeEffectOnTrainerEffectivenessPC = .85>>
+ <<set $AgeTrainingLowerBoundPC = 13, $AgeTrainingUpperBoundPC = 15, $AgeEffectOnTrainerPricingPC = .85, $AgeEffectOnTrainerEffectivenessPC = .85>>
<<case 3>>
<<set $AgeTrainingLowerBounds = 18, $AgeTrainingUpperBounds = 20, $AgePricing = .1, $AgeTrainingEffect = .1>>
<<case 4>>
@@ -1856,7 +1856,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
<<case 7>>
<<set $AgeTrainingLowerBounds = 14, $AgeTrainingUpperBounds = 16, $AgePricing = .75, $AgeTrainingEffect = .75>>
<<case 8>>
- <<set $AgeTrainingLowerBounds = 13, $AgeTrainingUpperBounds = 15, $AgePricing = .85, $AgeTrainingEffect = .85>>
+ <<set $AgeTrainingLowerBounds = 13, $AgeTrainingUpperBounds = 15, $AgePricing = .85, $AgeTrainingEffect = .85>>
<<case 9>>
<<set $AgeTrainingLowerBoundPC = 12, $AgeTrainingUpperBoundPC = 14, $AgeEffectOnTrainerPricingPC = 1.00, $AgeEffectOnTrainerEffectivenessPC = 1.00>>
<<case 10>>
@@ -1876,7 +1876,7 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
<<case 17>>
<<set $AgeTrainingLowerBoundPC = 4, $AgeTrainingUpperBoundPC = 6, $AgeEffectOnTrainerPricingPC = 1.07, $AgeEffectOnTrainerEffectivenessPC = 1.07>>
<<case 18>>
- <<set $AgeTrainingLowerBoundPC = 3, $AgeTrainingUpperBoundPC = 5, $AgeEffectOnTrainerPricingPC = 1.08, $AgeEffectOnTrainerEffectivenessPC = 1.08>>
+ <<set $AgeTrainingLowerBoundPC = 3, $AgeTrainingUpperBoundPC = 5, $AgeEffectOnTrainerPricingPC = 1.08, $AgeEffectOnTrainerEffectivenessPC = 1.08>>
/* <<case 19>> */
/* <<set $AgeTrainingLowerBoundPC = 2, $AgeTrainingUpperBoundPC = 4, $AgeEffectOnTrainerPricingPC = 1.09, $AgeEffectOnTrainerEffectivenessPC = 1.09>> */
/* <<case 20>> */
@@ -1911,3 +1911,28 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
}
})>>
<</widget>>
+
+/%
+Call as <<HSM>>
+%/
+<<widget "HSM">>
+ <<if $PC.hacking <= -100>>
+ <<set $HackingSkillMultiplier = 1.5>>
+ <<elseif $PC.hacking <= -75>>
+ <<set $HackingSkillMultiplier = 1.35>>
+ <<elseif $PC.hacking <= -50>>
+ <<set $HackingSkillMultiplier = 1.25>>
+ <<elseif $PC.hacking <= -25>>
+ <<set $HackingSkillMultiplier = 1.15>>
+ <<elseif $PC.hacking == 0>>
+ <<set $HackingSkillMultiplier = 1>>
+ <<elseif $PC.hacking <= 25>>
+ <<set $HackingSkillMultiplier = .95>>
+ <<elseif $PC.hacking <= 50>>
+ <<set $HackingSkillMultiplier = .75>>
+ <<elseif $PC.hacking <= 75>>
+ <<set $HackingSkillMultiplier = .65>>
+ <<elseif $PC.hacking >= 100>>
+ <<set $HackingSkillMultiplier = .5>>
+ <</if>>
+<</widget>>
\ No newline at end of file
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 10f3b675fdbbad8463130a7204a51a7ec68655cf..de0d1de390d1e8d8f065d149c5915a86063ecb17 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1143,6 +1143,18 @@
<<if ndef $arcologies[0].embargoTarget>>
<<set $arcologies[0].embargoTarget = -1>>
<</if>>
+<<if ndef $arcologies[0].hackingEconomic>>
+ <<set $arcologies[0].hackingEconomic = 1>>
+<</if>>
+<<if ndef $arcologies[0].hackingEconomicTarget>>
+ <<set $arcologies[0].hackingEconomicTarget = -1>>
+<</if>>
+<<if ndef $arcologies[0].hackingReputationTarget>>
+ <<set $arcologies[0].hackingReputationTarget = -1>>
+<</if>>
+<<if ndef $arcologies[0].hackingReputation>>
+ <<set $arcologies[0].hackingReputation = 1>>
+<</if>>
<<if ndef $arcologies[0].influenceTarget>>
<<set $arcologies[0].influenceTarget = -1>>
<</if>>
@@ -2952,6 +2964,9 @@ Setting missing slave variables:
<<HeroSlavesCleanup>>
Done!
+<<if ndef $PC.hacking>>
+ <<set $PC.hacking = 0>>
+<</if>>
/* Sec Exp */
<<if $secExp == 1>>
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 8be656bbfb3d251be19bcfbd4c7a5705677fe797..562bdad57f3c425cefc60114933fd692d2d7c920 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 == "hacking")>>
<<set $costs += _cost>>
<</if>>
<</if>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index d1bd5c778cb6169f176887b30d9c6ca21fbc9de0..2799b628580762c336c9806f61c37886f2d19ebd 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 == "hacking")>>
<<set _cost = 10000*$AgeEffectOnTrainerPricingPC>>
<<switch $personalAttention>>
<br>
@@ -226,6 +226,8 @@
__Engineering__
<<case medicine>>
__Medicine__
+<<case hacking>>
+ __Hacking__
<</switch>>
trainer fees: <<print cashFormat(_cost)>>
<br>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 8f098382e05d2d2c6b7a32a35f017d0c1c5684a8..77644345d116bd68438189ae95441b002ae45267 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -1,5 +1,5 @@
:: Manage Arcology [nobr]
-
+<<HSM>>
<<set $nextButton = "Back", $nextLink = "Main">>
<<if $cheatMode == 1>>
@@ -73,7 +73,7 @@ __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))>>.
+ 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]]
<<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.
@@ -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*$HackingSkillMultiplier)), $propHub = 1, $PC.engineering += 1, $PC.hacking += 1]]
+ //Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>.//
<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*$HackingSkillMultiplier)), $secHQ = 1, $PC.engineering += 1, $PC.hacking += 1]]
+ //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>.//
<br>//Building specialized in the management of security and crime.//
<<else>>
<br>
diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw
index 403220c55f7ea8ced76d2ce385c13a2641bc88ff..1504a0584b0cad6529ddc3239361a75c1f46dc47 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -40,8 +40,7 @@ The arcology has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trun
<<else>>
behind
<</if>>
-its neighbors.
-
+its neighbors.
<<set $desc = 0>>
<<set $seed = []>>
<<if $arcologies[$i].FSSubjugationist != "unset">>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index 0eb8ac225ac95a91a35d0a40ec0f453ea13d3578..a1f93014090d286dbc44fb1cc0450bdd0db08e5a 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -1,5 +1,5 @@
:: Personal assistant options [nobr]
-
+<<HSM>>
<<set $nextButton = "Back", $nextLink = "Main">>
<<if $marketAssistantLimit>><<set $marketAssistantLimit to Math.clamp($marketAssistantLimit, 10000, 10000000)>><</if>>
@@ -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*$HackingSkillMultiplier))>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $assistantPower += 1, $PC.engineering += 1, $PC.hacking += 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*$HackingSkillMultiplier))>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $assistantPower += 1, $PC.engineering += 1, $PC.hacking += 1]]
<<else>>
//The arcology's computer core is fully upgraded.//
<</if>>
@@ -828,11 +828,19 @@ __Downloadable Appearances:__
<</if>>
*/
<<if $assistantExtra2 == 0>>
- <<link "Purchase a set of heaven and hell themed appearances">>
- <<set $cash -= Math.trunc(10000*$upgradeMultiplierArcology), $assistantExtra2 = 1, $nextLink = "Personal assistant options">>
- <<goto "Assistant Appearance Pack Two">>
- <</link>> //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>//
- <<else>>You have downloaded a set of heavenly and hellish appearances for your avatar.
+ <<if $PC.hacking < 75>>
+ <<link "Purchase a set of heaven and hell themed appearances">>
+ <<set $cash -= Math.trunc(10000*$upgradeMultiplierArcology), $assistantExtra2 = 1, $nextLink = "Personal assistant options">>
+ <<goto "Assistant Appearance Pack Two">>
+ <</link>> //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>//
+ <<else>>
+ <<link "Acquire a set of heaven and hell themed appearances">>
+ <<set $assistantExtra2 = 1, $nextLink = "Personal assistant options">>
+ <<goto "Assistant Appearance Pack Two">>
+ <</link>> //Yet more unencrypted files, ripe for the taking//
+ <</if>>
+ <<else>>
+ You have downloaded a set of heavenly and hellish appearances for your avatar.
<</if>>
<</if>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 2229959a4eadcd2dcf023d90df176caa144fe9ab..5de296d736c5cf2b10870569304ce97aac772bb9 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1,5 +1,5 @@
:: SA long term effects [nobr]
-
+<<HSM>>
<<fetishChangeChance $slaves[$i]>>
<<set $bellyAccessory to $slaves[$i].bellyAccessory>>
<<set _para = 0>>
@@ -889,7 +889,7 @@
In fact, she @@.hotpink;regularly orgasms@@ even in non-sexual situations as the plug is @@.green;constantly stimulating@@ her rear-end.
<<set $slaves[$i].devotion += 1>>
<<set $slaves[$i].energy += 1>>
- <</if>>
+ <</if>>
<</if>>
<<else>>
<<if $slaves[$i].fuckdoll == 0 && $slaves[$i].fetish != "mindbroken">>
@@ -3487,7 +3487,7 @@
<<elseif $slaves[$i].drugs == "hormone blockers">>
The hormone blockers $pronoun is on suppress $possessive hormones, natural or not.
<<if $slaves[$i].energy > 20>>
- $possessiveCap libido is similarly
+ $possessiveCap libido is similarly
<<set _supp = 1, $slaves[$i].energy-->>
<</if>>
<<if _supp == 1>>
@@ -4314,14 +4314,14 @@
<</if>>
<</for>>
<</if>>
-
+
<<case "please you">>
<<if ($PC.dick == 1) && ($slaves[$i].eggType == "human") && (($slaves[$i].toyHole == "all her holes" && $slaves[$i].mpreg != 1 && $slaves[$i].vagina > 0) || ($slaves[$i].toyHole == "all her holes" && $slaves[$i].mpreg == 1 && $slaves[$i].anus > 0) || ($slaves[$i].toyHole == "pussy" && $slaves[$i].mpreg != 1) || ($slaves[$i].mpreg == 1 && $slaves[$i].toyHole == "ass"))>>
You frequently avail yourself to her fertile <<if $slaves[$i].mpreg == 1>>ass<<else>>pussy<</if>>. It's no surprise when @@.lime;she ends up pregnant with your child.@@
<<set $slaves[$i].preg = 1, $slaves[$i].pregSource = -1, $slaves[$i].pregWeek = 1, $slaves[$i].pregKnown = 1>><<SetPregType $slaves[$i]>>
<<set WombImpregnate($slaves[$i], $slaves[$i].pregType, -1, 1)>>
<</if>>
-
+
<<case "work in the brothel" "serve in the club" "whore" "serve the public">>
<<if ($slaves[$i].eggType == "human")>>
Due to all the citizens cumming in $possessive fertile <<if $slaves[$i].mpreg == 1>>ass<<else>>pussy<</if>>, @@.lime;$pronoun has become pregnant.@@
@@ -4888,7 +4888,7 @@
<<set $pornFameBonus = 1>>
<<if $studio == 1>>
<<if $slaves[$i].pornFameSpending > 0>>
- <<set $pornFameBonus += 0.2 + ($slaves[$i].pornFameSpending/10000)>>
+ <<set $pornFameBonus += 0.2 + (($slaves[$i].pornFameSpending/10000)*$HackingSkillMultiplier)>>
<<if ($slaves[$i].pornFameSpending >= 4000)>>
$possessiveCap near-ubiquitous presence in arcology pornography greatly increases $possessive impact on society.
<<elseif ($slaves[$i].pornFameSpending >= 2000)>>
@@ -7076,12 +7076,12 @@
<<set _oldFame = $slaves[$i].pornFame>>
<<if ($slaves[$i].pornFame < 35) && ($slaves[$i].prestige > 1)>>
Interest in porn of $object is very high, since $pronoun's already quite prestigious.
- <<set $slaves[$i].pornFame += 1>>
+ <<set $slaves[$i].pornFame += 1*$HackingSkillMultiplier>>
<<elseif ($slaves[$i].pornFame < 10) && ($slaves[$i].prestige > 0)>>
Interest in porn of $object is high, since $pronoun's already prestigious.
- <<set $slaves[$i].pornFame += 1>>
+ <<set $slaves[$i].pornFame += 1*$HackingSkillMultiplier>>
<</if>>
- <<set $slaves[$i].pornFame += ($slaves[$i].pornFameSpending/1000)>>
+ <<set $slaves[$i].pornFame += (($slaves[$i].pornFameSpending/1000)*$HackingSkillMultiplier)>>
<<if ($slaves[$i].prestige < 3) && ($slaves[$i].pornFame >= 100) && (_oldFame < 100)>>
<<set $slaves[$i].prestige = 3>>
@@.green;$pronounCap has become world famous for $possessive career in slave pornography!@@ Millions are now intimately familiar with