diff --git a/src/Mods/SpecialForce/TrickShotNight.tw b/src/Mods/SpecialForce/TrickShotNight.tw
index 39c1758f0a91f3a3e8b52fdb6feb30c0a711cfef..3aed0bca07025d0b5748aa6edb4462cf89f7455c 100644
--- a/src/Mods/SpecialForce/TrickShotNight.tw
+++ b/src/Mods/SpecialForce/TrickShotNight.tw
@@ -67,20 +67,17 @@ Despite your direct elevator, interaction with the majority of your security for
<<if random(1,100) < _shootChance>>
<br> <<link "Up the ante">>
<<replace "#bounty-result">>
- <<set $activeSlaveOneTimeMinAge = 25>>
- <<set $activeSlaveOneTimeMaxAge = 35>>
- <<set $one_time_age_overrides_pedo_mode = 1>>
- <<set $oneTimeDisableDisability = 1>>
<<if $arcologies[0].FSSupremacistLawME == 1>>
- <<set $fixedRace = $arcologies[0].FSSupremacistRace>>
+ <<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
- <<set $fixedRace = _races.random()>>
+ <<set _race = _races.random()>>
<</if>>
+ <<set _param = {minAge: 25, maxAge: 35, ageOverridesPedoMode: 1, race: _race, disableDisability: 1}>>
<<if $seeDicks != 100>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave = GenerateNewSlave("XX", _param)>>
<<else>>
- <<set $activeSlave = GenerateNewSlave("XY")>>
+ <<set $activeSlave = GenerateNewSlave("XY", _param)>>
<</if>>
<<set $activeSlave.origin = "$He put $himself up as collateral at a trick shot game, and lost.">>
<<set $activeSlave.career = "a soldier">>
diff --git a/src/markets/eliteSlave.tw b/src/markets/eliteSlave.tw
index c2814c58e847d4bbf2a76bbd70153399003522e7..7bba87b8776bf0c110b2e70f3739d808943be7a5 100644
--- a/src/markets/eliteSlave.tw
+++ b/src/markets/eliteSlave.tw
@@ -8,25 +8,23 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<set $eliteAuctioned = 1>>
<<if $arcologies[0].FSMaturityPreferentialist > 20>>
- <<set $activeSlaveOneTimeMinAge = 25>>
+ <<set _minAge = 25>>
<<else>>
- <<set $activeSlaveOneTimeMinAge = $fertilityAge>>
+ <<set _minAge = $fertilityAge>>
<</if>>
<<if $arcologies[0].FSYouthPreferentialist > 20>>
- <<set $activeSlaveOneTimeMaxAge = 23>>
+ <<set _maxAge = 23>>
<<else>>
- <<set $activeSlaveOneTimeMaxAge = 40>>
+ <<set _maxAge = 40>>
<</if>>
-<<set $one_time_age_overrides_pedo_mode = 1>>
-<<set $oneTimeDisableDisability = 1>>
<<if $arcologies[0].FSSupremacist != "unset">>
- <<set $fixedRace = $arcologies[0].FSSupremacistRace>>
+ <<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationist != "unset">>
<<set _races = ["amerindian", "asian", "asian", "asian", "asian", "asian", "asian", "black", "black", "indo-aryan", "indo-aryan", "latina", "latina", "latina", "malay", "malay", "middle eastern", "middle eastern", "mixed race", "pacific islander", "semitic", "semitic", "southern european", "southern european", "white", "white", "white", "white", "white", "white", "white", "white", "white"]>>
<<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
- <<set $fixedRace = _races.random()>>
+ <<set _race = _races.random()>>
<</if>>
-<<set $activeSlave = GenerateNewSlave("XX")>>
+<<set $activeSlave = GenerateNewSlave("XX", {minAge: _minAge, maxAge: _maxAge, ageOverridesPedoMode: 1, race: _race, disableDisability: 1})>>
<<set $activeSlave.origin = "$He was purchased from a member of the Elite.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.prestige = 1>>
diff --git a/src/markets/householdLiquidator.tw b/src/markets/householdLiquidator.tw
index af760dd4da3af999d4813e4fc230741ca917a9f2..c88af71dbc5e225488bd21e2d90f9c3713e469ba 100644
--- a/src/markets/householdLiquidator.tw
+++ b/src/markets/householdLiquidator.tw
@@ -6,8 +6,7 @@
<<if random(1,100) > 50>>
-<<set $oneTimeDisableDisability = 1>>
-<<set $activeSlave = GenerateNewSlave()>>
+<<set $activeSlave = GenerateNewSlave(null, {disableDisability: 1})>>
<<set $activeSlave.origin = "You bought $him from the household liquidator.">>
<<set $activeSlave.devotion = random(-75,-25)>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -35,13 +34,7 @@ The household liquidator is offering a set of siblings for sale. You are permitt
<<elseif random(1,100) > 20>>
-/% Begin younger parents submod. %/
-<<set $activeSlaveOneTimeMinAge = $fertilityAge + $minimumSlaveAge>>
-<<set $activeSlaveOneTimeMaxAge = 42>>
-<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a child who can be a slave. %/
-/% End younger parents submod. %/
-<<set $oneTimeDisableDisability = 1>>
-<<set $activeSlave = GenerateNewSlave()>>
+<<set $activeSlave = GenerateNewSlave(null, {minAge: ($fertilityAge + $minimumSlaveAge), maxAge: 42, ageOverridesPedoMode: 1, mature: , nationality: , race: , disableDisability: 1})>>
<<set $activeSlave.origin = "You bought $him from the household liquidator.">>
<<set $activeSlave.devotion = random(-75,-25)>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -73,8 +66,7 @@ The household liquidator is offering a $mother and $his <<if $activeSlave.genes
<<else>>
-<<set $oneTimeDisableDisability = 1>>
-<<set $activeSlave = GenerateNewSlave()>>
+<<set $activeSlave = GenerateNewSlave({disableDisability: 1})>>
<<set $activeSlave.origin = "You bought $him from the household liquidator.">>
<<set $activeSlave.devotion = random(-75,-25)>>
<<set $activeSlave.trust = random(-45,-25)>>
diff --git a/src/pregmod/FCTV/seFCTVremote.tw b/src/pregmod/FCTV/seFCTVremote.tw
index a321adba2bbfb6d01cac02c17914b868ba35b838..4c23769ec38bf588529565ecbaac877136d4cc82 100644
--- a/src/pregmod/FCTV/seFCTVremote.tw
+++ b/src/pregmod/FCTV/seFCTVremote.tw
@@ -2,17 +2,14 @@
<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $encyclopedia = "FCTV", $FCTV.remote = 2>>
-<<set $activeSlaveOneTimeMinAge = 25>>
-<<set $activeSlaveOneTimeMaxAge = 35>>
-<<set $one_time_age_overrides_pedo_mode = 1>>
-<<set $oneTimeDisableDisability = 1>>
+
<<if $arcologies[0].FSSupremacistLawME == 1>>
- <<set $fixedRace = $arcologies[0].FSSupremacistRace>>
+ <<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
- <<set $fixedRace = _races.random()>>
+ <<set _race = _races.random()>>
<</if>>
-<<set _slave = GenerateNewSlave()>>
+<<set _slave = GenerateNewSlave(null, {minAge: 25, maxAge: 35, ageOverridesPedoMode: 1, race: _race, disableDisability: 1})>>
<<set _slave.devotion = 0>>
<<set _slave.trust = 0>>
@@ -88,20 +85,17 @@
<<replace "#scene">>
/* set up customer */
- <<set $activeSlaveOneTimeMinAge = 25>>
- <<set $activeSlaveOneTimeMaxAge = 35>>
- <<set $one_time_age_overrides_pedo_mode = 1>>
- <<set $oneTimeDisableDisability = 1>>
<<if $arcologies[0].FSSupremacistLawME == 1>>
- <<set $fixedRace = $arcologies[0].FSSupremacistRace>>
+ <<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
- <<set $fixedRace = _races.random()>>
+ <<set _race = _races.random()>>
<</if>>
+ <<set _param = {minAge: 25, maxAge: 35, ageOverridesPedoMode: 1, race: _race, disableDisability: 1}>>
<<if $seeDicks > random(1,99)>>
- <<set _customer = GenerateNewSlave("XY")>>
+ <<set _customer = GenerateNewSlave("XY", _param)>>
<<else>>
- <<set _customer = GenerateNewSlave("XX")>>
+ <<set _customer = GenerateNewSlave("XX", _param)>>
<</if>>
<<set _customer = GenerateNewSlave()>>
<<set _customer.devotion = 0>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 3b3f74bc797350cc5dcb90d0804e52129a835007..5f2bacfc829f47aac2dc6a185d7267f1e81bade0 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -4,16 +4,15 @@
<<setPlayerPronouns>>
-<<set $activeSlaveOneTimeMinAge = 16>>
-<<set $oneTimeDisableDisability = 1>>
<<if $arcologies[0].FSSupremacistLawME == 1>>
- <<set $fixedRace = $arcologies[0].FSSupremacistRace>>
+ <<set _race = $arcologies[0].FSSupremacistRace>>
<<elseif $arcologies[0].FSSubjugationistLawME == 1>>
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
- <<set $fixedRace = _races.random()>>
+ <<set _race = _races.random()>>
<</if>>
+<<set _param = {minAge: 16, race: _race, disableDisability: 1}>>
<<if $PC.vagina >= 0>>
- <<set $activeSlave = GenerateNewSlave("XY")>>
+ <<set $activeSlave = GenerateNewSlave("XY", _param)>>
<<set $activeSlave.dick = 6>>
<<set $activeSlave.balls = 5>>
<<set $activeSlave.boobs = 0>>
@@ -21,7 +20,7 @@
<<set $activeSlave.skill.oral = 0>>
<<set $activeSlave.skill.anal = 0>>
<<else>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave = GenerateNewSlave("XX", _param)>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.preg = 0>>
<<set $activeSlave.weight = random(-20,30)>>
diff --git a/src/pregmod/reTheSirenStrikesBack.tw b/src/pregmod/reTheSirenStrikesBack.tw
index c24337547c7ba457a6f9479a49d7f5ee5ab7ccb0..45c94ea84ff53752cd6dec3113f3c1f1f34f9fef 100644
--- a/src/pregmod/reTheSirenStrikesBack.tw
+++ b/src/pregmod/reTheSirenStrikesBack.tw
@@ -6,14 +6,11 @@
<<set _ssb = $slaves.find(function(s) { return s.origin == "$He came to you to escape being sold to a cruel master after $his producer informed $him of $his debt." && s.newGamePlus == 0 && s.fetish != "mindbroken" && s.fuckdoll == 0; })>>
<<if $pedo_mode == 1>>
- <<set $activeSlaveOneTimeMinAge = 16>>
+ <<set _minAge = 16>>
<<else>>
- <<set $activeSlaveOneTimeMinAge = 30>>
+ <<set _minAge = 30>>
<</if>>
-<<set $activeSlaveOneTimeMaxAge = 40>>
-<<set $one_time_age_overrides_pedo_mode = 1>>
-<<set $oneTimeDisableDisability = 1>>
-<<set $activeSlave = GenerateNewSlave()>>
+<<set $activeSlave = GenerateNewSlave(null, {minAge: _minAge, maxAge: 40, ageOverridesPedoMode: 1, disableDisability: 1})>>
<<set $activeSlave.origin = "$He was brought to you to pay for what $he did to one of your slaves.">>
<<set $activeSlave.career = "a producer">>
<<set $activeSlave.devotion = random(-70,30)>>