From 387c0774c59fc96aed96575c714bf26aa546ff33 Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Mon, 29 Oct 2018 17:38:36 +0100 Subject: [PATCH] Visitors added --- src/init/storyInit.tw | 1 + src/uncategorized/arcmgmt.tw | 140 ++++++++++++++++++++++++++++------- 2 files changed, 115 insertions(+), 26 deletions(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 4b8a66bc8aa..84f1a01c7d1 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1113,6 +1113,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $AGrowth = 2>> <<set $ACitizens = 2850>> +<<set $visitors = 0>> <<set $welfare = 0.004>> <<set $LCDemand = 1840>> <<set $rentEffectL = 1>> diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index a11b560790a..f8d2d82243e 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -236,15 +236,103 @@ More elite citizens require their own slaves and will cause the population of sl <<set $ASlaves -= _expirationNPC>> <<set $helots -= _expirationPC>> <<if _expiration > 1>> - <<print _expiration>> Slaves died due to the tough working conditions in your arcology. + @@.red;<<print _expiration>> Slaves died@@ due to the tough working conditions in your arcology. <<if _expirationPC > 1>> - Of which <<print _expirationPC>> were yours. + Of which @@.red;<<print _expirationPC>> were yours.@@ <<elseif _expiration PC > 0>> - One of them was yours. + @@.red;One of them was yours.@@ <</if>> <</if>> +/*Bunch of visitor stuff*/ +<<set _FSScore = 0>> +<<if $arcologies[0].FSSupremacist != "unset">> + <<set _FSScore += $arcologies[0].FSSupremacist>> +<</if>> +<<if $arcologies[0].FSSubjugationist != "unset">> + <<set _FSScore += $arcologies[0].FSSubjugationist>> +<</if>> +<<if $arcologies[0].FSGenderRadicalist != "unset">> + <<set _FSScore += $arcologies[0].FSGenderRadicalist>> +<</if>> +<<if $arcologies[0].FSGenderFundamentalist != "unset">> + <<set _FSScore += $arcologies[0].FSGenderFundamentalist>> +<</if>> +<<if $arcologies[0].FSPaternalist != "unset">> + <<set _FSScore += $arcologies[0].FSPaternalist>> +<</if>> +<<if $arcologies[0].FSDegradationist != "unset">> + <<set _FSScore += $arcologies[0].FSDegradationist>> +<</if>> +<<if $arcologies[0].FSBodyPurist != "unset">> + <<set _FSScore += $arcologies[0].FSBodyPurist>> +<</if>> +<<if $arcologies[0].FSTransformationFetishist != "unset">> + <<set _FSScore += $arcologies[0].FSTransformationFetishist>> +<</if>> +<<if $arcologies[0].FSYouthPreferentialist != "unset">> + <<set _FSScore += $arcologies[0].FSYouthPreferentialist>> +<</if>> +<<if $arcologies[0].FSMaturityPreferentialist != "unset">> + <<set _FSScore += $arcologies[0].FSMaturityPreferentialist>> +<</if>> +<<if $arcologies[0].FSSlimnessEnthusiast != "unset">> + <<set _FSScore += $arcologies[0].FSSlimnessEnthusiast>> +<</if>> +<<if $arcologies[0].FSAssetExpansionist != "unset">> + <<set _FSScore += $arcologies[0].FSAssetExpansionist>> +<</if>> +<<if $arcologies[0].FSPastoralist != "unset">> + <<set _FSScore += $arcologies[0].FSPastoralist>> +<</if>> +<<if $arcologies[0].FSPhysicalIdealist != "unset">> + <<set _FSScore += $arcologies[0].FSPhysicalIdealist>> +<</if>> +<<if $arcologies[0].FSChattelReligionist != "unset">> + <<set _FSScore += $arcologies[0].FSChattelReligionist>> +<</if>> +<<if $arcologies[0].FSRomanRevivalist != "unset">> + <<set _FSScore += $arcologies[0].FSRomanRevivalist>> +<</if>> +<<if $arcologies[0].FSEgyptianRevivalist!= "unset">> + <<set _FSScore += $arcologies[0].FSEgyptianRevivalist>> +<</if>> +<<if $arcologies[0].FSEdoRevivalist != "unset">> + <<set _FSScore += $arcologies[0].FSEdoRevivalist>> +<</if>> +<<if $arcologies[0].FSArabianRevivalist != "unset">> + <<set _FSScore += $arcologies[0].FSArabianRevivalist>> +<</if>> +<<if $arcologies[0].FSChineseRevivalist != "unset">> + <<set _FSScore += $arcologies[0].FSChineseRevivalist>> +<</if>> +<<if $arcologies[0].FSNull != "unset">> + <<set _FSScore += $arcologies[0].FSNull>> +<</if>> +<<if $arcologies[0].FSRepopulationFocus != "unset">> + <<set _FSScore += $arcologies[0].FSRepopulationFocus>> +<</if>> +<<if $arcologies[0].FSRestart != "unset">> + <<set _FSScore += $arcologies[0].FSRestart>> +<</if>> +<<if $arcologies[0].FSHedonisticDecadence != "unset">> + <<set _FSScore += $arcologies[0].FSHedonisticDecadence>> +<</if>> +<<set _FSScore = _FSScore / $FSCreditCount>> +<<if $secExp == 1>> + <<if $docks > 0>> + <<set _transportHub = 0.7 + $docks / 10 + $airport / 10>> + <<elseif $railway > 0>> + <<set _transportHub = 0.7 + $railway / 10 + $airport / 10>> + <<else>> + <<set _transportHub = 0.7>> + <</if>> +<<else>> + <<set _transportHub = 1>> +<</if>> +<<set $visitors = Math.trunc((($prosperity + _FSScore * 3) * _transportHub) / (100 / $localEcon))>> +<br>@@.green;<<print $visitors>> Traders and tourists@@ visited your arcology this week. /*Demand for simple labor*/ -<<set _LSCD = ($LCDemand + ($prosperity * 5) + ($middleClass * 2) + ($upperClass * 4.5) + ($topClass * 20)>> +<<set _LSCD = ($LCDemand + ($prosperity * 5) + (($middleClass + $visitors * 0.75) * 2) + (($upperClass + $visitors * 0.25) * 4.5) + ($topClass * 20)>> /*Demand for owning slaves*/ <<set _SCD = ($upperClass * $slaveDemandU) + ($topClass * $slaveDemandT)>> /*More slaves than there is work*/ @@ -288,9 +376,9 @@ More elite citizens require their own slaves and will cause the population of sl <<set _ACImmigration = Math.trunc((_LCD - $ACitizens) * 0.3) + 1>> <<set $ACitizens += _ACImmigration>> <<if _ACImmigration > 1>> - <<print _ACImmigration>> Lower class citizens moved to your arcology. + <br>@@.green;<<print _ACImmigration>> Lower class citizens@@ moved to your arcology. <<elseif _ACImmigration > 0>> - One lower class citizen moved to your arcology. + <br>@@.green;One lower class citizen@@ moved to your arcology. <</if>> <<elseif $ACitizens > _LCD>> <<set _ACEmigration = Math.trunc(($ACitizens - _LCD) * 0.6) + 1>> @@ -298,13 +386,13 @@ More elite citizens require their own slaves and will cause the population of sl <<set _enslavedEmigrants = Math.trunc(($ACitizens - _LCD) * 0.6) * $enslaveChance)>> <<set _enslaved += _enslavedEmigrants>> <<if _ACEmigration > 1>> - <<print _ACEmigration>> Lower class citizens had no work and tried to leave your arcology. + <br>@@.red;<<print _ACEmigration>> Lower class citizens@@ had no work and tried to leave your arcology. <<if _enslavedEmigrants > 1>> - <<print _enslavedEmigrants>> Of them were enslaved instead. - <<if _enslavedEmigrants > 0>> - One of them was enslaved instead. + @@.green;<<print _enslavedEmigrants>> Of them were enslaved instead.@@ + <<elseif _enslavedEmigrants > 0>> + @@.green;One of them was enslaved instead.@@ <<elseif _ACEmigration > 0>> - One lower class citizen left your arcology due to a lack of work. + <br>@@.red;One lower class citizen@@ left your arcology due to a lack of work. <</if>> <<if _enslaved < 4>> <<set _enslavedPC = 1>> @@ -317,10 +405,10 @@ More elite citizens require their own slaves and will cause the population of sl <<set $ASlaves += _enslavedNPC>> <</if>> <<if _enslaved > 1>> - <<print _enslaved>> Lower class citizens were enslaved for failing to pay their debts. - <br> You enslaved <<print _enslavedPC>> of them while other debtholders in the arcology enslaved the remaining <<print _enslavedNPC>>. + <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>>. <<elseif _enslaved > 0>> - One lower class citizen was enslaved for failing to pay their debts. As arcology owner you claimed the slave. + <br>@@.green;As arcology owner you claimed the slave.@@ <</if>> /*Need more slaves still*/ <<if $ASlaves < _SCD>> @@ -336,18 +424,18 @@ More elite citizens require their own slaves and will cause the population of sl <<set _MCImmigration = Math.trunc((_MCD - $middleClass) * 0.3) + 1>> <<set $middleClass += _MCImmigration>> <<if _MCImmigration > 1>> - <<print _MCImmigration>> Middle class citizens moved to your arcology. + <br>@@.green;<<print _MCImmigration>> Middle class citizens@@ moved to your arcology. <<elseif _MCImmigration > 0>> - One middle class citizen moved to your arcology. + <br>@@.green;One middle class citizen@@ moved to your arcology. <</if>> /*Middle Class Citizens emigrating*/ <<elseif $middleClass > _MCD>> <<set _MCEmigration = Math.trunc(($middleClass - _MCD) * 0.6)>> <<set $middleClass -= _MCEmigration>> <<if _MCEmigration > 1>> - <<print _MCEmigration>> Middle class citizens left your arcology. + <br>@@.red;<<print _MCEmigration>> Middle class citizens@@ left your arcology. <<elseif _MCEmigration > 0>> - One middle class citizen left your arcology. + <br>@@.red;One middle class citizen@@ left your arcology. <</if>> <</if>> @@ -359,18 +447,18 @@ More elite citizens require their own slaves and will cause the population of sl <<set _UCImmigration = Math.trunc((_UCD - $upperClass) * 0.3) + 1>> <<set $upperClass += _UCImmigration>> <<if _UCImmigration > 1>> - <<print _UCImmigration>> Upper class citizens moved to your arcology. + <br>@@.green;<<print _UCImmigration>> Upper class citizens@@ moved to your arcology. <<elseif _UCImmigration > 0>> - One upper class citizen moved to your arcology. + <br>@@.green;One upper class citizen@@ moved to your arcology. <</if>> /*Upper Class Citizens Emigrating*/ <<elseif $upperClass > _UCD>> <<set _UCEmigration = Math.trunc(($upperClass - _UCD) * 0.6)>> <<set $upperClass -= _UCEmigration>> <<if _UCEmigration > 1>> - <<print _UCEmigration>> Upper class citizens left your arcology. + <br>@@.red;<<print _UCEmigration>> Upper class citizens@@ left your arcology. <<elseif _UCEmigration > 0>> - One upper class citizen left your arcology. + <br>@@.red;One upper class citizen@@ left your arcology. <</if>> <</if>> @@ -384,18 +472,18 @@ More elite citizens require their own slaves and will cause the population of sl <<set _TCImmigration = Math.trunc((_TCD - $topClass) * 0.3) + 1>> <<set $topClass += _TCImmigration>> <<if _TCImmigration > 1>> - <<print _TCImmigration>> Millionairs moved to your arcology. /*Fat Cat? One-Percenter?*/ + <br>@@.green;<<print _TCImmigration>> Millionaires@@ moved to your arcology. /*Fat Cat? One-Percenter?*/ <<elseif _TCImmigration > 0>> - One millionair moved to your arcology. + <br>@@.green;One millionaire@@ moved to your arcology. <</if>> /*Top Class Citizens emigrating*/ <<elseif $topClass > _UCD>> <<set _TCEmigration = Math.trunc(($topClass - _TCD) * 0.6)>> <<set $topClass -= _TCEmigration>> <<if _TCEmigration > 1>> - <<print _TCEmigration>> Millionairs left your arcology. + <br>@@.red;<<print _TCEmigration>> Millionaires@@ left your arcology. <<elseif _TCEmigration > 0>> - One millionair left your arcology. + <br>@@.red;One millionaire@@ left your arcology. <</if>> <</if>> -- GitLab