From c75ca0a0b25d2f5e0c62331b729204fc4f377004 Mon Sep 17 00:00:00 2001
From: hexall90 <hexall90@gmail.com>
Date: Thu, 12 Oct 2017 21:40:18 +0200
Subject: [PATCH] some fixes and adjustments
---
TODO.txt | 1 -
src/SecExp/attackGenerator.tw | 14 ++-
src/SecExp/attackOptions.tw | 89 ++++++++-------
src/SecExp/propagandaHub.tw | 4 +-
src/SecExp/rebellionEventGenerator.tw | 151 +++++++++++++++++++++++---
src/SecExp/rebellionReport.tw | 26 -----
src/SecExp/secExpEvents.tw | 109 ++++++++++++++++++-
src/SecExp/securityHQ.tw | 93 +++++++++-------
8 files changed, 362 insertions(+), 125 deletions(-)
delete mode 100644 src/SecExp/rebellionReport.tw
diff --git a/TODO.txt b/TODO.txt
index 52168587c58..9843c1d817d 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -6,7 +6,6 @@
-encyclopedia entries
-transport hub
-weapons manufactoring
--first battle
and big ones:
-rebellions
diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw
index d4a0fb39829..25bc011ef51 100644
--- a/src/SecExp/attackGenerator.tw
+++ b/src/SecExp/attackGenerator.tw
@@ -19,7 +19,11 @@
<<if $lastAttackWeeks >= 15>>
<<set _attackChance += 5>>
<</if>>
+ <<if $hasFoughtOnce == 1>>
+ <<set _attackChance = 25>>
+ <</if>>
<</if>>
+
/* testing <<set _attackChance = 100>> */
/* Rolls to see if attack happens this week */
@@ -31,9 +35,15 @@
<<set $attackThisWeek = 1>>
<<set $lastAttackWeeks = 0>>
<<set $leadingTroops = "assistant">>
- <<set $deployableUnits = 1 + $readiness>> /* +1 is for testing */
+ <<set $deployableUnits = 2 * $readiness>>
<<set $chosenTactic = either("Bait and Bleed", "Guerrilla", "Choke Points", "Interior Lines", "Pincer Manouver", "Defense In Depth", "Blitzkrieg", "Human Wave")>>
-
+ <<if $hasFoughtOnce == 0>>
+ <<set $attackType = "raiders">>
+ <<set $battleTerrain = "wasteland">>
+ <<set $attackTroops = 40>>
+ <<set $attackEquip = 0)>>
+ <<goto "attackOptions">>
+ <</if>>
/* _type is the chance out of 100 of an attack of that type happening */
<<set _raider = 25>>
<<set _oldWorld = 25>>
diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index 74ae6bf53f8..52dd3941bc5 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -2,43 +2,49 @@
<strong>Attack Imminent</strong>
<hr>
-The ominous message dominates the screens of your office, <<print $assistantName>> quickly gathers all information available to prepare for battle.
-<<if $attackType == "raiders">>
- <<if $recon >= 1>>
- A disorganized horde of raiders is coming to your city. To such jackals your arcology surely looks like an appetizing morsel.
- Fortunately you knew of their coming, thanks to your recon systems.
- <<else>>
- Some of your citizens saw the disorganized horde of raiders coming towards the city and quickly reported it. To such jackals your arcology surely looks like an appetizing morsel.
- <</if>>
- <br>
- Raiders are roaming gangs of bandits, preying on the vulnerable supply lines of free cities and old world nations. They are rarely equipped with decent armaments and even more rarely have any formal military training, but they make up for that with high mobility and numbers.
-<<elseif $attackType == "free city">>
- <<if $recon >= 1>>
- A menacing column of consumed mercenaries and slavers is coming to your city. Another free city is ready to use their best tools to hit a dangerous competitor where it hurts.
- Fortunately you knew of their coming, thanks to your recon systems.
- <<else>>
- Some of your citizens saw the menacing column of consumed mercenaries and slavers and rushed to your office to bring the grim news. Another free city is ready to use their best tools to bring down a dangerous competitor.
- <</if>>
- <br>
- Free City expeditions are usually composed of mercenaries hired to take down sensible supplies or infrastructure in order to damage the enemies of their contractor. They have on average good equipment and training, together with decent mobility, making them a formidable force. Their biggest weakness however is their low numbers.
-<<elseif $attackType == "freedom fighters">>
- <<if $recon >= 1>>
- A dangerous looking army of guerrillas is gathering just outside the arcology. Fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire.
- Fortunately you knew of their coming, thanks to your recon systems.
- <<else>>
- Some of your citizens saw the dangerous looking army of guerrillas is gathering just outside the arcology. Fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire.
- <</if>>
- <br>
- Freedom Fighters are groups of individuals fighting to rid the planet of "evils" such as the free cities and their way of life. Lacking the strenght to assault one directly they fight guerrilla style slowly starving to death their enemies. They are rarely well equipped, but with good training and mobility they are not a threat that can be taken lightly.
-<<elseif $attackType == "old world">>
- <<if $recon >= 1>>
- A diciplined yet dusty, scruffy old world army is approaching the confines of your arcology. There's nothing better than a good war to unite the electorate and your arcology is just the perfect target.
- Fortunately you knew of their coming, thanks to your recon systems.
- <<else>>
- Some of your citizens saw the diciplined yet dusty, scruffy old world army is approaching the confines of your arcology. There's nothing better than a good war to unite the electorate and your arcology is just the perfect target.
+<<if $hasFoughtOnce == 1>>
+ The ominous message dominates the screens of your office, <<print $assistantName>> quickly gathers all information available to prepare for battle.
+ <<if $attackType == "raiders">>
+ <<if $recon >= 1>>
+ A disorganized horde of raiders is coming to your city. To such jackals your arcology surely looks like an appetizing morsel.
+ Fortunately you knew of their coming, thanks to your recon systems.
+ <<else>>
+ Some of your citizens saw the disorganized horde of raiders coming towards the city and quickly reported it. To such jackals your arcology surely looks like an appetizing morsel.
+ <</if>>
+ <br>
+ Raiders are roaming gangs of bandits, preying on the vulnerable supply lines of free cities and old world nations. They are rarely equipped with decent armaments and even more rarely have any formal military training, but they make up for that with high mobility and numbers.
+ <<elseif $attackType == "free city">>
+ <<if $recon >= 1>>
+ A menacing column of consumed mercenaries and slavers is coming to your city. Another free city is ready to use their best tools to hit a dangerous competitor where it hurts.
+ Fortunately you knew of their coming, thanks to your recon systems.
+ <<else>>
+ Some of your citizens saw the menacing column of consumed mercenaries and slavers and rushed to your office to bring the grim news. Another free city is ready to use their best tools to bring down a dangerous competitor.
+ <</if>>
+ <br>
+ Free City expeditions are usually composed of mercenaries hired to take down sensible supplies or infrastructure in order to damage the enemies of their contractor. They have on average good equipment and training, together with decent mobility, making them a formidable force. Their biggest weakness however is their low numbers.
+ <<elseif $attackType == "freedom fighters">>
+ <<if $recon >= 1>>
+ A dangerous looking army of guerrillas is gathering just outside the arcology. Fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire.
+ Fortunately you knew of their coming, thanks to your recon systems.
+ <<else>>
+ Some of your citizens saw the dangerous looking army of guerrillas is gathering just outside the arcology. Fanatics and idealists armed with dead men's words and hope, set on erasing your fledgling empire.
+ <</if>>
+ <br>
+ Freedom Fighters are groups of individuals fighting to rid the planet of "evils" such as the free cities and their way of life. Lacking the strenght to assault one directly they fight guerrilla style slowly starving to death their enemies. They are rarely well equipped, but with good training and mobility they are not a threat that can be taken lightly.
+ <<elseif $attackType == "old world">>
+ <<if $recon >= 1>>
+ A diciplined yet dusty, scruffy old world army is approaching the confines of your arcology. There's nothing better than a good war to unite the electorate and your arcology is just the perfect target.
+ Fortunately you knew of their coming, thanks to your recon systems.
+ <<else>>
+ Some of your citizens saw the diciplined yet dusty, scruffy old world army is approaching the confines of your arcology. There's nothing better than a good war to unite the electorate and your arcology is just the perfect target.
+ <</if>>
+ <br>
+ Old world expeditions are usually sent to secure resources and trade routs for their nation or, more often, to provide their citizens with a boogey man to be scared of. They are usually decently equipped and trained, which together with their generous numbers make them a tough nut to crack. They however often lack in mobility.
<</if>>
- <br>
- Old world expeditions are usually sent to secure resources and trade routs for their nation or, more often, to provide their citizens with a boogey man to be scared of. They are usually decently equipped and trained, which together with their generous numbers make them a tough nut to crack. They however often lack in mobility.
+<<else>>
+ Your assistant interrupted your rest to bring the grim news. You quickly rush to your console, where you can see one of the convoys supplying your arcology has been attacked and looted. It seems a group of desperate looking bandits decided it was a good idea to steal from you.
+ Due to their great wealth, free cities inevitably become tasty morsels for anyone able to field armed men. Considering the particular needs of arcologies their supply lines tend to be delicate lifelines, often preyed upon by those who stand to gain from the free city downfall.
+ <br>You quickly summon your security drones to deal with the threat.
<</if>>
<br><br>
@@ -325,7 +331,10 @@ Offensive Tactics
<br>
<<if $deployedUnits > 0>>
<<link "Send your orders">>
- <<set $battleResult = 4>> /* sets $battleResult value outside accepted range to avoid evaluation problems */
+ <<set $battleResult = 4>> /* sets $battleResult value outside accepted range to avoid evaluation problems */
+ <<if $hasFoughtOnce == 0>>
+ <<set $hasFoughtOnce = 1>>
+ <</if>>
<<goto "attackHandler">>
<</link>>
<<else>>
@@ -334,6 +343,9 @@ Offensive Tactics
<br>
<<link "Surrender">>
<<set $battleResult = -1>>
+ <<if $hasFoughtOnce == 0>>
+ <<set $hasFoughtOnce = 1>>
+ <</if>>
<<goto "attackHandler">>
<</link>>
<br>
@@ -352,6 +364,9 @@ Offensive Tactics
<<link "Attempt to bribe">>
<<set $battleResult = 1>>
+ <<if $hasFoughtOnce == 0>>
+ <<set $hasFoughtOnce = 1>>
+ <</if>>
<<goto "attackHandler">>
<</link>>
<br> //Will cost around ¤<<print Math.round($bribeCost * (1 + either(-1,1) * random(2) * 0.1))>>.//
\ No newline at end of file
diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index 5a6ad2f4293..1df92bcc896 100644
--- a/src/SecExp/propagandaHub.tw
+++ b/src/SecExp/propagandaHub.tw
@@ -150,7 +150,7 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<br>Set up a department tasked with the protection of your person, as well as operations requiring a delicate approach.
<br>//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>. Will provide authority and unlock special upgrades, but will increase upkeep.//
<<else>>
- <<if $secretService < 5>>
+ <<if $secretService < 5 && $rep >= ($secretService * 1000) + 5000>>
<<link "Expand the secret service">>
<<set $secretService += 1>>
<<set $cash -= 5000*$upgradeMultiplierArcology * ($secretService + 1)>>
@@ -159,6 +159,8 @@ The propaganda hub is a surprisingly inconspicuous building, dimly lit from the
<</link>>
<br>Invest more resources into the project to increase its effectiveness.
<br>//Costs ¤<<print Math.trunc(5000 * $upgradeMultiplierArcology * ($secretService + 1))>>. Will provide more authority each week, but increases upkeep.//
+ <<elseif $secretService < 5>>
+ You lack the reputation to further expand operations.
<<else>>
You have upgraded the secret service to its maximum.
<</if>>
diff --git a/src/SecExp/rebellionEventGenerator.tw b/src/SecExp/rebellionEventGenerator.tw
index 883357e2002..4b145da8537 100644
--- a/src/SecExp/rebellionEventGenerator.tw
+++ b/src/SecExp/rebellionEventGenerator.tw
@@ -2,19 +2,140 @@
/* each week each possible rebellion will roll for events. If one happens (only one each week in total) the player may interact with it and the counter for the rebellion may go up or stay the same */
-Slaves:
- -low authority
- -low citizens/slaves
- -FSs (degradation/paternalist, maybe others)
- -low security
-
-Citizens:
- -low authority
- -militarization without military focused revivalist FSs
- -FSs (eugenics with many citizens, repopulation with few, maybe others)
- -high crime
+<<set _slave = 0>>
+<<set _citizen = 0>>
+<<set _CSratio = $ACitizens / $ASlaves>>
+
+/* slaves */
+<<if $authority <= 3000>>
+ <<set _slave += 30>>
+<<elseif $authority <= 6000>>
+ <<set _slave += 25>>
+<<elseif $authority <= 9000>>
+ <<set _slave += 20>>
+<<elseif $authority <= 12000>>
+ <<set _slave += 15>>
+<<elseif $authority <= 15000>>
+ <<set _slave += 10>>
+<<elseif $authority <= 18000>>
+ <<set _slave += 5>>
+<</if>>
+<<if _CSratio <= 0.2>>
+ <<set _slave += 30>>
+<<elseif _CSratio <= 0.4>>
+ <<set _slave += 25>>
+<<elseif _CSratio <= 0.6>>
+ <<set _slave += 20>>
+<<elseif _CSratio <= 0.8>>
+ <<set _slave += 15>>
+<<elseif _CSratio <= 1>>
+ <<set _slave += 10>>
+<<elseif _CSratio >= 1.2>>
+ <<set _slave -= 5>>
+<</if>>
+<<if $security <= 10>>
+ <<set _slave += 30>>
+<<elseif $security <= 30>>
+ <<set _slave += 20>>
+<<elseif $security <= 60>>
+ <<set _slave += 10>>
+<<elseif $security >= 90>>
+ <<set _slave -= 5>>
+<</if>>
+<<if $arcologies[0].FSDegradationist != "unset">>
+ <<set _slave += 30>>
+<<elseif $arcologies[0].FSPaternalist != "unset">>
+ <<set _slave -= 5>>
+<<else>>
+ <<set _slave += 5>>
+<</if>>
+<<if $arcologies[0].FSRestart != "unset">>
+ <<set _slave += 30>>
+<<elseif $arcologies[0].FSRepopulationFocus != "unset">>
+ <<set _slave -= 5>>
+<<else>>
+ <<set _slave += 5>>
+<</if>>
-Mercenaries:
- -low authority
- -high numbers
- -failing to pay upkeep each week (falling into debt)
\ No newline at end of file
+/* citizens */
+<<if $authority <= 3000>>
+ <<set _citizen += 30>>
+<<elseif $authority <= 6000>>
+ <<set _citizen += 25>>
+<<elseif $authority <= 9000>>
+ <<set _citizen += 20>>
+<<elseif $authority <= 12000>>
+ <<set _citizen += 15>>
+<<elseif $authority <= 15000>>
+ <<set _citizen += 10>>
+<<elseif $authority <= 18000>>
+ <<set _citizen += 5>>
+<</if>>
+<<if $crime >= 90>>
+ <<set _citizen += 30>>
+<<elseif $crime >= 60>>
+ <<set _citizen += 15>>
+<<elseif $crime >= 30>>
+ <<set _citizen += 5>>
+<<else>>
+ <<set _citizen -= 5>>
+<</if>>
+<<if $militiaFounded == 1>>
+ <<if ($arcologies[0].FSRomanRevivalist == "unset" && $arcologies[0].FSAztecRevivalist == "unset" && $arcologies[0].FSEgyptianRevivalist == "unset" &&
+ $arcologies[0].FSEdoRevivalist == "unset" && $arcologies[0].FSArabianRevivalist == "unset" && $arcologies[0].FSChineseRevivalist == "unset")>>
+ <<if $militarizedSociety == 1>>
+ <<set _citizen += 20>>
+ <<elseif $militaryService == 1>>
+ <<set _citizen += 15>>
+ <<else>>
+ <<set _citizen += 10>>
+ <</if>>
+ <<else>>
+ <<if $militarizedSociety == 1>>
+ <<set _citizen += 10>>
+ <<elseif $militaryService == 1>>
+ <<set _citizen += 5>>
+ <<else>>
+ <<set _citizen -= 5>>
+ <</if>>
+ <</if>>
+<</if>>
+<<if $arcologies[0].FSNull != "unset">>
+ <<set _citizen += either(20,30)>>
+<</if>
+<<if $arcologies[0].FSRestart != "unset">>
+ <<if _CSratio > 1>>
+ <<set _citizen +=20>>
+ <<elseif _CSratio > 0.5>>
+ <<set _citizen += 15>>
+ <<elseif _CSratio < 0.2>>
+ <<set _citizen -= 5>>
+ <</if>>
+<<elseif $arcologies[0].FSRepopulationFocus != "unset">>
+ <<if _CSratio < 0.5>>
+ <<set _citizen +=20>>
+ <<elseif _CSratio < 1>>
+ <<set _citizen += 15>>
+ <<elseif _CSratio > 1.4>>
+ <<set _citizen += 5>>
+ <</if>>
+<</if>>
+
+/* rolls to see if event happens */
+<<if _slave > _citizen>>
+ <<if _slave > 100>>
+ <<set _slave = random(90,95)>> /* there's always a small chance nothing happens */
+ <</if>>
+ <<if random(1,100) < _slave>>
+ <<set $slaveRebellionEventFires = 1>>
+ <<set $citizenRebellionEventFires = 0>>
+ <</if>>
+<<else>>
+ <<if _citizen > 100>>
+ <<set _citizen = random(90,95)>>
+ <</if>>
+ <<if random(1,100) < _citizen>>
+ <<set $slaveRebellionEventFires = 0>>
+ <<set $citizenRebellionEventFires = 1>>
+ <</if>>
+<</if>>
\ No newline at end of file
diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw
deleted file mode 100644
index dd7a25bbd7b..00000000000
--- a/src/SecExp/rebellionReport.tw
+++ /dev/null
@@ -1,26 +0,0 @@
-:: rebellionEventGenerator [nobr]
-
-/* each week each possible rebellion will roll for events. If one happens (only one each week in total) the player may interact with it and the counter for the rebellion may go up or stay the same */
-
-
-
-
-
-
-
-
-
-
-
-
-Slaves:
- -low authority
- -low citizens/slaves
- -FSs (degradation/paternalist, maybe others)
- -low security
-
-Citizens:
- -low authority
- -militarization without military focused revivalist FSs
- -FSs (eugenics with many citizens, repopulation with few, maybe others)
- -high crime
diff --git a/src/SecExp/secExpEvents.tw b/src/SecExp/secExpEvents.tw
index afe2719d586..8b5410dd1a4 100644
--- a/src/SecExp/secExpEvents.tw
+++ b/src/SecExp/secExpEvents.tw
@@ -1,17 +1,118 @@
:: secExpEvents [nobr]
+<<if $slaveRebellionEventFires == 1>>
+ <<if $tension <= 33>>
+ <<set _event = 1>>
+ <<elseif $tension <= 66>>
+ <<set _event = 2>>
+ <<else>>
+ <<set _event = 3>>
+ <</if>>
+<<elseif $citizenRebellionEventFires == 1>>
+ <<if $tension <= 33>>
+ <<set _event = 4>>
+ <<elseif $tension <= 66>>
+ <<set _event = 5>>
+ <<else>>
+ <<set _event = 6>>
+ <</if>>
+<<else>>
+ <<set _event = 0>>
+<</if>>
+
+<<switch _event>>
+<<case 0>>
+ /* random events not linked to rebellions */
+<<case 1>>
+ /* low tension slave rebellion events */
+ <<set _select = random(1,3)>>
+ <<if _select == 1>>
+ Dangerous Communications
+ <hr>
+ Your quiet morning routine was interrupted by an urgent message from your assistant. It seems an interesting conversation were intercepted during the night. The authors were quite smart in their execution:
+ knowing all digital channels are to some level under surveillance, they resolved to use simple written messages hidden away in incospicuos drop points. A couple of security drones reported suspicious activity and <<if $secHQ == 1>>the security department<<else>>your assistant<</if>> quickly extracted the messages. It used a simple encryption code based on alphanumerical recombinations, nothing your faithful AI cloud not handle.
+ You quickly read the short message and immediately understand the urgency of the call: the conversation was between two or maybe more slaves, plotting the death of their master and their escape.
+ <br>Masters dying by the hands of their slaves is nothing newsworthy, any human being pushed too far will eventually snap, with potentially lethal consequences, any slaver worth half a dime know this. As such you are not really surprised by the intent of the conspirators, but by their cold calculations and planning. The minds behind those written lines were clever and experienced, too much of a danger to be left alone or free.
+ <br>
+ <br>
+ You silently evaluate your options: the atmosphere of the arcology is rather calm at the moment, so harsh punishment for the responsibles will most likely not spark any violent reaction, on the other hand however stepping out of the boundaries of your public figure will not be seen in a good light.
+ <br>
+ <<link "Quietly deal with the slaves involved">>
+ <<set _result = 0>>
+ <<replace "#effect">>
+ Order your <<if $secHQ == 1>>security department<<else>>loyal subordinates<</if>> to find and permanently deal with the slave conspirators. This way your public person will not be involved in the aftermath and dangerous individuals will not be free to act against your institutions. That said covert ops like this will make your citizens doubt the efficacy of your security systems or even worse suspect foul play. <<if $blackOps == 1>>Your black ops team stands ready to carry out your orders<<else>>Hiring a black ops team to carry out the action will cost some cash<</if>>
+ <</replace>>
+ <</link>>
+ |
+ <<link "Tip the victim">>
+ <<set _result = 1>>
+ <<replace "#effect">>
+ Make the discovery reach the ears of the slave owner. This way you will stay out of the public eye, while the slaves residing in the arcology will witness the result of rebellious activity.
+ Revealing the depth of your control over the information flow and movements in the arcology will scare and anger many of your citizens, damaging your reputation. Furthermore, while tensions may subdue in the short term, public display of punishments may radicalize more slave.
+ <</replace>>
+ <</link>>
+ |
+ <<link "Publically punish the slaves">>
+ <<set _result = 2>>
+ <<replace "#effect">>
+ Act quickyl and harshly against those who would rise against their better. The slaves residing in the arcology will witness the result of rebellious activity, but many of your citizens will be concerned with your authoritarian actions against what is private property of one of your citizens. Furthermore, while tensions may subdue in the short term, such public display may radicalize more slave.
+ <</replace>>
+ <</link>>
+ <br>
+ <br>
+ <span id="effect">Click on a choice to see its effects</span>
+ <br>
+ <<link "Confirm">>
+ <<if _result == 0>>
+ <<if $blackOps == 0>>
+ <<set $cash -= 2500>>
+ <</if>>
+ <<set $slaveProgression += random(0,5)>>
+ <<set $tension += random(0,5)>>
+ <<set $security -= random(0,3)>>
+ <<elseif _result == 1>>
+ <<set $slaveProgression += random(2,8)>>
+ <<set $tension -= random(0,5)>>
+ <<set $rep -= random(1000,1500)>>
+ <<elseif _result == 2>>
+ <<set $slaveProgression += random(2,8)>>
+ <<set $tension -= random(0,5)>>
+ <<set $authority -= random(1000,1500)>>
+ <</if>>
+ <<goto "">>
+ <</link>>
+ <<elseif _select == 2>>
+ /* inflammatory graffiti */
+
+ <<else>>
+ /* escape attempt */
+
+ <</if>>
+<<case 2>>
+ /* med tension slave rebellion events */
+<<case 3>>
+ /* high tension slave rebellion events */
+<<case 4>>
+ /* low tension citizen rebellion events */
+<<case 5>>
+ /* med tension citizen rebellion events */
+<<case 6>>
+ /* high tension citizen rebellion events */
+<</switch>>
+
+
+
events:
Slaves:
low:
- -suspicious messages
- -inflammatory graffiti
- -suspicious movements in the night
+ -inflammatory material
+ -escape attempt
med:
-disappearing of weapons
-mysterious homicide
-rumors of slave assemblies
high:
-riots
- -warehouse night raids
+ -night raids
-burning of personal properties
\ No newline at end of file
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index 7926241c6fa..4d96d1ed560 100644
--- a/src/SecExp/securityHQ.tw
+++ b/src/SecExp/securityHQ.tw
@@ -98,20 +98,23 @@ Considering the current upgrades the resting level for security is <<print $secR
You have bought advanced cybersecurity algorithms that will defend your arcology against hack attempts or cyber frauds.
<</if>>
<br>
-<<if $secUpgrades.eyeScan == 0>>
- [[Install invisible eye scanners|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $secUpgrades.eyeScan = 1, $secRestPoint += 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>. 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), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>. Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.//
+<<if $rep > 10000>>
+ <<if $secUpgrades.eyeScan == 0>>
+ [[Install invisible eye scanners|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $secUpgrades.eyeScan = 1, $secRestPoint += 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>. 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), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>. 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>>
<<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>>
-
+ you lack the reputation to access more advanced upgrades.
+<</if>>
<br>
<br>
@@ -146,18 +149,22 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
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, $secHQUpkeep += $upgradeUpkeep]]
- <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>>
- 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), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <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.//
+<<if $rep > 10000>>
+ <<if $crimeUpgrades.autoTrial == 0>>
+ [[Install automated trials software|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <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>>
+ 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), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <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>>
+ 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>>
<<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.
+ you lack the reputation to access more advanced upgrades.
<</if>>
<br>
@@ -192,11 +199,15 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
You have installed advanced signal interception equipment.
<</if>>
<br>
-<<if $intelUpgrades.radar == 0>>
- [[Install advanced radar equipment|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>. Will increase recon capabilites, but will require 10 extra slaves in the headquarters and increases upkeep.//
+<<if $rep > 10000>>
+ <<if $intelUpgrades.radar == 0>>
+ [[Install advanced radar equipment|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>. Will increase recon capabilites, but will require 10 extra slaves in the headquarters and increases upkeep.//
+ <<else>>
+ You have installed sophisticated radar equipment.
+ <</if>>
<<else>>
- You have installed sophisticated radar equipment.
+ you lack the reputation to access more advanced upgrades.
<</if>>
<br>
@@ -231,16 +242,20 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap
You have bought rapid armored transport vehicles able to bring your troops to battle much quicker than before.
<</if>>
<br>
-<<if $readinessUpgrades.rapidPlatforms == 0>>
- [[Build rapid deployment platforms|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $readinessUpgrades.rapidPlatforms = 1, $readiness += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>. Will increase readiness, but will require 5 extra slaves in the headquarters and increases upkeep.//
-<<else>>
- You have built rapid deployment platforms able to equip and deploy units within very limited time windows.
-<</if>>
-<br>
-<<if $readinessUpgrades.earlyWarn == 0>>
- [[Institute early warning systems|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology), $readinessUpgrades.earlyWarn = 1, $readiness += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
- <br>//Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>. Will increase readiness, but will require 10 extra slaves in the headquarters and increases upkeep.//
+<<if $rep > 10000>>
+ <<if $readinessUpgrades.rapidPlatforms == 0>>
+ [[Build rapid deployment platforms|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $readinessUpgrades.rapidPlatforms = 1, $readiness += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs ¤<<print Math.trunc(10000*$upgradeMultiplierArcology)>>. Will increase readiness, but will require 5 extra slaves in the headquarters and increases upkeep.//
+ <<else>>
+ You have built rapid deployment platforms able to equip and deploy units within very limited time windows.
+ <</if>>
+ <br>
+ <<if $readinessUpgrades.earlyWarn == 0>>
+ [[Institute early warning systems|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology), $readinessUpgrades.earlyWarn = 1, $readiness += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]]
+ <br>//Costs ¤<<print Math.trunc(15000*$upgradeMultiplierArcology)>>. Will increase readiness, but will require 10 extra slaves in the headquarters and increases upkeep.//
+ <<else>>
+ You have created early warning systems that constantly analyze in real time data to determine the likeness of an attack.
+ <</if>>
<<else>>
- You have created early warning systems that constantly analyze in real time data to determine the likeness of an attack.
+ you lack the reputation to access more advanced upgrades.
<</if>>
\ No newline at end of file
--
GitLab