working on options

Security expansion documentation.txt

-
-
-$maxTurns:
-The maximum number of "turns" the battle is allowed to continue. In practice the number of loops attackHandler goes through to determine the victor.
-
-$battleResult:
--3	defeat					(either our morale or hp reached 0 or below)
--2	partial defeat 			(the battle lasted more than $maxTurns and enemy morale was higher)
--1 	surrender				(the player chose to surrender)
-0	failed bribery			(not enough money or wrong enemy, eg. freedom figthers)
-1	successful bribery		(enemy bribed)
-2	partial victory			(the battle lasted more than $maxTurns and our morale was higher)
-3	victory					(either enemy morale or hp reached 0 or below)
\ No newline at end of file

TODO.txt

@@ -4,3 +4,7 @@
 -min rep for upgrades
 -renaming of units depending on FSs
 -gender fundamentalism does not allow women in army/gerder radicalism does?
+-encyclopedia entries
+-PC wounds
+-transport hub
+-weapons manufactoring

src/SecExp/attackOptions.tw

@@ -2,100 +2,48 @@
 
 <strong>Attack Imminent</strong>
 <hr>
-The ominous message dominates the screens of your office, <<print $assistantName>> quickly gathers all information available to prepare your arcology for battle.
+The ominous message dominates the screens of your office, <<print $assistantName>> quickly gathers all information available to prepare for battle.
 <<if $attackType == "raiders">>
-	<<if $riskSim == 1 && $riskSimExpectedAttack == $attackType>>
+	<<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 weeks in advance, the risk simulation system did its job admirably.
-	<<elseif $perimeterDrones == 1>>
-		Your drones easily spot the disorganized horde of raiders riding their ragtag vehicles. 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:
-	<br>&nbsp;- high attack
-	<br>&nbsp;- low defense
-	<br>&nbsp;- low toughness
-	<br>&nbsp;- low morale
+	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 $riskSim == 1 && $riskSimExpectedAttack == $attackType>>
-		A menacing column of consumed mercenaries and slavers is coming to your city. Another free city is ready to use their best tools to bring down a dangerous competitor.
-		Fortunately you knew of their coming weeks in advance, the risk simulation system did its job admirably.
-	<<elseif $perimeterDrones == 1>>
-		Your drones easily spot the menacing column of consumed mercenaries and slavers. Another free city is ready to use their best tools to bring down a dangerous competitor.
+	<<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 expedition:
-	<br>&nbsp;- low attack
-	<br>&nbsp;- high defense
-	<br>&nbsp;- moderate toughness
-	<br>&nbsp;- moderate morale
+	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 $riskSim == 1 && $riskSimExpectedAttack == $attackType>>
+	<<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 weeks in advance, the risk simulation system did its job admirably.
-	<<elseif $perimeterDrones == 1>>
-		Your drones easily spot 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.
+		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:
-	<br>&nbsp;- very high attack
-	<br>&nbsp;- low defense
-	<br>&nbsp;- moderate toughness
-	<br>&nbsp;- very high morale
+	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 $riskSim == 1 && $riskSimExpectedAttack == $attackType>>
+	<<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 weeks in advance, the risk simulation system did its job admirably.
-	<<elseif $perimeterDrones == 1>>
-		Your drones easily spot 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. 
+		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 expedition:
-	<br>&nbsp;- high attack
-	<br>&nbsp;- high defense
-	<br>&nbsp;- low toughness
-	<br>&nbsp;- low morale
-<<elseif $attackType == "mercenary">>
-	<<if $riskSim == 1 && $riskSimExpectedAttack == $attackType>>
-		Some sections of the lower levels were already no longer responding. In the end it happened, your own mercenaries took arms against their benefactor. 
-		Fortunately you knew of their coming weeks in advance, the risk simulation system did its job admirably.
-	<<elseif $perimeterDrones == 1>>
-		Your drones easily spot the nervous movement of mercenary units assembling in the lower levels. In the end it happened, your own mercenaries took arms against their benefactor.
-	<<else>>
-		Some of your citizens, terrified by the movements of mercenary units in the lower levels, were gathering near the entrance of your penthouse. In the end it happened, your own mercenaries took arms against their benefactor.
-	<</if>>
-<<elseif $attackType == "citizen">>
-	<<if $riskSim == 1 && $riskSimExpectedAttack == $attackType>>
-		The streets were already clogged with citizens armed to the teeth, ready to oust their owner. In the end it happened, your own citizens dared took arms against their arcology owner.
-		Fortunately you knew of their coming weeks in advance, the risk simulation system did its job admirably.
-	<<elseif $perimeterDrones == 1>>
-		Your drones easily spot the tumultuos mobs of armed citizens invading the streets. In the end it happened, your own citizens dared took arms against their arcology owner.
-	<<else>>
-		Some of your citizens, terrified by the mobs of armed rebels, were gathering near the entrance of your penthouse. In the end it happened, your own citizens dared took arms against their arcology owner.
-	<</if>>
-<<elseif $attackType == "slave">>
-	<<if $riskSim == 1 && $riskSimExpectedAttack == $attackType>>
-		Reports from all over the arcology are pouring in, filled with slaves assaulting, killing and butchering your citizens. In the end it happened, the slaves dared attack their betters.
-		Fortunately you knew of their coming weeks in advance, the risk simulation system did its job admirably.
-	<<elseif $perimeterDrones == 1>>
-		Your drones easily spot inumerable instances of slaves assaulting, killing and butchering your citizens. In the end it happened, the slaves dared attack their betters.
-	<<else>>
-		Some of your citizens, terrified by the mass of slaves assaulting, killing and butchering their fellow citizens, were gathering near the entrance of your penthouse. In the end it happened, the slaves dared attack their betters
-	<</if>>
+	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>>
-
-	<<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>
 It seems your troops and your adversary will fight
 <<if $battleTerrain == "urban">>
@@ -112,10 +60,6 @@ It seems your troops and your adversary will fight
 	in <strong>the mountains</strong> overlooking the arcology.
 <<elseif $battleTerrain == "wasteland">>
 	in <strong>the wastelands</strong> outside the free city territory.
-<<elseif $battleTerrain == "err">>
-	Error: failed to assign terrain
-<<else>>
-	Error: failed to read terrain, battleTerrain reads <<print $battleTerrain>>
 <</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.

src/SecExp/seaAttackHandler.tw

-:: seaAttackHandler [nobr]
\ No newline at end of file

src/events/intro/terrainIntro.tw

@@ -59,6 +59,6 @@ Finally, a few Free Cities have been carved out from old world cities. Urban dec
 <br>&nbsp;&nbsp;&nbsp;&nbsp;Moderate ease of commerce with the old world.
 <br>&nbsp;&nbsp;&nbsp;&nbsp;@@.red;Very low@@ access to refugees and other desperate people.
 <br>&nbsp;&nbsp;&nbsp;&nbsp;@@.green;Very high@@ cultural independence.
-<br>&nbsp;&nbsp;&nbsp;&nbsp;Ensures access to slaves from all over the world and will not associate the arcology with a continent.
+<br>&nbsp;&nbsp;&nbsp;&nbsp;Ensures access to slaves from all over the world and will not associate the arcology with a continent. Oceanic arcologies will be subjects of attacks.
 
 <</if>>

src/gui/mainMenu/AlphaDisclaimer.tw

@@ -4,6 +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//@@
 
 ''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/.