diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 18e36faaa8b949dc9b758c12e575b3b12353692b..9e6128a4681ac946212a102aa1d834bbabf0891b 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -65,17 +65,13 @@
<<if $RESSevent == "mean girls">>
<<set _newSlaves = []>>
<<for _ress = 0; _ress < 3; _ress++>>
- <<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 $one_time_age_overrides_pedo_mode = 1>>
- <<set $activeSlaveOneTimeMinAge = 16>>
- <<set $activeSlaveOneTimeMaxAge = 19>>
- <<set _meanGirl = GenerateNewSlave("XX", {nationality: "American"})>>
+ <<set _meanGirl = GenerateNewSlave("XX", {minAge: 16, maxAge: 19, ageOverridesPedoMode: 1, nationality: "American", race: _race, disableDisability: 1})>>
<<set _meanGirl.origin = "You enslaved $him for abusing " + $eventSlave.slaveName + " while " + getPronouns($eventSlave).pronoun + " was serving the public.">>
<<set _meanGirl.career = "a student">>
<<set _meanGirl.markings = "none", _meanGirl.weight = -20>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index e94b8d581e099f434e603736639edeb3a395f4c4..24534cc2a561f5c25a1bab39d1c9340661a5f039 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -4,14 +4,13 @@
<<set $hostageAnnounced = 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 $activeSlave = GenerateNewSlave("XX")>>
+<<set $activeSlave = GenerateNewSlave("XX", {race: _race, disableDisability: 1})>>
<<set $activeSlave.origin = "You were acquainted with $him before you were an arcology owner; your rival tried to use $him to manipulate you, but you rescued $him.">>
<<set $activeSlave.boobs = 400>>
<<set $activeSlave.butt = 3>>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index e9df601411f8f6f5b4fb25149bb73c82950e88b5..651c3acc5f6865cf8d57404255f1ebc937f58929 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -3,23 +3,22 @@
<<set $nextButton = "Continue", $nextLink = "RIE Eligibility Check", $returnTo = "RIE Eligibility Check">>
<<if $pedo_mode == 1>>
- <<set $activeSlaveOneTimeMinAge = 21>>
+ <<set _minAge = 21>>
<<else>>
- <<set $activeSlaveOneTimeMinAge = 38>>
+ <<set _minAge = 38>>
<</if>>
-<<set $activeSlaveOneTimeMaxAge = 43>>
-<<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 _genParam = {minAge: _minAge, maxAge: 43, ageOverridesPedoMode: 1, race: _race, disableDisability: 1}>>
<<if $seeDicks != 100>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave = GenerateNewSlave("XX", _genParam)>>
<<else>>
- <<set $activeSlave = GenerateNewSlave("XY")>>
+ <<set $activeSlave = GenerateNewSlave("XY", _genParam)>>
<</if>>
<<set $activeSlave.origin = "You sentenced $him to enslavement as a punishment for dereliction of $his duty to you as a mercenary and for theft.">>
<<set $activeSlave.career = "a soldier">>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index 81ef873928769a8250fce13c17f992b965a120c4..b13df215d74c715b69b23bceea735afd08e4889d 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -6,10 +6,7 @@
<<set $introType = "egyptian", $newSlavesDone = 0, $newSlaveIndex = 0, _newSlaves = []>>
<<set _contractCost = 3000>>
-<<set $oneTimeDisableDisability = 1>>
-<<set $activeSlaveOneTimeMinAge = Math.max(16, $minimumSlaveAge + 3)>>
-<<set $activeSlaveOneTimeMaxAge = 29>>
-<<set $activeSlave = GenerateNewSlave()>>
+<<set $activeSlave = GenerateNewSlave(null, {minAge: Math.max(16, $minimumSlaveAge + 3), maxAge: 29, disableDisability: 1})>>
<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself to you for enslavement hoping you would preserve $his incestuous relationship with $his sibling.">>
<<set $activeSlave.devotion = random(5,15)>>
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index 067c85cc5a7287b1722d49feac7b012bd0a3abe7..14ca8e626ccc0c58e4bb1c663578f08268bfce12 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -6,17 +6,13 @@
<<set _milfSlave = $slaves[_milfed]>>
<<run Enunciate(_milfSlave)>>
-<<set $activeSlaveOneTimeMinAge = 36>>
-<<set $activeSlaveOneTimeMaxAge = 42>>
-<<set $one_time_age_overrides_pedo_mode = 1>> /* middle-aged */
-<<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 $activeSlave = GenerateNewSlave("XX")>>
+<<set $activeSlave = GenerateNewSlave("XX", {minAge: 36, maxAge: 42, ageOverridesPedoMode: 1, race: _race, disableDisability: 1})>>
<<set $activeSlave.origin = "$He came to your arcology as a tourist and found $himself enslaved.">>
<<set $activeSlave.devotion = random(-70,-55)>>
<<set $activeSlave.trust = random(-45,-25)>>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index d5e1767247ec97fe3ef76c2bf1c8cfad2ef6993c..e727fda708c79ef1e84955d7f1e915a5cf938ca0 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -54,20 +54,17 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<</link>>
<br>
<<link "Up the ante">>
- <<set $activeSlaveOneTimeMinAge = 38>>
- <<set $activeSlaveOneTimeMaxAge = 43>>
- <<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 _genParam = {minAge: 38, maxAge: 43, ageOverridesPedoMode: 1, race: _race, disableDisability:1}>>
<<if $seeDicks != 100>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave = GenerateNewSlave("XX", _genParam)>>
<<else>>
- <<set $activeSlave = GenerateNewSlave("XY")>>
+ <<set $activeSlave = GenerateNewSlave("XY", _genParam)>>
<</if>>
<<set $activeSlave.origin = "$He put $himself up as collateral at a poker game, and lost.">>
<<set $activeSlave.career = "a soldier">>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 7351407d3d4b7f6202e7290bb94d9db6648029d7..0f7ca419cc211b295d9b3d485fe4077fca284e33 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -2,18 +2,15 @@
<<set $nextButton = " ", $nextLink = "RIE Eligibility Check">>
-<<set $activeSlaveOneTimeMinAge = 36>>
-<<set $activeSlaveOneTimeMaxAge = 42>>
-<<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 _ContractCost = 10000>>
-<<set $activeSlave = GenerateNewSlave("XX")>>
+<<set $activeSlave = GenerateNewSlave("XX", {minAge: 36, maxAge: 42, ageOverridesPedoMode: 1, race: _race, disableDisability: 1})>>
<<set $activeSlave.origin = "$He was once an inspector for the Shelter, but you put a stop to that.">>
<<set $activeSlave.career = "a charity worker">>
<<set $activeSlave.devotion = random(-90,-75)>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index a5f750d8e5e63c400eb005c629fd4e7d67b727ad..37743cf33fdaf899db4e4357d6baa1e5bddc69a5 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -648,11 +648,7 @@
Call as <<JFCSlave>>
%/
<<widget "JFCSlave">>
- <<set $activeSlaveOneTimeMinAge = 20>>
- <<set $activeSlaveOneTimeMaxAge = 36>>
- <<set $one_time_age_overrides_pedo_mode = 1>>
- <<set $oneTimeDisableDisability = 1>>
- <<set $activeSlave = GenerateNewSlave("XX")>>
+ <<set $activeSlave = GenerateNewSlave("XX", {minAge: 20, maxAge: 36, ageOverridesPedoMode: 1, disableDisability: 1})>>
<<set $activeSlave.weight = random(-30,20), $activeSlave.waist = random(-30,10), $activeSlave.face = random(40,60)>>
<<if $activeSlave.faceShape == "masculine">>
<<set $activeSlave.faceShape = "sensual">>