diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index d70a423d2155e1ff03b015b5a81df58af2a5cbf6..74ae6bf53f86066d8ab9e246370afea7f4d9d0a2 100644
--- a/src/SecExp/attackOptions.tw
+++ b/src/SecExp/attackOptions.tw
@@ -40,15 +40,11 @@ The ominous message dominates the screens of your office, <<print $assistantName
<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>>
-<<if $hasFoughtOnce != 1>>
- <br>
- This is your first battle as an arcology owner, <<print $assistantName>> suggests reviewing the meaning of all the data laying in front of you: [[Battle statistics and mechanics|secTutorial]]
-<</if>>
-<hr>
+
+<br><br>
+
It seems your troops and your adversary will fight
-<<if $battleTerrain == "urban">>
- in <strong>the streets of <<if $terrain == "urban">>the old world city surrounding the arcology<<else>>of the free city<</if>>.</strong>
-<<elseif $battleTerrain == "rural">>
+<<if $battleTerrain == "rural">>
in <strong>the rural land</strong> surrounding the free city.
<<elseif $battleTerrain == "hills">>
on <strong>the hills</strong> around the free city.
@@ -61,22 +57,17 @@ It seems your troops and your adversary will fight
<<elseif $battleTerrain == "wasteland">>
in <strong>the wastelands</strong> outside the free city territory.
<</if>>
-<<if $riskSim == 1 && $riskSimExpectedAttack == $attackType>>
- Your sophisticated virtual simulations and advanced recon drones allows you to accurately predict the numbers you're about to face.Approximately <strong><<print Math.round($attackTroops * (1 + either(-1,1) * 0.1))>> men</strong> are coming.
-<<elseif $perimeterDrones ==1>>
- Thanks to your drones you have a rough estimate of the numbers you're about to face. Around <strong><<print Math.round($attackTroops * (1 + either(-1,1) * random(2) * 0.1))>> men</strong> are coming
-<<else>>
- Unfortunately you have no good information on what is coming your way, the confused reports of your citizens gives you only a vague number. Around <strong><<print Math.round($attackTroops * (1 + either(-1,1) * random(3) * 0.1))>> men</strong> are coming.
-<</if>>
-They seems to be
<<set _expectedEquip = 0>>
-<<if $riskSim == 1 && $riskSimExpectedAttack == $attackType>>
- <<set _expectedEquip = $attackEquip>>
-<<elseif $perimeterDrones == 1>>
- <<set _expectedEquip = $attackEquip + either(-1,1)>>
+<<if $recon == 3>>
+ Your recon capabilities are top notch. The information collected will be most likely correct or very close to be so:<<set _expectedEquip = $attackEquip + random(-1,1)>>
+<<elseif $recon == 2>>
+ Your recon capabilities are decent. The information collected will be mostly close to the truth:<<set _expectedEquip = $attackEquip + random(-1,2)>>
+<<elseif $recon == 1>>
+ Your recon capabilities are fairly low. The information collected will be quite inaccurate:<<set _expectedEquip = $attackEquip + random(-2,2)>>
<<else>>
- <<set _expectedEquip = $attackEquip + either(-1,1) * random(2)>>
+ Your recon capabilities are almost non-existent. The information collected will be wild guesses at best:<<set _expectedEquip = $attackEquip + random(-2,3)>>
<</if>>
+approximately <strong><<print Math.round($attackTroops * (1 + either(-1,1) * (random(3,4) - $recon) * 0.1))>> men</strong> are coming, they seems to be
<<if _expectedEquip <= 0>>
<strong>poorly armed</strong>. old rusty small arms are the norm with just a few barely working civilian vehicles.
<<elseif _expectedEquip == 1>>
@@ -89,11 +80,9 @@ They seems to be
<strong>extremely well armed</strong>. excellent small arms and specialized teams with heavy duty infantry support weapons. Heavy presence of armored military vehicles, artillery pieces and even some attack helicopters.
<</if>>
-<br><br>
+<hr>
You quickly lay down a plan of action:
-<br>
-
<br><br>
/* leader assignment */
@@ -140,8 +129,7 @@ You quickly lay down a plan of action:
/* troop deployment */
<br><br>
With your current readiness level you can <<if $deployedUnits > 0>>still<</if>> send <strong><<print $deployableUnits>></strong> units.
-<br>
-
+<br>Deployable units:
<<set _mL = $militiaUnits.length>>
<<set _sL = $slaveUnits.length>>
<<set _meL = $mercUnits.length>>
@@ -202,7 +190,7 @@ With your current readiness level you can <<if $deployedUnits > 0>>still<</if>>
Unit roster full.
<</if>>
-<br>
+<br><br>
Units about to be deployed:
<<if $deployedUnits > 0>>
diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw
index 62c589bc256430992ec16a5673efd3e2f67d265c..437a4909334d5bd892b01cbdcfe673c7d39ced96 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -321,7 +321,7 @@
<<set $cash += 20000>>
<</if>>
<br>
- @@.red;Damage to the city was virtually non-existent@@, costing only pocket cash to bring the structure back to normal. The inhabitants as well reported little to no injuries, because of this the prosperity of the arcology did not suffer.
+ Damage to the infrastructure was @@.yellow;virtually non-existent@@, costing only pocket cash to bring the structure back to normal. The inhabitants as well reported little to no injuries, because of this the prosperity of the arcology did not suffer.
<<set $cash -= 1000>>
<<if $PCvictoryStreak >= 3>>
It seems your victories over the constant threats directed your way is having @@.green;a positive effect on the prosperity of the arcology@@, due to the security your leadership affords.
@@ -503,7 +503,7 @@
<<set $authority -= 600>>
<</if>>
<br>
- Fortunately the arcology survives @@.red;mostly intact@@, however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days.
+ Fortunately the arcology survives @@.yellow;mostly intact@@, however reports of @@.red;mass looting and killing of citizens@@ flood your office for a few days.
<<set $cash -= 1000>>
<<if $week <= 30>>
<<set $ACitizens -= random(80)>>
@@ -1257,16 +1257,6 @@
<<set $helots += _captives>>
<<replace "#captOptions">>Captives added as menial slaves<</replace>>
<</link>>
- <<if _candidates > 0>>
- |
- <<link "keep them and sell the rest|not implemented yet">>
-
- <</link>>
- |
- <<link "keep them and keep the rest as menial slaves|not implemented yet">>
-
- <</link>>
- <</if>>
</span>
<</if>>
diff --git a/src/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw
index 9b4a6bb0aabbc45dceb9883b454c382040a05a66..fce0ace87ce8e3ac6214343d795f218383c7aea4 100644
--- a/src/gui/mainMenu/AlphaDisclaimer.tw
+++ b/src/gui/mainMenu/AlphaDisclaimer.tw
@@ -4,7 +4,7 @@
//version $ver build $releaseID//
@@.green;//Mod: expanded age ranges and other tweaks 2016-08-30//@@ @@.darkred;+SV@@
@@.green;//Mod: extra preg content and other crap//@@
-@@.greem;//Mod: Security Expansion//@@
+@@.green;//Mod: Security Expansion//@@
''This is an alpha.'' That means the game is missing content, is full of bugs, is imbalanced, and is generally in an incomplete state. The game will keep a start of turn autosave. If you encounter a bug, I strongly recommend you reload your start of turn autosave immediately. Bugs will occasionally cause a bugged slave named $activeSlave.slaveName (or similar) to appear. If this happens, use the "Discard her" option on the slave menu to get rid of her. Then, please report the circumstances (especially what random event you just saw) to the dev. Please submit your feedback and bug reports at https://www.reddit.com/r/freecitiesgame/ or at https://freecitiesblog.blogspot.com/.
diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw
index 51749054731375272a59edd030a370385b61338b..97d9629487a56ea0b7a8a9e76d99afaaa61e344a 100644
--- a/src/uncategorized/manageArcology.tw
+++ b/src/uncategorized/manageArcology.tw
@@ -87,14 +87,13 @@ __Construction__
You have installed the FCTV receiver and have access to the full range of FCTV's programs. Low viewership rates amongst your citizens limits the impact of FCTV on your societal goals.
<</if>>
-<br>
-/* fortifications */
/* security */
<<if $propHub == 0>>
<br>
[[Set up the propaganda Hub|Manage Arcology][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $propHub = 1]]
- //Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
+ //Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>.//
+ <br>//Building specialized in the management of authority.//
<<else>>
<br>
The [[Propaganda Hub|propagandaHub]] is ready to manipulate reality on your command.
@@ -102,7 +101,8 @@ __Construction__
<<if $secHQ == 0>>
<br>
[[Set up the security headquarters|Manage Arcology][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $secHQ = 1]]
- //Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
+ //Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>.//
+ <br>//Building specialized in the management of security and crime.//
<<else>>
<br>
The [[security HQ|securityHQ]] is constantly working to protect your arcology.
@@ -111,6 +111,7 @@ __Construction__
<br>
[[Set up the barracks|Manage Arcology][$cash -= Math.trunc(5000*$upgradeMultiplierArcology), $secBarracks = 1]]
//Costs ¤<<print Math.trunc(5000*$upgradeMultiplierArcology)>>//
+ <br>//Building specialized in the management of armed forces.//
<<else>>
<br>
The [[barracks|secBarracks]] patiently await your orders.
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 117392d9d6adb53df5ec6a0e8e3d815caa684e5f..9b84bd8dad16f975ababa97ae7991d945bbb3dfb 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -200,45 +200,45 @@
<<set $authority = Math.clamp(Math.trunc($authority), 0, 20000)>>
<span id="auth">
<<if $authority > 19500>>
- @@color:rgb(148,0,211);divine will@@
+ @@color:rgb(148, 0, 211);divine will@@
<<elseif $authority > 19000>>
- @@color:rgb(148,0,211);sovereign@@
+ @@color:rgb(148, 0, 211);sovereign@@
<<elseif $authority > 18000>>
- @@color:rgb(148,0,211);monarch@@
+ @@color:rgb(148, 0, 211);monarch@@
<<elseif $authority > 17000>>
- @@color:rgb(148,0,211);tyrant@@
+ @@color:rgb(148, 0, 211);tyrant@@
<<elseif $authority > 15000>>
- @@color:rgb(148,0,211);dictator@@
+ @@color:rgb(148, 0, 211);dictator@@
<<elseif $authority > 14000>>
- @@color:rgb(148,0,211);prince@@
+ @@color:rgb(148, 0, 211);prince@@
<<elseif $authority > 13000>>
- @@color:rgb(148,0,211);master@@
+ @@color:rgb(183, 0, 211);master@@
<<elseif $authority > 12000>>
- @@color:rgb(148,0,211);leader@@
+ @@color:rgb(183, 0, 211);leader@@
<<elseif $authority > 11000>>
- @@color:rgb(148,0,211);director@@
+ @@color:rgb(183, 0, 211);director@@
<<elseif $authority > 10000>>
- @@color:rgb(148,0,211);overseer@@
+ @@color:rgb(183, 0, 211);overseer@@
<<elseif $authority > 9000>>
- @@color:rgb(148,0,211);chief@@
+ @@color:rgb(183, 0, 211);chief@@
<<elseif $authority > 8000>>
- @@color:rgb(148,0,211);manager@@
+ @@color:rgb(183, 0, 211);manager@@
<<elseif $authority > 7000>>
- @@color:rgb(148,0,211);principal@@
+ @@color:rgb(211,0,204);principal@@
<<elseif $authority > 6000>>
- @@color:rgb(148,0,211);auxiliary@@
+ @@color:rgb(211,0,204);auxiliary@@
<<elseif $authority > 5000>>
- @@color:rgb(148,0,211);subordinate@@
+ @@color:rgb(211,0,204);subordinate@@
<<elseif $authority > 4000>>
- @@color:rgb(148,0,211);follower@@
+ @@color:rgb(211,0,204);follower@@
<<elseif $authority > 3000>>
- @@color:rgb(148,0,211);powerless@@
+ @@color:rgb(211,0,204);powerless@@
<<elseif $authority > 2000>>
- @@color:rgb(148,0,211);toothless@@
+ @@color:rgb(211,0,204);toothless@@
<<elseif $authority > 1000>>
- @@color:rgb(148,0,211);mostly harmless@@
+ @@color:rgb(211,0,204);mostly harmless@@
<<else>>
- @@color:rgb(148,0,211);harmless@@
+ @@color:rgb(211,0,204);harmless@@
<</if>>
(<<print $authority>>)
</span>