From ddebe3c94fe797e6a303169b02b0a0525f0a9589 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 3 Apr 2018 22:00:20 -0400 Subject: [PATCH] tweaks --- src/uncategorized/generateXXSlave.tw | 9 ++++----- src/uncategorized/generateXYSlave.tw | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw index 136531db6bb..a995f62cb9c 100644 --- a/src/uncategorized/generateXXSlave.tw +++ b/src/uncategorized/generateXXSlave.tw @@ -30,11 +30,10 @@ <</if>> <<set $activeSlave.actualAge = random($activeSlaveOneTimeMinAge,$activeSlaveOneTimeMaxAge)>> <<set $activeSlaveOneTimeMinAge = random($activeSlaveOneTimeMinAge,$activeSlaveOneTimeMaxAge)>> -<<set $activeSlaveOneTimeMinAge = random($activeSlaveOneTimeMinAge,$activeSlaveOneTimeMaxAge)>> -<<if ($arcologies[0].FSYouthPreferentialist != "unset") && ($arcologies[0].FSYouthPreferentialist >= random(1,200)) && $activeSlave.actualAge > 24>> - <<set $activeSlave.actualAge = random($activeSlaveOneTimeMinAge, $activeSlave.actualAge)>> -<<elseif ($arcologies[0].FSMaturityPreferentialist != "unset") && ($arcologies[0].FSMaturityPreferentialist >= random(1,150)) && $activeSlaveOneTimeMaxAge > 24 && $activeSlave.actualAge <= 24>> - <<set $activeSlave.actualAge = random($activeSlave.actualAge, $activeSlaveOneTimeMaxAge)>> +<<if ($arcologies[0].FSYouthPreferentialist != "unset") && ($arcologies[0].FSYouthPreferentialist >= random(1,100))>> + <<set $activeSlave.actualAge = Math.min($activeSlave.actualAge, $activeSlaveOneTimeMinAge)>> +<<elseif ($arcologies[0].FSMaturityPreferentialist != "unset") && ($arcologies[0].FSMaturityPreferentialist >= random(1,200))>> + <<set $activeSlave.actualAge = Math.max($activeSlave.actualAge, $activeSlaveOneTimeMaxAge)>> <</if>> <<if $activeSlave.actualAge >= $retirementAge>> <<set $activeSlave.actualAge = ($retirementAge-2)>> diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw index 074d239172c..66e1793a7bd 100644 --- a/src/uncategorized/generateXYSlave.tw +++ b/src/uncategorized/generateXYSlave.tw @@ -31,10 +31,10 @@ <</if>> <<set $activeSlave.actualAge = random($activeSlaveOneTimeMinAge,$activeSlaveOneTimeMaxAge)>> <<set $activeSlaveOneTimeMinAge = random($activeSlaveOneTimeMinAge,$activeSlaveOneTimeMaxAge)>> -<<if ($arcologies[0].FSYouthPreferentialist != "unset") && ($arcologies[0].FSYouthPreferentialist >= random(1,200)) && $activeSlave.actualAge > 24>> - <<set $activeSlave.actualAge = random($activeSlaveOneTimeMinAge, $activeSlave.actualAge)>> -<<elseif ($arcologies[0].FSMaturityPreferentialist != "unset") && ($arcologies[0].FSMaturityPreferentialist >= random(1,150)) && $activeSlaveOneTimeMaxAge > 24 && $activeSlave.actualAge <= 24>> - <<set $activeSlave.actualAge = random($activeSlave.actualAge, $activeSlaveOneTimeMaxAge)>> +<<if ($arcologies[0].FSYouthPreferentialist != "unset") && ($arcologies[0].FSYouthPreferentialist >= random(1,100))>> + <<set $activeSlave.actualAge = Math.min($activeSlave.actualAge, $activeSlaveOneTimeMinAge)>> +<<elseif ($arcologies[0].FSMaturityPreferentialist != "unset") && ($arcologies[0].FSMaturityPreferentialist >= random(1,200))>> + <<set $activeSlave.actualAge = Math.max($activeSlave.actualAge, $activeSlaveOneTimeMaxAge)>> <</if>> <<if $activeSlave.actualAge >= $retirementAge>> <<set $activeSlave.actualAge = ($retirementAge-2)>> -- GitLab