From 33ba39a11ab8baa4c0bd7aee26e9874fa8f61ff4 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Tue, 23 Apr 2019 23:22:33 +0200
Subject: [PATCH] generate xy slave
---
src/Mods/DinnerParty/dinnerPartyExecution.tw | 2 +-
src/SecExp/secExpSmilingMan.tw | 2 +-
src/SpecialForce/TrickShotNight.tw | 2 +-
src/npc/acquisition.tw | 2 +-
src/pregmod/eliteTakeOverResult.tw | 8 +++---
src/pregmod/pRaped.tw | 2 +-
src/pregmod/seFCTVshows.tw | 4 +--
src/pregmod/seHuskSlaveDelivery.tw | 2 +-
src/uncategorized/generateXYSlave.tw | 3 --
src/uncategorized/genericPlotEvents.tw | 4 +--
src/uncategorized/jeSlaveDispute.tw | 2 +-
src/uncategorized/pCoupAttempt.tw | 6 ++--
src/uncategorized/pInvasion.tw | 2 +-
src/uncategorized/pRaidResult.tw | 2 +-
src/uncategorized/pRivalryCapture.tw | 10 +++----
src/uncategorized/prestigiousSlave.tw | 24 ++++++++--------
src/uncategorized/reAWOL.tw | 2 +-
src/uncategorized/reFSAcquisition.tw | 4 +--
src/uncategorized/reMalefactor.tw | 2 +-
src/uncategorized/rePokerNight.tw | 2 +-
src/uncategorized/reRecruit.tw | 30 ++++++++++----------
src/uncategorized/recETS.tw | 10 +++----
src/uncategorized/resFailure.tw | 8 +++---
src/uncategorized/seCoursing.tw | 6 ++--
src/uncategorized/seCustomSlaveDelivery.tw | 2 +-
src/uncategorized/seRaiding.tw | 2 +-
src/uncategorized/seRecruiterSuccess.tw | 4 +--
src/uncategorized/slaveShelter.tw | 6 ++--
src/utility/slaveCreationWidgets.tw | 12 ++++----
29 files changed, 82 insertions(+), 85 deletions(-)
delete mode 100644 src/uncategorized/generateXYSlave.tw
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index a92591da94f..2217732709c 100644
--- a/src/Mods/DinnerParty/dinnerPartyExecution.tw
+++ b/src/Mods/DinnerParty/dinnerPartyExecution.tw
@@ -578,7 +578,7 @@
<<set $MOD_enemyList = []>>
<</if>>
<<for _i = 0; _i < 6; _i++>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.devotion = -20>>
<<set $activeSlave.trust = -2>>
<<set $activeSlave.oldDevotion = -20>>
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index 73da20f3911..7ef0ca3ce40 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -255,7 +255,7 @@
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.ovaries = 1>>
<<else>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.boobs = 250>>
<<set $activeSlave.faceShape = "androgynous">>
<<set $activeSlave.boobShape = "perky">>
diff --git a/src/SpecialForce/TrickShotNight.tw b/src/SpecialForce/TrickShotNight.tw
index 7ac083f3656..62547bdc8fe 100644
--- a/src/SpecialForce/TrickShotNight.tw
+++ b/src/SpecialForce/TrickShotNight.tw
@@ -78,7 +78,7 @@ Despite your direct elevator, interaction with the majority of your security for
<<if $seeDicks != 100>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<else>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<</if>>
<<set $activeSlave.origin = "She put herself up as collateral at a trick shot game, and lost.">>
<<set $activeSlave.career = "a soldier">>
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index cfbdc0162ee..5f7a1bddbaa 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -287,7 +287,7 @@ The previous owner seems to have left in something of a hurry.
<<case "GenderRadicalist">>
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(15,-15), $activeSlave.health = 100>>
<<set $activeSlave.face = random(0,55)>>
<<set $activeSlave.boobs += 100*random(2,4)>>
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index 4fe16637cfe..825eb7dac4e 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -129,11 +129,11 @@
<<if $seeDicks == 0>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<elseif $seeDicks == 100>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<elseif random(1,100) > 50>> /* 50% chance of getting girl or boy */
<<set $activeSlave = GenerateNewSlave("XX")>>
<<else>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<</if>>
<<set _origin = "She was a member of the Societal Elite, captured in their failed attempt at expressing their displeasure.">>
<<set $activeSlave.origin = _origin>>
@@ -173,11 +173,11 @@
<<if $seeDicks == 0>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<elseif $seeDicks == 100>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<elseif random(1,100) > 50>> /* 50% chance of getting girl or boy */
<<set $activeSlave = GenerateNewSlave("XX")>>
<<else>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<</if>>
<<set _origin = "She was a member of the Societal Elite, captured in their failed attempt at expressing their displeasure.">>
<<set $activeSlave.origin = _origin>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index ea0c45e4942..e0b7da8cc0c 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -123,7 +123,7 @@ It would be prudent to up security in your arcology. That or take a guard along
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You sentenced her to enslavement for the attempted rape of a free woman.">>
<<set $activeSlave.devotion = -100>>
<<set $activeSlave.trust = -100>>
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 5dd458198d2..661b8ce49e9 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -460,7 +460,7 @@
<<elseif $randShow == 7 || $randShow == 8>> /* huge balls */
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.anus = 2>>
<<set $activeSlave.balls = random(20,35)>>
<<set $activeSlave.scrotum = $activeSlave.balls>>
@@ -475,7 +475,7 @@
<<elseif $randShow == 9>> /* mpreg dickgirl */
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.anus = 2>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.ovaries = 0>>
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index 3a80f0a77c2..c8dd367ffed 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -9,7 +9,7 @@
<<set $fixedNationality = $huskSlave.nationality>>
<<set $fixedRace = $huskSlave.race>>
<<if $huskSlave.sex == 2>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.boobs = 0>>
<<set $activeSlave.boobsImplant = 0>>
<<else>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
deleted file mode 100644
index 47cf1b30672..00000000000
--- a/src/uncategorized/generateXYSlave.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Generate XY Slave [nobr]
-
-<<set $activeSlave = GenerateNewSlave("XY")>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 39b3a373b39..b3075d67aa8 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -417,7 +417,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlaveOneTimeMinAge = 26>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was the owner of a religious orientation conversion therapy camp whose remnants you enslaved.">>
<<set $activeSlave.career = "a business owner">>
<<set $activeSlave.devotion = -20>>
@@ -1293,7 +1293,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You won her at a shotgun match against other arcology owners.">>
<<set $activeSlave.skill.vaginal = 15>>
<<set $activeSlave.skill.oral = 15>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 39d22c781b2..344f3bb43d5 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -51,7 +51,7 @@
<<case "slave training">>
<<set $contractCost = 10000>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought out a deal involving her training to be an expert gelded sex slave.">>
<<set $activeSlave.devotion = random(30,40)>>
<<set $activeSlave.trust = $activeSlave.devotion>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index b30e94836a6..47a5680d037 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -71,7 +71,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 32>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.weight = random(-20,30)>>
<<set $activeSlave.muscles = random(20,80)>>
<<set $activeSlave.waist = random(10,80)>>
@@ -108,7 +108,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 32>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">>
<<set $activeSlave.weight = random(-20,30)>>
<<set $activeSlave.muscles = random(20,80)>>
@@ -157,7 +157,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 32>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">>
<<set $activeSlave.weight = random(-20,30)>>
<<set $activeSlave.muscles = random(20,80)>>
diff --git a/src/uncategorized/pInvasion.tw b/src/uncategorized/pInvasion.tw
index a1af96fb2ae..ece9b593132 100644
--- a/src/uncategorized/pInvasion.tw
+++ b/src/uncategorized/pInvasion.tw
@@ -97,7 +97,7 @@ The loose militia lately organized by the arcology owners has been called out to
<<for _i = 0; _i < 3; _i++>>
<<if (random(0,99) < $seeDicks)>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<else>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
diff --git a/src/uncategorized/pRaidResult.tw b/src/uncategorized/pRaidResult.tw
index 495fa4fa9c9..48d76ba24c9 100644
--- a/src/uncategorized/pRaidResult.tw
+++ b/src/uncategorized/pRaidResult.tw
@@ -15,7 +15,7 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
<<run repX(2500, "event")>>
<<for _prr = 0; _prr < 3; _prr++>>
<<if ($seeDicks > 0)>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She is an enslaved refugee who participated in the defeated attack on your arcology.">>
<<set _newSlaves.push($activeSlave)>>
<<else>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index e26ea1762d5..8fd102042c2 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -29,7 +29,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceImplant = 15>>
<<set $activeSlave.faceShape = "androgynous">>
@@ -65,7 +65,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.chem = 3000>>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceShape = "masculine">>
@@ -100,7 +100,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceShape = "androgynous">>
<<set $activeSlave.muscles = 0>>
@@ -133,7 +133,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.face = 55>>
<<set $activeSlave.faceImplant = 0>>
<<set $activeSlave.faceShape = "masculine">>
@@ -164,7 +164,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.face = 55>>
<<set $activeSlave.faceImplant = 0>>
<<set $activeSlave.faceShape = "masculine">>
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index 383cd422ee6..f11272b6b0a 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -456,7 +456,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlaveOneTimeMaxAge = 40>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Enslaved as an adult. %/
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She is a natural-born hermaphrodite. She was enslaved as an adult and subjected to treatment to upgrade both her halves to full functionality.">>
@@ -527,7 +527,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlaveOneTimeMinAge = 24>>
<<set $activeSlaveOneTimeMaxAge = 40>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She was once a noted adult film star, and was sold into slavery by her unscrupulous managers.">>
@@ -572,7 +572,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlaveOneTimeMinAge = 19>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She was once the young trophy husband of a powerful woman in the old world, but she sold her into slavery in revenge for her infidelities.">>
@@ -601,7 +601,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She was once expected to become a major sports star, but flamed out due to injury and was recently enslaved due to debt.">>
@@ -633,7 +633,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<case "d young model">>
<<set $activeSlaveOneTimeMaxAge = 21>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She was once a rising young model, but apparently someone decided to take a shortcut in cashing in on her great beauty.">>
@@ -664,7 +664,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<case "d albino">>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She is a natural albino, and was quickly enslaved due to the great demand for physically unusual specimens.">>
@@ -686,7 +686,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlaveOneTimeMaxAge = 35>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% 15 years a slave. %/
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 2>>
<<set $activeSlave.prestigeDesc = "She is one of the longest legally-enslaved persons in the world, having been a slave for 15 years. She has spent almost all that time working as a slave prostitute, and has been heavily modified to keep her productive.">>
@@ -740,7 +740,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlaveOneTimeMinAge = 24>>
<<set $activeSlaveOneTimeMaxAge = 28>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 2>>
<<set $activeSlave.prestigeDesc = "She was once a B-list actress, but fell on hard times and drug addiction and was recently enslaved due to debt.">>
@@ -775,7 +775,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlaveOneTimeMinAge = 38>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 2>>
<<set $activeSlave.prestigeDesc = "She was once a rising old world politician, but was forced to flee from the increasingly dangerous politics common in a stressed world, and was subsequently enslaved.">>
@@ -802,7 +802,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 3>>
<<set $activeSlave.prestigeDesc = "She was born a child of royalty, but her family was overthrown when she was still young. She is a graduate cum laude of the world's most renowned slave school.">>
@@ -837,7 +837,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlaveOneTimeMinAge = 28>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 3>>
<<set $activeSlave.prestigeDesc = "She was once an arcology owner like you, but lost a Free Cities power struggle and was enslaved. An object lesson in the need to stay vigilant.">>
@@ -886,7 +886,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<case "d streamer">>
<<set $activeSlaveOneTimeMaxAge = 28>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She was once a popular creator on a live streaming service, but donations dropped off after getting caught up in some controversy.">>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index 569c2e6650d..62391c396ff 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -19,7 +19,7 @@
<<if $seeDicks != 100>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<else>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<</if>>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for dereliction of her duty to you as a mercenary and for theft.">>
<<set $activeSlave.career = "a soldier">>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 084c210ab2a..ea558d7caaf 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -137,7 +137,7 @@
<<set $contractCost = 1000>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She offered herself for voluntary enslavement to escape life in an area that disapproved of her sexual tendencies.">>
<<set $activeSlave.health = random(-20,20)>>
<<set $activeSlave.devotion = random(15,20)>>
@@ -154,7 +154,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She offered herself for voluntary enslavement after a lifetime as an outcast due to her sexual tendencies.">>
<<set $activeSlave.health = random(-20,20)>>
<<set $activeSlave.devotion = random(15,20)>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 65949fffe4d..2bbdfd1598c 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -211,7 +211,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for rape of a free woman.">>
<<set $activeSlave.devotion = random(-75,-60)>>
<<set $activeSlave.trust = random(-15,0)>>
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index a7217880632..e415f97174e 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -72,7 +72,7 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<<if $seeDicks != 100>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<else>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<</if>>
<<set $activeSlave.origin = "She put herself up as collateral at a poker game, and lost.">>
<<set $activeSlave.career = "a soldier">>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 673ca0da236..cd14e70d211 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -70,7 +70,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She offered herself to you as a slave to escape a life of boredom.">>
<<set $activeSlave.career = "a party girl">>
<<set $activeSlave.devotion = random(25,45)>>
@@ -155,7 +155,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You turned her into a slave girl after she fell into debt to you.">>
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.trust = random(-15,0)>>
@@ -310,7 +310,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You tricked her into enslavement, manipulating her based on her surgical addiction.">>
<<set $activeSlave.devotion = random(-75,-60)>>
<<set $activeSlave.trust = random(-15,0)>>
@@ -362,7 +362,7 @@
<<set $activeSlaveOneTimeMaxAge = 16>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was raised in a radical slave school that treated her from a very young age, up to the point that she never experienced male puberty.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = random(25,45)>>
@@ -456,7 +456,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She asked to be enslaved since she felt you were her only hope of becoming a prettier woman.">>
<<set $activeSlave.devotion = random(10,15)>>
<<set $activeSlave.trust = random(-15,-10)>>
@@ -534,7 +534,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She got into debt for damaging someone's property during a student protest and you bought out her debt.">>
<<set $activeSlave.devotion = random(-30,-5)>>
<<set $activeSlave.trust = random(-25,-5)>>
@@ -667,7 +667,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She (formerly he) enslaved herself to be with a man she loved, only to be sold to you afterward.">>
<<set $activeSlave.devotion = random(-30,-5)>>
<<set $activeSlave.trust = random(-25,-5)>>
@@ -708,7 +708,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She (formerly he) enslaved herself to be with a man she loved, only to be sold to you afterward.">>
<<set $activeSlave.devotion = random(-30,-5)>>
<<set $activeSlave.trust = random(-25,-5)>>
@@ -744,7 +744,7 @@
<<set $activeSlaveOneTimeMinAge = 17>>
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was given to you by criminals as 'tribute', after which you transformed the overthrown (male) leader of their rival gang.">>
<<set $activeSlave.devotion = random(-70,-40)>>
<<set $activeSlave.trust = random(-20,-5)>>
@@ -777,7 +777,7 @@
<<case "DG runaway">>
<<set $activeSlaveOneTimeMaxAge = 24>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was a runaway slave captured by a gang outside your arcology. You bought her cheap after she was harshly used by them.">>
<<set $activeSlave.devotion = random(0,25)>>
<<set $activeSlave.trust = -20>>
@@ -817,7 +817,7 @@
<<case "herm runaway">>
<<set $activeSlaveOneTimeMaxAge = 24>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was a runaway slave captured by a gang outside your arcology. You bought her cheap after she was harshly used by them.">>
<<set $activeSlave.devotion = random(0,25)>>
<<set $activeSlave.trust = -20>>
@@ -1000,7 +1000,7 @@
<<set $activeSlaveOneTimeMinAge = 19>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was a dickgirl chaser in the slave races before being sold to you.">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "Many people remember her from the slavegirl races where she slammed her cock into countless runners' pussies after catching them.">>
@@ -1258,7 +1258,7 @@
<</if>>
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was a breeding bull in the stable of a slaveholding farmer before being sold to you.">>
<<set $activeSlave.devotion = random(25,50)>>
<<set $activeSlave.trust = random(25,50)>>
@@ -1370,7 +1370,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was in an orphanage until reaching maturity, at which point she was sold to you.">>
<<set $activeSlave.devotion = random(10,40)>>
<<set $activeSlave.trust = random(-25,0)>>
@@ -1905,7 +1905,7 @@
<</if>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.face = random(80,100)>>
<<set $activeSlave.intelligence = random(60,100)>>
<<set $activeSlave.intelligenceImplant = 30>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 7f4e6e311b0..6bd2b758a3b 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -153,7 +153,7 @@
<<set $activeSlaveOneTimeMaxAge = 40>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a daughter to knock up. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She offered to become your slave to protect her incestuous relationship.">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -260,7 +260,7 @@
<<set $activeSlaveOneTimeMaxAge = 20>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She offered to become your slave to protect her incestuous relationship.">>
<<set $activeSlave.career = "a dropout">>
<<set $activeSlave.devotion = random(-15,15)>>
@@ -326,7 +326,7 @@
<<set $activeSlaveOneTimeMaxAge = 20>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She offered to become your slave to protect her incestuous relationship.">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -428,7 +428,7 @@
<<set $activeSlaveOneTimeMaxAge = 40>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a son. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She offered to become your slave to protect her incestuous relationship.">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -462,7 +462,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was sold into slavery by her older sister.">>
<<set $activeSlave.career = "a prostitute">>
<<set $activeSlave.devotion = random(-15,15)>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index 7f5ca804ae7..06ce2f71aab 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -294,7 +294,7 @@
<<set $LDE.schoolAnnexed = 1>>
<<for $i = 0; $i < $slavesToAdd; $i++>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was given to you by a failed branch campus of the innovative École des Enculées right after her graduation.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.intelligenceImplant = 0>>
@@ -362,7 +362,7 @@
<<set $TGA.schoolAnnexed = 1>>
<<for $i = 0; $i < $slavesToAdd; $i++>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was given to you by a failed branch campus of the intense Gymnasium-Academy right after her majority.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.intelligenceImplant = 15>>
@@ -480,7 +480,7 @@
<<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
<<set $activeSlave = GenerateNewSlave()>>
<<else>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<</if>>
<<set $activeSlave.origin = "She was a Futanari Sister until you engineered her early enslavement.">>
<<set $activeSlave.career = "a Futanari Sister">>
@@ -677,7 +677,7 @@
<<run newSlave($activeSlave)>> /* skip New Slave Intro */
<</for>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She was the leader of your arcology's Futanari Sisters until you engineered her community's failure and enslavement.">>
<<set $activeSlave.career = "a Futanari Sister">>
<<set $activeSlave.intelligence = random(51,95)>>
diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw
index ce9d671188c..c37f650dd00 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -176,7 +176,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<elseif $origin == "disobedient young dickgirl">>
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.anus = 2>>
<<set $activeSlave.counter.anal += 1, $analTotal += 1>>
<<set $activeSlave.dick = random(2,4)>>
@@ -194,7 +194,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<elseif $origin == "huge balled">>
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.counter.anal += 1, $analTotal += 1>>
<<set $activeSlave.balls = 5>>
@@ -207,7 +207,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<elseif $origin == "feminized">>
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.boobs += 800>>
<<set $activeSlave.boobsImplant += 800>>
<<set $activeSlave.butt += 1>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 41bb33b09e6..2ff7f797bd6 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -111,7 +111,7 @@
<<set $fixedRace = $customSlave.race>>
<</if>>
<<if $customSlave.sex == 2>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.dick = $customSlave.dick>>
<<set $activeSlave.balls = $customSlave.balls>>
<<set $activeSlave.scrotum = $activeSlave.balls>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index 0182d88f010..02e9fccae06 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -189,7 +189,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 45>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.career = "a military officer">>
<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
<<set $activeSlave.faceImplant += 20>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index cce07479e2a..ee1a94180df 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -66,7 +66,7 @@
<<elseif $recruiterTarget == "reassignment candidates">>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She submitted to enslavement as her only way to obtain surgery to transform her into a woman.">>
<<set $activeSlave.devotion = random(-15,5)>>
<<set $activeSlave.trust = random(-10,10)>>
@@ -94,7 +94,7 @@
<<elseif $recruiterTarget == "dissolute sissies">>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XY Slave">>
+<<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "She submitted to enslavement out of a misguided desire to join a sexually libertine society.">>
<<set $activeSlave.devotion = random(-15,5)>>
<<set $activeSlave.trust = random(-10,10)>>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index 9344c897f88..14c04dcfeb7 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -136,7 +136,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $activeSlaveOneTimeMaxAge = 42>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her previous owner forced her to cut off her dick and balls and cook them.">>
<<set $shelterSlave.career = "a slave">>
@@ -223,7 +223,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $activeSlaveOneTimeMinAge = 20>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her previous owner gelded her and used her for anal abuse.">>
<<set $shelterSlave.career = "a slave">>
@@ -246,7 +246,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $activeSlaveOneTimeMinAge = 20>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her background is obscure, but seems to have involved terrible abuse of her huge cock and balls.">>
<<set $shelterSlave.career = "a slave">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index b10ddc90b81..5dbf617ac10 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -692,7 +692,7 @@
<<set $activeSlave = GenerateNewSlave("XX")>>
<<elseif $corpSpecGender == 2>>
Slaves without dicks are not trained.
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<else>>
Slaves are passed to training regardless of whether they have dicks or pussies.
<<set $activeSlave = GenerateNewSlave()>>
@@ -2079,7 +2079,7 @@
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her from the innovative École des Enculées right after her graduation.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.intelligenceImplant = 0>>
@@ -2139,7 +2139,7 @@
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.origin = "You bought her fresh from the intense Gymnasium-Academy right after her majority.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.intelligenceImplant = 30>>
@@ -2231,7 +2231,7 @@
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set $activeSlave.slaveName = setup.cowSlaveNames.random()>>
<<set $activeSlave.slaveSurname = 0>>
<<set $activeSlave.origin = "You bought her from The Cattle Ranch.">>
@@ -2336,7 +2336,7 @@
<<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
<<set $activeSlave = GenerateNewSlave()>>
<<else>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<</if>>
<<set $activeSlave.origin = "You bought her from the enigmatic Futanari Sisters after they sold her into slavery.">>
<<set $activeSlave.career = "a Futanari Sister">>
@@ -2651,7 +2651,7 @@
<</if>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set _criminal = setup.gangCriminalPool.random()>>
--
GitLab