From b6d4a49c03c9aedca551819da4abbb609ae967b6 Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Sun, 9 Dec 2018 12:56:51 +0100 Subject: [PATCH] Citizen Retirement fixes This bit of code apparently had all the whoopsies. --- src/uncategorized/arcmgmt.tw | 10 +++++----- src/uncategorized/policies.tw | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index a18c81b2ea8..4a3b41cf825 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -587,15 +587,15 @@ _middleClass *= 1 + ($TSS.subsidize + $GRI.subsidize + $SCP.subsidize + $LDE.sub <<elseif $arcologies[0].FSSubjugationistLawME == 1>> <<set $lowerClass += Math.trunc(($NPCSlaves + $helots + $fuckdolls + $menialBioreactors) * 0.15)>> <</if>> - _helotsRetirement = Math.trunc($helots * 0.8), + <<set _helotsRetirement = Math.trunc($helots * 0.2), $helots = Math.trunc($helots * 0.8), - _fuckdollsRetirement = Math.trunc($fuckdolls * 0.8), + _fuckdollsRetirement = Math.trunc($fuckdolls * 0.2), $fuckdolls = Math.trunc($fuckdolls * 0.8), - _menialBioreactorsRetirement = Math.trunc($menialBioreactors * 0.8), + _menialBioreactorsRetirement = Math.trunc($menialBioreactors * 0.2), $menialBioreactors = Math.trunc($menialBioreactors * 0.8), - _ASlavesRetirement = Math.trunc($NPCSlaves * 0.8), + _ASlavesRetirement = Math.trunc($NPCSlaves * 0.2), $NPCSlaves = Math.trunc($NPCSlaves * 0.8), - $CitizenRetirement = 2>> + $CitizenRetirementTrigger = 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. diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw index 8d92252bebe..dd9828d2f17 100644 --- a/src/uncategorized/policies.tw +++ b/src/uncategorized/policies.tw @@ -129,13 +129,8 @@ <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>> - <<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>> + <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]] <<else>> <br>''Menial Retirement:'' in the absence of a clear slave retirement policy, overaged sex slaves will become menial slaves. <</if>> @@ -861,9 +856,15 @@ <<if $ArcadeRetirement == 0>> <<if $CitizenRetirement == 0>> <<if $arcologies[0].FSDegradationist == "unset">> - <br>''Citizen Retirement:'' all slaveowners will be required to pay into accounts to support their slaves as lower-class citizens in retirement. - [[Implement|Policies][$CitizenRetirement = 1, $cash -=5000, $rep -= 1000]] - <br> //Will add upkeep to all slaves// + <<if $CitizenRetirementTrigger == 0>> + <br>''Citizen Retirement:'' all slaveowners will be required to pay into accounts to support their slaves as lower-class citizens in retirement. + [[Implement|Policies][$CitizenRetirement = 1, $cash -=5000, $rep -= 1000, $CitizenRetirementTrigger = 1]] + <br> //Will add upkeep to all slaves// + <<else>> + <br>''Citizen Retirement:'' all slaveowners will be required to pay into accounts to support their slaves as lower-class citizens in retirement. + [[Implement|Policies][$CitizenRetirement = 1, $cash -=5000, $rep -= 1000]] + <br> //Will add upkeep to all slaves// + <</if>> <</if>> <<if $arcologies[0].FSPaternalist == "unset">> <br>''Public Arcade Retirement:'' once reaching mandatory retirement age, slaves will be placed in cheap public arcades to be used until useless. -- GitLab