diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw
index ba3a129db6ef2982957d892a98fe71b44cd5611c..e650c981778f0f29b68ceb49fe94c6374501ddf1 100644
--- a/src/SecExp/SecExpBackwardCompatibility.tw
+++ b/src/SecExp/SecExpBackwardCompatibility.tw
@@ -13,6 +13,9 @@
<<if ndef $crime>>
<<set $crime = 0>>
<</if>>
+<<if ndef $crimeCap>>
+ <<set $crimeCap = 100>>
+<</if>>
<<if ndef $readiness>>
<<set $readiness = 0>>
<</if>>
@@ -53,11 +56,18 @@
<</if>>
<<if ndef $secUpgrades >>
<<set $secUpgrades = {
- cctvCams: 0,
+ nanoCams: 0,
cyberBots: 0,
eyeScan: 0,
cryptoAnalyzer: 0}>>
<</if>>
+<<if ndef $crimeUpgrades>>
+ <<set $crimeUpgrades = {
+ autoTrial: 0,
+ autoArchive: 0,
+ worldProfiler: 0,
+ advForensic: 0}>>
+<</if>>
/* upgrades */
<<if ndef $riskSim>>
diff --git a/src/SecExp/secInit.tw b/src/SecExp/secInit.tw
index 6948cae831f2dae7a111cde9a32898bf4994334a..45a4106e25fb25b1132e043a5914e8e4528a92ea 100644
--- a/src/SecExp/secInit.tw
+++ b/src/SecExp/secInit.tw
@@ -5,6 +5,7 @@
<<set $security = 50>>
<<set $secRestPoint = 40>>
<<set $crime = 20>>
+<<set $crimeCap = 100>>
<<set $readiness = 0>>
<<set $maxPlatoons = 0>>
<<set $attackType = "none">>
@@ -18,12 +19,19 @@
<<set $secHQ = 0>>
<<set $maxHelotsInSecHQ = 100>>
<<set $secHelots = 0>>
-<<set $$reqHelots = 20>>
+<<set $reqHelots = 20>>
<<set $secUpgrades = {
- cctvCams: 0,
+ nanoCams: 0,
cyberBots: 0,
eyeScan: 0,
cryptoAnalyzer: 0}>>
+<<set $crimeUpgrades = {
+ autoTrial: 0,
+ autoArchive: 0,
+ worldProfiler: 0,
+ advForensic: 0}>>
+<<set $intelUpgrades = {
+
/* armed forces stats */
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index ee5c6f9bf79fae7474caeb48c760d4d9947a83b1..6dfa7661165d28e7712fe9be2e712e93abc52acf 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -5,31 +5,8 @@
Security headquarters
<hr>
-/* security level. Effects and influences */
-<<if $security <= 20>>
- Your security level (@@.deepskyblue;<<print $security>>@@) is dangerously low. If measures are not taken crime will quickly become a big problem and your arcology will be highly susceptible to external attacks.
-<<elseif $security <= 40>>
- Your security level (@@.deepskyblue;<<print $security>>@@) is low. In the long run crime will slowly but inevitably grow and your arcology is open to attacks.
-<<elseif $security <= 60>>
- Your security level (@@.deepskyblue;<<print $security>>@@) is decent. Crime will have difficulty growing, but it will also be hard to extirpate. Your arcology is reasonably safe from external attacks.
-<<elseif $security <= 80>>
- Your security level (@@.deepskyblue;<<print $security>>@@) is good. With time crime will slowly be eliminated and your arcology is highly secured agaist external attacks.
-<<else>>
- Your security level (@@.deepskyblue;<<print $security>>@@) is great. You turned your arcology in a deadly trap for criminals and external attacks can be dealt with very effectively.
-<</if>>
-<<if $security < $secRestPoint>>
- Your security is under its resting point (<<print $secRestPoint>>), with enough slaves in the headquarters it will increase in the coming weeks.
-<<elseif $security > $secRestPoint>>
- Your security is over its resting point (<<print $secRestPoint>>), without investments in the infrastructure it will slowly decay.
-<<else>>
- Your security is at its resting point (<<print $secRestPoint>>), without outside interference it will remain at this level.
-<</if>>
-
-<br>
-<br>
-
-/* security level. Slaves and upgrades */
-You have <span id="secHel"><<print $secHelots>></span> slaves working in the HQ. To maintain the current level of security $reqHelots are required and you have <span id="hel"><<print $helots>></span> free menial slaves.
+/* security level. Slaves */
+You have <span id="secHel"><<print $secHelots>></span> slaves working in the HQ. $reqHelots are required and you have <span id="hel"><<print $helots>></span> free menial slaves.
<<if $secHelots < $reqHelots>>
You do not have enough slaves here. Security will slowly decay until you transfer enough.
<<else>>
@@ -89,30 +66,53 @@ You have <span id="secHel"><<print $secHelots>></span> slaves working in the HQ.
<br>
<br>
-<<if $secUpgrades.cctvCams == 0>>
- [[Install an extensive CCTV camera system |securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $secUpgrades.cctvCams = 1, $secRestPoint += 10, $reqHelots += 5]]
- <br>//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>. Will increase the resting point of security level by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.//
+/* security level and upgrades */
+<<if $security <= 20>>
+ Your security level (@@.deepskyblue;<<print $security>>@@) is dangerously low.
+<<elseif $security <= 40>>
+ Your security level (@@.deepskyblue;<<print $security>>@@) is low.
+<<elseif $security <= 60>>
+ Your security level (@@.deepskyblue;<<print $security>>@@) is decent.
+<<elseif $security <= 80>>
+ Your security level (@@.deepskyblue;<<print $security>>@@) is good.
+<<else>>
+ Your security level (@@.deepskyblue;<<print $security>>@@) is great.
+<</if>>
+<<if $security < $secRestPoint>>
+ Your security is under its resting point (<<print $secRestPoint>>), with enough slaves in the headquarters it will increase in the coming weeks.
+<<elseif $security > $secRestPoint>>
+ Your security is over its resting point (<<print $secRestPoint>>), without investments in the infrastructure it will slowly decay.
<<else>>
- You have installed an extensive CCTV camera system to keep the arcology under your watchful eye.
+ Your security is at its resting point (<<print $secRestPoint>>), without outside interference it will remain at this level.
+<</if>>
+
+<br>
+<br>
+
+<<if $secUpgrades.nanoCams == 0>>
+ [[Install an extensive nano-cameras system |securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $secUpgrades.cctvCams = 1, $secRestPoint += 10, $reqHelots += 5]]
+ <br>//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>. Will raise the resting 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(5000*$upgradeMultiplierArcology), $secUpgrades.cyberBots = 1, $secRestPoint += 10, $reqHelots += 5]]
- <br>//Costs ¤<<print Math.trunc(7500*$upgradeMultiplierArcology)>>. Will further increase the resting point of security level by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.//
+ [[Buy cybersecurity algorithms|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology), $secUpgrades.cyberBots = 1, $secRestPoint += 10, $reqHelots += 5]]
+ <br>//Costs ¤<<print Math.trunc(7500*$upgradeMultiplierArcology)>>. Will raise the resting 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 $secUpgrades.eyeScan == 0>>
- [[Install non intrusive eye scanners|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $secUpgrades.eyeScan = 1, $secRestPoint += 15, $reqHelots += 10]]
- <br>//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>. Will increase the resting point of security level by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.//
+ [[Install non intrusive eye scanners|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $secUpgrades.eyeScan = 1, $secRestPoint += 15, $reqHelots += 10]]
+ <br>//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>. Will raise the resting 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(5000*$upgradeMultiplierArcology), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 15, $reqHelots += 10]]
- <br>//Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>. Will increase the resting point of security level by another 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), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 15, $reqHelots += 10]]
+ <br>//Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>. Will raise the resting 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>>
@@ -120,34 +120,72 @@ You have <span id="secHel"><<print $secHelots>></span> slaves working in the HQ.
<br>
<br>
-/* crime */
+/* crime level and upgrades */
<<if $crime <= 20>>
- Your crime level (@@.orangered;<<print $crime>>@@) is very low. Robberies are rare and violence is almost absent. Businesses and immigrants are attracted to such safe shores.
+ Your crime level (@@.orangered;<<print $crime>>@@) is very low.
<<elseif $crime <= 40>>
- Your crime level (@@.orangered;<<print $crime>>@@) is low. Theft is uncommon and violent crimes quite rare. Businesses and immigrants are attracted to your arcology because of this.
+ Your crime level (@@.orangered;<<print $crime>>@@) is low.
<<elseif $crime <= 60>>
- Your crime level (@@.orangered;<<print $crime>>@@) is average. Theviery is sadly part of life and violent crimes are present if uncommon. Business and immigrants are not encouraged, but not too worried either.
+ Your crime level (@@.orangered;<<print $crime>>@@) is average.
<<elseif $crime <= 80>>
- Your crime level (@@.orangered;<<print $crime>>@@) is high. Theft is commonplace and violent crimes are part of the daily grind. Business and immigrants are discouraged by such levels of precariousness.
+ Your crime level (@@.orangered;<<print $crime>>@@) is high.
<<else>>
- Your crime level (@@.orangered;<<print $crime>>@@) is extremely high. Thievery is extremely common and violent crime is commonplace. Business and immigrants are highly discouraged by such levels of precariousness.
+ Your crime level (@@.orangered;<<print $crime>>@@) is extremely high.
<</if>>
-<<if $secHelots < $reqHelots>>
- <<set _crimeRestPoint = 100 - $secRestPoint * ($secHelots / $reqHelots)>>
+Considering the current upgrades, prosperity and demographics of your arcology, the maximum level of crime is <<print $crimeCap>>.
+
+<br>
+<br>
+
+<<if $crimeUpgrades.advForensic == 0>>
+ [[Install advanced forensic equipment|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5]]
+ <br>//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>. 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 software|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5]]
+ <br>//Costs ¤<<print Math.trunc(7500*$upgradeMultiplierArcology)>>. 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 $crimeUpgrades.autoTrial == 0>>
+ [[Install automated trials software|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10]]
+ <br>//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.//
<<else>>
- <<set _crimeRestPoint = 100 - $secRestPoint>>
+ You have installed advanced legal algorithms that allows the handling of legal matters much quicker and much more accurately.
<</if>>
-<<if $crime < _crimeRestPoint>>
- The crime level is below its resting point (<<print _crimeRestPoint>>). If measures are not taken it will increase with time.
-<<elseif $crime > _crimeRestPoint>>
- The crime level is above its resting point (<<print _crimeRestPoint>>). If the situation does not change it will decrease with time.
+<br>
+<<if $crimeUpgrades.worldProfiler == 0>>
+ [[Install worldwide profilers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10]]
+ <br>//Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.//
<<else>>
- The crime level is at its resting point (<<print _crimeRestPoint>>). If the situation does not change it will remain stable.
+ 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>>
-/* readiness */
+<br>
+<br>
/* intelligence */
+<<if $recon == 0>>
+ Your reconnaissance capabilities are severely limited. Very little information will be available if the arcology is attacked.
+<<elseif $recon == 1>>
+ You have some reconnaissance capabilities. You'll have some information on the enemy if the arcology is attacked.
+<<elseif $recon == 2>>
+ You have good reconnaissance capabilities. You'll have good, reliable information on the enemy if the arcology is attacked.
+<<else>>
+ You have great reconnaissance capabilities. You'll have very accurate information on the enemy if the arcology is attacked.
+<</if>>
+
+<br>
+<br>
+
+<<if $intelUpgrades.
+
+/* readiness */
+
/* recruitment and units */