From f554233aab5f4b1ac96308472ca567302b75d942 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Sat, 29 Aug 2020 23:48:11 -0400
Subject: [PATCH] last of the one offs
---
src/uncategorized/RESS.tw | 10 +++-------
src/uncategorized/pRivalryHostage.tw | 7 +++----
src/uncategorized/reAWOL.tw | 17 ++++++++---------
.../reFSEgyptianRevivalistAcquisition.tw | 5 +----
src/uncategorized/reMilfTourist.tw | 10 +++-------
src/uncategorized/rePokerNight.tw | 13 +++++--------
src/uncategorized/reShelterInspection.tw | 11 ++++-------
src/utility/slaveCreationWidgets.tw | 6 +-----
8 files changed, 28 insertions(+), 51 deletions(-)
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 18e36faaa8b..9e6128a4681 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 e94b8d581e0..24534cc2a56 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 e9df601411f..651c3acc5f6 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 81ef8739287..b13df215d74 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 067c85cc5a7..14ca8e626cc 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 d5e1767247e..e727fda708c 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 7351407d3d4..0f7ca419cc2 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 a5f750d8e5e..37743cf33fd 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">>
--
GitLab