From 6805459b4124ae8fc9d0f62d85a0c0cd44cb65e8 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Mon, 6 Aug 2018 21:41:06 -0500 Subject: [PATCH] 119 Oldest --- src/events/intro/initNationalities.tw | 1 + src/uncategorized/reFSAcquisition.tw | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw index 5b87edcb94b..99d92fbb600 100644 --- a/src/events/intro/initNationalities.tw +++ b/src/events/intro/initNationalities.tw @@ -1,6 +1,7 @@ :: init Nationalities [silently] <<set $minimumSlaveAge = variableAsNumber($minimumSlaveAge, 18, 3, 18)>> +<<set $retirementAge = Math.clamp($retirementAge, 25, 120)>> <<set $fertilityAge = variableAsNumber($fertilityAge, 13, 3, 18)>> <<set $potencyAge = variableAsNumber($potencyAge, 13, 3, 18)>> diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw index 356d23caddc..f8cc0404675 100644 --- a/src/uncategorized/reFSAcquisition.tw +++ b/src/uncategorized/reFSAcquisition.tw @@ -429,8 +429,8 @@ <<case "Maturity Preferentialist">> <<set $contractCost = 1000>> -<<set $activeSlaveOneTimeMinAge = $fertilityAge + $minimumSlaveAge>> -<<set $activeSlaveOneTimeMaxAge = Math.max($activeSlaveOneTimeMinAge,$retirementAge-2)>> +<<set $activeSlaveOneTimeMinAge = 40>> +<<set $activeSlaveOneTimeMaxAge = ($retirementAge-1)>> <<set $one_time_age_overrides_pedo_mode = 1>> /% A mature woman. %/ <<include "Generate New Slave">> <<set $activeSlave.origin = "She offered herself to you for enslavement after deciding you were her best hope of a good life as a slave.">> @@ -457,8 +457,8 @@ <<case "Maturity Preferentialist Two">> <<set $contractCost = 3000>> -<<set $activeSlaveOneTimeMinAge = 25>> -<<set $activeSlaveOneTimeMaxAge = 42>> +<<set $activeSlaveOneTimeMinAge = 36>> +<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>> <<set $one_time_age_overrides_pedo_mode = 1>> <<include "Generate New Slave">> <<set $activeSlave.origin = "She was sold to you by her son, in order to raise funds for his business.">> @@ -484,7 +484,7 @@ <<case "Transformation Fetishist">> <<set $contractCost = 1000>> -<<set $activeSlaveOneTimeMaxAge = 42>> +<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>> <<if $arcologies[0].FSSupremacistLawME == 1>><<set $fixedRace = $arcologies[0].FSSupremacistRace>><</if>> <<include "Generate New Slave">> <<set $activeSlave.origin = "You received her from a surgeon who botched an implant operation on her and needed to get her out of sight.">> -- GitLab