From b321e83c5b3d54c99fae456708ae343288ab01b8 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Sun, 21 Apr 2019 17:34:30 +0200
Subject: [PATCH] remove generateNewSlave.tw
---
devNotes/AnatomyOfAFreeCitiesEvent.txt | 2 +-
src/npc/acquisition.tw | 40 ++++++-------
src/pregmod/reTheSirenStrikesBack.tw | 2 +-
src/uncategorized/REFS.tw | 4 +-
src/uncategorized/generateNewSlave.tw | 3 -
src/uncategorized/genericPlotEvents.tw | 4 +-
src/uncategorized/householdLiquidator.tw | 4 +-
src/uncategorized/jeSlaveDispute.tw | 6 +-
src/uncategorized/pRaidResult.tw | 4 +-
src/uncategorized/reFSAcquisition.tw | 56 +++++++++----------
.../reFSEgyptianRevivalistAcquisition.tw | 2 +-
src/uncategorized/reMalefactor.tw | 8 +--
src/uncategorized/reRecruit.tw | 6 +-
src/uncategorized/recETS.tw | 2 +-
src/uncategorized/resFailure.tw | 2 +-
src/uncategorized/seRecruiterSuccess.tw | 6 +-
src/uncategorized/slaveShelter.tw | 12 ++--
src/utility/slaveCreationWidgets.tw | 30 +++++-----
18 files changed, 95 insertions(+), 98 deletions(-)
delete mode 100644 src/uncategorized/generateNewSlave.tw
diff --git a/devNotes/AnatomyOfAFreeCitiesEvent.txt b/devNotes/AnatomyOfAFreeCitiesEvent.txt
index 5a6ac0cba79..8d9d406fd85 100644
--- a/devNotes/AnatomyOfAFreeCitiesEvent.txt
+++ b/devNotes/AnatomyOfAFreeCitiesEvent.txt
@@ -120,7 +120,7 @@ A choice doesn't need to have a specific effect. If your event has an immediate
Confronting the citizen is simplicity in itself; he would not dare defy you under threat of arrest by your security drones and is unlikely to garner any sympathy from the public for his degradationist behaviors. As such, you are able to take civil ownership over the poor slave girl and take her into your care with only minimal compensation to the citizen. As you stride away from her former owner with the girl in your arms, she leans over to plant a chaste kiss of thanks on your cheek.
<<set $cash -= 2000>>
<<set $activeSlaveOneTimeMaxAge = 22>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was taken into your custody from an abusive owner.">>
<<set $activeSlave.devotion = random(-25,0)>>
<<set $activeSlave.trust = random(-25,0)>>
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index fa8f690e9fc..df4bae5c0a8 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -260,7 +260,7 @@ The previous owner seems to have left in something of a hurry.
<<switch $targetArcology.type>>
<<case "Supremacist">>
<<set $oneTimeDisableDisability = 1>>
- <<set $fixedRace = $arcologies[0].FSSupremacistRace>><<include "Generate New Slave">>
+ <<set $fixedRace = $arcologies[0].FSSupremacistRace>><<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(0,15)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
@@ -273,7 +273,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "please you">>
<<case "Subjugationist">>
<<set $oneTimeDisableDisability = 1>>
- <<set $fixedRace = $arcologies[0].FSSubjugationistRace>><<include "Generate New Slave">>
+ <<set $fixedRace = $arcologies[0].FSSubjugationistRace>><<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(0,15)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
@@ -314,7 +314,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "be a servant">>
<<case "Paternalist">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(55,65), $activeSlave.health = random(55,65)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.intelligence = random(0,100), $activeSlave.intelligenceImplant = 30>>
@@ -322,7 +322,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.clothes = "conservative clothing", $activeSlave.collar = "none", $activeSlave.shoes = "flats">>
<<set $activeSlave.assignment = "be a servant">>
<<case "Degradationist">>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = 25, $activeSlave.trust = -25, $activeSlave.health = random(0,15)>>
<<set $activeSlave.fuckdoll = 100>>
<<set $activeSlave.career = "a Fuckdoll">>
@@ -337,7 +337,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "please you">>
<<case "AssetExpansionist">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-15,15), $activeSlave.health = random(25,45)>>
<<set $activeSlave.chem = 50>>
<<set $activeSlave.face = random(15,100)>>
@@ -357,7 +357,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "please you">>
<<case "SlimnessEnthusiast">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(55,65), $activeSlave.health = random(55,65)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.boobs = 100*random(1,4)>>
@@ -373,7 +373,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "please you">>
<<case "TransformationFetishist">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-15,15), $activeSlave.health = random(-15,0)>>
<<set $activeSlave.faceImplant = random(40,70)>>
<<set $activeSlave.face = Math.trunc($activeSlave.face+$activeSlave.faceImplant/2,-100,100)>>
@@ -393,7 +393,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "whore">>
<<case "BodyPurist">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(25,45), $activeSlave.health = 100>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.weight = random(-5,5)>>
@@ -410,7 +410,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlaveOneTimeMaxAge = 39>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(-15,15), $activeSlave.health = random(25,45)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.boobs += 100*random(1,4)>>
@@ -427,7 +427,7 @@ The previous owner seems to have left in something of a hurry.
<<case "YouthPreferentialist">>
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(55,65), $activeSlave.health = random(25,45)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.boobs = 100*random(1,4)>>
@@ -440,7 +440,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "be a servant">>
<<case "Pastoralist">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(25,45)>>
<<set $activeSlave.boobs += 100*random(10,20)>>
<<if $activeSlave.balls > 0>><<set $activeSlave.balls++>><</if>>
@@ -449,7 +449,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "get milked">>
<<case "PhysicalIdealist">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(25,45), $activeSlave.health = 100>>
<<set $activeSlave.muscles = random(50,100)>>
<<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
@@ -462,7 +462,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "whore">>
<<case "ChattelReligionist">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(55,65), $activeSlave.health = random(0,15)>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina++>><</if>>
<<set $activeSlave.skill.whoring = random(10,20)>>
@@ -472,7 +472,7 @@ The previous owner seems to have left in something of a hurry.
<<case "RomanRevivalist">>
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = 100, $activeSlave.trust = random(55,65), $activeSlave.health = 100>>
<<set $activeSlave.face = random(0,55)>>
<<set $activeSlave.muscles = random(25,50)>>
@@ -485,7 +485,7 @@ The previous owner seems to have left in something of a hurry.
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "latina">>
<<set $fixedNationality = "Mexican">>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.accent = 0>>
<<set $activeSlave.devotion = 75, $activeSlave.trust = 75, $activeSlave.health = random(-20,20)>>
<<set $activeSlave.muscles = random(50,75)>>
@@ -495,7 +495,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "be your Head Girl", $HeadGirl = $activeSlave>>
<<case "EgyptianRevivalist">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(25,45), $activeSlave.health = random(25,45)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.skill.oral = random(15,35), $activeSlave.skill.anal = random(15,35)>>
@@ -511,7 +511,7 @@ The previous owner seems to have left in something of a hurry.
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "asian">>
<<set $fixedNationality = "Japanese">>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.accent = 0>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(25,45), $activeSlave.health = random(25,45)>>
<<set $activeSlave.face = random(15,100)>>
@@ -521,7 +521,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "serve the public">>
<<case "ArabianRevivalist">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-15,15), $activeSlave.health = random(25,45)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.intelligence = random(-15,80), $activeSlave.intelligenceImplant = 0>>
@@ -534,7 +534,7 @@ The previous owner seems to have left in something of a hurry.
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "asian">>
<<set $fixedNationality = "Chinese">>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = random(55,65), $activeSlave.trust = random(25,45), $activeSlave.health = random(25,45)>>
<<set $activeSlave.face = random(0,55)>>
<<set $activeSlave.accent = 0>>
@@ -551,7 +551,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlave.assignment = "be your Head Girl", $HeadGirl = $activeSlave>>
<<case "Eugenics">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.devotion = -100, $activeSlave.trust = -100, $activeSlave.health = random(80,90)>>
<<set $activeSlave.intelligence = 100>>
<<set $activeSlave.intelligenceImplant = 30>>
diff --git a/src/pregmod/reTheSirenStrikesBack.tw b/src/pregmod/reTheSirenStrikesBack.tw
index ca88db0d1dd..d0f84a3fd6a 100644
--- a/src/pregmod/reTheSirenStrikesBack.tw
+++ b/src/pregmod/reTheSirenStrikesBack.tw
@@ -13,7 +13,7 @@
<<set $activeSlaveOneTimeMaxAge = 40>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was brought to you to pay for what she did to one of your slaves.">>
<<set $activeSlave.career = "a producer">>
<<set $activeSlave.devotion = random(-70,30)>>
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index b8847e3b305..ec2f9eecdfe 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -45,7 +45,7 @@
<<case "paternalist encounter">>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was taken into your custody from an abusive owner.">>
<<set $activeSlave.devotion = random(0,25)>>
<<set $activeSlave.trust = random(0,25)>>
@@ -60,7 +60,7 @@
<<case "degradationist encounter">>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was taken into your custody from an owner who treated her as an equal.">>
<<set $activeSlave.devotion = random(0,50)>>
<<set $activeSlave.trust = random(25,70)>>
diff --git a/src/uncategorized/generateNewSlave.tw b/src/uncategorized/generateNewSlave.tw
deleted file mode 100644
index e4aa6d85956..00000000000
--- a/src/uncategorized/generateNewSlave.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Generate New Slave [nobr]
-
-<<set $activeSlave = GenerateNewSlave()>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index bc7bb3104aa..700c08d9f10 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -66,7 +66,7 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<if $PStrip == 1>>
<<set $activeSlave.origin = "She offered herself to you as a slave to escape the hard life of a free whore.">>
<<set $activeSlave.career = "a prostitute">>
@@ -404,7 +404,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<</if>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was a student you enslaved when you evacuated her from a threatened old world grade school.">>
<<set $activeSlave.career = "a student">>
<<set $activeSlave.devotion = random(-90,-75)>>
diff --git a/src/uncategorized/householdLiquidator.tw b/src/uncategorized/householdLiquidator.tw
index 0e3fae23ab2..cf921fe671d 100644
--- a/src/uncategorized/householdLiquidator.tw
+++ b/src/uncategorized/householdLiquidator.tw
@@ -8,7 +8,7 @@ The household liquidator is offering a set of siblings for sale. As usual, you w
<br><br>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought her from the household liquidator.">>
<<set $activeSlave.devotion = random(-75,-25)>>
@@ -97,7 +97,7 @@ The household liquidator is offering something special: identical twins. The mar
<br><br>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought her from the household liquidator.">>
<<set $activeSlave.devotion = random(-75,-25)>>
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index 72d1338afeb..221200bddd9 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -88,7 +88,7 @@
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was raised to be a slave, since she was mistakenly thought to be from good slave stock.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = random(10,15)>>
@@ -112,7 +112,7 @@
<<set $activeSlaveOneTimeMinAge = 24>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.health = random(-20,20)>>
<<set $activeSlave.anus = 2>>
<<if $activeSlave.vagina > -1>>
@@ -142,7 +142,7 @@
<<set $contractCost = 10000>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought out a deal for her sale after the seller took her virginity and the buyer no longer wanted her.">>
<<if ndef $activeSlave.counter.publicUse>><<set $activeSlave.counter.publicUse = 10>><<else>><<set $activeSlave.counter.publicUse += 10>><</if>>
<<set $activeSlave.devotion = random(25,30)>>
diff --git a/src/uncategorized/pRaidResult.tw b/src/uncategorized/pRaidResult.tw
index 5f32ec58408..5cd7d036ecc 100644
--- a/src/uncategorized/pRaidResult.tw
+++ b/src/uncategorized/pRaidResult.tw
@@ -28,7 +28,7 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
Under orders to target civilians, your mercenaries head for the isolated group. When the VTOL descends to circle around the large group of refugees, it becomes obvious that it won't even be necessary to expend nonlethal ammunition. A few of the refugees throw themselves down in bitterness, but most just subside into the catatonia of helplessness. They stand quiescent as they are searched, tagged, and loaded onto the VTOL like the wretched human refuse they are. The successful raid @@.green;is the talk of the Free City.@@
<<run repX(1000, "event")>>
<<for _prr = 0; _prr < 4; _prr++>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She is an enslaved refugee.">>
<<set _newSlaves.push($activeSlave)>>
<</for>>
@@ -37,7 +37,7 @@ Out ahead of the main body of refugees there is a small knot moving quickly and
<<set $slaveMedic = 1>>
<<run repX(1000, "event")>>
<<for _prr = 0; _prr < 5; _prr++>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She is an enslaved refugee who was wounded in the defeated attack on your arcology.">>
<<set $activeSlave.health = random(-80,-40)>>
<<set _newSlaves.push($activeSlave)>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index c6d68b04535..e77a43c3411 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -78,7 +78,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSupremacistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was captured and enslaved in a conflict zone and fenced to you by a mercenary group.">>
<<set $activeSlave.devotion -= 40>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -95,7 +95,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSupremacistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She made the mistake of marrying into a $arcologies[0].FSSupremacistRace neighborhood and was kidnapped then sold to you.">>
<<set $activeSlave.devotion -= 40>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -109,7 +109,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = $arcologies[0].FSSubjugationistRace>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was beaten, sexually assaulted, and finally enslaved for being stupid enough to visit an arcology that doesn't like her kind.">>
<<set $activeSlave.health = random(-80,-60)>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -124,7 +124,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = $arcologies[0].FSSubjugationistRace>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She came to your arcology to be enslaved out of a sense of self-loathing for her kind.">>
<<set $activeSlave.health = random(-80,-60)>>
<<set $activeSlave.trust = random(-25,-15)>>
@@ -215,7 +215,7 @@
<<set $contractCost = 1000>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was voluntarily enslaved after she decided that your paternalistic arcology was a better place for advancement than the old world.">>
<<set $activeSlave.career = setup.educatedCareers.random()>>
<<set $activeSlave.health = random(40,60)>>
@@ -234,7 +234,7 @@
<<set $contractCost = 1000>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was voluntarily enslaved after she decided that your paternalistic arcology was a better place to live than the old world.">>
<<set $activeSlave.health = random(40,60)>>
<<set $activeSlave.devotion = random(25,45)>>
@@ -327,7 +327,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself for voluntary enslavement to get to an arcology in which implants are uncommon, since she has a fear of surgery.">>
<<set $activeSlave.health = random(-20,20)>>
<<set $activeSlave.devotion = random(-15,15)>>
@@ -342,7 +342,7 @@
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself for voluntary enslavement after graduating from a slave school and passing her majority, because she heard you treat slaves without implants well.">>
<<set $activeSlave.age = random(18,24)>>
<<set $activeSlave.career = "a student">>
@@ -357,7 +357,7 @@
<<set $contractCost = 1000>>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She came to you for enslavement out of desperation, terrified that she was about to be enslaved into a worse situation by her abusive family.">>
<<set $activeSlave.health = random(-40,30)>>
<<set $activeSlave.devotion = random(10,15)>>
@@ -381,7 +381,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She came to you for enslavement out of desperation, terrified that she was about to be asked to do something with her life by her family.">>
<<set $activeSlave.health = random(-40,30)>>
<<set $activeSlave.devotion = random(10,15)>>
@@ -403,7 +403,7 @@
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% A mature woman. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself to you for enslavement after deciding you were her best hope of a good life as a slave.">>
<<set $activeSlave.health = random(40,60)>>
<<set $activeSlave.devotion = random(25,45)>>
@@ -432,7 +432,7 @@
<<set $activeSlaveOneTimeMaxAge = 55>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was sold to you by her son, in order to raise funds for his business.">>
<<set $activeSlave.boobs = random(4,6)*200>>
<<set $activeSlave.weight = 20>>
@@ -464,7 +464,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You received her from a surgeon who botched an implant operation on her and needed to get her out of sight.">>
<<set $activeSlave.boobsImplant += random(10,20)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
@@ -492,7 +492,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "Her husband sold her into slavery to escape his debts.">>
<<set $activeSlave.career = "a trophy wife">>
<<set $activeSlave.boobsImplant += random(5,10)*200>>
@@ -520,7 +520,7 @@
<<set $activeSlaveOneTimeMaxAge = $retirementAge>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself to you for enslavement because she felt your arcology was the best place for a woman of her appearance.">>
<<set $activeSlave.boobs = random(4,6)*50>>
<<set $activeSlave.weight = -20>>
@@ -546,7 +546,7 @@
<<set $contractCost = 3000>>
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself to you for enslavement to escape having plastic surgery foisted on her.">>
<<set $activeSlave.boobs = random(4,6)*50>>
<<set $activeSlave.weight = -20>>
@@ -569,7 +569,7 @@
<<set $contractCost = 1000>>
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself to you for enslavement after following a dangerous, illegal growth hormone regimen.">>
<<set $activeSlave.boobs += random(10,20)*200>>
<<set $activeSlave.nipples = "inverted">>
@@ -594,7 +594,7 @@
<<set $activeSlaveOneTimeMaxAge = 44>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself to you to escape enslavement in her homeland for being older and unmarried.">>
<<set $activeSlave.age = random(28,$retirementAge)>>
<<set $activeSlave.boobs += random(6,15)*200>>
@@ -616,7 +616,7 @@
<<set $contractCost = 1000>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was voluntarily enslaved after she decided that your arcology was the best place for her to get the steroids that she'd allowed to define her life.">>
<<set $activeSlave.career = setup.uneducatedCareers.random()>>
<<set $activeSlave.health = random(20,60)>>
@@ -634,7 +634,7 @@
<<set $contractCost = 1000>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was voluntarily enslaved after she decided that your arcology was the best place for her to get the steroids that she'd allowed to define her life.">>
<<set $activeSlave.health = random(20,60)>>
<<set $activeSlave.muscles = 100>>
@@ -650,7 +650,7 @@
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself for enslavement out of religious conviction.">>
<<set $activeSlave.health = random(10,30)>>
<<set $activeSlave.devotion = -100>>
@@ -665,7 +665,7 @@
<<set $contractCost = 1000>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She was offered to you by a group of Chattel Religionists eager to be rid of her blasphemous old world beliefs.">>
<<set $activeSlave.health = random(-10,10)>>
<<set $activeSlave.devotion = random(-15,15)>>
@@ -696,7 +696,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She sold herself to you to escape those who condemned her lifestyle.">>
<<set $activeSlave.career = "a shut-in">>
<<set $activeSlave.health = random(-40,20)>>
@@ -737,7 +737,7 @@
<<set $contractCost = 1000>>
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself for enslavement in hope of being less dull.">>
<<set $activeSlave.health = random(0,10)>>
<<set $activeSlave.devotion = random(0,15)>>
@@ -837,7 +837,7 @@
<<set $contractCost = 1000>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She considered herself ugly and wished to stay out of your gene pool.">>
<<set $activeSlave.health = random(0,60)>>
<<set $activeSlave.trust = random(25,45)>>
@@ -920,7 +920,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself to you for enslavement because she had a disgustingly naïve view of medieval Japanese culture.">>
<<set $activeSlave.devotion = random(-15,-5)>>
<<set $activeSlave.trust = random(5,15)>>
@@ -950,7 +950,7 @@
<<set $activeSlaveOneTimeMaxAge = Math.max(25,$retirementAge-5)>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Arabian revivalist recruit is described as being in her 30s. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself to you for enslavement because she thought your harem her best hope for good treatment.">>
<<set $activeSlave.devotion = random(30,35)>>
<<set $activeSlave.trust = random(30,35)>>
@@ -975,7 +975,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Chinese revivalist recruit is described as a middle aged woman. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself to you for enslavement because she thought she would have prospects of advancement among your slaves.">>
<<set $activeSlave.devotion = random(30,35)>>
<<set $activeSlave.trust = random(30,35)>>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index 3dd63a3156c..8cf13e24433 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -9,7 +9,7 @@
<<set $contractCost = 3000>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself to you for enslavement hoping you would preserve her incestuous relationship with her sibling.">>
<<set $activeSlave.devotion = random(5,15)>>
<<set $activeSlave.trust = random(-15,-5)>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 097ee7ba7e1..02f4abca2f1 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -6,7 +6,7 @@
<<case "addict">>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for attempted burglary.">>
<<set $activeSlave.career = "a criminal">>
<<set $activeSlave.devotion = random(-75,-60)>>
@@ -36,7 +36,7 @@
<<case "escapee">>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for suspected escapism.">>
<<set $activeSlave.devotion = random(-75,-60)>>
<<set $activeSlave.trust = random(-15,0)>>
@@ -99,7 +99,7 @@
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 12>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for suspected escapism.">>
<<set $activeSlave.career = "an orphan">>
<<set $activeSlave.devotion = random(-15,0)>>
@@ -168,7 +168,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for theft and battery.">>
<<set $activeSlave.career = "a prostitute">>
<<set $activeSlave.devotion = random(-75,-60)>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 48774f0288d..3fbc3a239ed 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -251,7 +251,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She came to you to escape being sold to a cruel master after her producer informed her of her debt.">>
<<set $activeSlave.career = "a musician">>
<<set $activeSlave.devotion = random(30,100)>>
@@ -1520,7 +1520,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She offered herself to you for enslavement out of devotion to her artistic 'craft'.">>
<<set $activeSlave.boobs = random(4,6)*50>>
<<set $activeSlave.weight = -20>>
@@ -1584,7 +1584,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She sold herself into slavery to pay her immigration costs.">>
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.trust = random(-15,0)>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 578bd622515..d42682514ad 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -34,7 +34,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She sold herself into slavery to escape addiction debts.">>
<<set $activeSlave.devotion = random(-15,15)>>
<<set $activeSlave.trust = random(-15,15)>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index bd6af732e86..eb51edc28c7 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -478,7 +478,7 @@
<<set _slaveGenRange = random(1,4)>>
<<set $oneTimeDisableDisability = 1>>
<<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<else>>
<<include "Generate XY Slave">>
<</if>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index b7ba7fce205..fbd6cf9e6a9 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -8,7 +8,7 @@
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She submitted to enslavement for a better chance at survival than she had as a migrant.">>
<<set $activeSlave.devotion = random(-15,5)>>
<<set $activeSlave.trust = random(-10,10)>>
@@ -38,7 +38,7 @@
<<set $activeSlaveOneTimeMinAge = 30>>
<<set $activeSlaveOneTimeMaxAge = 45>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She submitted to enslavement for a better quality of life than she had as a recent divorcee.">>
<<set $activeSlave.devotion = random(-15,5)>>
<<set $activeSlave.trust = random(-10,10)>>
@@ -168,7 +168,7 @@
<<set $activeSlaveOneTimeMinAge = 11>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate New Slave">>
+<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "She submitted to enslavement to escape the hard life of an old world whore.">>
<<set $activeSlave.career = "a prostitute">>
<<set $activeSlave.devotion = random(-15,5)>>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index b1f633103de..fd9ca71a5a8 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -39,7 +39,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<switch _origin>>
<<case "broken">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "She has never communicated anything about her background, since she arrived at the shelter with a broken mind.">>
<<set $shelterSlave.career = "a slave">>
@@ -60,7 +60,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.fetishStrength = 0>>
<<case "amputee">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "It's not clear why her previous owner cut her arms and legs off.">>
<<set $shelterSlave.career = "a slave">>
@@ -74,7 +74,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her owner purposely blinded her by dumping boiling water into her eyes.">>
<<set $shelterSlave.career = "a slave">>
@@ -91,7 +91,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her owner purposely deafened her by piercing her eardrums with knitting needles.">>
<<set $shelterSlave.career = "a slave">>
@@ -178,7 +178,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $activeSlaveOneTimeMinAge = 14>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "She is an enslaved Daughter of Liberty, caught some weeks after the failed coup. Her previous owner used her as a punching bag and dart board, then when he was bored of her tattooed obscenities all over her body and threw her away.">>
<<set $shelterSlave.career = "a slave">>
@@ -342,7 +342,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $shelterSlave.sexualFlaw = either("apathetic", "hates anal", "hates oral", "hates penetration")>>
<<case "reaction">>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "She was discarded after suffering a terrible reaction to growth hormone treatment.">>
<<set $shelterSlave.career = "a slave">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 87961595476..107cf0e4434 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -4,7 +4,7 @@
Call as <<StartingGirlsWorkaround>>
%/
<<widget "StartingGirlsWorkaround">>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $startingGirlCopied = 0>>
<<set $activeSlave.health = 0>>
<<set $activeSlave.devotion = 0>>
@@ -695,7 +695,7 @@
<<include "Generate XY Slave">>
<<else>>
Slaves are passed to training regardless of whether they have dicks or pussies.
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<</if>>
<<set $activeSlave.origin = "She was enslaved and trained by your corporation.">>
<<set $activeSlave.devotion = random(-30,0)>>
@@ -1120,7 +1120,7 @@
<<if $arcologies[_market].FSSubjugationist > 20>>
<<set $fixedRace = $arcologies[_market].FSSubjugationistRace>>
<</if>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought her from ">>
<<set $activeSlave.origin += $arcologies[_market].name>>
<<set $activeSlave.origin += ".">>
@@ -1573,7 +1573,7 @@
<</if>>
<<case "heap">>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought her from a body dump, completely broken.">>
<<set $activeSlave.devotion = 0>>
<<set $activeSlave.trust = 0>>
@@ -1626,7 +1626,7 @@
<<case "wetware">>
<<set $fixedNationality = "Stateless">>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought her from a wetware CPU farm, her body ruined but her mind subjected to a simulated career.">>
<<set $activeSlave.devotion = 40>>
<<set $activeSlave.trust = -100>>
@@ -1707,7 +1707,7 @@
<<set $activeSlave.fetishStrength = 0>>
<<case "kidnappers">>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought her from the kidnappers' slave market, so she was probably forced into slavery.">>
<<set $activeSlave.devotion -= 5>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -1730,7 +1730,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You purchased her indenture contract, making her yours for as long as it lasts.">>
<<set $activeSlave.indentureRestrictions = either(0,1,1,2,2,2,2)>>
<<if $activeSlave.indentureRestrictions >= 2>>
@@ -1747,7 +1747,7 @@
<<case "hunters">>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought her from the runaway hunters' slave market after they recaptured her and her original owner did not pay their fee.">>
<<set $activeSlave.devotion = -20>>
<<set $activeSlave.trust = random(-15,15)>>
@@ -1812,7 +1812,7 @@
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = $fertilityAge>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Must not have had their first period. %/
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought her from the underage raiders' slave market.">>
<<set $activeSlave.trust -= 25>>
<<set $activeSlave.health += 20>>
@@ -1835,7 +1835,7 @@
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Supposed to have just reached the age of majority. %/
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought her from the girl raiders' slave market the week she reached her majority.">>
<<set $activeSlave.trust -= 25>>
<<set $activeSlave.health += 20>>
@@ -1862,7 +1862,7 @@
<<case "trainers">>
<<set $activeSlaveOneTimeMaxAge = 42>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "You bought her from the trainers' slave market after they put her through basic training.">>
<<set $activeSlave.devotion += 40>>
<<set $activeSlave.trust += 40>>
@@ -2334,7 +2334,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<if $TFS.schoolUpgrade == 3 && $TFS.compromiseWeek+15 <= $week>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<else>>
<<include "Generate XY Slave">>
<</if>>
@@ -2869,7 +2869,7 @@
<</if>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
/*
<<if $activeSlave.dick > 0>>
@@ -3048,7 +3048,7 @@
<</if>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
<<set _criminal = setup.whiteCollarCriminalPool.random()>>
@@ -3146,7 +3146,7 @@
<</if>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate New Slave">>
+ <<set $activeSlave = GenerateNewSlave()>>
/*
<<if $activeSlave.dick > 0>>
--
GitLab