diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 538411e8f5bfa069253b8c5a3539bb447dddf927..921bbeac8e8225b1ff82219074f8276d8aa60e1a 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -144,6 +144,11 @@
<<if $PC.rumor == "social engineering">>
<<set $FSGotRepCredits += 1>>
<</if>>
+ <<else>>
+ <<set $activeArcology.type = "New">>
+ <<if $PC.rumor == "social engineering">>
+ <<set $FSGotRepCredits += 1>>
+ <</if>>
<</if>>
<<else>>
<<if $i < 4>> /* X-4 is reserved for player's arcology, so X-1 is available */
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 79e71cb3b3ae83582543336ce4ca8eac4edf61f0..363124a3a6543f10af2ffb56602aeb955f7236f5 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -388,6 +388,7 @@ You should have received a copy of the GNU General Public License along with thi
/* Pregmod specific */
<<set $economy = 100>>
<<set $econRate = 2>>
+ <<set $SOMEWEATHERUPGRADE = 0>> /*for testing*/
<<set $difficultySwitch = 0>>
<<set $econWeatherDamage = 0>>
<<set $disasterResponse = 0>>
@@ -1114,21 +1115,20 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $arcologyUpgrade = {drones: 0, hydro: 0, apron: 0, grid: 0, spire: 0}>>
<<set $AGrowth = 2>>
-<<set $ACitizens = 4000>>
-<<set $lowerClass = 2850>>
+<<set $ACitizens = 4250>>
+<<set $lowerClass = 3120>>
<<set $visitors = 0>>
<<set $welfare = 0.004>>
-<<set $LCDemand = 1840>>
<<set $rentEffectL = 1>>
-<<set $middleClass = 910>>
+<<set $middleClass = 890>>
<<set $rentEffectM = 1>>
-<<set $upperClass = 195>>
+<<set $upperClass = 200>>
<<set $rentEffectU = 1>>
-<<set $topClass = 45>>
+<<set $topClass = 40>>
<<set $rentEffectT = 1>>
-<<set $GDP = 257.8>>
+<<set $GDP = 278.6>>
<<set $ACitizenLimit = 4800>>
-<<set $ASlaves = 950>>
+<<set $ASlaves = 900>>
<<set $slaveDemandU = 2>>
<<set $slaveDemandT = 12>>
<<set $slaveProductivity = 0.8>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index dc3b211fdeb6235065d7acad0b85b001fa008a0b..5cbaacfd6a260848706443ea2c7e1ca4e8c540b7 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3451,37 +3451,34 @@ Done!
<</if>>
<<if ndef $lowerClass>>
- <<set $lowerCLass = 2850>>
+ <<set $lowerClass = 3120>>
<</if>>
<<if ndef $welfare>>
<<set $welfare = 0.004>>
<</if>>
-<<if ndef $LCDemand>>
- <<set $LCDemand = 1840>>
-<</if>>
<<if ndef $rentEffectL>>
<<set $rentEffectL = 1>>
<</if>>
<<if ndef $middleClass>>
- <<set $middleClass = 910>>
+ <<set $middleClass = 890>>
<</if>>
<<if ndef $rentEffectM>>
<<set $rentEffectM = 1>>
<</if>>
<<if ndef $upperClass>>
- <<set $upperClass = 195>>
+ <<set $upperClass = 200>>
<</if>>
<<if ndef $rentEffectU>>
<<set $rentEffectU = 1>>
<</if>>
<<if ndef $topClass>>
- <<set $topClass = 45>>
+ <<set $topClass = 38>>
<</if>>
<<if ndef $rentEffectT>>
<<set $rentEffectT = 1>>
<</if>>
<<if ndef $GDP>>
- <<set $GDP = 257.8>>
+ <<set $GDP = 278.6>>
<</if>>
<<if ndef $slaveDemandU>>
<<set $slaveDemandU = 2>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 8601f63853f196875644c77367815e4abba18452..a1328d67d6b1478b51772cc38cf7a7a1cdcf2aa8 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -3,230 +3,16 @@
<<if $useTabs == 0>>__Arcology Management__<</if>>
<br>
-<<set _flux = random(20,40)>>
-<<if $arcologies[0].FSPaternalist != "unset">>
- Poor citizens can rely on their better-off peers in $arcologies[0].name.
- <<set _flux -= Math.trunc($arcologies[0].FSPaternalist/10)>>
-<<elseif $arcologies[0].FSDegradationist != "unset">>
- The arcology is a cutthroat place in which falling into slavery is very easy.
- <<set _flux += Math.trunc($arcologies[0].FSDegradationist/10)>>
-<</if>>
-<<if $arcologies[0].FSEgyptianRevivalist != "unset">>
- Egyptian Revivalism is benevolent in some ways, and charity is common here.
- <<set _flux -= Math.trunc($arcologies[0].FSEgyptianRevivalist/10)>>
-<<elseif $arcologies[0].FSRomanRevivalist != "unset">>
- Your citizens take pride in looking after each other.
- <<set _flux -= Math.trunc($arcologies[0].FSRomanRevivalist/10)>>
-<</if>>
-<<if $arcologies[0].FSChattelReligionist != "unset">>
- Chattel Religionism helps some poor citizens see slavery as a spiritually pure fate.
- <<set _flux += Math.trunc($arcologies[0].FSChattelReligionist/10)>>
-<<elseif $arcologies[0].FSNull != "unset">>
- Your arcology's vibrant, open culture helps everyone succeed, preventing many struggling citizens from falling into slavery.
- <<set _flux -= Math.trunc($arcologies[0].FSNull/5)>>
-<</if>>
-<<if $arcologies[0].FSPastoralist != "unset">>
- The pastoralization of $arcologies[0].name helps concentrate wealth in the hands of a few.
- <<set _flux += Math.trunc($arcologies[0].FSPastoralist/10)>>
-<</if>>
-<<if $AntiEnslavementCash == 1>>
- Your charity purse prevents a few citizens from falling into slavery.
- <<set _flux -= 10>>
-<<elseif $ProEnslavementCash == 1>>
- You @@.yellowgreen;take kickbacks@@ for ignoring enslavement of citizens.
- <<set _flux += 10>>
- <<set $cash += random(500,1500)>>
-<</if>>
-<<if $AntiEnslavementRep == 1>>
- You use your personal influence to help struggling citizens.
- <<set _flux -= 10, $rep -= 100>>
-<<elseif $ProEnslavementRep == 1>>
- You @@.green;make friends@@ by tacitly supporting enslavement of upstart citizens.
- <<set _flux += 10, $rep += 100>>
-<</if>>
-<<if $enslavementRights == 1>>
- As the only legal entity in the arcology able to declare the status of a person as enslaved, you are able to @@.yellowgreen;collect fees@@ over enslavement of your citizens. Many, however, consider this move an intromission in private affairs, @@.red;damaging your authority.@@
- <<set $authority -= 10>>
- <<set $cash += _flux * 100>>
-<</if>>
-<<set $oldFlux = _flux>>
-<<set $ACitizens -= _flux, $ASlaves += _flux>>
-This week, <<if _flux >= 20>>many<<elseif _flux >= 5>>some<<else>>few to none<</if>> of $arcologies[0].name's citizens fell into slavery.
-
-<<if $ACitizens < $ACitizenLimit>>
- <<if $AntiImmigrationCash == 1>>
- You covertly @@.yellowgreen;sell@@ the private information of potential arcology immigrants on the old world black market.
- <<set $cash += random(500,1500), $ACitizens -= random(5,15)>>
- <</if>>
- <<if $AntiImmigrationRep == 1>>
- You allow citizens input on potential immigrants, a @@.green;popular@@ program.
- <<set $rep += 100, $ACitizens -= random(5,15)>>
- <</if>>
- <<if $arcologies[0].FSRestartLaw == 1>>
- Your sterilization program drives several disloyal citizens out of the arcology.
- <<set $ACitizens -= random(3,10)>>
- <</if>>
-<</if>>
-
-<<set $oldACitizens = $ACitizens>>
- <<set _immigrants = 0>>
-<<if $ACitizens >= $ACitizenLimit>>
- <<set $ACitizens = $ACitizenLimit>>
- Your arcology is currently home to as many citizens as it can house; unless the living areas are reconfigured, the citizen population will not increase.
-<<else>>
- <<set _immigrants += random(-10,10)>>
- <<if $ProImmigrationRep == 1>>
- Your welcome program for new citizens helps encourage wealthy people from the old world to immigrate, but @@.red;annoys some longstanding citizens.@@
- <<set _immigrants += random(10,20), $rep -= 100>>
- <</if>>
- <<if $ProImmigrationCash == 1>>
- The rent promotion for new immigrants brings new citizens to the arcology.
- <<set _immigrants += random(10,20)>>
- <</if>>
- <<if $arcologies[0].FSRepopulationFocusLaw == 1>>
- The rent promotion for pregnant women attracts several gravid ladies and a few girls eager to become mothers to enroll as citizens in your arcology.
- <<set _immigrants += random(5,10)>>
- <</if>>
- <<if $ACitizens < $ACitizenLimit*0.6>>
- The availability of a large number of apartments encourages many new citizens to immigrate.
- <<set _immigrants += random(10,20)>>
- <</if>>
- <<if $secExp == 1>>
- <<if $crime > 80>>
- Crime is a widespread phenomenon in your arcology, many potential immigrants are scared away.
- <<set _immigrants -= random(5,10)>>
- <<elseif $crime < 20>>
- Crime is a distant issue within the walls of your arcology, many immigrants are attracted to such safe shores.
- <<set _immigrants += random(5,10)>>
- <</if>>
- <<if $limitSubhumans == 1>>
- Subhumans are stopped and turned away as soon as they dare petition for citizenship in your arcology, slightly lowering immigrants numbers.
- <<set _immigrants -= random(5,10)>>
- <</if>>
- <<if $openBorders == 1>>
- The very liberal attitude towards immigration calls many hopeful immigrants to your arcology.
- <<set _immigrants += random(10,20)>>
- <</if>>
- <<if $propCampaign >= 1 && $propFocus == "immigration">>
- Your advertisement campaign outside the free city brings more people to the gates of your arcology.
- <<if $RecuriterOffice == 0 || $Recruiter == 0>>
- <<if $propCampaignBoost == 0>>
- <<set _immigrants += random(1,2) * $propCampaign>>
- <<else>>
- <<set _immigrants += random(1,4) * $propCampaign>>
- <</if>>
- <<else>>
- ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your immigration campaign from her PR hub office.
- <<if $propCampaignBoost == 0>>
- <<set _immigrants += random(2,5+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32)) * $propCampaign>>
- <<else>>
- <<set _immigrants += random(2,6+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32)) * $propCampaign>>
- <</if>>
- <</if>>
- <</if>>
- <<if $limitImmigration == 1>>
- The strict limits on immigration keep the number of people coming in the arcology limited.
- <<if _immigrants > 40>>
- <<set _immigrants = 40>>
- <</if>>
- <</if>>
- <<if $garrison.waterwayTime > 0>>
- The damage caused to the water supply of the arcology discourages immigration and causes the death of some of the poorest residents.
- It will still take <<if $garrison.waterwayTime > 1>>$garrison.waterwayTime weeks<<else>>a week<</if>> to finish repair works.
- <<set _immigrants = Math.clamp(_immigrants - random(40,60), 0 , _immigrants)>>
- <<set $ACitizens -= random(10,20), $ASlaves -= random(10,20)>>
- <<set $garrison.waterwayTime-->>
- <<set $PC.engineering += .1>>
- <</if>>
- <</if>>
-<</if>>
-<<if !isInt(_immigrants)>>
- <br>@@.red;Error: immigrants is outside accepted range, please report this issue@@
-<</if>>
-<<set $ACitizens += _immigrants>>
-<<if $ACitizens <= 100>>
- Your arcology is home to an extremely small number of very wealthy citizens; wealth is as concentrated as possible and the citizen population will not decrease further.
- <<set $ACitizens = 100>>
-<</if>>
-
-<<if $ASlaves >= $ASlaveLimit>>
- <<set $ASlaves = $ASlaveLimit>>
- The living areas of the arcology are packed with sex slaves; your citizens cannot find space for any more.
-<<else>>
- <<set $ASlaves -= random(1,10)+Math.trunc(10*(1-$slaveCostFactor))>>
- <<if $slaveCostFactor >= 1.1>>
- With the price of slaves so high, some of your citizens make money by selling a few of their girls.
- <<elseif $slaveCostFactor <= 0.9>>
- With the price of slaves so low, some of your citizens gratify themselves with new purchases.
- <</if>>
- <<if $ASlaves < $ASlaveLimit*0.8>>
- <<if $ASlaves < $ASlaveLimit*0.6>>
- Since there's a lot of space for sex slaves in the living areas, it's fashionable for your citizens to buy up cheap girls and fill their apartments.
- <<set $ASlaves += random(1,10)+Math.trunc($arcologies[0].prosperity/5)>>
- <<else>>
- Since the living areas can comfortably house more sex slaves, it's fashionable for your citizens to buy more girls.
- <<set $ASlaves += random(1,10)+Math.trunc($arcologies[0].prosperity/10)>>
- <</if>>
- <<if $arcologies[0].prosperity > 200>>
- $arcologies[0].name is extremely prosperous, and they can afford to buy many of the best.
- <<elseif $arcologies[0].prosperity > 100>>
- $arcologies[0].name is quite prosperous, and they can afford to buy many pretty slaves.
- <</if>>
- <</if>>
- <<if $liveTargets == 1>>
- Disobedient slaves are used as live targets in the shooting ranges of the arcology<<if $secBarracks != 0>> and the barracks.<<else>>.<</if>>
- <<set $ASlaves -= random(10,20)>>
- <</if>>
- <<if $ASlaves <= 1000>><<set $ASlaves = 1000>><</if>>
-<</if>>
-
-<<if !isInt($ACitizens)>>
- <br>@@.red;Error: ACitizens is outside accepted range, please report this issue@@
-<</if>>
-<<if !isInt($ASlaves)>>
- <br>@@.red;Error: ASlaves is outside accepted range, please report this issue@@
-<</if>>
-
-<<print commaNum($ACitizens)>> citizens and <<print commaNum($ASlaves+$helots+$slaves.length)>> slaves now live in your arcology.
-<<if $arcologies[0].FSSupremacistLawME == 1>>The citizenry is entirely $arcologies[0].FSSupremacistRace.<</if>>
-<<if $arcologies[0].FSRomanRevivalistLaw == 1>>The citizens take pride in their martial duties, preferring to wear utilitarian clothing even when off duty.<</if>>
-<<if $arcologies[0].FSGenderRadicalistDecoration == 100>>Every single one of the slaves is female by virtue of her fuckable asshole.
-<<elseif $arcologies[0].FSGenderFundamentalistSMR == 1>>Almost every citizen is an upstanding man, while the slave population is almost completely female.<</if>>
-<<if $arcologies[0].FSEgyptianRevivalistLaw == 1>>Close relationships between citizens and slaves, especially slave siblings, are common.<<elseif $arcologies[0].FSEgyptianRevivalistIncestPolicy == 1>>Close relationships between citizens, slaves and siblings are common.<</if>>
-<<if $arcologies[0].FSSubjugationistLawME == 1>>$arcologies[0].FSSubjugationistRace subhumans form a majority of the slaves.<</if>>
-<<if $arcologies[0].FSChattelReligionistLaw == 1>>The slave population as a whole is unusually accepting of its station.<</if>>
-<<if $arcologies[0].FSPaternalistLaw == 1>>The slaves are well cared for, and it can sometimes be difficult to tell slaves from citizens.
-<<elseif $arcologies[0].FSDegradationistLaw == 1>>Most of the slaves are recent captures, since the vicious society that's taken root here uses people up quickly.<</if>>
-<<if $arcologies[0].FSBodyPuristLaw == 1>>The average slave is quite healthy.
-<<elseif $arcologies[0].FSTransformationFetishistLaw == 1>>
- <<if $arcologies[0].FSTransformationFetishistResearch == 1>>
- Breast implants are almost universal; <<if $arcologies[0].FSSlimnessEnthusiast == "unset">>an M cup bust is below average among the slave population<<else>>even the most lithe slave sports a pair of overly round chest balloons<</if>>.
- <<else>>
- Breast implants are almost universal; <<if $arcologies[0].FSSlimnessEnthusiast == "unset">>a D cup bust is below average among the slave population.<<else>>even the most lithe slave sports a pair of overly round chest balloons<</if>>.
- <</if>>
-<</if>>
-<<if $arcologies[0].FSSlimnessEnthusiastSMR == 1>>Most of the slave population is quite slim and physically fit.
-<<elseif $arcologies[0].FSAssetExpansionistSMR == 1>>The arcology's consumption of pharmaceuticals is impressive, since slave growth hormones are nearly ubiquitous.<</if>>
-<<if $arcologies[0].FSRepopulationFocusLaw == 1>>Many of the women in the arcology are pregnant.<<elseif $arcologies[0].FSRepopulationFocusSMR == 1>>Most of the slaves in the arcology are pregnant.<<elseif $arcologies[0].FSRestartLaw == 1>>Many of your civilians have agreed to be sterilized.<<elseif $arcologies[0].FSRestartSMR == 1>>Many of slave slaves in your arcology are infertile.<</if>>
-<<if $arcologies[0].FSPastoralistLaw == 1>>Much of the menial slave labor force works to service the arcology's hundreds of human cattle.<</if>>
-<<if $arcologies[0].FSPhysicalIdealistSMR == 1>>The arcology must import a very large quantity of nutritive protein to nourish its slaves.<</if>>
-<<if $arcologies[0].FSHedonisticDecadenceSMR == 1>>The arcology must import a very large quantity of fattening food to plump up its slaves.<</if>>
-
-<<if $ACitizens > $ASlaves*2>>
- Since most citizens do not own sex slaves, @@.yellowgreen;demand for sexual services is intense.@@
-<<elseif $ACitizens > $ASlaves>>
- Since many citizens do not own sex slaves, @@.yellowgreen;demand for sexual services is healthy.@@
-<<elseif $ACitizens > $ASlaves*0.5>>
- Since many citizens keep a personal sex slave, @@.yellow;demand for sexual services is only moderate.@@
-<<elseif $ACitizens > $ASlaves*0.25>>
- Since most citizens keep at least one sex slave, @@.gold;local demand for sexual services is low,@@ though visitors to the arcology will always keep it above a certain minimum.
-<<else>>
- Since most of your citizens now keep private harems of sex slaves, @@.gold;local demand for sexual services is very low,@@ though visitors to the arcology will always keep it above a certain minimum.
-<</if>>
-
/* New Population
Populations depend on the 'demand' for them. People flock to the Free City when there are jobs. Jobs for lower class people depend on prosperity and the need for labor from other classes. They compete with slaves for work.
-More elite citizens require their own slaves and will cause the population of slaves to increase as they move in. FS and policies will impact how many slaves they desire and how productive they are. The PC's menials also compete for labor within the arcology. Slaves can now 'expire', speed depends on FS and policies. Default lifespan for menials is an average of ~4 years.
+More elite citizens require their own slaves and will cause the population of slaves to increase as they move in. FS and policies will impact how many slaves they desire and how productive they are. The PC's menials also compete for labor within the arcology. Slaves can now 'expire', speed depends on FS and policies. Default lifespan for menials is an average of ~4 years. */
+
+<<set _oldACitizens = $ACitizens>>
+<<set _oldASlaves = $ASlaves>>
+<<set _oldLowerClass = $lowerClass>>
+<<set _oldMiddleClass = $middleClass>>
+<<set _oldUpperClass = $upperClass>>
+<<set _oldTopClass = $topClass>>
/*Slave expiration*/
<<set _expirationPC = Math.trunc($helots * $slaveExpiration)>>
@@ -238,15 +24,15 @@ More elite citizens require their own slaves and will cause the population of sl
@@.red;<<print _expiration>> Slaves died@@ due to the tough working conditions in your arcology.
<<if _expirationPC > 1>>
Of which @@.red;<<print _expirationPC>> were yours.@@
- <<elseif _expiration PC > 0>>
+ <<elseif _expirationPC > 0>>
@@.red;One of them was yours.@@
<</if>>
<</if>>
/*Citizens turning into slaves*/
<<set _enslaved = Math.trunc($lowerClass * $welfare)>>
+<br><<print _enslaved>> enslaved
<<set $lowerClass -= _enslaved>>
-<<set $ASlaves += _enslaved>>
/*Bad weather switch*/
<<if $weatherToday.severity > 3>>
@@ -256,7 +42,7 @@ More elite citizens require their own slaves and will cause the population of sl
<<else>>
<<set _weatherFreeze = 0>>
<</if>>
- <<elseif $SOMEWEATHERUPGRADE < X>>
+ <<elseif $SOMEWEATHERUPGRADE < 2>>
<<set _weatherFreeze = 1>>
<<else>>
<<set _weatherFreeze = 0>>
@@ -268,7 +54,7 @@ More elite citizens require their own slaves and will cause the population of sl
<<else>>
<<set _weatherFeeze = 0>>
<</if>>
- <<elseif $SOMEWEATHERUPGRADE < X-1>>
+ <<elseif $SOMEWEATHERUPGRADE < 1>>
<<set _weatherFreeze = 1>>
<<else>>
<<set _weatherFreeze = 0>>
@@ -277,7 +63,7 @@ More elite citizens require their own slaves and will cause the population of sl
<<set _weatherFreeze = 0>>
<</if>>
-<<if _weatherFreeze = 0>>
+<<if _weatherFreeze == 0>>
/*Bunch of visitor stuff*/
<<set _FSScore = 0>>
<<if $arcologies[0].FSSupremacist != "unset">>
@@ -378,53 +164,60 @@ More elite citizens require their own slaves and will cause the population of sl
<<elseif $terrain == "oceanic" || "ravine">>
<<set _terrain = 0.8>>
<</if>>
-<<if $targetArcology.type == "New">>
+
+<<if $arcologies[0].type == "New">>
<<if $week < 21>>
<<set _honeymoon = 210 - 10 * $week>>
<<else>>
<<set _honeymoon = 0>>
<</if>>
+<<else>>
+ <<set _honeymoon = 0>>
<</if>>
-<<set $visitors = Math.trunc((($arcologies[0].prosperity + _FSScore * 5 + _honeymoon) * _transportHub * _terrain * _crime) / (100 / $localEcon))>>
+<br> <<print $arcologies[0].prosperity>> | <<print _FSScore>> | <<print _honeymoon>> | <<print _transportHub>> | <<print _terrain>> | <<print _crime>>
+<<set $visitors = Math.trunc((($arcologies[0].prosperity + _FSScore * 5 + _honeymoon) * _transportHub * _terrain * _crime) * ($localEcon / 100))>>
<br>@@.green;<<print $visitors>> Traders and tourists@@ visited your arcology this week.
/*slaves*/
/*Demand for simple labor*/
-<<set _LSCD = ($LCDemand + ($arcologies[0].prosperity * 5) + (($middleClass + $visitors * 0.75) * 2) + (($upperClass + $visitors * 0.25) * 4.5) + ($topClass * 20)>>
+<<set _LSCD = (800 * ($localEcon / 100)) + ($arcologies[0].prosperity * 4) + (($middleClass + $visitors * 0.6) * 1.5) + (($upperClass + $visitors * 0.2) * 3.5) + ($topClass * 18)>>
+<br><<print _LSCD>> LSCD
/*Demand for owning slaves*/
<<set _SCD = ($upperClass * $slaveDemandU) + ($topClass * $slaveDemandT)>>
+<br><<print _SCD>> SCD
/*More slaves than there is work*/
<<if $ASlaves > _LSCD / $slaveProductivity>>
- <<set $slaveDemandFactor -= $ASlaves - Math.trunc(_LSCD / $slaveProductivity)>>
+ <<set $menialDemandFactor -= $ASlaves - Math.trunc(_LSCD / $slaveProductivity)>>
<<set $ASlaves = Math.trunc(_LSCD / $slaveProductivity)>>
/*More slaves than they know what to do with*/
<<elseif $ASlaves > _SCD * 1.6>>
- <<set $slaveDemandFactor -= $ASlaves - Math.trunc(_SCD * 1.6)>>
+ <<set $menialDemandFactor -= $ASlaves - Math.trunc(_SCD * 1.6)>>
<<set $ASlaves = Math.trunc(_SCD * 1.6)>>
/*Cutting back on slaves*/
<<elseif $ASlaves > _SCD * 1.4>>
<<if $slaveCostFactor > 0.95>>
- <<set $slaveDemandFactor -= Math.trunc(($ASlaves - _SCD) * 0.4)>>
+ <<set $menialDemandFactor -= Math.trunc(($ASlaves - _SCD) * 0.4)>>
<<set $ASlaves -= Math.trunc(($ASlaves - _SCD) * 0.4)>>
<</if>>
/*Selling excess slaves for profit*/
<<elseif $ASlaves > _SCD * 1.2>>
<<if $slaveCostFactor > 1.1>>
- <<set $slaveDemandFactor -= Math.trunc(($ASlaves - _SCD) * 0.4)>>
+ <<set $menialDemandFactor -= Math.trunc(($ASlaves - _SCD) * 0.4)>>
<<set $ASlaves -= Math.trunc(($ASlaves - _SCD) * 0.4)>>
<</if>>
<</if>>
/*Buying slaves because they are really cheap*/
<<if $slaveCostFactor < 0.8>>
<<if $ASlaves < _SCD * 1.5>>
- <<set $slaveSupplyFactor -= Math.trunc(_SCD * 0.05)>>
+ <<set $menialSupplyFactor -= Math.trunc(_SCD * 0.05)>>
<<set $ASlaves += Math.trunc(_SCD * 0.05)>>
<</if>>
<</if>>
/*Lower Class Citizens*/
/*Work left for lower class citizens*/
-<<set _LCD = ($LCDemand + ($arcologies[0].prosperity * 5) + (($middleClass + $visitors * 0.75) * 2) + (($upperClass + $visitors * 0.25) * 4.5) + ($topClass * 20) - Math.trunc(($ASlaves + $helots) * $slaveProductivity)) * $rentEffectL>>
+<<set _LCD = (800 * ($localEcon / 100)) + (($arcologies[0].prosperity * 4) + (($middleClass + $visitors * 0.6) * 1.5) + (($upperClass + $visitors * 0.2) * 3.5) + ($topClass * 18) - ($ASlaves + $helots) * $slaveProductivity) * $rentEffectL>>
+<br><<print _LCD>> LCD
/*Changing population depending on work available*/
<<if $lowerClass < _LCD>>
<<set _ACImmigration = Math.trunc((_LCD - $lowerClass) * 0.3) + 1>>
@@ -436,8 +229,8 @@ More elite citizens require their own slaves and will cause the population of sl
<</if>>
<<elseif $lowerClass > _LCD>>
<<set _ACEmigration = Math.trunc(($lowerClass - _LCD) * 0.6) + 1>>
+ <<set _enslavedEmigrants = Math.trunc((($lowerClass - _LCD) * 0.6) * $enslaveChance)>>
<<set $lowerClass -= _ACEmigration>>
- <<set _enslavedEmigrants = Math.trunc(($lowerClass - _LCD) * 0.6) * $enslaveChance)>>
<<set _enslaved += _enslavedEmigrants>>
<<if _ACEmigration > 1>>
<br>@@.red;<<print _ACEmigration>> Lower class citizens@@ had no work and tried to leave your arcology.
@@ -445,19 +238,20 @@ More elite citizens require their own slaves and will cause the population of sl
@@.green;<<print _enslavedEmigrants>> Of them were enslaved instead.@@
<<elseif _enslavedEmigrants > 0>>
@@.green;One of them was enslaved instead.@@
+ <</if>>
<<elseif _ACEmigration > 0>>
<br>@@.red;One lower class citizen@@ left your arcology due to a lack of work.
<</if>>
- <<if _enslaved < 4>>
- <<set _enslavedPC = 1>>
- <<set _enslavedNPC = _enslaved - 1>>
- <<else>>
- <<set _enslavedPC = Math.trunc(_enslaved / 4)>>
- <<set _enslavedNPC = _enslaved - _enslavedPC>>
- <</if>>
- <<set $helots += _enslavedPC>>
- <<set $ASlaves += _enslavedNPC>>
<</if>>
+<<if _enslaved < 4>>
+ <<set _enslavedPC = 1>>
+ <<set _enslavedNPC = _enslaved - 1>>
+<<else>>
+ <<set _enslavedPC = Math.trunc(_enslaved / 4)>>
+ <<set _enslavedNPC = _enslaved - _enslavedPC>>
+<</if>>
+<<set $helots += _enslavedPC>> <br><<print _enslavedPC>> slave PC
+<<set $ASlaves += _enslavedNPC>> <br><<print _enslavedNPC>> slave NPC
<<if _enslaved > 1>>
<br>In total @@.green;<<print _enslaved>> Lower class citizens@@ were enslaved for failing to pay their debts.
<br> @@.green;You enslaved <<print _enslavedPC>>@@ of them while other debtholders in the arcology enslaved the remaining <<print _enslavedNPC>>.
@@ -466,13 +260,14 @@ More elite citizens require their own slaves and will cause the population of sl
<</if>>
/*Need more slaves still*/
<<if $ASlaves < _SCD>>
- <<set $slaveSupplyFactor -= Math.trunc((_SCD - $ASlaves) * 0.75) + 1>>
+ <<set $menialSupplyFactor -= Math.trunc((_SCD - $ASlaves) * 0.75) + 1>>
<<set $ASlaves += Math.trunc((_SCD - $ASlaves) * 0.75) + 1>>
<</if>>
/*Middle Class Citizens*/
/*Demand for Middle Class*/
-<<set _MCD = (($ASlaves * 0.16) + ($lowerClass * 0.15) + ($upperClass + $visitors * 0.25) + ($topClass * 3)) * $rentEffectM>>
+<<set _MCD = (200 * ($localEcon / 100)) + $arcology[0].prosperity + (($ASlaves * 0.15) + ($lowerClass * 0.1) + (($upperClass + $visitors * 0.2) * 0.5) + ($topClass * 2.5)) * $rentEffectM>>
+<br><<print _MCD>> MCD
/*Middle Class Citizens immigrating*/
<<if $middleClass < _MCD>>
<<set _MCImmigration = Math.trunc((_MCD - $middleClass) * 0.3) + 1>>
@@ -495,7 +290,7 @@ More elite citizens require their own slaves and will cause the population of sl
/*Upper Class Citizens*/
/*Demand for Upper Class*/
-<<set _UCD = (($ASlaves * 0.015) + ($ACizitens * 0.025) + (($middleClass + $visitors * 0.75) * 0.1) + ($topClass * 0.5)) * $rentEffectU>>
+<<set _UCD = (40 * ($localEcon / 100)) + ($arcology[0].prosperity * 0.2) + (($ASlaves * 0.02) + ($lowerClass * 0.025) + (($middleClass + $visitors * 0.6) * 0.05) + ($topClass * 0.3)) * $rentEffectU>>
/*Upper Class Citizens immigrating*/
<<if $upperClass < _UCD>>
<<set _UCImmigration = Math.trunc((_UCD - $upperClass) * 0.3) + 1>>
@@ -520,7 +315,7 @@ More elite citizens require their own slaves and will cause the population of sl
/*Setting GDP depending on population*/
<<set $GDP = Math.trunc((($ASlaves + $helots) * 0.35 * $slaveProductivity) + ($lowerClass * 0.35) + ($middleClass * 0.75) + ($upperClass * 2) + ($topClass * 10)) / 10>>
/*Top Class Interest in living in your arcology*/
-<<set _TCD = (Math.trunc($GDP / 18)) * $rentEffectT + 30>>
+<<set _TCD = (Math.trunc($GDP / 15)) * $rentEffectT + 20>>
/*Top Class Citizens immigrating*/
<<if $topClass < _TCD>>
<<set _TCImmigration = Math.trunc((_TCD - $topClass) * 0.3) + 1>>
@@ -531,8 +326,8 @@ More elite citizens require their own slaves and will cause the population of sl
<br>@@.green;One millionaire@@ moved to your arcology.
<</if>>
/*Top Class Citizens emigrating*/
-<<elseif $topClass > _UCD>>
- <<set _TCEmigration = Math.trunc(($topClass - _TCD) * 0.6)>>
+<<elseif $topClass > _TCD>>
+ <<set _TCEmigration = Math.trunc(($topClass - _TCD) * 0.6) + 1>>
<<set $topClass -= _TCEmigration>>
<<if _TCEmigration > 1>>
<br>@@.red;<<print _TCEmigration>> Millionaires@@ left your arcology.
@@ -543,7 +338,25 @@ More elite citizens require their own slaves and will cause the population of sl
<</if>> /*ends _weatherFreeze*/
<<set $ACitizens = $lowerClass + $middleClass + $upperClass + $topClass>>
-*/
+<<set _difACitizens = $ACitizens - _oldACitizens>>
+<<set _difASlaves = $ASlaves - _oldASlaves>>
+<<set _difLowerClass = $lowerClass - _oldLowerClass>>
+<<set _difMiddleClass = $middleClass - _oldMiddleClass>>
+<<set _difUpperClass = $upperClass - _oldUpperClass>>
+<<set _difTopClass = $topClass - _oldTopClass>>
+<<set _percACitizens = Math.trunc(($ACitizens / ($ACitizens + $ASlaves)) * 1000) / 10>>
+<<set _percASlaves = Math.trunc(($ASlaves / ($ACitizens + $ASlaves)) * 1000) / 10>>
+<<set _percLowerClass = Math.trunc(($lowerClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
+<<set _percMiddleClass = Math.trunc(($middleClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
+<<set _percUpperClass = Math.trunc(($upperClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
+<<set _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>>
+
+<br><br><<print $ACitizens>> | <<print _difACitizens>> | <<print _percACitizens>>
+<br><<print $ASlaves>> | <<print _difASlaves>> | <<print _percASlaves>>
+<br><<print $lowerClass>> | <<print _difLowerClass>> | <<print _percLowerClass>>
+<br><<print $middleClass>> | <<print _difMiddleClass>> | <<print _percMiddleClass>>
+<br><<print $upperClass>> | <<print _difUpperClass>> | <<print _percUpperClass>>
+<br><<print $topClass>> | <<print _difTopClass>> | <<print _percTopClass>>
<br>