diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index 014d544980796fb154619748834f18596e4e9c9c..b83a8771b3bc5386725b3c01e7d69f3da67e14e9 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -1,5 +1,5 @@
:: propagandaHub [nobr]
-<<SISM>>
+<<HSM>>
<<if $career == "capitalist" || $career == "celebrity" || $career == "wealth">>
<<set _HistoryDiscount = .5>>
<<else>>
@@ -79,13 +79,13 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<<if $propCampaign < 5>>
<<link "Invest more resources in the propaganda machine">>
<<set $propCampaign += 1>>
- <<set $cash -= 5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$SystemIntrusionSkillMultiplier>>
- <<set $PC.engineering += 1, $PC.SystemIntrusion += 1>>
+ <<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*$SystemIntrusionSkillMultiplier))>>. Will provide more of the focused resource each week, but increases reputation upkeep.//
+ <br>//Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierArcology * ($propCampaign + 1) * _HistoryDiscount*$HackingSkillMultiplier))>>. Will provide more of the focused resource each week, but increases reputation upkeep.//
<<else>>
You upgraded your propaganda machine to its limits.
<</if>>
@@ -134,13 +134,13 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<<if $controlLeaks == 0>>
<<link "Institute controlled leaks protocols">>
<<set $controlLeaks = 1>>
- <<set $cash -= 10000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier>>
- <<set $PC.SystemIntrusion += 1>>
+ <<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*$SystemIntrusionSkillMultiplier))>>. 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 d52194a2755f5d417396b969858e95acda108579..7b638b31eee08bc6a80d65d45f0a3529d0ea9501 100644
--- a/src/SecExp/riotControlCenter.tw
+++ b/src/SecExp/riotControlCenter.tw
@@ -1,5 +1,5 @@
:: riotControlCenter [nobr]
-<<SISM>>
+<<HSM>>
<<set $nextButton = "Back to Arcology Management", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
Riot Control Center
@@ -24,13 +24,13 @@ The riot control center opens its guarded doors to you. The great chamber inside
<<if $riotUpgrades.freeMedia < 5>>
<<link "Invest more resources in the free media project">>
<<set $riotUpgrades.freeMedia += 1>>
- <<set $cash -= ((5000 * $upgradeMultiplierArcology * ($riotUpgrades.freeMedia + 1)*$SystemIntrusionSkillMultiplier))>>
- <<set $PC.engineering += 1, $PC.SystemIntrusion += 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)*$SystemIntrusionSkillMultiplier))>>. 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>>
@@ -153,13 +153,13 @@ The riot control center opens its guarded doors to you. The great chamber inside
<<elseif $brainImplantProject < 5>>
<<link "Invest more resources in the brain implant project">>
<<set $brainImplantProject += 1>>
- <<set $cash -= 50000 * $upgradeMultiplierArcology * $brainImplantProject*$SystemIntrusionSkillMultiplier>>
- <<set $PC.engineering += 1, $PC.SystemIntrusion += 1>>
+ <<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*$SystemIntrusionSkillMultiplier))>>. 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/secBarracks.tw b/src/SecExp/secBarracks.tw
index 31a5241cbe55a37c49bf3b529104d6a8b8401d9a..8a1d6a0afd3e560a4f284720dbb0f5b62530a42c 100644
--- a/src/SecExp/secBarracks.tw
+++ b/src/SecExp/secBarracks.tw
@@ -1,5 +1,5 @@
:: secBarracks [nobr]
-<<SISM>>
+<<HSM>>
<<set $nextButton = "Back to Arcology Management", $nextLink = "Manage Arcology", $returnTo = "Manage Arcology">>
The Barracks
@@ -79,11 +79,11 @@ While this a sore sight for many citiens of $arcologies[0].name, the barracks st
<<elseif $secBarracksUpgrades.luxury == 2>>
<<link "Further increase the quality of life of your soldiers by providing high speed, free access to digital media">>
<<set $secBarracksUpgrades.luxury += 1>>
- <<set $cash -= 10000*$SystemIntrusionSkillMultiplier>>
+ <<set $cash -= 10000*$HackingSkillMultiplier>>
<<set $secBarracksUpkeep += $upgradeUpkeep>>
<<goto "secBarracks">>
<</link>>
- <br>//Costs <<print cashFormat(10000*$SystemIntrusionSkillMultiplier)>> and will provide a 5% bonus to morale, for a total of +15%.//
+ <br>//Costs <<print cashFormat(10000*$HackingSkillMultiplier)>> and will provide a 5% bonus to morale, for a total of +15%.//
<<elseif $secBarracksUpgrades.luxury == 3>>
<<link "Further increase the quality of life of your soldiers by adding and staffing an exclusive brothel to the structure">>
<<set $secBarracksUpgrades.luxury += 1>>
@@ -157,7 +157,7 @@ __Security Drones__
<<if $secBots.troops < $secBots.maxTroops>>
|
<<link "Replenish the unit">>
- <<set $cash -= ($secBots.maxTroops - $secBots.troops) * $secBotsCost*$SystemIntrusionSkillMultiplier>>
+ <<set $cash -= ($secBots.maxTroops - $secBots.troops) * $secBotsCost*$HackingSkillMultiplier>>
<<set $secBots.troops = $secBots.maxTroops>>
<<goto "secBarracks">>
<</link>>
@@ -165,7 +165,7 @@ __Security Drones__
<<else>>
You have lost too many security drones to be able to field them again.
<<link "Reform the unit">>
- <<set $cash -= $secBots.maxTroops * $secBotsCost*$SystemIntrusionSkillMultiplier>>
+ <<set $cash -= $secBots.maxTroops * $secBotsCost*$HackingSkillMultiplier>>
<<set $secBots.troops = $secBots.maxTroops>>
<<set $secBots.active = 1>>
<<goto "secBarracks">>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index 102762cb59e1b2fd46321003f1a5667b230e8639..6aaa72cc3a7fa7a06d7ab0119d2135c4f2d47de8 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -1,5 +1,5 @@
:: securityHQ [nobr]
-<<SISM>>
+<<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*$SystemIntrusionSkillMultiplier), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier, $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.SystemIntrusion += 1]]
- <br>//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$SystemIntrusionSkillMultiplier))>>. 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 ff1c6d511836c9a81da2e845945813b43b2d6a06..23d833918d5217aa4f213be105d8cb24527d8a37 100644
--- a/src/SecExp/weaponsManufacturing.tw
+++ b/src/SecExp/weaponsManufacturing.tw
@@ -1,12 +1,12 @@
:: weaponsManufacturing [nobr]
-<<SISM>>
+<<HSM>>
<<set $nextButton = "Back", $nextLink = "Main">>
This sector of the arcology has been dedicated to weapons manufacturing. These factories supply
<<if $militiaUnits.length > 0>> your militia and<</if>>
<<if $slaveUnits.length > 0>> your slave soldiers and<</if>>
<<if $mercenaries >0>> your mercenaries and<</if>>
-many small old world nations as the advanced technology that free cities have available is hard to come by otherwise.
+many small old world nations as the advanced hacking that free cities have available is hard to come by otherwise.
<br>
<<if $weapProductivity == 1>>
Production is completely manned by human workers. The complex has close to zero automation.
@@ -23,7 +23,7 @@ many small old world nations as the advanced technology that free cities have av
<<if $weapLab == 1>>
There's a very Spartan lab attached to the complex that occupies itself mainly with weapons testing and small adjustments to the manufacturing process.
<<elseif $weapLab == 2>>
- There's a lab attached to the complex. It mainly test weapons effectiveness and manufacturing efficiency, but has enough equipment and personnel to develop new technology.
+ There's a lab attached to the complex. It mainly test weapons effectiveness and manufacturing efficiency, but has enough equipment and personnel to develop new hacking.
<<else>>
There's a large lab attached to the complex. The complement of equipment and personnel makes it a great beacon of military science in an otherwise ignorant world.
<</if>>
@@ -199,10 +199,10 @@ __Upgrades__:
unit: 0,
type: "attack",
time: _time}>>
- <<set $cash -= 10000*$SystemIntrusionSkillMultiplier>>
+ <<set $cash -= 10000*$HackingSkillMultiplier>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(10000*$SystemIntrusionSkillMultiplier)>> 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*$SystemIntrusionSkillMultiplier>>
+ <<set $cash -= 120000*$HackingSkillMultiplier>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(120000*$SystemIntrusionSkillMultiplier)>> 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*$SystemIntrusionSkillMultiplier>>
+ <<set $cash -= 120000*$HackingSkillMultiplier>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(120000*$SystemIntrusionSkillMultiplier)>> 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*$SystemIntrusionSkillMultiplier>>
+ <<set $cash -= 1000000*$HackingSkillMultiplier>>
<<goto "weaponsManufacturing">>
<</link>>
- <br>//Will take _time weeks, cost <<print cashFormat(1000000*$SystemIntrusionSkillMultiplier)>> 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 c6aa710c259497fc60709904fceda9743970ed43..68026fb811d792ccb897f58df202f1471c5748d9 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -992,7 +992,7 @@ __''Mods''__
<<case "medicine">>
<<set $PC.medicine = 100>>
<<case "arcology owner">>
- <<set $PC.trading = 100, $PC.warfare = 100, $PC.SystemIntrusion = 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 ef333c8f4447b16bb66a955cab070aedb6900c9b..0064c103aa1319811b26750c99202192df149444 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, SystemIntrusion: 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, hacking: 0, slaving: 0, engineering: 0, medicine: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>>
<<set $cash = 10000>>
<<set $normalizedEvents = 0>>
<<set $autosave = 1>>
@@ -342,7 +342,7 @@ You should have received a copy of the GNU General Public License along with thi
<</if>>
<<set $cash = Math.clamp(1000*Math.trunc($cash/100000), 5000, 1000000)>>
<<if $retainCareer == 0>>
- <<set $PC.career = "arcology owner", $PC.trading = 100, $PC.warfare = 100, $PC.SystemIntrusion = 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>>
@@ -357,7 +357,7 @@ You should have received a copy of the GNU General Public License along with thi
<<else>>
<<set $cheater = 0>>
<<set $cash = 10000>>
- <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, SystemIntrusion: 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, hacking: 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>>
@@ -1123,7 +1123,7 @@ FertilityAge($fertilityAge)
<<set $fcnn.push("...just ahead, interview with Desha Moore, prominent advocate for compulsory female enslavement...")>>
<<set $fcnn.push("...just ahead, Slave Market Trends: will the pierced anus be in again this year...")>>
<<set $fcnn.push("...just ahead, Slave Market Trends: upstart slave trainers avoid implants...")>>
-<<set $fcnn.push("...implant technology firm BusTech notches successful initial public offering...")>>
+<<set $fcnn.push("...implant hacking firm BusTech notches successful initial public offering...")>>
<<set $fcnn.push("...the upcoming shortage of authentic leather and what it means for the whip industry...")>>
<<set $fcnn.push("...dairy conglomerate Creem Inc. denies allegations of adulterating breast milk with...")>>
<<set $fcnn.push("...two-time award-winning actress Linda Loveless debuted new implants on the red carpet this...")>>
@@ -1285,8 +1285,8 @@ ocularImplant: 0,
erectileImplant: 0
} >>
-<<if ndef $PC.SystemIntrusion>>
- <<set $PC.SystemIntrusion = 0>>
+<<if ndef $PC.hacking>>
+ <<set $PC.hacking = 0>>
<</if>>
/* Security Expansion */
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index dbd5e777432baf4004575f84ecb191ff18805927..9e5b7f75b9dae50d9758293cee0ade164625f9c9 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -269,7 +269,7 @@ 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.SystemIntrusion) {
+ } else if(State.variables.personalAttention === PersonalAttention.hacking) {
costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
}
}
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
index 1a2cd92f374690bd6c08177e64a1964da8953f8e..9ac8baa658e6ac9d05d51aec4b88fe26dfa06f06 100755
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
@@ -1,5 +1,5 @@
:: SpecialForceUpgradeOptions
-<<SISM>>
+<<HSM>>
<<nobr>>
<<if ($SFAO < _max) && $securityForceUpgradeToken == 0>>
<span id="resultX">
@@ -48,9 +48,9 @@
<br><<link "Barracks">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_arcCost*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(_arcCost*$Env*$HackingSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades == 13>>
<br><<link "Barracks">>
<<replace "#resultX">><br><br>
@@ -240,9 +240,9 @@
<br><<link "A space plane">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "A orbital plane should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= 4750000*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= 4750000*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(4750000*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(4750000*$Env*$HackingSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceSpacePlanePower >= 1 && $securityForceSpacePlanePower < _SpacePlaneMax>>
<<if $securityForceSpacePlanePower < 4>>
<<set _spCost = 50000000>>
@@ -268,9 +268,9 @@
<br><<link "Space plane">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "Upgrading the orbital plane should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= _spCost*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSpacePlanePower++, $cash -= _spCost*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_spCost*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(_spCost*$Env*$HackingSkillMultiplier)>> //
<</if>>
<<if $securityForceSpacePlanePower == _SpacePlaneMax>>
<br>//$securityForceName has fully upgraded the space plane to support it's activities.//
@@ -298,16 +298,16 @@
<br><<link "An AC-130">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "An AC-130 would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 35000000*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 35000000*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(35000000*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(35000000*$Env*$HackingSkillMultiplier)>> //
<<elseif $securityForceAC130 > 1 && $securityForceAC130 < _AC130Max>>
<br><<link "AC-130">>
<<replace "#resultY">><br><br>
"Sure, boss." she says, nodding. "Upgrading the AC-130, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 25000000*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceAC130++, $cash -= 25000000*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(25000000*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(25000000*$Env*$HackingSkillMultiplier)>> //
<</if>>
<<if $securityForceAC130 == _AC130Max>>
<br>//$securityForceName has fully upgraded the AC-130 to support it's activities.//
@@ -341,16 +341,16 @@
<br><<link "Drone bay">>
<<replace "#resultX">>
"Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 45000*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(45000*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(45000*$Env*$HackingSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && _DroneBay < _DroneBayMax && $TierTwoUnlock == 1>>
<br><<link "Drone bay">>
<<replace "#resultX">>
"Sure, boss." she says, nodding. "Some new drones would be nice." She laughs. "The poor bastards out there shit themselves when they see combat drones fly over the horizon." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 2000000*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceDronePower++, $cash -= 2000000*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(2000000*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(2000000*$Env*$HackingSkillMultiplier)>> //
<</if>>
<<if _DroneBay == _DroneBayMax>>
<br>//$securityForceName has fully upgraded the drone bay to support it's activities.//
@@ -369,9 +369,9 @@
<br><<link "A Satellite">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "A Satellite should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= 3750000*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= 3750000*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(3750000*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(3750000*$Env*$HackingSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower >= 1 && $securityForceSatellitePower < _SatelliteMax>>
<<switch $securityForceSatellitePower>>
<<case 11>>
@@ -392,7 +392,7 @@
<<set _satCost = 300000000000>>
<<case 19>>
<<set _satCost = 450000000000>>
- <<case 20 && $PC.SystemIntrusion >= 75>>
+ <<case 20 && $PC.hacking >= 75>>
<<set _satCost = 550000000000>>
<<default>>
<<set _satCost = 2350000>>
@@ -400,16 +400,16 @@
<br><<link "Satellite">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "Upgrading the Satellite should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_satCost*$Env*$SystemIntrusionSkillMultiplier)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower == 20 && $PC.SystemIntrusion >= 75>>
+ <</link>> // Costs <<print cashFormat(_satCost*$Env*$HackingSkillMultiplier)>> //
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceSatellitePower == 20 && $PC.hacking >= 75>>
<br><<link "Satellite">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "Upgrading the Satellite should help a lot." She laughs. "The scum out there don't seem to like it when we have eyes they can't hit." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSatellitePower++, $cash -= _satCost*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_satCost*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(_satCost*$Env*$HackingSkillMultiplier)>> //
<</if>>
<<if $securityForceSatellitePower == _SatelliteMax>>
<br>//$securityForceName has fully upgraded the Satellite to support it's activities.//
@@ -419,9 +419,9 @@
<br><<link "A giant robot">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "A giant robot would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= 50000000*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(50000000*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(50000000*$Env*$HackingSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot >= 1 && $securityForceGiantRobot < _GiantRobotMax>>
<<if $securityForceGiantRobot < 3>>
<<set _robCost = 25000000>>
@@ -453,22 +453,22 @@
<<set _robCost = 6550000000>>
<<case 14>>
<<set _robCost = 8550000000>>
- <<case 15 $PC.SystemIntrusion >= 75>>
+ <<case 15 $PC.hacking >= 75>>
<<set _robCost = 9550000000>>
<</switch>>
<br><<link "Giant robot">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "Upgrading the giant robot, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_robCost*$Env*$SystemIntrusionSkillMultiplier)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot == 15 && $PC.SystemIntrusion >= 75>>
+ <</link>> // Costs <<print cashFormat(_robCost*$Env*$HackingSkillMultiplier)>> //
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceGiantRobot == 15 && $PC.hacking >= 75>>
<br><<link "Giant robot">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "Upgrading the giant robot, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceGiantRobot++, $cash -= _robCost*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_robCost*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(_robCost*$Env*$HackingSkillMultiplier)>> //
<</if>>
<<if $securityForceGiantRobot == _GiantRobotMax && ($terrain != "oceanic" && $terrain != "marine")>>
<br>//$securityForceName has fully upgraded the giant robot to support it's activities.//
@@ -478,9 +478,9 @@
<br><<link "A missile silo">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "A missile silo would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= 200000000*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= 200000000*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(200000000*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(200000000*$Env*$HackingSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceMissileSilo >= 1 && $securityForceMissileSilo < _MissileSiloMax>>
<<if $securityForceMissileSilo == 1>>
<<set _msCost = 250000000>>
@@ -490,9 +490,9 @@
<br><<link "Missile silo">>
<<replace "#resultZ">><br><br>
"Sure, boss." she says, nodding. "Upgrading the missile silo, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= _msCost*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceMissileSilo++, $cash -= _msCost*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_msCost*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(_msCost*$Env*$HackingSkillMultiplier)>> //
<</if>>
<<if $securityForceMissileSilo == _MissileSiloMax && ($terrain != "oceanic" && $terrain != "marine")>><br>//$securityForceName has fully upgraded the missile silo to support it's activities.//<</if>>
@@ -515,16 +515,16 @@
<br><<link "An aircraft carrier">>
<<replace "#resultA">><br><br>
"Sure, boss." she says, nodding. "An aircraft carrier would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 1500000*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 1500000*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(1500000*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(1500000*$Env*$HackingSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceAircraftCarrier >= 1 && $securityForceAircraftCarrier < _AircraftCarrierMax>>
<br><<link "Aircraft carrier">>
<<replace "#resultA">><br><br>
"Sure, boss." she says, nodding. "Upgrading the aircraft carrier should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 25000000*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceAircraftCarrier++, $cash -= 25000000*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(25000000*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(25000000*$Env*$HackingSkillMultiplier)>> //
<</if>>
<<if $securityForceAircraftCarrier == _AircraftCarrierMax && ($terrain == "oceanic" || $terrain == "marine")>>
<br>//$securityForceName has fully upgraded the aircraft carrier to support it's activities.//
@@ -534,9 +534,9 @@
<br><<link "A submarine">>
<<replace "#resultA">><br><br>
"Sure, boss." she says, nodding. "A submarine would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= 1500000*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= 1500000*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(1500000*$Env*$SystemIntrusionSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(1500000*$Env*$HackingSkillMultiplier)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine >= 1 && $securityForceSubmarine < _SubmarineMax>>
<<if $securityForceSubmarine < 4>>
<<set _subCost = 25000000>>
@@ -544,20 +544,20 @@
<<set _subCost = 85000000>>
<<elseif $securityForceSubmarine == 5>>
<<set _subCost = 86500000>>
- <<elseif $securityForceSubmarine == 6 && $PC.SystemIntrusion >= 75>>
+ <<elseif $securityForceSubmarine == 6 && $PC.hacking >= 75>>
<<set _subCost = 87800000>>
<</if>>
<br><<link "Submarine">>
<<replace "#resultA">><br><br>
"Sure, boss." she says, nodding. "Upgrading the submarine, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*$Env*$HackingSkillMultiplier>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_subCost*$Env*$SystemIntrusionSkillMultiplier)>> //
- <<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine == 6 && $PC.SystemIntrusion >= 75>>
+ <</link>> // Costs <<print cashFormat(_subCost*$Env*$HackingSkillMultiplier)>> //
+ <<elseif $securityForceUpgradeToken == 0 && $securityForceSubmarine == 6 && $PC.hacking >= 75>>
<br><<link "Submarine">>
<<replace "#resultA">><br><br>
"Sure, boss." she says, nodding. "Upgrading the submarine, should help us gain a massive advantage." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*$Env*$SystemIntrusionSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceSubmarine++, $cash -= _subCost*$Env*$HackingSkillMultiplier>>
<</replace>>
<</if>>
<<if $securityForceSubmarine == _SubmarineMax && ($terrain == "oceanic" || $terrain == "marine")>><br>//$securityForceName has fully upgraded the submarine to support it's activities.//<</if>>
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
index da110089db4f86ca7b0d4ccc19f420f5635f0a63..971b6e542524dfe4800a1c9814224b8c1ad0797a 100644
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeTree.tw
@@ -30,7 +30,7 @@
<<set _DroneBayMax = 8>>
/* Launch Bay */
- <<if $PC.SystemIntrusion >= 75>>
+ <<if $PC.hacking >= 75>>
<<set _SatelliteMax = 21>>
<<set _GiantRobotMax = 16>>
<<else>>
@@ -41,14 +41,14 @@
<<set _LaunchBayNO = $securityForceSatellitePower+$securityForceGiantRobot+$securityForceMissileSilo, _LaunchBayNOMax = _SatelliteMax+_GiantRobotMax+_MissileSiloMax>>
<<set _LaunchBayO = $securityForceSatellitePower>>
- <<if $PC.SystemIntrusion >= 75>>
+ <<if $PC.hacking >= 75>>
<<set _LaunchBayOMax = 21>>
<<else>>
<<set _LaunchBayOMax = 20>>
<</if>>
<<set _AircraftCarrierMax = 6>>
- <<if $PC.SystemIntrusion >= 75>>
+ <<if $PC.hacking >= 75>>
<<set _SubmarineMax = 7>>
<<else>>
<<set _SubmarineMax = 6>>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 38ac09f15f9e6489ffc01142fcefb4110615a6b3..58c0aeca9ba3454e8816699a4f3a8cde8bccb13b 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -209,26 +209,26 @@ You ponder what skills may be useful in running your arcology.
Alcohol makes pain go away, right?
<</if>>
-<br>SystemIntrusion:
-<<if $PC.SystemIntrusion >= 100>>
- You are a master of technology.
-<<elseif $PC.SystemIntrusion >= 80>>
- You are an expert at technology.
-<<elseif $PC.SystemIntrusion >= 60>>
- You are skilled in technology.
-<<elseif $PC.SystemIntrusion >= 40>>
- You know some things about technology.
-<<elseif $PC.SystemIntrusion >= 20>>
- You are a beginner in technology.
-<<elseif $PC.SystemIntrusion >= 0>>
- You know only the basics of technology.
-<<elseif $PC.SystemIntrusion >= -20>>
+<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.SystemIntrusion >= -40>>
+<<elseif $PC.hacking >= -40>>
Enter does something?
-<<elseif $PC.SystemIntrusion >= -60>>
+<<elseif $PC.hacking >= -60>>
Where is the "any" key?
-<<elseif $PC.SystemIntrusion >= -80>>
+<<elseif $PC.hacking >= -80>>
You can push the power button button, good job.
<<else>>
This black box thingy is magical.
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 8bf4622116e1d77952df35afdc76385eab814481..0cd6c34ca0e94bc22093a3c94838de5b171eeec0 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -1900,26 +1900,26 @@ Of $possessive $slaves[$i].pregType child<<if $slaves[$i].pregType > 1>>ren<</if
<</widget>>
/%
-Call as <<SISM>>
+Call as <<HSM>>
%/
-<<widget "SISM">>
- <<if $PC.SystemIntrusion == -100>>
- <<set $SystemIntrusionSkillMultiplier = 1.5>>
- <<elseif $PC.SystemIntrusion <= -75>>
- <<set $SystemIntrusionSkillMultiplier = 1.35>>
- <<elseif $PC.SystemIntrusion <= -50>>
- <<set $SystemIntrusionSkillMultiplier = 1.25>>
- <<elseif $PC.SystemIntrusion <= -25>>
- <<set $SystemIntrusionSkillMultiplier = 1.15>>
- <<elseif $PC.SystemIntrusion == 0>>
- <<set $SystemIntrusionSkillMultiplier = 1>>
- <<elseif $PC.SystemIntrusion <= 25>>
- <<set $SystemIntrusionSkillMultiplier = .95>>
- <<elseif $PC.SystemIntrusion <= 50>>
- <<set $SystemIntrusionSkillMultiplier = .75>>
- <<elseif $PC.SystemIntrusion <= 75>>
- <<set $SystemIntrusionSkillMultiplier = .65>>
- <<elseif $PC.SystemIntrusion >= 100>>
- <<set $SystemIntrusionSkillMultiplier = .5>>
+<<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 0473502e9c9106d88e5654e6db85850ca3f08bab..047e92db6ea72aa46040a87c21cbdbd9b84cdaae 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -236,7 +236,6 @@
<<set $PC.degeneracy = 0>>
<</if>>
-
<<if ndef $universalRulesImmobileSlavesMaintainMuscles>>
<<set $universalRulesImmobileSlavesMaintainMuscles = 0>>
<</if>>
@@ -1082,6 +1081,9 @@
<<if ndef $defaultRules[_bci].surgery.prostate>>
<<set $defaultRules[_bci].surgery.prostate = "no default setting">>
<</if>>
+ <<if ndef $defaultRules[_bci].surgery.eyes>>
+ <<set $defaultRules[_bci].surgery.eyes = "no default setting">>
+ <</if>>
<<if $releaseID < 1018>>
<<if $defaultRules[_bci].growth == "none">>
<<set $defaultRules[_bci].growth = {boobs: 0, butt: 0, lips: 0, dick: 0, balls: 0}>>
@@ -1134,6 +1136,18 @@
<<if ndef $arcologies[0].embargoTarget>>
<<set $arcologies[0].embargoTarget = -1>>
<</if>>
+<<if ndef $arcologies[0].hackingfinanical>>
+ <<set $arcologies[0].hackingfinanical = 1>>
+<</if>>
+<<if ndef $arcologies[0].hackingfinanicalFinanicalTarget>>
+ <<set $arcologies[0].hackingfinanicalFinanicalTarget = -1>>
+<</if>>
+<<if ndef $arcologies[0].hackingReputation>>
+ <<set $arcologies[0].hackingReputation = 1>>
+<</if>>
+<<if ndef $arcologies[0].hackingReputationTarget>>
+ <<set $arcologies[0].hackingReputationTarget = -1>>
+<</if>>
<<if ndef $arcologies[0].influenceTarget>>
<<set $arcologies[0].influenceTarget = -1>>
<</if>>
@@ -2937,8 +2951,8 @@ Setting missing slave variables:
<<HeroSlavesCleanup>>
Done!
-<<if ndef $PC.SystemIntrusion>>
- <<set $PC.SystemIntrusion = 0>>
+<<if ndef $PC.hacking>>
+ <<set $PC.hacking = 0>>
<</if>>
/* Sec Exp */
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index 35fcd03408d5fcd12d3d5a62426908a95a02630d..97518a6aa01f0c9ba082f255c40c81f86c4479ab 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -1,5 +1,5 @@
:: SFM Barracks [nobr]
-<<SISM>>
+<<HSM>>
<<set _N1 = 2, _N2 = 2, _N3 = 2>>
<<set _Name = "<<if $CurrentTradeShowAttendance == 1 && $LieutenantColonel == 2>>Lieutenant Colonel <<SlaveFullName $LieutenantColonel>> <<elseif $CurrentTradeShowAttendance == 1 && $LieutenantColonel != 2>> a soldier <<elseif $CurrentTradeShowAttendance == 0>> The Colonel<</if>>">>
@@ -59,7 +59,7 @@
<<link "Ask _Name for some extra cash">>
<<replace "#result">>
/*<<set $CashGift = ((Math.ceil((Math.abs($cash)*0.05)*(Math.max(0.99,$SFAO))))*($arcologies[0].prosperity/100))*$Env>> OLD*/
- <<set $CashGift = Math.ceil((25000+(Math.abs($cash)*0.005))*(Math.max(0.99,$SFAO))*($arcologies[0].prosperity/1000)*$Env)>>
+ <<set $CashGift = 25000*(Math.max(0.99,$SFAO/10))*$Env>>
<<if random(1,100) > 50>>
<<if random(1,100) > 50>>
_Name nods. "Sure boss," she says, "we had a bit of a haul this week. One of my sergeants convinced a woman to tell us where she had hidden her shit. Cut her up pretty bad, but she told us. Bunch of nice jewelry, I kept a nice piece for myself." She picks up a tablet on the table, tapping a few commands on it. "@@.green;There's your cut,@@ <<print cashFormat($CashGift)>>."
@@ -121,11 +121,10 @@
<<if $securityForceUpgradeToken == 1 && ($SFAO < _max)>>
<br>//_Name is working to improve $securityForceName this week.//
+<<elseif $TierTwoUnlock == 1>>
+ <br>//You receive a message from The Colonel "there's a trade show coming up with exotic upgrades but I'll get laughed out unless we bring the best gear we can get now?"//
<<elseif $SFAO >= _max>>
- <br>//$securityForceName is fully equipped and upgraded - <<if $PC.SystemIntrusion < 75>>nothing else can currently be done, due to your lack of technicial skill <<else>>nothing else can be done<</if>>.//
-<</if>>
-<<if $TierTwoUnlock == 1>>
- <br>//You receive a message from The Colonel "there's a trade show coming up with exotic upgrades but I'll get laughed out unless we bring the best gear we can get now."//
+ <br>//$securityForceName is fully equipped and upgraded - nothing else can be done.//
<</if>>
<<if $securityForceGiftToken == 1>>
@@ -149,7 +148,6 @@
<</if>>
<<include "SpecialForceUpgradeOptions">>
-
<<if $securityForceColonelToken == 0 && $securityForceSexedColonelToken == 0 && $CurrentTradeShowAttendance == 0>>
<br><br>
<span id="result3">
@@ -302,19 +300,19 @@
<</replace>>
<</link>>
,
- <<link "network threads">>
- <<set $PC.SystemIntrusion += 3>>
+ <<link "hacking">>
+ <<set $PC.hacking += 3>>
<<replace "#result4">>
<br>
- <<if $PC.SystemIntrusion < 10>>
+ <<if $PC.hacking < 10>>
//Good job you know what a on button now does.//
- <<elseif $PC.SystemIntrusion >= 100>>
+ <<elseif $PC.hacking >= 100>>
//Time to for you to out there and tinker with a system.//
- <<elseif $PC.SystemIntrusion >= 60>>
+ <<elseif $PC.hacking >= 60>>
//Feel free to 'plug into' me any time.//
- <<elseif $PC.SystemIntrusion >= 30>>
+ <<elseif $PC.hacking >= 30>>
//Currect srew driver holding procedure acquired.//
- <<elseif $PC.SystemIntrusion >= 10>>
+ <<elseif $PC.hacking >= 10>>
//You can now some what use a mouse.//
<</if>>
<</replace>>
@@ -326,7 +324,7 @@
<<set $PC.trading += 2>>
<<set $PC.warfare += 2>>
<<set $PC.medicine += 2>>
- <<set $PC.SystemIntrusion += 2>>
+ <<set $PC.hacking += 2>>
<<replace "#result4">>
//Hopefully this general education I could provide may be of use.//
<</replace>>
diff --git a/src/uncategorized/brothel.tw b/src/uncategorized/brothel.tw
index 7fb0cd4ff3027144391bc62cf4297c73b3d79fe6..78b25db4d7b4f3c4476d53e0096246595cd18060 100644
--- a/src/uncategorized/brothel.tw
+++ b/src/uncategorized/brothel.tw
@@ -1,5 +1,5 @@
:: Brothel [nobr]
-<<SISM>>
+<<HSM>>
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Brothel", $showEncyclopedia = 1, $encyclopedia = "Brothel", $brothelSlaves = $BrothiIDs.length, $Flag = 0>>
<<if $brothelName != "the Brothel">>
@@ -157,8 +157,8 @@ $brothelNameCaps
<<elseif $brothelUpgradeDrugs == 0.1>>
It has been upgraded with aphrodisiac injection systems that monitor the whores and adjust dosage to keep them healthy but desperately horny and hopelessly addicted. The systems are currently disabled. [[Enable them|Brothel][$brothelUpgradeDrugs = 1]] //Will increase upkeep costs//
<<else>>
- <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier)>>
- It is a standard brothel. [[Upgrade the brothel with aphrodisiac injection systems|Brothel][$cash -= _Tmult1, $brothelUpgradeDrugs = 0.1, $PC.SystemIntrusion += 1]] //Costs <<print cashFormat(_Tmult1)>> and will increase upkeep costs//
+ <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
+ It is a standard brothel. [[Upgrade the brothel with aphrodisiac injection systems|Brothel][$cash -= _Tmult1, $brothelUpgradeDrugs = 0.1, $PC.hacking += 1]] //Costs <<print cashFormat(_Tmult1)>> and will increase upkeep costs//
<</if>>
<br>$brothelNameCaps is
diff --git a/src/uncategorized/clinic.tw b/src/uncategorized/clinic.tw
index d95a95e7853ff7c32e577dfbf188a7cd7d880a5e..16c57abcdae97e2045ea8a335c6ebad7a394d060 100644
--- a/src/uncategorized/clinic.tw
+++ b/src/uncategorized/clinic.tw
@@ -1,5 +1,5 @@
:: Clinic [nobr]
-<<SISM>>
+<<HSM>>
<<set $nextButton = "Back to Main", $nextLink = "Main", $returnTo = "Clinic", $showEncyclopedia = 1, $encyclopedia = "Clinic", $clinicSlaves = $CliniciIDs.length>>
<<if $clinicName != "the Clinic">>
@@ -72,13 +72,13 @@ $clinicNameCaps
<<set _Tmult0 = Math.trunc($clinic*1000*$upgradeMultiplierArcology)>>
<br>$clinicNameCaps has room to support $clinic slaves while they receive treatment. Currently $clinicSlaves slaves are reciving treatement.
-[[Expand the clinic|Clinic][$cash -= _Tmult0, $clinic += 5, $PC.engineering += .1], $PC.SystemIntrusion += 1] //Costs <<print cashFormat(_Tmult0)>>//
+[[Expand the clinic|Clinic][$cash -= _Tmult0, $clinic += 5, $PC.engineering += .1], $PC.hacking += 1] //Costs <<print cashFormat(_Tmult0)>>//
<br>
<<if $clinicUpgradeScanner == 1>>
$clinicNameCaps's scanners have been upgraded with a sampling system that can estimate carcinogenic damage to a slave's genome.
<<else>>
- <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier)>>
+ <<set _Tmult1 = Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
It mounts powerful medical scanning technology. [[Upgrade the scanners to help detect genomic damage|Clinic][$cash -= _Tmult1, $clinicUpgradeScanner = 1]] //Costs <<print cashFormat(_Tmult1)>>//
<</if>>
@@ -87,15 +87,15 @@ $clinicNameCaps
<<if $clinicUpgradePurge == 1>>
The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. The blood is intensely cleaned to greatly decrease the presence of impurities at the cost of compatibility. Patients will likely be ill for the duration of the treatment.
<<else>>
- <<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier)>>
- The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][$cash -= _Tmult3, $clinicUpgradePurge to 1, $PC.SystemIntrusion += 1]] //Costs <<print cashFormat(_Tmult3)>> and may cause health problems in slaves//
+ <<set _Tmult3 = Math.trunc(150000*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
+ The entire floor beneath $clinicName is occupied by a huge filtration plant that constantly cycles out the patients' blood to remove impurities. [[Increase the effectiveness of the impurity purging|Clinic][$cash -= _Tmult3, $clinicUpgradePurge to 1, $PC.hacking += 1]] //Costs <<print cashFormat(_Tmult3)>> and may cause health problems in slaves//
<</if>>
<<if $Nurse == 0>>
<br>However, without a nurse in attendance, the blood treatment equipment remains idle.
<</if>>
<<else>>
- <<set _Tmult2 = Math.trunc(50000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier)>>
- It includes standard dialysis equipment. [[Install advanced blood treatment equipment to help address drug side effects|Clinic][$cash -= _Tmult2, $clinicUpgradeFilters = 1, $PC.SystemIntrusion += 1]] //Costs <<print cashFormat(_Tmult2)>>//
+ <<set _Tmult2 = Math.trunc(50000*$upgradeMultiplierArcology*$HackingSkillMultiplier)>>
+ It includes standard dialysis equipment. [[Install advanced blood treatment equipment to help address drug side effects|Clinic][$cash -= _Tmult2, $clinicUpgradeFilters = 1, $PC.hacking += 1]] //Costs <<print cashFormat(_Tmult2)>>//
<</if>>
<br>
diff --git a/src/uncategorized/costs.tw b/src/uncategorized/costs.tw
index 9e420f6b02e65a753f228a345561943bef2f6da4..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") || ($personalAttention == "SystemIntrusion")>>
+<<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 193bfe65e867b166632ddf322c526fcd3fd5658b..e3954188180af58f7ba2ee0f13d1a285b968ff0d 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") || ($personalAttention == "SystemIntrusion")>>
+<<if ($personalAttention == "trading") || ($personalAttention == "warfare") || ($personalAttention == "slaving") || ($personalAttention == "engineering") || ($personalAttention == "medicine") || ($personalAttention == "hacking")>>
<<set _cost = 10000*$AgeEffectOnTrainerPricingPC>>
<<switch $personalAttention>>
<br>
@@ -226,8 +226,8 @@
__Engineering__
<<case medicine>>
__Medicine__
-<<case SystemIntrusion>>
- __SystemIntrusion__
+<<case hacking>>
+ __hacking__
<</switch>>
trainer fees: <<print cashFormat(_cost)>>
<br>
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index f53970bd5799759886fd87471f1bd26f6c8e4135..b4f8d3ef63a412cba87c06cb84739f0ebcfb60fa 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -1,5 +1,5 @@
:: Manage Arcology [nobr]
-<<SISM>>
+<<HSM>>
<<set $nextButton = "Back", $nextLink = "Main">>
<<if $cheatMode == 1>>
@@ -43,14 +43,14 @@ __Construction__
<<set $secBots.troops = 30>>
<<set $secBots.maxTroops = 30>>
<<goto "Manage Arcology">>
- <<if $PC.engineering < 100>><<set $PC.engineering += 1, $PC.SystemIntrusion += 1>><</if>>
+ <<if $PC.engineering < 100>><<set $PC.engineering += 1, $PC.hacking += 1>><</if>>
<</link>>
<<elseif $arcologyUpgrade.hydro != 1>>
//The next major upgrade needed is the installation of a better water reclamation system so your residents will have access to cheaper water and hydroponically grown food. This upgrade will cost <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>.// [[Upgrade water reclamation system|Manage Arcology][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $arcologyUpgrade.hydro = 1, $PC.engineering += 1]]
<<elseif $arcologyUpgrade.apron != 1>>
//The next major upgrade needed is the installation of a broader apron at the bottom of the arcology to increase its surface area and gather more solar energy. Right now, tenants that use a lot of power have to import it from outside. This upgrade will cost <<print cashFormat(Math.trunc(20000*$upgradeMultiplierArcology))>>.// [[Install solar apron|Manage Arcology][$cash -= Math.trunc(20000*$upgradeMultiplierArcology), $arcologyUpgrade.apron = 1, $PC.engineering += 1]]
<<elseif $arcologyUpgrade.grid != 1>>
- //The next major upgrade needed is an improvement of the arcology's electrical transmission lines to make efficient use of the additional power from the solar apron. This upgrade will cost <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology))>>.// [[Upgrade transmission lines|Manage Arcology][$cash -= Math.trunc(50000*$upgradeMultiplierArcology), $arcologyUpgrade.grid = 1, $PC.engineering += 1, $PC.SystemIntrusion += 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.hacking += 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*$SystemIntrusionSkillMultiplier))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc((20000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier))>>. 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*$SystemIntrusionSkillMultiplier))>>.
- [[No subsidy|Manage Arcology][$cash -= Math.trunc((25000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1, $PC.SystemIntrusion += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc((20000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1, $PC.SystemIntrusion += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1, $PC.SystemIntrusion += 1]]
+ You have not installed an FCTV receiver. Installing this receiver yourself will cost <<print cashFormat(Math.trunc(25000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>. You can have your citizens pay for the fiberoptic upgrades, reducing the cost to <<print cashFormat(Math.trunc((20000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>. 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*$HackingSkillMultiplier))>>.
+ [[No subsidy|Manage Arcology][$cash -= Math.trunc((25000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep += 500, $PC.engineering += 1, $PC.hacking += 1]] | [[Light subsidy|Manage Arcology][$cash -= Math.trunc((20000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $PC.engineering += 1, $PC.hacking += 1]] | [[Heavy subsidy|Manage Arcology][$cash -= Math.trunc((10000*$upgradeMultiplierArcology*$HackingSkillMultiplier)), $FCTVreceiver = 1, $receiverAvailable = $week, $rep -= 1500, $PC.engineering += 1, $PC.hacking += 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*$SystemIntrusionSkillMultiplier)), $propHub = 1, $PC.engineering += 1, $PC.SystemIntrusion += 1]]
- //Costs <<print cashFormat(Math.trunc((5000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier))>>.//
+ [[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*$SystemIntrusionSkillMultiplier)), $secHQ = 1, $PC.engineering += 1, $PC.SystemIntrusion += 1]]
- //Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier))>>.//
+ [[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..e000f2f4f88424e07bc06ae476f371bdfe520421 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -40,8 +40,27 @@ The arcology has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trun
<<else>>
behind
<</if>>
-its neighbors.
+its neighbors.
+<<if $arcologies[0].hackingFinanical = 1 && $arcologies[$i].name == $arcologies[0].hackingFinanicalTarget>>
+ <br>You have gained @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100))>>m,@@ from your hacking campaign.
+ <<set $arcologies[$i].prosperity -= random (5,10)>>
+<<elseif $arcologies[0].hackingFinanical = 2 && $arcologies[$i].name == $arcologies[0].hackingFinanicalTarget>>
+ <br>You have gained @@.yellowgreen;<<print cashFormat(Math.trunc((0.3*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100))>>m,@@ from your hacking campaign
+ <<set $arcologies[$i].prosperity -= random (10,20)>>
+<<elseif $arcologies[0].hackingFinanical = 3 && $arcologies[$i].name == $arcologies[0].hackingFinanicalTarget>>
+ <br>You have gained @@.yellowgreen;<<print cashFormat(Math.trunc((0.3*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100))>>m,@@ from your hacking campaign
+ <<set $arcologies[$i].prosperity -= random (30,35)>>
+<</if>>
+
+<<if $arcologies[0].hackingReputation = 1 && $arcologies[$i].name == $arcologies[0].hackingReputationTarget>>
+ <<set $arcologies[$i].prosperity -= random (5,10), $activeArcology.PCminority += $activeArcology.PCminority+.1, $activeArcology.ownership -= $activeArcology.ownership-.1>>
+<<elseif $arcologies[0].hackingReputation = 2 && $arcologies[$i].name == $arcologies[0].hackingReputationTarget>>
+ <<set $arcologies[$i].prosperity -= random (5,10), $activeArcology.PCminority += $activeArcology.PCminority+.2, $activeArcology.ownership -= $activeArcology.ownership-.2>>
+<<elseif $arcologies[0].hackingReputation = 3 && $arcologies[$i].name == $arcologies[0].hackingReputationTarget>>
+ <<set $arcologies[$i].prosperity -= random (5,10), $activeArcology.PCminority += $activeArcology.PCminority+.3, $activeArcology.ownership -= $activeArcology.ownership-.3>>
+<</if>>
+
<<set $desc = 0>>
<<set $seed = []>>
<<if $arcologies[$i].FSSubjugationist != "unset">>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index bd792c47d7524ae507ce63246d961d8920d71031..9875ed6d64fd2cab4bd270538e93dd939d3fda57 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -67,6 +67,27 @@
<br>
+<<if $arcologies[0].hackingfinanicalFinanicalTarget == -1>>
+ You are not engaged in cyber warfare against a neighboring arcology.
+<<else>>
+ <<for $i = 0; $i < $arcologies.length; $i++>>
+ <<if $arcologies[$i].direction == $arcologies[0].hackingfinanicalFinanicalTarget>>
+ You have targeted ''$arcologies[$i].name'' for cyber warfare.
+ <<break>>
+ <</if>>
+ <</for>>
+ <br> Its planned impacts will be
+ <<if $arcologies[0].hackingfinanical == 3>>
+ ''widespread.'' [[Moderate|Neighbor Interact][$arcologies[0].hackingfinanical -= 1]]
+ <<elseif $arcologies[0].hackingfinanical == 2>>
+ ''limited.'' [[Intensify|Neighbor Interact][$arcologies[0].hackingfinanical += 1]] | [[Moderate|Neighbor Interact][$arcologies[0].hackingfinanical -= 1]]
+ <<else>>
+ ''nominal.'' [[Intensify|Neighbor Interact][$arcologies[0].hackingfinanical += 1]]
+ <</if>>
+<</if>>
+
+<br>
+
<<set $desc = []>>
<<if $arcologies[0].FSSubjugationist > 60>>
<<set $desc.push("Racial Subjugation")>>
@@ -168,6 +189,8 @@
<</for>>
<br> [[Target for economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = $activeArcology.direction]]
+<br> [[Target for cryber finanical warfare|Neighbor Interact][$arcologies[0].hackingFinanicalTarget = $activeArcology.direction]]
+<br> [[Target for cryber reputation warfare|Neighbor Interact][$arcologies[0].hackingReputationTarget = $activeArcology.direction]]
<<if $desc.length > 0>>
| [[Set as influence target|Neighbor Interact][$arcologies[0].influenceTarget = $activeArcology.direction]]
<</if>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index ef201eb7f12c88da61c113d2a24db6ca1d8f8cbf..820551484c9af36b04e08f45d3da3ca246b1aff5 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3911,24 +3911,24 @@ You remind yourself that success in this conflict will not be defined by the tra
<</if>>
<</if>>
-<<if $PC.SystemIntrusion >= 100 && (($PC.career == "mercenary") || ($PC.career == "arcology owner")>>
+<<if $PC.hacking >= 100 && (($PC.career == "mercenary") || ($PC.career == "arcology owner")>>
<<if $mercenaries >= 3 || $securityForceActive == 1>>
<br><<link "Trap your rival in their own archology and then extract them">>
<<replace "#result">>
One night, you're working late in your office, $assistantName's avatar glowing companionably beside you. Without preamble, <<if $assistant == 0>>it<<else>>she<</if>> reports to you in <<if $assistant == 0>>its<<else>>her<</if>> normal tones, "Team One reports
- <<if $PC.SystemIntrusion < 10 && random(0,100) > 90>>
+ <<if $PC.hacking < 10 && random(0,100) > 90>>
<<set _Success = 1>>
- <<elseif $PC.SystemIntrusion >= 100 && random(0,100) > 50>>
+ <<elseif $PC.hacking >= 100 && random(0,100) > 50>>
<<set _Success = 1>>
- <<elseif $PC.SystemIntrusion >= 80 && random(0,100) > 55>>
+ <<elseif $PC.hacking >= 80 && random(0,100) > 55>>
<<set _Success = 1>>
- <<elseif $PC.SystemIntrusion >= 60 && random(0,100) > 60>>
+ <<elseif $PC.hacking >= 60 && random(0,100) > 60>>
<<set _Success = 1>>
- <<elseif $PC.SystemIntrusion >= 40 && random(0,100) > 65>>
+ <<elseif $PC.hacking >= 40 && random(0,100) > 65>>
<<set _Success = 1>>
- <<elseif $PC.SystemIntrusion >= 20 && random(0,100) > 75>>
+ <<elseif $PC.hacking >= 20 && random(0,100) > 75>>
<<set _Success = 1>>
- <<elseif $PC.SystemIntrusion >= 10 && random(0,100) > 85>>
+ <<elseif $PC.hacking >= 10 && random(0,100) > 85>>
<<set _Success = 1>>
<</if>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 9bc0cc7f3f4ef148625a5e71cf5ac0889ef459fa..30d167a3172996be15876f17d8e1c0b59b262b21 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -459,60 +459,60 @@
<</if>>
<<case "technical accidents">>
- <<set $cash += 25000*$PC.SystemIntrusion*$arcologies[0].prosperity, _X = 0>>
- <<if $PC.SystemIntrusion == -100>>
+ <<set $cash += 25000*$PC.hacking*$arcologies[0].prosperity, _X = 0>>
+ <<if $PC.hacking == -100>>
<<set _Catchtchance = 10>>
- <<elseif $PC.SystemIntrusion <= -75>>
+ <<elseif $PC.hacking <= -75>>
<<set _Catchtchance = 30>>
- <<elseif $PC.SystemIntrusion <= -50>>
+ <<elseif $PC.hacking <= -50>>
<<set _Catchtchance = 40>>
- <<elseif $PC.SystemIntrusion <= -25>>
+ <<elseif $PC.hacking <= -25>>
<<set _Catchtchance = 45>>
- <<elseif $PC.SystemIntrusion == 0>>
+ <<elseif $PC.hacking == 0>>
<<set _Catchtchance = 50>>
- <<elseif $PC.SystemIntrusion <= 25>>
+ <<elseif $PC.hacking <= 25>>
<<set _Catchtchance = 60>>
- <<elseif $PC.SystemIntrusion <= 50>>
+ <<elseif $PC.hacking <= 50>>
<<set _Catchtchance = 70>>
- <<elseif $PC.SystemIntrusion <= 75>>
+ <<elseif $PC.hacking <= 75>>
<<set _Catchtchance = 85>>
- <<elseif $PC.SystemIntrusion >= 100>>
+ <<elseif $PC.hacking >= 100>>
<<set _Catchtchance = 100>>
<</if>>
- This week your technicial accidents for the highest bidder earned you @@.yellowgreen;<<print cashFormat(25000*$PC.SystemIntrusion*$arcologies[0].prosperity)>>.@@ cash <<if random(0,100) > _Catchtchance>> however as you were traced your <<if $secExp == 1>> <<set _X = 1>> @@.red;authority.@@, <<set $authority -= random(100,500)>> @@.red;crime rate.@@ <<set $crime += random(10,25)>> and<</if>> @@.red;reputation.@@ <<set $rep -= random (100,500)>> <<if _X != 1>> has <<else>> have<</if>> been effected.
+ This week your technicial accidents for the highest bidder earned you @@.yellowgreen;<<print cashFormat(25000*$PC.hacking*$arcologies[0].prosperity)>>.@@ cash <<if random(0,100) > _Catchtchance>> however as you were traced your <<if $secExp == 1>> <<set _X = 1>> @@.red;authority.@@, <<set $authority -= random(100,500)>> @@.red;crime rate.@@ <<set $crime += random(10,25)>> and<</if>> @@.red;reputation.@@ <<set $rep -= random (100,500)>> <<if _X != 1>> has <<else>> have<</if>> been effected.
-<<case "SystemIntrusion">>
- <<set _oldSkill = $PC.SystemIntrusion>>
+<<case "hacking">>
+ <<set _oldSkill = $PC.hacking>>
<<if _X == 1>>
- <<set $PC.SystemIntrusion += _Cal>>
+ <<set $PC.hacking += _Cal>>
<<else>>
- <<set $PC.SystemIntrusion -= _Cal>>
+ <<set $PC.hacking -= _Cal>>
<</if>>
<<if _oldSkill <= 10>>
- <<if $PC.SystemIntrusion > 10>>
- You now have @@.green;basic knowledge@@ about how to be a SystemIntrusion.
+ <<if $PC.hacking > 10>>
+ You now have @@.green;basic knowledge@@ about how to be a hacking.
<<else>>
- You have made progress towards a basic knowledge of SystemIntrusion work.
+ You have made progress towards a basic knowledge of hacking work.
<</if>>
<<elseif _oldSkill <= 30>>
- <<if $PC.SystemIntrusion > 30>>
- You now have @@.green;some skill@@ as a SystemIntrusion.
+ <<if $PC.hacking > 30>>
+ You now have @@.green;some skill@@ as a hacking.
<<else>>
- You have made progress towards being skilled in SystemIntrusion work.
+ You have made progress towards being skilled in hacking work.
<</if>>
<<elseif _oldSkill <= 60>>
- <<if $PC.SystemIntrusion > 60>>
- You are now an @@.green;expert SystemIntrusion.@@
+ <<if $PC.hacking > 60>>
+ You are now an @@.green;expert hacking.@@
<<else>>
- You have made progress towards being an expert in SystemIntrusion work.
+ You have made progress towards being an expert in hacking work.
<</if>>
<<else>>
- <<if $PC.SystemIntrusion >= 100>>
+ <<if $PC.hacking >= 100>>
<<set $personalAttention = "sex">>
- You are now a @@.green;master SystemIntrusion.@@
+ You are now a @@.green;master hacking.@@
<<else>>
- You have made progress towards mastering SystemIntrusion work.
+ You have made progress towards mastering hacking work.
<</if>>
<</if>>
diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw
index 79184bbab90ced616f5db130462a5d917a3192df..4a3c29368945d1d335724bfaa436f87db59634c8 100644
--- a/src/uncategorized/personalAssistantOptions.tw
+++ b/src/uncategorized/personalAssistantOptions.tw
@@ -1,5 +1,5 @@
:: Personal assistant options [nobr]
-<<SISM>>
+<<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*$SystemIntrusionSkillMultiplier))>>.// [[Install holographic memory core|Personal assistant options][$cash -= Math.trunc(20000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier), $assistantPower += 1, $PC.engineering += 1, $PC.SystemIntrusion += 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*$SystemIntrusionSkillMultiplier))>>.// [[Install optical RAM|Personal assistant options][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier), $assistantPower += 1, $PC.engineering += 1, $PC.SystemIntrusion += 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>>
@@ -822,16 +822,16 @@ __Downloadable Appearances:__
<br>
/*
<<if $assistantExtra1 == 0>>
- [[Purchase a set of monstergirl appearances|Assistant Events][$event = "", $cash -= Math.trunc(6000*$upgradeMultiplier*$SystemIntrusionSkillMultiplier), $assistantExtra1 = 1]]
- //Costs <<print cashFormat(Math.trunc(6000*$upgradeMultiplier*$SystemIntrusionSkillMultiplier))>>//
+ [[Purchase a set of monstergirl appearances|Assistant Events][$event = "", $cash -= Math.trunc(6000*$upgradeMultiplier*$HackingSkillMultiplier), $assistantExtra1 = 1]]
+ //Costs <<print cashFormat(Math.trunc(6000*$upgradeMultiplier*$HackingSkillMultiplier))>>//
<<else>>You have downloaded a set of monstergirl appearances for your avatar.
<</if>>
*/
<<if $assistantExtra2 == 0>>
<<link "Purchase a set of heaven and hell themed appearances">>
- <<set $cash -= Math.trunc(10000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier), $assistantExtra2 = 1, $nextLink = "Personal assistant options">>
+ <<set $cash -= Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier), $assistantExtra2 = 1, $nextLink = "Personal assistant options">>
<<goto "Assistant Appearance Pack Two">>
- <</link>> //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*$SystemIntrusionSkillMultiplier))>>//
+ <</link>> //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*$HackingSkillMultiplier))>>//
<<else>>You have downloaded a set of heavenly and hellish appearances for your avatar.
<</if>>
<</if>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index ba8c9cc4fdb60f73cb8a3d281ac3f6b77e5d13d4..f1aeb871548486d1af90a3a3ac68fb3e5796ad4a 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -10,7 +10,7 @@
<<if $PC.career == "gang">>
| [[Help people "pass" things around|Main][$personalAttention = "smuggling"]]
<</if>>
- <<if $PC.SystemIntrusion > 0>>
+ <<if $PC.hacking > 0>>
<br>[[Create technical accidents in your arcology for the highest bidder|Main][$personalAttention = "technical accidents"]]
<</if>>
<</if>>
@@ -66,21 +66,21 @@
<br>[[Hire a mercenary to train you in warfare|Main][$personalAttention = "warfare"]]
<</if>>
<</if>>
-<<if $PC.SystemIntrusion >= 100>>
- <br>//You are a master SystemIntrusion.//
+<<if $PC.hacking >= 100>>
+ <br>//You are a master hacking.//
<<else>>
<br>
- <<if $PC.SystemIntrusion > 60>>
- //You are an expert SystemIntrusion.//
- <<elseif $PC.SystemIntrusion > 30>>
- //You have some skill as a SystemIntrusion.//
- <<elseif $PC.SystemIntrusion > 10>>
- //You have basic knowledge as a SystemIntrusion.//
+ <<if $PC.hacking > 60>>
+ //You are an expert hacking.//
+ <<elseif $PC.hacking > 30>>
+ //You have some skill as a hacking.//
+ <<elseif $PC.hacking > 10>>
+ //You have basic knowledge as a hacking.//
<</if>>
- <<if $personalAttention == "SystemIntrusion">>
- You are training in the ways of a SystemIntrusion.
- <<elseif $PC.SystemIntrusion < 100 && $PC.actualAge < $IsPastPrimePC>>
- [[Hire a network threat specialist to train you in network threats|Main][$personalAttention = "SystemIntrusion"]]
+ <<if $personalAttention == "hacking">>
+ You are training in the ways of a hacking.
+ <<elseif $PC.hacking < 100 && $PC.actualAge < $IsPastPrimePC>>
+ [[Hire a network threat specialist to train you in network threats|Main][$personalAttention = "hacking"]]
<</if>>
<</if>>
<<if $PC.slaving >= 100>>
@@ -132,7 +132,7 @@
<</if>>
<</if>>
<</if>>
-<<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC && ($PC.medicine < 100 || $PC.engineering < 100 || $PC.slaving < 100 || $PC.warfare < 100 || $PC.trading < 100 || $PC.SystemIntrusion < 100)>><br>//<br>//Training will cost <<print cashFormat(_cost)>> per week.//<br><br><<else>><br><br><</if>>
+<<if $PC.actualAge >= $IsInPrimePC && $PC.actualAge < $IsPastPrimePC && ($PC.medicine < 100 || $PC.engineering < 100 || $PC.slaving < 100 || $PC.warfare < 100 || $PC.trading < 100 || $PC.hacking < 100)>><br>//<br>//Training will cost <<print cashFormat(_cost)>> per week.//<br><br><<else>><br><br><</if>>
<<if typeof $personalAttention != "object" || $personalAttention.length == 0>>
You have not selected a slave for your personal attention.
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 2ac51dc1084056d7f49a42959354b97d80a810f5..c92cf9d5ce21121d926882ad79c6261fd5d0ae1d 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -512,6 +512,21 @@
<<set $recruit.push("female runaway")>>
<</if>>
<</if>>
+<<if $PC.hacking >= 50>>
+ <<if $securityForceActive == 1 || $mercenaries >= 1 || $activeUnits > 0 || $Bodyguard != 0 || $cash >= 20000>>
+ <set $recruit.push("Held POW")>>
+ <</if>>
+ <<if $familyTesting == 1 && $securityForceActive == 1 || $mercenaries >= 1 || $activeUnits > 0 || $Bodyguard != 0 || $cash >= 20000>>
+ <<if $PC.mother == 0>>
+ <set $recruit.push("Lost mother")>>
+ <</if>>
+ <<if $PC.father == 0>>
+ <set $recruit.push("Lost father")>>
+ <</if>>
+ <</if>>
+<</if>>
+
+
<<set $recruit.push("female SD")>>
<<set $recruit.push("female SD 2")>>
<<set $recruit.push("female SE")>>
@@ -558,6 +573,10 @@
<<if $seeDicks != 0>> /*XY ACQUISITIONS*/
+<<if ($familyTesting == 1 && $PC.father == 0) && $securityForceActive == 1 || $mercenaries >= 1 || $activeUnits > 0 || $Bodyguard != 0 || $cash >= 20000>>
+ <set $recruit.push("Lost father")>>
+ <</if>>
+
<<set $recruit.push("male debtor")>>
<<set $recruit.push("tg addict")>>
<<set $recruit.push("male SD")>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 8564a187f75ef41591fe5b1b0618045e458fba85..5d86c325d166cf8c59f937f59c67ba125987f86b 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1735,9 +1735,77 @@ As you are heading back to your penthouse from inspecting a new line of sex shop
<</if>>
Every push, every desperate contraction must be agonizing to her. Fortunately you know what to do, however, it will not come cheap. Hour after hour you work with the girl, her dept to you growing ever higher, until you finally manage to coax the newborn from her battered body. She smiles at her baby before losing consciousness, she is in really bad shape. Odds are her child will grow up an orphan, even if you call in her debt.
+<<case "Held POW">>
+
+ <<set $activeSlaveOneTimeMinAge = $fertilityAge>>
+ <<set $activeSlaveOneTimeMaxAge = 22>>
+ <<include "Generate XX Slave">>
+ <<set $activeSlave.origin = "You helped her free her from a POW camp after her country abanded, leaving her deeply indebted to you.">>
+ <<set $activeSlave.devotion = random(0,20)>>
+ <<set $activeSlave.trust = random(0,20)>>
+ <<set $activeSlave.health = -80>>
+ <<set $activeSlave.weight = random(-80, -60)>>
+ <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.boobs += random(3,6)*100>>
+ <<if $activeSlave.actualAge < 13>>
+ <<set $activeSlave.career = setup.veryYoungCareers.random()>>
+ <<else>>
+ <<set $activeSlave.career = setup.bodyguardCareers.random() || $activeSlave.career = setup.wardenessCareers.random()>>
+ <</if>>
+ <<set $activeSlave.vagina = 1>>
+
+ While digging through the database of a POW camp for shits and gigles you find that a <<if $activeSlave.visualAge > 17>>fully grown<<elseif $activeSlave.visualAge > 12>>teenage<<else>>child<</if>> soldier abonded by her nation. You decide to send a small sqaud <<if $securityForceActive ==1>> $securityForceName <<elseif $mercenaries >= 1>> $mercenariesTitle <<elseif $activeUnits > 0>> your army <<elseif $Bodyguard != 0>> your bodyguard $bodyguard.name and a few loyal slaves <<elseif $cash >= 20000>> hired mercs <<set $cash -= 20000>> <</if>> to free the prisoner then transport her to a safe house.
+
+ Upon their arrival they see that she has been,
+ <<if $seeExtreme == 1>>
+ modified for war <<set $activeSlave.amp = -4, $activeSlave.teeth = "pointy">> with the wounds still visable.
+ <<else>>
+ her wounds are still visable.
+ <</if>>
+
+<<case "Lost mother">>
+
+ <<set $activeSlave.age = $PC.actualAge+14>>
+ <<include "Generate XX Slave">>
+ <<set $activeSlave.origin = "You helped her free her from a POW camp after her country abanded, leaving her deeply indebted to you.">>
+ <<set $activeSlave.devotion = random(0,20)>>
+ <<set $activeSlave.trust = random(0,20)>>
+ <<set $activeSlave.health = -80>>
+ <<set $activeSlave.weight = random(-80, -60)>>
+ <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.boobs += random(3,6)*100>>
+ <<set $activeSlave.career = setup.bodyguardCareers.random() || $activeSlave.career = setup.wardenessCareers.random()>>
+ <<set $activeSlave.vagina = 1>>
+ <<set $activeSlave.ID == $PC.mother>>
+
+ After countless searching you have found your long lost mother. You decide to send a small sqaud <<if $securityForceActive ==1>> $securityForceName <<elseif $mercenaries >= 1>> $mercenariesTitle <<elseif $activeUnits > 0>> your army <<elseif $Bodyguard != 0>> your bodyguard $bodyguard.name and a few loyal slaves <<elseif $cash >= 20000>> hired mercs <<set $cash -= 20000>> <</if>> to free the prisoner then transport her to a safe house.
+
+<<case "Lost father">>
+
+ <<set $activeSlave.age = $PC.actualAge+14>>
+ <<include "Generate XY Slave">>
+ <<set $activeSlave.origin = "You helped her free her from a POW camp after her country abanded, leaving her deeply indebted to you.">>
+ <<set $activeSlave.devotion = random(0,20)>>
+ <<set $activeSlave.trust = random(0,20)>>
+ <<set $activeSlave.health = -80>>
+ <<set $activeSlave.weight = random(-80, -60)>>
+ <<set $activeSlave.combatSkill = 1>>
+ <<set $activeSlave.boobs += random(3,6)*100>>
+ <<set $activeSlave.career = setup.bodyguardCareers.random() || $activeSlave.career = setup.wardenessCareers.random()>>
+ <<set $activeSlave.dick = 10>>
+ <<set $activeSlave.ID == $PC.father>>
+
+ After countless searching you have found your long lost father. You decide to send a small sqaud <<if $securityForceActive ==1>> $securityForceName <<elseif $mercenaries >= 1>> $mercenariesTitle <<elseif $activeUnits > 0>> your army <<elseif $Bodyguard != 0>> your bodyguard $bodyguard.name and a few loyal slaves <<elseif $cash >= 20000>> hired mercs <<set $cash -= 20000>> <</if>> to free the prisoner then transport him to a safe house.
+
<</switch>> /* END SLAVE GENERATION AND INTRODUCTION */
<<switch $recruit>>
+<<case "Lost father">>
+ <<set $contractCost = 10000>>
+<<case "Lost mother">>
+ <<set $contractCost = 10000>>
+<<case "Held POW">>
+ <<set $contractCost = 1000>>
<<case "female SD" "male SD" "female SD 2">>
<<set $contractCost = 6000>>
<<case "female SE">>
@@ -1772,6 +1840,12 @@ Every push, every desperate contraction must be agonizing to her. Fortunately yo
<<set $cash -= $contractCost>>
<<replace "#result">>
<<switch $recruit>>
+ <<case "Lost mother">>
+ With your order recived your mother is quickly black baged and brought to your penthouse.
+ <<case "Lost father">>
+ With your order recived your father is quickly black baged and brought to your penthouse.
+ <<case "Held POW">>
+ With your order recived the POW is quickly black baged and brought to your penthouse.
<<case "female recruit">>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on her heels. Finally she works up her courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your sternly tell her to call you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, to ask questions only with permission, and to strip. She looks at $HeadGirl.slaveName, but $HeadGirl.slaveName returns her look with no compassion at all and tells her to do what you say. Looking suddenly fearful, $activeSlave.slaveName strips. Once your inspection of her body reaches her anus, she becomes suddenly nervous. "A-am I going to have t-to do butt stuff, <<Master>>?"
<<case "male recruit">>
@@ -1898,6 +1972,12 @@ Every push, every desperate contraction must be agonizing to her. Fortunately yo
<<set $cash += $slaveCost>>
<<replace "#result">>
<<switch $recruit>>
+ <<case "Lost mother">>
+ With your order recived your mother is quickly black baged and sent to your bidder.
+ <<case "Lost father">>
+ With your order recived your father is quickly black baged and sent to your bidder.
+ <<case "Held POW">>
+ With your order recived the POW is quickly black baged and sent to your bidder.
<<case "female recruit">>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on her heels. Finally she works up her courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take her away. As he restrains the disbelieving girl, you tell her she's been purchased by a brothel, so she's going to be fucked about 70,000 times before she gets to be too old and is retired, so she can be sure she won't be bored. She releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over her head.
<<case "male recruit">>