From 6083cf77d710ff3365b35587b2f846d281be72d8 Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Tue, 4 Dec 2018 13:03:31 +0100 Subject: [PATCH] Balancing deaths and more retirements --- src/uncategorized/arcmgmt.tw | 63 ++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index 33d86878828..8e9222d7b08 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,11 +149,21 @@ _topClassP = 1>> <</if>> <<if $arcologies[0].FSAssetExpansionist != "unset">> <<set _FSScore += Math.min($arcologies[0].FSAssetExpansionist, 100)>> + <<if $arcologies[0].FSPaternalist != "unset">> + _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>> + _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, + <<if $arcologies[0].FSPaternalist != "unset">> + _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>> + _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSPastoralist, 100) / 20) * 0.05, + <</if>> _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, @@ -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, /*This doesn't really mesh well with _welfareFS reducing the amount of enslaved lower class AND the part where Roman Revivalism reduces the prices of slaves (part of the earlier slave market rework), because them being forced to buy the slaves that die pushes the other way. It gives a kind of internal struggle for the FS, which is a bit odd. Won't break anything, though. It does feel inconsistent, as if different views of what FSRR should be have shaped different parts of it. Is there supposed to be an extra sharp distinction between citizen and slave?*/ _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, @@ -250,6 +261,11 @@ _topClassP = 1>> _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, + <<if $arcologies[0].FSPaternalist != "unset">> + _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>> + _expirationFS *= 1 + Math.trunc(Math.min($arcologies[0].FSRepopulationFocus, 100) / 20) * 0.05, + <</if>> _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, @@ -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, -- GitLab