diff --git a/TODO.txt b/TODO.txt
index 593158bc9e258371636f59c5cf359654c75b7a02..9843c1d817d58734cc4047f367ce34a3bcbcce6c 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,6 +1,4 @@
-add fortifications?
--finish PC wound code
--finish mercenary recruits in report
-add random crimes as events
-min rep for upgrades
-renaming of units depending on FSs
@@ -8,8 +6,6 @@
-encyclopedia entries
-transport hub
-weapons manufactoring
--first battle
--make the mod toggleable
and big ones:
-rebellions
diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw
index 61f2514a8237e50c055cb9b6e00ed98bceba084f..962754d4e7f925b4bbc07a44104263c87407c9c1 100644
--- a/src/SecExp/SecExpBackwardCompatibility.tw
+++ b/src/SecExp/SecExpBackwardCompatibility.tw
@@ -5,7 +5,7 @@
<<set $authority = 0>>
<</if>>
<<if ndef $security>>
-<<set $security = 50>>
+<<set $security = 35>>
<</if>>
<<if ndef $secRestPoint>>
<<set $secRestPoint = 40>>
diff --git a/src/SecExp/attackGenerator.tw b/src/SecExp/attackGenerator.tw
index d4a0fb39829d7438a03cfe5a8b62b4403b78701d..25bc011ef517926ca16fd69b917147677ce56caa 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/attackHandler.tw b/src/SecExp/attackHandler.tw
index b583fe7696efb2d2e3da97c23f52108b871b5f5d..bcee3d121b2cac14ee88719223a901289c922da7 100644
--- a/src/SecExp/attackHandler.tw
+++ b/src/SecExp/attackHandler.tw
@@ -124,6 +124,7 @@
<<set _mercMod -= 0.2>>
<<set _enemyMod += 0.2>>
<<set $PCWounded = 1>>
+ <<set $woundCooldown = 3>>
<</if>>
<<elseif $leadingTroops == "assistant">>
<<if $rep < 10000 && $authority < 10000>>
diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw
index 74ae6bf53f86066d8ab9e246370afea7f4d9d0a2..52dd3941bc5bba206ecb9e3aabe1a8c284d2c106 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/attackReport.tw b/src/SecExp/attackReport.tw
index 437a4909334d5bd892b01cbdcfe673c7d39ced96..d48ae99e3bb0d6bccaabdf13caf700a4d48bb24c 100644
--- a/src/SecExp/attackReport.tw
+++ b/src/SecExp/attackReport.tw
@@ -646,7 +646,7 @@
<</if>>
<<if $PCWounded == 1>>
During the fighting @@.red;you were wounded@@. Your medics assure you it's nothing life threatening, but you'll be weakened for a few weeks.
- <<set $PCWoundCooldown = 6>>
+ <<set $PCWoundCooldown = 3>>
<</if>>
<<elseif $leadingTroops == "assistant">>
<<if $auto == 1>>$assistantName<<else>>You<</if>> let your personal assistant lead the troops.
@@ -742,6 +742,7 @@
<<elseif $woundType >= 4>>
While grave wounds, it seems she will be able to fully recover, given enough time.
<</if>>
+ Your troops were greatly affected by the loss of their leader.
<</if>>
<<elseif $leadingTroops == "headGirl">>
<<if $auto == 1>>$assistantName<<else>>You<</if>> decided it will be your head girl to lead the troops.
@@ -821,6 +822,7 @@
<<elseif $woundType >= 4>>
While grave wounds, it seems she will be able to fully recover, given enough time.
<</if>>
+ Your troops were greatly affected by the loss of their leader.
<</if>>
<<elseif $leadingTroops == "citizen">>
<<if $auto == 1>>$assistantName<<else>>You<</if>> decided to appoint one of your volunteers as the commander.
@@ -851,6 +853,9 @@
<<else>>
You mercenaries are not thrilled to be lead by a civilian without any formal martial training or education.
<</if>>
+ <<if $leaderWounded == 1>>
+ During the battle a stray bullet managed to reach the leader. Your troops were greatly affected by the loss.
+ <</if>>
<<elseif $leadingTroops == "mercenary">>
<<if $deployingMercs == 1>>
Your mercenaries of course approve of your decision.
@@ -863,6 +868,9 @@
<<if $arcologies[0].FSDegradationist != "unset" && $deployingSlaves == 1>>
Because of your degradationist society, your slave soldiers are highly distrustful of the gun for hire you forced them to accept as leader.
<</if>>
+ <<if $leaderWounded == 1>>
+ During the battle a stray bullet managed to reach the mercenary. Your troops were greatly affected by the loss of their leader.
+ <</if>>
<</if>>
<br><br>
@@ -1262,7 +1270,6 @@
/* resets variables */
<<set $leaderWounded = 0>>
-<<set $PCWounded = 0>>
<<set $gainedWarfare = 0>>
<<set $woundType = 0>>
<<set $tacticsSuccessful == 0>>
diff --git a/src/SecExp/authorityReport.tw b/src/SecExp/authorityReport.tw
index f37349b25663713d2348167b3d7220a2deedc459..2c3e1cbd3f422c4d5b8fe647267abe1a0877fdba 100644
--- a/src/SecExp/authorityReport.tw
+++ b/src/SecExp/authorityReport.tw
@@ -1,5 +1,9 @@
:: authorityReport [nobr]
+<<if $useTabs == 0>>__Authority__<</if>>
+<br>
+
+
<<if $authority > 19500>>
Your authority is nearly absolute. The arcology is yours to command as it pleases you.
<<elseif $authority > 15000>>
diff --git a/src/SecExp/propagandaHub.tw b/src/SecExp/propagandaHub.tw
index 5a6ad2f42932863924ca22b59c2c9e2efdd1ba47..1df92bcc8968466c5edbf16b30be577c30c4f8d7 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
new file mode 100644
index 0000000000000000000000000000000000000000..4b145da85377c1525db71e4fb2e047ce914d6906
--- /dev/null
+++ b/src/SecExp/rebellionEventGenerator.tw
@@ -0,0 +1,141 @@
+:: 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 */
+
+<<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>>
+
+/* 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/secExpEvents.tw b/src/SecExp/secExpEvents.tw
new file mode 100644
index 0000000000000000000000000000000000000000..8b5410dd1a4ee5331abf0a21757bdb3acb92000d
--- /dev/null
+++ b/src/SecExp/secExpEvents.tw
@@ -0,0 +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:
+ -inflammatory material
+ -escape attempt
+ med:
+ -disappearing of weapons
+ -mysterious homicide
+ -rumors of slave assemblies
+ high:
+ -riots
+ -night raids
+ -burning of personal properties
\ No newline at end of file
diff --git a/src/SecExp/secInit.tw b/src/SecExp/secInit.tw
index cafe26bb08496acaf0937ae7012a3111bd681f8d..0053d96765355a6fa9b037db036b063d7dbe02bd 100644
--- a/src/SecExp/secInit.tw
+++ b/src/SecExp/secInit.tw
@@ -2,7 +2,7 @@
/* base vars */
<<set $authority = 0>>
-<<set $security = 50>>
+<<set $security = 35>>
<<set $secRestPoint = 40>>
<<set $crime = 20>>
<<set $crimeCap = 100>>
diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw
index 7926241c6faacb50cdd532e12e906955ff5b9f7d..4d96d1ed560817dd4253532f2e6bc59e496e6ecc 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
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index 06dbf5ae1cac8fba740543d2f3b199b3c1d45ace..e5245fd733f1828400136981da9b15e2763078ed 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -9,6 +9,8 @@
<<set _crimeGrowth = 0>>
<<set _crimeCap = 0>>
<<set _newCrime = 0>>
+<<set _recruits = 0>>
+<<set _newMercs = 0>>
<<if $useTabs == 0>>__Security__<</if>>
<br>
@@ -104,6 +106,8 @@
<</if>>
<<if _secRest < $secRestPoint && $secHQ == 1>>
The limited staff assigned to the HQ hampers the improvements to security achieved this week.
+<<elseif _secRest < $secRestPoint>>
+ The limited infrastructure available slowly erodes the security level of the arcology.
<</if>>
<<set _restGrowth = (_secRest - $security) * 0.2>>
<<set _newSec = Math.trunc($security + _secGrowth + _secRest)>>
@@ -136,11 +140,11 @@
The low prosperity of the arcology facilitates criminal recruitment and organization.<<set _crimeGrowth += 2>>
<<elseif $arcologies[0].prosperity < 80>>
The fairly low prosperity of the arcology facilitates criminal recruitment and organization.<<set _crimeGrowth += 1>>
-<<elseif $arcologies[0].prosperity < 12>>
+<<elseif $arcologies[0].prosperity < 120>>
The prosperity of the arcology is not high or low enough to have significant effects on criminal recruitment and organization.
-<<elseif $arcologies[0].prosperity < 16>>
+<<elseif $arcologies[0].prosperity < 160>>
The prosperity of the arcology is high enough to provide its citizens a decent life, hampering criminal recruitment and organization.<<set _crimeGrowth -= 0.5>>
-<<elseif $arcologies[0].prosperity < 18>>
+<<elseif $arcologies[0].prosperity < 180>>
The prosperity of the arcology is high enough to provide its citizens a decent life, significantly hampering criminal recruitment and organization.<<set _crimeGrowth -= 1>>
<<else>>
The prosperity of the arcology is high enough to provide its citizens a very good life, significantly hampering criminal recruitment and organization.<<set _crimeGrowth -= 2>>
@@ -203,6 +207,7 @@
<br>
<<if $militiaFounded == 1 || $activeUnits >= 1>>
+ /* militia */
<strong>Military</strong>:
<<if $recruitVolunteers == 1>>
Your militia accepts only volunteering citizens, ready to defend their arcology.
@@ -308,6 +313,43 @@
There are not many more citizens able to join the arcology armed forces. You'll need to enact higher recruitment edicts if you need more manpower.
<</if>>
<</if>>
+
+ /* mercs */
+ <<if $mercenaries >= 1>>
+ <<set _newMercs = random(0,3)>>
+ <<if $rep < 6000>>
+ Your low reputation turns some mercenaries away, hoping to find contracts that would bring them more renown.<<set _newMercs -= 1>>
+ <<elseif $rep < 12000>>
+ Your reputation is not high enough to attract many mercenaries to your free city.
+ <<else>>
+ Your reputation attracts many guns for hire who would be proud to have such distinct character on their resume.<<set _newMercs += 1>>
+ <</if>>
+ <<if $arcologies[0].prosperity < 50>>
+ The low prosperity of the arcology discourages new guns for hire from coming to your arcology.<<set _newMercs -= 1>>
+ <<elseif $arcologies[0].prosperity < 80>>
+ The fairly low prosperity of the arcology discourages new guns for hire from coming to your arcology.<<set _newMercs += 1>>
+ <<elseif $arcologies[0].prosperity < 120>>
+ The prosperity of the arcology attracts a few mercenaries, hopeful to find lucrative contracts within its walls.<<set _newMercs += random(1,2)>>
+ <<elseif $arcologies[0].prosperity < 160>>
+ The fairly high prosperity of the arcology attracts some mercenaries, hopeful to find lucrative contracts within its walls.<<set _newMercs += random(2,3)>>
+ <<elseif $arcologies[0].prosperity < 180>>
+ The high prosperity of the arcology is attracts some mercenaries, hopeful to find lucrative contracts within its walls.<<set _newMercs += random(2,4)>>
+ <<else>>
+ The very high prosperity of the arcology attracts a lot of mercenaries, hopeful to find lucrative contracts within its walls.<<set _newMercs += random(3,5)>>
+ <</if>>
+ <<if $crime > 60>>
+ The powerful crime organizatiosn that nested themselves in the arcology have an unending need for cheap guns for hire, many mercenaries flock to your free city in search of employment.<<set _newMercs += random(1,2)>>
+ <</if>>
+ <<if _newMercs > 0>>
+ <<set $mercTotalManpower += _recruits>>
+ <<set $mercFreeManpower += _recruits>>
+ This week <<print _newMercs>> citizens joined the militia.
+ <<else>>
+ This week no new mercenaries reached the arcology.
+ <</if>>
+ <</if>>
+
+ /* training */
<<if $secBarracksUpgrades.training >= 1>>
<<if $secBarracksUpgrades.training == 1>>
<<set _sL = $slaveUnits.length>>
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 05c28390404e528b50933e4f70a04d4e4e2d330b..0ebbb36858033a8b142ed5957d7a623fd4322648 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -19,9 +19,6 @@ window.getCost = function(array) {
var dairy = State.variables.dairy;
var servantsQuarters = State.variables.servantsQuarters;
var incubator = State.variables.incubator;
- var propHQ = State.variables.propHub;
- var secHQ = State.variables.secHQ;
- var secBarracks = State.variables.secBarracks;
var mercCosts = State.variables.mercenaries * 2000;
var policyCost = State.variables.policyCost;
var costs = (State.variables.brothel * facilityCost)
@@ -65,13 +62,13 @@ window.getCost = function(array) {
}
//security expansion
- if(propHQ > 0) {
+ if(State.variables.propHub > 0) {
costs += State.variables.propHubUpkeep;
}
- if(secHQ > 0) {
+ if(State.variables.secHQ > 0) {
costs += State.variables.secHQUpkeep + 20 * state.variables.secHelots;
}
- if(secBarracks > 0) {
+ if(State.variables.secBarracks > 0) {
costs += State.variables.secBarracksUpkeep;
}
for (var i = 0; i < State.variables.militiaUnits.length; i++) {
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 81c80254dd61e69202fd94d3d866a54baa1e5899..72bf11e13685ecdc4ddb39da9f438a6b23a1957b 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -37,7 +37,10 @@
<</if>>
<<include "Reputation">>
-
+<<if $secExp == 1>>
+<br><br>
+<<include "authorityReport">>
+<</if>>
<br><br>
@@ -68,10 +71,9 @@
<<if $corpAnnounced == 1>>
<button class="tablinks" onclick="opentab(event, 'Corporation')">Corporation</button>
<</if>>
- <<if $secExp == 1>>
- <button class="tablinks" onclick="opentab(event, 'Reputation')">Reputation and Authority</button>
- <<else>>
<button class="tablinks" onclick="opentab(event, 'Reputation')">Reputation</button>
+ <<if $secExp == 1>>
+ <button class="tablinks" onclick="opentab(event, 'Authority')">Authority</button>
<</if>>
<button class="tablinks" onclick="opentab(event, 'Management')">Arcology Management</button>
<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
@@ -117,6 +119,12 @@ You have not yet committed funds to create a publicly traded slave trading corpo
</div>
</div>
+<div id="Authority" class="tabcontent">
+<div class="content">
+<<include "authorityReport">>
+</div>
+</div>
+
<div id="Management" class="tabcontent">
<div class="content">
<<include "Arcology Management">>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index aab2870f4d757187a7b85ef6280031d32ea16717..2f2665c835636fc5afd3ad41ae8f62808f0f4f16 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -357,10 +357,18 @@ Curative side effects are @@.red;DISABLED@@. [[Enable|Options][$curativeSideEffe
<<include "SecExpBackwardCompatibility">>
<<goto "Options">>
<</link>>
+<<elseif ndef $secExp>>
+ <<set $secExp = 0>>
+ The Security Expansion mod is @@.red;DISABLED@@.
+ <<link "Enable">>
+ <<set $secExp = 1>>
+ <<include "SecExpBackwardCompatibility">>
+ <<goto "Options">>
+ <</link>>
<<else>>
The Security Expansion Mod is currently @@.cyan;ENABLED@@. [[Disable|Options][$secExp = 0]]
<</if>>
-//The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game. If this is the first time activating the mod or you are updating an old save, please run backward compatibility.//
+//The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game.//
<br><br>
''CHEATING/DEV OPTIONS''
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 64ddb494c168306a6f2105c14c0ef480a3237d64..8b48a124580d119fc267941cfdbc90dfb9526417 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -3,6 +3,21 @@
<<if $useTabs == 0>>__Personal Business__<</if>>
<br>
+<<if $PCWounded == 1>>
+ <<set $PCWoundCooldown-->>
+ <<if $PCWoundCooldown > 0>>
+ The injuries received in the recent battle prevents you from engaging in tiring endeavours.
+ <</if>>
+ <<if $PCWoundCooldown == 1>>
+ You are starting to feel better. It's very likely you will be back to full working order within the next week.
+ <<elseif $PCWoundCooldown == 0>>
+ <<set $PCWounded = 0>>
+ You finally recovered from your injuries.
+ <<else>>
+ Your trusted physician believes it will still take a few weeks to fully recover.
+ <</if>>
+<</if>>
+
<<if $cash < 0>>
@@.red;You are in debt.@@ This week, interest came to ¤<<print (1+Math.trunc(Math.abs($cash)/100))>>.
<<set $cash -= (1+Math.trunc(Math.abs($cash)/100))>>
@@ -22,6 +37,8 @@
<<set $gameover = "debt">><<goto "Gameover">>
<</if>>
<</if>>
+<<elseif $PCWounded == 1>>
+ /* does nothing for this week */
<<elseif ($personalAttention == "whoring")>>
<<if $PC.belly >= 1500>>
<<if $arcologies[0].FSRepopulationFocus != "unset">>
@@ -356,7 +373,9 @@
You have enough cash to manage your affairs, but not enough to do much business.
<</if>>
-<<if ($personalAttention == "trading")>>
+<<if $PCWounded == 1>>
+ /* does nothing this week */
+<<elseif ($personalAttention == "trading")>>
<<set _oldSkill = $PC.trading>>
<<set $PC.trading += random(1,3)>>
<<if _oldSkill <= 10>>
@@ -576,7 +595,7 @@
<<if $marketInfiltration == 1>>
Your secret service makes use of black markets and illegal streams of goods to make a profit, making you @@.yellowgreen;¤a discreet sum@@. This however allows @@.red;crime to flourish@@ in the underbelly of the arcology.
<<set $cash += 1000>>
- <<set $crime += random(0,1)>>
+ <<set $crime += random(0,2)>>
<</if>>
Routine upkeep of your demesne costs @@.yellow;¤$costs.@@
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 480aa8567be1958ab59dbc9802fb1b4030e89e79..7074419738e6c8d942e65207208affb24b31ebbd 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -667,10 +667,4 @@ On formal occasions, you are announced as $PCTitle.
<<elseif $failedElite > 50>>
The Societal Elite @@.red;mutter about you@@.
<</if>>
-<</if>>
-
-<br><br>
-
-<<if $secExp == 1>>
-<<include "authorityReport">>
<</if>>
\ No newline at end of file
diff --git a/src/utility/descriptionWidgets.tw b/src/utility/descriptionWidgets.tw
index a2b1c8e7116955b2af5c2242497f8f54add72a36..f0b8d1498c0e7c3a64017a0323d7b479e0d0604b 100644
--- a/src/utility/descriptionWidgets.tw
+++ b/src/utility/descriptionWidgets.tw
@@ -2,6 +2,9 @@
<<widget "MainLinks">>
<center>
+<<if $PCWounded == 1>>
+ The injuries received in the recent battle prevent you from undertaking tiring efforts.
+<<else>>
<<switch $personalAttention>>
<<case "business">>You plan to focus on business this week.
<<case "whoring">>You plan to focus on earning extra money this week.
@@ -175,6 +178,7 @@
<br>@@.yellow;For your first purchase, @@<strong>[[The Futanari Sisters][$slavesSeen += 1]]</strong>@@.yellow; will sell at half price this week.@@
<</if>>
<</if>>
+<</if>> /* closes wound check */
</center>
<</widget>>