diff --git a/src/SecExp/rebellionGenerator.tw b/src/SecExp/rebellionGenerator.tw
index 42d83bfda29a29748156c7afcc74314525504972..7fef4f15e5f97037ea0e1b29ab24ccf122db7c6a 100644
--- a/src/SecExp/rebellionGenerator.tw
+++ b/src/SecExp/rebellionGenerator.tw
@@ -20,17 +20,17 @@
<<else>>
Your absolute authority does not allow slaves to have a single free thought.<<set _slave += 1>>
<</if>>
-<<if _CSratio <= 0.2>>
+<<if _CSratio <= 0.4>>
There are a lot more slaves than citizens, making some doubt their masters are strong enough to stop them.<<set _slave += 30>>
-<<elseif _CSratio <= 0.4>>
- There are a lot more slaves than citizens, making some doubt their masters are strong enough to stop them.<<set _slave += 25>>
<<elseif _CSratio <= 0.6>>
- There are more slaves than citizens, making some doubt their masters are strong enough to stop them.<<set _slave += 20>>
+ There are a lot more slaves than citizens, making some doubt their masters are strong enough to stop them.<<set _slave += 25>>
<<elseif _CSratio <= 0.8>>
- There are more slaves than citizens, making some doubt their masters are strong enough to stop them.<<set _slave += 15>>
+ There are more slaves than citizens, making some doubt their masters are strong enough to stop them.<<set _slave += 20>>
<<elseif _CSratio <= 1>>
+ There are more slaves than citizens, making some doubt their masters are strong enough to stop them.<<set _slave += 15>>
+<<elseif _CSratio <= 1.5>>
There are fewer slaves than citizens, making some doubt they would be strong enough to defeat their masters.<<set _slave += 10>>
-<<elseif _CSratio >= 1.2>>
+<<elseif _CSratio >= 3>>
There are fewer slaves than citizens, making some doubt they would be strong enough to defeat their masters.<<set _slave -= 5>>
<<else>>
Citizen and slave population is sufficiently balanced not to cause problems either way.<<set _slave -= 1>>
@@ -110,11 +110,11 @@
Many of your more conservative citizens do not enjoy the cultural freedom you afford the residents of the arcology.<<set _citizen += either(20,30)>>
<</if>>
<<if $arcologies[0].FSRestart != "unset">>
- <<if _CSratio > 1>>
+ <<if _CSratio > 2>>
Your citizens are not happy with the noticeable lack of slaves compared to their numbers.<<set _citizen += 20>>
- <<elseif _CSratio > 0.5>>
+ <<elseif _CSratio > 1>>
Your citizens are not happy with the lack of slaves compared to their numbers.<<set _citizen += 15>>
- <<elseif _CSratio < 0.2>>
+ <<elseif _CSratio < 0.5>>
<<set _citizen -= 5>>
<</if>>
<<elseif $arcologies[0].FSRepopulationFocus != "unset">>
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index 05d3353a575d901caa2186db88908c2a9a82ed93..cb48bc883b68e8b48beafb8e993c0e3a8098f923 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -1,7 +1,13 @@
:: securityReport [nobr]
/* init */
-<<set _immigration = $ACitizens - $oldACitizens>>
+<<if $ACitizens > $oldACitizens>>
+ <<set _immigration = $ACitizens - $oldACitizens,
+ _emigration = 0>>
+<<else>>
+ <<set _emigration = $oldACitizens - $ACitizens, /*takes into account citizens leaving and those getting enslaved*/
+ _immigration = 0>>
+<</if>>
<<set _secGrowth = 0>>
<<set _secRest = 0>>
<<set _restGrowth = 0>>
@@ -44,27 +50,53 @@
The ex-criminal known to the world as The Smiling Man puts her impressive skills to work, dramatically increasing the efficiency of your security measures.
<<set _secGrowth += 2>>
<</if>>
-<<if $ACitizens + $ASlaves <= 2000>>
+<<if $ACitizens + $ASlaves <= 5000>>
The small number of residents makes their job easier.<<set _secGrowth += 2>>
-<<elseif $ACitizens + $ASlaves <= 4000>>
+<<elseif $ACitizens + $ASlaves <= 7500>>
The fairly low number of residents makes their job a little easier.<<set _secGrowth += 1>>
-<<elseif $ACitizens + $ASlaves <= 6000>>
+<<elseif $ACitizens + $ASlaves <= 10000>>
The fairly high number of residents makes their job a little harder.<<set _secGrowth -= -0.5>>
-<<elseif $ACitizens + $ASlaves <= 8000>>
+<<elseif $ACitizens + $ASlaves <= 15000>>
The high number of residents makes their job harder.<<set _secGrowth -= 1>>
<<else>>
The extremely high number of residents makes their job a lot harder.<<set _secGrowth -= 2>>
<</if>>
-<<if _immigration < 10>>
- The limited number of immigrants that reached the arcology this week does not have any serious impact on the efficiency of current security measures.<<set _secGrowth += 0.5>>
-<<elseif _immigration < 30>>
- The number of immigrants that reached the arcology this week is high enough to complicate security protocols.<<set _secGrowth -= 0.2>>
-<<elseif _immigration < 60>>
- The high number of immigrants that reached the arcology this week complicates security protocols.<<set _secGrowth -= 0.5>>
-<<elseif _immigration < 80>>
- The high number of immigrants that reached the arcology this week severely complicates security protocols.<<set _secGrowth -= 1>>
+<<if _immigration >= 0 && _emigration == 0>>
+ <<if _immigration < 50>>
+ The limited number of immigrants that reached the arcology this week does not have any serious impact on the efficiency of current security measures.<<set _secGrowth += 0.5>>
+ <<elseif _immigration < 150>>
+ The number of immigrants that reached the arcology this week is high enough to complicate security protocols.<<set _secGrowth -= 0.2>>
+ <<elseif _immigration < 300>>
+ The high number of immigrants that reached the arcology this week complicates security protocols.<<set _secGrowth -= 0.5>>
+ <<elseif _immigration < 500>>
+ The high number of immigrants that reached the arcology this week severely complicates security protocols.<<set _secGrowth -= 1>>
+ <<else>>
+ The extremely high number of immigrants that reached the arcology this week severely complicates security protocols.<<set _secGrowth -= 2>>
+ <</if>>
+<</if>>
+<<if $visitors < 300>>
+ The limited number of visitors coming and going did not have any serious impact on the efficiency of current security measures.<<set _secGrowth += 0.5>>
+<<elseif _immigration < 750>>
+ The number of visitors coming and going somewhat complicates security protocols.<<set _secGrowth -= 0.2>>
+<<elseif _immigration < 1500>>
+ The high number of visitors coming and going complicates security protocols.<<set _secGrowth -= 0.5>>
+<<elseif _immigration < 2500>>
+ The high number of visitors coming and going greatly complicates security protocols.<<set _secGrowth -= 1>>
<<else>>
- The extremely high number of immigrants that reached the arcology this week severely complicates security protocols.<<set _secGrowth -= 2>>
+ The extremely high number of visitors coming and going severely complicates security protocols.<<set _secGrowth -= 2>>
+<</if>>
+<<if _emigration != 0 && _immigration == 0>>
+ <<if _emigration < 100>>
+ The limited reduction in citizens this week does not have any serious impact on the efficiency of current security measures.<<set _secGrowth += 0.5>>
+ <<elseif _emigration < 300>>
+ The reduction in citizens this week is high enough to complicate security protocols.<<set _secGrowth -= 0.2>>
+ <<elseif _emigration < 600>>
+ The large reduction in citizens this week complicates security protocols.<<set _secGrowth -= 0.5>>
+ <<elseif _emigration < 1000>>
+ The huge reduction in citizens this week severely complicates security protocols.<<set _secGrowth -= 1>>
+ <<else>>
+ The extreme reduction in citizens this week severely complicates security protocols.<<set _secGrowth -= 2>>
+ <</if>>
<</if>>
<<if $crime < 20>>
Crime is a distant problem in the arcology, which makes improving security easier.<<set _secGrowth += 1>>
@@ -173,7 +205,7 @@
<</if>>
<<set $security = Math.clamp(_newSec, 0, 100)>>
-<br>
+<br><br>
<strong>Crime</strong>:
/* crime modifiers */
<<if $week < 30>>
@@ -654,3 +686,4 @@
It will be finished in <<if $currentUpgrade.time == 1>> one week.<<else>><<print $currentUpgrade.time>> weeks.<</if>>
<</if>>
<</if>>
+<br>
diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw
index 6243b92079b2db0524d488ce83320a21340562ff..979398ff8e3657ce2fd4cd7d0057fdaaaf10474f 100644
--- a/src/SecExp/unitsRebellionReport.tw
+++ b/src/SecExp/unitsRebellionReport.tw
@@ -301,43 +301,43 @@
<br>
<<set _loss = _lossesList.pluck()>>
<<if _loss > $ACitizens * 0.95>>
- <<set _loss = Math.trunc($ACitizens * 0.95)>> /* this is unlikely to happen, but might as well be safe*/
- The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology:
- <<if _loss <= 0>>
- no casualties
- <<elseif _loss <= 10>>
- light casualties
- <<elseif _loss <= 30>>
- moderate casualties
- <<elseif _loss <= 60>>
- heavy casualties
- <<else>>
- catastrophic casualties
- <</if>>
- suffered.
- <<if _loss > $lowerClass * 0.95>> /*I suspect only lower class ever get to fight/die, but being safe*/
- <<set $lowerClass = Math.trunc($lowerClass * 0.05),
- _loss -= $lowerClass * 0.95>>
- <<if _loss > $middleClass * 0.95>>
- <<set $middleClass = Math.trunc($middleClass * 0.05),
- _loss -= $middleClass *0.95>>
- <<if _loss > $upperClass * 0.95>>
- <<set $upperClass = Math.trunc($upperClass * 0.05),
- _loss -= $upperClass * 0.95>>
- <<if _loss > $topClass * 0.95>>
- <<set $topClass = Math.trunc($topClass * 0.05)>>
- <<else>>
- <<set $topClass -= _loss>>
- <</if>>
+ <<set _loss = Math.trunc($ACitizens * 0.95)>> /* this is unlikely to happen, but might as well be safe*/
+ <</if>>
+ The volunteering citizens were quickly organized into an irregular militia unit and deployed in the arcology:
+ <<if _loss <= 0>>
+ no casualties
+ <<elseif _loss <= 10>>
+ light casualties
+ <<elseif _loss <= 30>>
+ moderate casualties
+ <<elseif _loss <= 60>>
+ heavy casualties
+ <<else>>
+ catastrophic casualties
+ <</if>>
+ suffered.
+ <<if _loss > $lowerClass * 0.95>> /*I suspect only lower class ever get to fight/die, but being safe*/
+ <<set $lowerClass = Math.trunc($lowerClass * 0.05),
+ _loss -= Math.trunc($lowerClass * 0.95)>>
+ <<if _loss > $middleClass * 0.95>>
+ <<set $middleClass = Math.trunc($middleClass * 0.05),
+ _loss -= Math.trunc($middleClass *0.95)>>
+ <<if _loss > $upperClass * 0.95>>
+ <<set $upperClass = Math.trunc($upperClass * 0.05),
+ _loss -= Math.trunc($upperClass * 0.95)>>
+ <<if _loss > $topClass * 0.95>>
+ <<set $topClass = Math.trunc($topClass * 0.05)>>
<<else>>
- <<set $upperClass -= _loss>>
+ <<set $topClass -= _loss>>
<</if>>
<<else>>
- <<set $middleClass -= _loss>>
+ <<set $upperClass -= _loss>>
<</if>>
<<else>>
- <<set $lowerClass -= _loss>>
+ <<set $middleClass -= _loss>>
<</if>>
+ <<else>>
+ <<set $lowerClass -= _loss>>
<</if>>
<</if>>
<<if $secBots.active == 1>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 33d86878828da63784601ef817f90b22e87a04b7..3adad68d924d6a1cc106da9016c6954feb1484ec 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -72,7 +72,7 @@ _topClassP = 1>>
<<set _FSScore += Math.min($arcologies[0].FSPaternalist, 100),
_slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.04,
_slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.05,
- _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.1,
+ _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.15,
_slaveProductivity += Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * 0.02,
_lowerClass += Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * 80,
_lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * 0.004,
@@ -89,7 +89,7 @@ _topClassP = 1>>
<<set _FSScore += Math.min($arcologies[0].FSDegradationist, 100),
_slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.04,
_slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.05,
- _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.1,
+ _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.2,
_slaveProductivity += Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * 0.01,
_lowerClass += Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * -80,
_lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSDegradationist, 100) / 20) * -0.004,
@@ -149,12 +149,22 @@ _topClassP = 1>>
<</if>>
<<if $arcologies[0].FSAssetExpansionist != "unset">>
<<set _FSScore += Math.min($arcologies[0].FSAssetExpansionist, 100)>>
+ <<if $arcologies[0].FSPaternalist != "unset">>
+ <<set _expirationFS *= 1 + (Math.trunc(Math.min($arcologies[0].FSAssetExpansionist, 100) / 20) * 0.05) * (1 + (Math.trunc(Math.min($arcologies[0].FSBodyPurist, 100) / 20) * -0.1)>>
+ <<else>>
+ <<set _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSAssetExpansionist, 100) / 20) * 0.05>>
+ <</if>>
<</if>>
<<if $arcologies[0].FSPastoralist != "unset">>
<<set _FSScore += Math.min($arcologies[0].FSPastoralist, 100),
_slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.04,
- _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.05,
- _lowerClass += Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * -80,
+ _slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.05>>
+ <<if $arcologies[0].FSPaternalist != "unset">>
+ <<set _expirationFS *= 1 + (Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.05) * (1 + (Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.1)>>
+ <<else>>
+ <<set _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.05>>
+ <</if>>
+ <<set _lowerClass += Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * -80,
_lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * -0.004,
_middleClass += Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 16,
_middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.002,
@@ -193,6 +203,7 @@ _topClassP = 1>>
<<set _FSScore += Math.min($arcologies[0].FSRomanRevivalist, 100),
_slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * 0.02,
_slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * 0.025,
+ _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * -0.1,
_welfareFS *= 1 + Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * -0.05,
_lowerClass += Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * 40,
_lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRomanRevivalist, 100) / 20) * 0.002,
@@ -249,8 +260,13 @@ _topClassP = 1>>
<<set _FSScore += Math.min($arcologies[0].FSRepopulationFocus, 100),
_slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 0.04,
_slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 0.05,
- _slaveProductivity += Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * -0.01,
- _lowerClass += Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 80,
+ _slaveProductivity += Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * -0.01>>
+ <<if $arcologies[0].FSPaternalist != "unset">>
+ <<set _expirationFS *= 1 + (Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 0.05) * (1 + (Math.trunc(Math.min($arcologies[0].FSPaternalist, 100) / 20) * -0.1)>>
+ <<else>>
+ <<set _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 0.05>>
+ <</if>>
+ <<set _lowerClass += Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 80,
_lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 0.004,
_middleClass += Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 16,
_middleClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 0.002,
@@ -279,6 +295,7 @@ _topClassP = 1>>
_slaveDemandU *= 1 + Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * 0.02,
_slaveDemandT *= 1 + Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * 0.025,
_slaveProductivity += Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * -0.01,
+ _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * 0.1, /*too high?*/
_lowerClass += Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * 40,
_lowerClassP *= 1 + Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * 0.002,
_middleClass += Math.trunc(Math.min($arcologies[0].FSHedonisticDecadence, 100) / 20) * -16,
@@ -304,6 +321,48 @@ _topClassP = 1>>
_upperClassP *= 0.98,
_topClass += -5,
_topClassP *= 0.98>>
+ <<if $MilkMilestoneRetirement == 1>> /*additional conditional retirement options are each half as strong as base retirement*/
+ <<set _slaveDemandU *= 0.9,
+ _slaveDemandT *= 0.875,
+ _slaveProductivity += 0.025,
+ _expirationFS *= 0.9,
+ _lowerClass += 100,
+ _lowerClassP *= 1.01,
+ _middleClass += 40,
+ _middleClassP *= 1.01,
+ _upperClass += -13.5,
+ _upperClassP *= 0.99,
+ _topClass += -2.5,
+ _topClassP *= 0.99>>
+ <</if>>
+ <<if $CumMilestoneRetirement == 1>>
+ <<set _slaveDemandU *= 0.9,
+ _slaveDemandT *= 0.875,
+ _slaveProductivity += 0.025,
+ _expirationFS *= 0.9,
+ _lowerClass += 100,
+ _lowerClassP *= 1.01,
+ _middleClass += 40,
+ _middleClassP *= 1.01,
+ _upperClass += -13.5,
+ _upperClassP *= 0.99,
+ _topClass += -2.5,
+ _topClassP *= 0.99>>
+ <</if>>
+ <<if $BirthsMilestoneRetirement == 1>>
+ <<set _slaveDemandU *= 0.9,
+ _slaveDemandT *= 0.875,
+ _slaveProductivity += 0.025,
+ _expirationFS *= 0.9,
+ _lowerClass += 100,
+ _lowerClassP *= 1.01,
+ _middleClass += 40,
+ _middleClassP *= 1.01,
+ _upperClass += -13.5,
+ _upperClassP *= 0.99,
+ _topClass += -2.5,
+ _topClassP *= 0.99>>
+ <</if>>
<</if>>
<<if $ProRefugees == 1>>
<<set _slaveDemandU *= 1.1,
@@ -521,8 +580,6 @@ _topClassP = 1>>
<<set _middleClass += ($TSS.subsidize + $GRI.subsidize + $SCP.subsidize + $LDE.subsidize + $TGA.subsidize + $TCR.subsidize + $TFS.subsidize + $HA.subsidize) * 20,
_middleClass *= 1 + ($TSS.subsidize + $GRI.subsidize + $SCP.subsidize + $LDE.subsidize + $TGA.subsidize + $TCR.subsidize + $TFS.subsidize + $HA.subsidize) * 0.01>>
-<br>
-
/*Slave retirement trigger pulled (one time only)*/
<<if $CitizenRetirementTrigger == 1>>
<<if $arcologies[0].FSSupremacistLawME < 1 && $arcologies[0].FSSubjugationistLawME < 1>>
@@ -890,7 +947,6 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<br><<print _TCD>> Top Class Demand | <<print _topClassP>> TC Multiplier
<</if>>
<br>
-<br>
<<print $arcologies[0].name>> is home to the following:
<br>Lower Class Citizens | <<print $lowerClass>> | <<print _percLowerClass>>%
<br>Middle Class Citizens | <<print $middleClass>> | <<print _percMiddleClass>>%
@@ -935,7 +991,6 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
<</if>>
<br>
-
<<set _rentMultiplier = 1>>
<<if $arcologies[0].FSPaternalistLaw == 1>>
<<set _rentMultiplier *= 0.95>>
@@ -1419,10 +1474,10 @@ The Hippolyta Academy have a <<if $HA.schoolProsperity > 4>>very prosperous<<els
You have a policy of covertly undermining them.
<<set $HA.schoolProsperity-->>
<</if>>
-<</if>>
-
<</if>>
<br>
+<</if>>
+
<<if $marketAssistantLimit != 0>>
<<silently>> <<= MenialPopCap()>> <</silently>>
@@ -1464,3 +1519,4 @@ Your ''business assistant'' manages the menial slave market.
<</if>>
<<silently>><<= MenialPopCap()>><</silently>>
<</if>>
+<br>
diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw
index 5cb8b8f5f8585be6b5fe4dc5ce35a530ac5c5e20..9f403ab05b3c1d51f6383dc3f9e5da375125d80c 100644
--- a/src/uncategorized/economics.tw
+++ b/src/uncategorized/economics.tw
@@ -20,12 +20,15 @@
<br><br>
-<<include "Personal Business">>
+<<include "Arcology Management">>
-<br><br>
+<<if $FSAnnounced > 0>>
+ <br><br>
+ <<include "FS Developments">>
+<</if>>
<<if $corpAnnounced == 1>>
- <br>
+ <br><br>
<<if $corpIncorporated == 0>>
<span id="incorporate">
You have not yet committed funds to create a publicly traded slave trading corporation. <<link "Lay the groundwork for incorporation">><<set $corpIncorporated = 1>><<set $sharePrice = 10>><<set $oldSharePrice = $sharePrice>><<set $personalShares = 2000>><<set $cash -= 30000>><<set $publicShares = 1000>><<set $corpCash = 20000>><<set $generalAssets = 500>><<set $slaveAssets = 1000>><<set $entrapmentAssets = 500>><<set $captureAssets = 500>><<set $trainingAssets = 500>><<set $surgicalAssets = 500>><<set $drugAssets = 500>><<replace "#incorporate">><<print "The groundwork has been laid for the incorporation of a publicly traded slave trading corporation. The IPO will involve 1000 shares at <<print cashFormat(10)>>/share.">><</replace>><</link>> //Costs <<print cashFormat(30000)>>//
@@ -33,32 +36,26 @@
<<else>>
<<include "Corporation Developments">>
<</if>>
- <br><br>
<</if>>
-<<include "Reputation">>
<<if $secExp == 1>>
<br><br>
<<include "authorityReport">>
+<br><br>
+<<include "securityReport">>
<</if>>
<br><br>
-<<include "Arcology Management">>
+<<include "Reputation">>
-<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
<br><br>
-<<include "Personal Notes">>
-<</if>>
-<<if $FSAnnounced > 0>>
- <br><br>
- <<include "FS Developments">>
-<</if>>
+<<include "Personal Business">>
+<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
<br><br>
-<<if $secExp == 1>>
-<<include "securityReport">>
+<<include "Personal Notes">>
<</if>>
<<else>>
@@ -66,24 +63,22 @@
<body>
<div class="tab">
- <button class="tablinks" onclick="opentab(event, 'Arcologies')" id="defaultOpen">Arcologies</button>
- <button class="tablinks" onclick="opentab(event, 'Business')">Personal Business</button>
+ <button class="tablinks" onclick="opentab(event, 'Arcologies')" id="defaultOpen">Arcologies</button>
+ <button class="tablinks" onclick="opentab(event, 'Management')">Arcology Management</button>
+ <<if $FSAnnounced > 0>>
+ <button class="tablinks" onclick="opentab(event, 'Societies')">Society Development</button>
+ <</if>>
<<if $corpAnnounced == 1>>
- <button class="tablinks" onclick="opentab(event, 'Corporation')">Corporation</button>
+ <button class="tablinks" onclick="opentab(event, 'Corporation')">Corporation</button>
<</if>>
- <button class="tablinks" onclick="opentab(event, 'Reputation')">Reputation</button>
<<if $secExp == 1>>
- <button class="tablinks" onclick="opentab(event, 'Authority')">Authority</button>
+ <button class="tablinks" onclick="opentab(event, 'Authority')">Authority</button>
+ <button class="tablinks" onclick="opentab(event, 'securityReport')">Security</button>
<</if>>
- <button class="tablinks" onclick="opentab(event, 'Management')">Arcology Management</button>
+ <button class="tablinks" onclick="opentab(event, 'Reputation')">Reputation</button>
+ <button class="tablinks" onclick="opentab(event, 'Business')">Personal Business</button>
<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
- <button class="tablinks" onclick="opentab(event, 'Personal')">Personal Notes</button>
- <</if>>
- <<if $FSAnnounced > 0>>
- <button class="tablinks" onclick="opentab(event, 'Societies')">Society Development</button>
- <</if>>
- <<if $secExp == 1>>
- <button class="tablinks" onclick="opentab(event, 'securityReport')">Security</button>
+ <button class="tablinks" onclick="opentab(event, 'Personal')">Personal Notes</button>
<</if>>
</div>
@@ -93,12 +88,20 @@
</div>
</div>
-<div id="Business" class="tabcontent">
+<div id="Management" class="tabcontent">
<div class="content">
-<<include "Personal Business">>
+<<include "Arcology Management">>
</div>
</div>
+<<if $FSAnnounced > 0>>
+<div id="Societies" class="tabcontent">
+<div class="content">
+<<include "FS Developments">>
+</div>
+</div>
+<</if>>
+
<<if $corpAnnounced == 1>>
<div id="Corporation" class="tabcontent">
<div class="content">
@@ -113,45 +116,37 @@ You have not yet committed funds to create a publicly traded slave trading corpo
</div>
<</if>>
-<div id="Reputation" class="tabcontent">
-<div class="content">
-<<include "Reputation">>
-</div>
-</div>
-
<div id="Authority" class="tabcontent">
<div class="content">
<<include "authorityReport">>
</div>
</div>
-<div id="Management" class="tabcontent">
+<div id="securityReport" class="tabcontent">
<div class="content">
-<<include "Arcology Management">>
+<<include "securityReport">>
</div>
</div>
-<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
-<div id="Personal" class="tabcontent">
+<div id="Reputation" class="tabcontent">
<div class="content">
-<<include "Personal Notes">>
+<<include "Reputation">>
</div>
</div>
-<</if>>
-<<if $FSAnnounced > 0>>
-<div id="Societies" class="tabcontent">
+<div id="Business" class="tabcontent">
<div class="content">
-<<include "FS Developments">>
+<<include "Personal Business">>
</div>
</div>
-<</if>>
-<div id="securityReport" class="tabcontent">
+<<if ($PC.boobs == 1 && $PC.boobsBonus > 0) || $PC.pregKnown == 1 || $playerAging != 0>>
+<div id="Personal" class="tabcontent">
<div class="content">
-<<include "securityReport">>
+<<include "Personal Notes">>
</div>
</div>
+<</if>>
<script>
function opentab(evt, tabName) {
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 7af350ada5696dd11e79467feb16160b3b7f2385..fdf403477ba9eb7192a903d7532f81277db2b133 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -2696,7 +2696,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if $plot>>
<<if $peacekeepers != 0>>
- <br><br>
+ <br>
<<if $peacekeepers.strength >= 50>>
<<set _prisoners = Math.trunc($peacekeepers.attitude/10)+random(0,10)>>
General $peacekeepers.generalName's little empire near the arcology
@@ -2730,5 +2730,6 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
Unfortunately, the presence of so much old world military power near the Free City causes @@.red;public concern.@@
<<set $rep -= 100>>
<</if>>
+ <br>
<</if>>
<</if>>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index bcb753e4a484c798d08ace25cbe18b85cd36a798..51d0041715b7983592035f34e3341e97ed95938c 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -800,9 +800,9 @@ Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@
<<set $cash -= $costs>>
<<if $secExp == 1>>
- <br>
- <br>
<<if $weapManu == 1>>
+ <br>
+ <br>
The weapons manufacturing complex produces armaments
<<if $weapProductivity <= 2>>
at a steady pace.
@@ -852,9 +852,9 @@ Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@
<br>Fees on transitioning goods this week made @@.yellowgreen;<<print cashFormat(_tradeTax)>>.@@
<<set $cash += Math.ceil(_tradeTax)>>
<</if>>
+ <br>
<</if>>
-<br>
/*Adding random changes to slave demand and supply*/
/*Without events triggering and a relatively average supply/demand situation, the best case scenario is an increase/decrease in the price of slaves of 10 in one week. Chance of these conditions happening are 1/25. For demand or supply to go from average to their maximum will take 25 weeks if rolling highest growth each time a roll is made and all other luck is average. Because of the properties of the market and how it develops the likely prices one will encounter are distributed in a bellshaped fashion, centered around 1000. Minimum possible price is 750, maximum 1250. At +/- 35000 chances of supply or demand getting even more extreme are reduced.*/
<<set _demandSlaveVar = random(-10,10)*10>>
@@ -1061,3 +1061,4 @@ The RomanFS may need further tweaking (it probably got weaker). Could increase t
<</if>>
<<if $SF.Toggle && $SF.Active >= 1>> <<include "SF_Report">> <</if>>
+<br>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 507b40da420aa3b9fa479e7cbafff066c2660278..20b786574b24b5f13049f923451905807991b026 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -787,3 +787,4 @@ On formal occasions, you are announced as $PCTitle.
The Societal Elite @@.red;mutter about you@@.
<</if>>
<</if>>
+<br>