From b8cef1143cad9957406cb2e1605eb9ecb5f83deb Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Thu, 8 Nov 2018 15:09:11 +0100 Subject: [PATCH] Policy integration --- src/init/storyInit.tw | 3 + src/uncategorized/BackwardsCompatibility.tw | 9 + src/uncategorized/arcmgmt.tw | 314 +++++++++++++++++--- src/uncategorized/policies.tw | 29 +- 4 files changed, 304 insertions(+), 51 deletions(-) diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index bdfe384d8ae..1bc8990655b 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -1255,6 +1255,9 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $BioreactorRetirement = 0>> <<set $ArcadeRetirement = 0>> <<set $CitizenRetirement = 0>> +<<set $CitizenRetirementTrigger = 0>> +<<set $FSSupremacistLawMETrigger = 0>> +<<set $FSSubjugationistLawMETrigger = 0>> <<set $SexMilestoneRetirement = 0>> <<set $MilkMilestoneRetirement = 0>> <<set $CumMilestoneRetirement = 0>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 2d06bcc76f9..dd5ba72ad11 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -2499,6 +2499,15 @@ Setting missing global variables: <<if ndef $CitizenRetirement>> <<set $CitizenRetirement = 0>> <</if>> +<<if ndef $CitizenRetirementTrigger>> +<<set $CitizenRetirementTrigger = 0>> +<</if>> +<<if ndef $FSSupremacistLawMETrigger>> +<<set $FSSupremacistLawMETrigger = 0>> +<</if>> +<<if ndef $FSSubjugationistLawMETrigger>> +<<set $FSSubjugationistLawMETrigger = 0>> +<</if>> <<if def $manuallyRetired>> <<unset $manuallyRetired>> <</if>> diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index e1ffafb8ce0..efc949898c6 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -186,7 +186,7 @@ _topClassP = 1>> <<set _FSScore += $arcologies[0].FSChattelReligionist, _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSChattelReligionist / 20) * 0.01, _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSChattelReligionist / 20) * 0.0125, - _lowerClass += Math.trunc($arcologies[0].FSChattelReligionist / 20) * -2 10, + _lowerClass += Math.trunc($arcologies[0].FSChattelReligionist / 20) * -10, _lowerClassP *= 1 + Math.trunc($arcologies[0].FSChattelReligionist / 20) * -0.002, _upperClass += Math.trunc($arcologies[0].FSChattelReligionist / 20) * 0.25, _upperClassP *= 1 + Math.trunc($arcologies[0].FSChattelReligionist / 20) * 0.001, @@ -198,14 +198,22 @@ _topClassP = 1>> <<set _FSScore += $arcologies[0].FSRomanRevivalist, _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSRomanRevivalist / 20) * 0.01, _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSRomanRevivalist / 20) * 0.0125, - _welfareFS *= 1 + Math.trunc($arcologies[0].FSRomanRevivalist / 20) * -0.25>> + _welfareFS *= 1 + Math.trunc($arcologies[0].FSRomanRevivalist / 20) * -0.05>> + _lowerClass += Math.trunc($arcologies[0].FSRomanRevivalist / 20) * 10, + _lowerClassP *= 1 + Math.trunc($arcologies[0].FSRomanRevivalist / 20) * 0.002, + _topClass += Math.trunc($arcologies[0].FSRomanRevivalist / 20) * -0.2, + _topClassP *= 1 + Math.trunc($arcologies[0].FSRomanRevivalist / 20) * -0.002>> Your citizens take pride in looking after each other. <</if>> <<if $arcologies[0].FSEgyptianRevivalist != "unset">> <<set _FSScore += $arcologies[0].FSEgyptianRevivalist, _slaveDemandU *= 1 + Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * 0.01, _slaveDemandT *= 1 + Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * 0.0125, - _welfareFS *= 1 + Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * -0.25>> + _welfareFS *= 1 + Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * -0.05, + _lowerClass += Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * 10, + _lowerClassP *= 1 + Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * 0.002, + _topClass += Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * -0.2, + _topClassP *= 1 + Math.trunc($arcologies[0].FSEgyptianRevivalist / 20) * -0.002>> Egyptian Revivalism is benevolent in some ways, and charity is common here. <</if>> <<if $arcologies[0].FSEdoRevivalist != "unset">> @@ -287,8 +295,267 @@ _topClassP = 1>> Your citizens enjoy the pleasures of life to their fullest, but some prefer to earn these pleasures. <</if>> +/*policies*/ +<<if $CitizenRetirement == 1>> + <<set _slaveDemandU *= 0.8, + _slaveDemandT *= 0.75, + _slaveProductivity += 0.05, + _expirationFS *= 0.8, + _lowerClass += 50, + _lowerClassP *= 1.01, + _middleClass += 15, + _middleClassP *= 1.01, + _upperClass += -2.5, + _upperClassP *= 0.99, + _topClass += -1, + _topClassP *= 0.99>> +<</if>> +<<if $ProRefugees == 1>> + <<set _slaveDemandU *= 1.05, + _slaveDemandT *= 1.0625>> +<</if>> +<<if $ProImmigrationCash == 1>> + <<set _lowerClass += 100, + _lowerClassP *= 1.02, + _middleClass += 15, + _middleClassP *= 1.01, + _upperClass += -2.5, + _upperClassP *= 0.99, + _topClass += -1, + _topClass *= 0.98>> +<</if>> +<<if $ProImmigrationRep == 1>> + <<set _lowerClass += 100, + _lowerClassP *= 1.02, + _middleClass += 15, + _middleClassP *= 1.01, + _upperClass += -2.5, + _upperClassP *= 0.99, + _topClass += -1, + _topClass *= 0.98>> +<</if>> +<<if $AntiImmigrationCash == 1>> + <<set _lowerClass += -100, + _lowerClassP *= 0.98, + _middleClass += -15, + _middleClassP *= 0.99, + _upperClass += 2.5, + _upperClassP *= 1.01, + _topClass += 1, + _topClass *= 1.02>> +<</if>> +<<if $AntiImmigrationRep == 1>> + <<set _lowerClass += -100, + _lowerClassP *= 0.98, + _middleClass += -15, + _middleClassP *= 0.99, + _upperClass += 2.5, + _upperClassP *= 1.01, + _topClass += 1, + _topClass *= 1.02>> +<</if>> +<<if $ProEnslavementCash == 1>> + <<set _slaveDemandU *= 1.05, + _slaveDemandT *= 1.0625, + _lowerClass += -50, + _lowerClassP *= .99, + _topClass += 0.5, + _topClass *= 1.01>> +<</if>> +<<if $ProEnslavementRep == 1>> + <<set _slaveDemandU *= 1.05, + _slaveDemandT *= 1.0625, + _lowerClass += -50, + _lowerClassP *= .99, + _topClass += 0.5, + _topClass *= 1.01>> +<</if>> +<<if $AntiEnslavementCash == 1>> + <<set _slaveDemandU *= 0.95, + _slaveDemandT *= 0.9375, + _lowerClass += 50, + _lowerClassP *= 1.01, + _topClass += -0.5, + _topClass *= 0.99>> +<</if>> +<<if $AntiEnslavementRep == 1>> + <<set _slaveDemandU *= 0.95, + _slaveDemandT *= 0.9375, + _lowerClass += 50, + _lowerClassP *= 1.01, + _topClass += -0.5, + _topClass *= 0.99>> +<</if>> +<<if $arcologies[0].FSSupremacistLawME == 1>> + <<set _lowerClass += -200, + _lowerClassP *= 0.96, + _middleClass += -30, + _middleClassP *= 1.02, + _upperClass += 5, + _upperClassP *= 1.02, + _topClass += 2, + _topClassP *= 1.04>> + <<if $FSSupremacistLawMETrigger == 1>> + <<set _ASlavesSupremeLaw = Math.trunc(($lowerClass + $middleClass + $upperClass) * 0.65), + $ASlaves += _Math.trunc(ASlavesSupremeLaw * 0.75), + $helots += Math.trunc(_ASlavesSupremeLaw * 0.25), + $lowerClass = Math.trunc($lowerClass * 0.35), + $middleClass = Math.trunc($middleClass * 0.35), + $upperClass = Math.trunc($upperClass * 0.35), + $FSSupremacistLawMETrigger = 2>> + <</if>> +<</if>> +<<if $arcologies[0].$FSSubjugationistLawME == 1>> + <<set _lowerClass += -100, + _lowerClassP *= 0.98, + _middleClass += -15, + _middleClassP *= 1.01, + _upperClass += 2.5, + _upperClassP *= 1.01, + _topClass += 1, + _topClassP *= 1.02>> + <<if $FSSubjugationistLawMETrigger == 1>> + <<set _ASlavesSupremeLaw = Math.trunc(($lowerClass + $middleClass + $upperClass) * 0.2), + $ASlaves += _Math.trunc(ASlavesSupremeLaw * 0.75), + $helots += Math.trunc(_ASlavesSupremeLaw * 0.25), + $lowerClass = Math.trunc($lowerClass * 0.8), + $middleClass = Math.trunc($middleClass * 0.8), + $upperClass = Math.trunc($upperClass * 0.8), + $FSSubjugationistLawMETrigger = 2>> + <</if>> +<</if>> +<<if $arcologies[0].FSRepopulationFocusLaw == 1>> + <<set _lowerClass += 50, + _lowerClassP *= 1.01, + _topClass += -0.5, + _topClassP *= 0.99>> +<</if>> +<<if $arcologies[0].FSRestartLaw == 1>> + <<set _lowerClass += -50, + _lowerClassP *= 0.99, + _topClass += 0.5, + _topClassP *= 1.01>> +<</if>> +<<if $arcologies[0].FSHedonisticDecadenceLaw == 1>> + <<set _middleClass += 30, + _middleClassP *= 1.02>> +<</if>> +<<if $arcologies[0].FSPaternalistLaw == 1>> + <<set _slaveDemandU *= 0.9, + _slaveDemandT *= 0.85, + _upperClass += 2.5, + _upperClassP *= 1.01, + _topClass += 0.5, + _topClassP *= 1.01>> +<</if>> +<<if $arcologies[0].FSYouthPreferentialistLaw == 1>> + <<set _lowerClass += 100, + _lowerClassP *= 1.02, + _middleClass += -30, + _middleClassP *= 0.98>> +<</if>> +<<if $arcologies[0].FSMaturityPreferentialistLaw == 1>> + <<set _lowerClass += -100, + _lowerClassP *= 0.98, + _middleClass += 30, + _middleClassP *= 1.02>> +<</if>> +<<if $arcologies[0].FSChattelReligionistCreed == 1>> + <<if $nicaeaFocus == "slaves">> + <<set _slaveDemandU *= 1 + $nicaeaPower * -0.025, + _slaveDemandT *= 1 + $nicaeaPower * -0.03125, + _slaveProductivity *= 1 + $nicaeaPower * 0.125, + _expirationFS *= 1 + $nicaeaPower * -0.125, + _lowerClass += $nicaeaPower * 25, + _lowerClassP *= 1 + $nicaeaPower * 0.005, + _topClass += $nicaeaPower * -0.25, + _topClassP *= 1 + $nicaeaPower * -0.005>> + <<elseif $nicaeaFocus == "slaveowners">> + <<set _slaveDemandU *= 1 + $nicaeaPower * 0.025, + _slaveDemandT *= 1 + $nicaeaPower * 0.03125, + _lowerClass += $nicaeaPower * -50, + _lowerClassP *= 1 + $nicaeaPower * -0.01, + _middleClass += $nicaeaPower * -7.5, + _middleClassP *= 1 + $nicaeaPower * -0.005, + _upperClass += $nicaeaPower * 1.25, + _upperClassP *= 1 + $nicaeaPower * 0.005, + _topClass += $nicaeaPower * 0.5, + _topClassP *= 1 + $nicaeaPower * 0.01>> + <</if>> + <<if $nicaeaAssignment == "whore">> + <<set _upperClass += $nicaeaPower * 1.25, + _upperClassP *= 1 + $nicaeaPower * 0.005, + _topClass += $nicaeaPower * 0.25, + _topClassP *= 1 + $nicaeaPower * 0.005>> + <<elseif $nicaeaAssignment == "serve the public">> + <<set _lowerClass += $nicaeaPower * 50, + _lowerClassP *= 1 + $nicaeaPower * 0.005, + _middleClass += $nicaeaPower * 7.5, + _middleClassP *= 1 + $nicaeaPower * 0.005>> + <<else>> + <<set _expirationFS *= 1 + $nicaeaPower 0.25, + _lowerClass += $nicaeaPower * 100, + _lowerClassP *= 1 + $nicaeaPower *0.01, + _middleClass += $nicaeaPower * 7.5, + _middleClassP *= 1 + $nicaeaPower * 0.005, + _upperClass += $nicaeaPower * -1.25, + _upperClassP *= 1 + $nicaeaPower * -0.005, + _topClass += $nicaeaPower * -0.5, + _topClassP *= 1 + $nicaeaPower * -0.01>> + <</if>> + <<if $nicaeaAchievement == "slaves">> + <<set _slaveDemandU *= 1 + $nicaeaPower * 0.2, + _slaveDemandT *= 1 + $nicaeaPower * 0.25, + _lowerClass += $nicaeaPower * -100, + _lowerClassP *= 1 + $nicaeaPower * -0.01>> + <</if>> +<</if>> +<<if $arcologies[0].FSAztecRevivalistLaw == 1>> + <<set _lowerClass += 200, + _lowerClassP *= 1.02, + _middleClass += -15, + _middleClassP *= 0.99, + _upperClass += -2.5, + _upperClassP *= 0.99>> +<</if>> +<<set _middleClass += ($TSS.subsidize + $GRI.subsidize + $SCP.subsidize + $LDE.subsidize + $TGA.subsidize + $TCR.subsidize + $TFS.subsidize + $HA.subsidize) * 15, +_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>> + <<set $lowerClass += Math.trunc(($ASlaves + $helots + $fuckdolls + $menialBioreactors) * 0.2), + _helotsRetirement = Math.trunc($helots * 0.8), + $helots = Math.trunc($helots * 0.8), + _fuckdollsRetirement = Math.trunc($fuckdolls * 0.8), + $fuckdolls = Math.trunc($fuckdolls * 0.8), + _menialBioreactorsRetirement = Math.trunc($menialBioreactors * 0.8), + $menialBioreactors = Math.trunc($menialBioreactors * 0.8), + _ASlavesRetirement = Math.trunc($ASlaves * 0.8), + $ASlaves = Math.trunc($ASlaves * 0.8), + $CitizenRetirement = 2>> + You have enacted citizen retirement, the slaves of eligible age are granted freedom. + <<if _helotsRetirement > 1>> + @@.red;<<print _helotsRetirement>> of your menial slaves@@ were retired. + <<elseif _helotsRetirements > 0>> + @@.red;One of your menial slaves@@ was retired. + <</if>> + <<if _fuckdollsRetirement > 1>> + @@.red;<<print _fuckdollsRetirement>> of your fuckdolls@@ were retired. + <<elseif _fuckdollsRetirements > 0>> + @@.red;One of your fuckdolls@@ was retired. + <</if>> + <<if _menialBioreactorsRetirement > 1>> + @@.red;<<print _menialBioreactorsRetirement>> of your bioreactors@@ were retired. + <<elseif _menialBioreactorsRetirements > 0>> + @@.red;One of your bioreactors@@ was retired. + <</if>> + <<if _ASlavesRetirement > 1>> + @@.red;<<print _ASlavesRetirement>> slaves@@ in your arcology were given a citizen retirement. + <</if>> /*I could bother with a single slave retirement message, but that's never going to get used*/ +<</if>> + /*Slave expiration*/ <<set _expirationPC = Math.trunc($helots * ($slaveExpiration * _expirationFS), _expirationNPC = Math.trunc($ASlaves * ($slaveExpiration * _expirationFS)), @@ -719,47 +986,6 @@ You own earning you @@.yellowgreen;<<print cashFormat(_earnings)>>.@@ <</if>> -<<set _refugees = 0>> -<<if $terrain == "urban">> - <<set _refugees += random(0,5)>> -<<elseif $terrain == "rural">> - <<set _refugees += random(0,3)>> -<<elseif $terrain == "marine">> - <<set _refugees += random(0,1)>> -<</if>> -<<if $ProRefugees == 1>> - <<set _refugees += random(0,1)>> -<</if>> -<<for $i = 0; $i < 3; $i++>> - <<if $rep > random(0,30000)>> - <<set _refugees += 1>> - <</if>> -<</for>> -<<if _refugees > 0>> - Some desperate people filtered into the arcology during the - <<if $propCampaign >= 1 && $propFocus == "enslavement">> - week, many attracted by your advertisement campaigns. - <<if $RecuriterOffice == 0 || $Recruiter == 0>> - <<if $propCampaignBoost == 1>> - <<set _refugees += random(0,4)>> - <<else>> - <<set _refugees += random(0,2)>> - <</if>> - <<else>> - ''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your self-enslavement campaign from her PR hub office. - <<if $propCampaignBoost == 1>> - <<set _refugees += random(0,5+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32))>> - <<else>> - <<set _refugees += random(0,3+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/32))>> - <</if>> - <</if>> - <<else>> - week. - <</if>> - As owner, you were able to enslave _refugees of them. - <<set $helots += _refugees>> -<</if>> - <<set _AWeekGrowth = $AGrowth>> <<if _AWeekGrowth+$arcologies[0].prosperity > $AProsperityCap>> @@.yellow;$arcologies[0].name is at its maximum prosperity, so rents will not increase until it is improved.@@ diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw index 50ae50e60e0..593ce1fefc2 100644 --- a/src/uncategorized/policies.tw +++ b/src/uncategorized/policies.tw @@ -129,8 +129,13 @@ <br>''Public Arcade Retirement:'' once reaching mandatory retirement age, slaves are placed in cheap public arcades to be used until useless. [[Repeal|Policies][$ArcadeRetirement = 0]] <<elseif $CitizenRetirement == 1>> - <br>''Citizen Retirement:'' all slaveowners are required to pay into accounts to support their slaves as lower-class citizens in retirement. - [[Repeal|Policies][$CitizenRetirement = 0, $SexMilestoneRetirement = 0, $MilkMilestoneRetirement = 0, $CumMilestoneRetirement = 0, $BirthsMilestoneRetirement = 0, $KillsMilestoneRetirement = 0]] + <<if $CitizenRetirementTrigger == 0>> + <br>''Citizen Retirement:'' all slaveowners are required to pay into accounts to support their slaves as lower-class citizens in retirement. + [[Repeal|Policies][$CitizenRetirement = 0, $SexMilestoneRetirement = 0, $MilkMilestoneRetirement = 0, $CumMilestoneRetirement = 0, $BirthsMilestoneRetirement = 0, $KillsMilestoneRetirement = 0, $CitizenRetirementTrigger = 1]] + <<else>> + <br>''Citizen Retirement:'' all slaveowners are required to pay into accounts to support their slaves as lower-class citizens in retirement. + [[Repeal|Policies][$CitizenRetirement = 0, $SexMilestoneRetirement = 0, $MilkMilestoneRetirement = 0, $CumMilestoneRetirement = 0, $BirthsMilestoneRetirement = 0, $KillsMilestoneRetirement = 0]] + <</if>> <<else>> <br>''Menial Retirement:'' in the absence of a clear slave retirement policy, overaged sex slaves will become menial slaves. <</if>> @@ -244,7 +249,7 @@ <</if>> <<if $AntiImmigrationRep == 1>> - <br>''Citizen Input on Immigration:'' you are selectively turn away potential immigrants to the arcology based on the recommendations of citizens. + <br>''Citizen Input on Immigration:'' you are selectively turning away potential immigrants to the arcology based on the recommendations of citizens. [[Repeal|Policies][$AntiImmigrationRep = 0]] <</if>> @@ -422,8 +427,13 @@ <</if>> <<if $arcologies[0].FSSupremacistLawME == 1>> - <br>''Universal Enslavement of the Impure:'' by law, anyone not of the $arcologies[0].FSSupremacistRace in your arcology is a slave. - [[Repeal|Policies][$arcologies[0].FSSupremacistLawME = 0]] + <<if $FSSupremacistLawMETrigger == 0>> + <br>''Universal Enslavement of the Impure:'' by law, anyone not of the $arcologies[0].FSSupremacistRace in your arcology is a slave. + [[Repeal|Policies][$arcologies[0].FSSupremacistLawME = 0, $FSSupremacistLawMETrigger = 1]] + <<else>> + <br>''Universal Enslavement of the Impure:'' by law, anyone not of the $arcologies[0].FSSupremacistRace in your arcology is a slave. + [[Repeal|Policies][$arcologies[0].FSSupremacistLawME = 0]] + <</if>> <</if>> <<if $arcologies[0].FSSupremacistSMR == 1>> @@ -432,8 +442,13 @@ <</if>> <<if $arcologies[0].FSSubjugationistLawME == 1>> - <br>''Universal Enslavement of Subhumans:'' by law, all $arcologies[0].FSSubjugationistRace subhumans in your arcology are slaves. - [[Repeal|Policies][$arcologies[0].FSSubjugationistLawME = 0]] + <<if $FSSubjugationistLawMETrigger == 0>> + <br>''Universal Enslavement of Subhumans:'' by law, all $arcologies[0].FSSubjugationistRace subhumans in your arcology are slaves. + [[Repeal|Policies][$arcologies[0].FSSubjugationistLawME = 0, $FSSubjugationistLawMETrigger = 1]] + <<else>> + <br>''Universal Enslavement of Subhumans:'' by law, all $arcologies[0].FSSubjugationistRace subhumans in your arcology are slaves. + [[Repeal|Policies][$arcologies[0].FSSubjugationistLawME = 0]] + <</if>> <</if>> <<if $arcologies[0].FSSubjugationistSMR == 1>> -- GitLab