diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index f3da81b97605b1732d2f84c551a274acf992e3ba..de2fb790e89bf1f85012fe462bf9e5506b49e3e0 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -3,6 +3,7 @@ Pregmod
0.10.7.1-2.3.x
9
+ -unified cybermod with vanilla
-slave assignment links improved
-breast implants now impact milk production based on % implant
-many new names added to lacking name pools
diff --git a/src/Mods/DinnerParty/dinnerPartyExecution.tw b/src/Mods/DinnerParty/dinnerPartyExecution.tw
index a0c08688fbbcd7b782d2ed5933e805c4d06ec99f..4c787fb150aedfbdce05df8c8d42234651f0ffc6 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/Mods/DinnerParty/dinnerPartyPreparations.tw b/src/Mods/DinnerParty/dinnerPartyPreparations.tw
index 1032e3f551b1dc9b3ebc0f927ef5b7bdfbc17f05..fd37212d85e2c3a018137e47eac4d6659ef87929 100644
--- a/src/Mods/DinnerParty/dinnerPartyPreparations.tw
+++ b/src/Mods/DinnerParty/dinnerPartyPreparations.tw
@@ -7,7 +7,7 @@ Hosting of high society dinner parties will increase your prestige significantly
<h1>Cooking Instructions and Recipes:</h1>
-''Roast Long Pig'' – Made with the meat of a human roasted on a spit. Young meat is better than old meat. There should be some amount of fat to make the meat juicy, but not too much fat that makes the meat greasy. Muscles affect the texture of the meat. Meat without muscles lacks texture while an excess will be tough and hard to chew. Remember you can't eat silicone, and virgin meat is highly sought after. <<if $seePreg != 0>>If the human is pregnant a veal dish can also be made from the fetus.<</if>>
+''Roast Long Pig'' – Made with the meat of a human roasted on a spit. Young meat is better than old meat. There should be some amount of fat to make the meat juicy, but not too much fat that makes the meat greasy. Muscles affect the texture of the meat. Meat without muscles lacks texture while an excess will be tough and hard to chew. Remember you can't eat silicone, and virgin meat is highly sought after.<<if $seePreg != 0>> If the human is pregnant a veal dish can also be made from the fetus.<</if>>
<br><br>
''Dicky Roll'' – An erect penis made into a spring roll. For best results harvest the penis at the moment of ejaculation. The size of the penis and the amount of accumulated ejaculate all affect the quality of the dish. Too big of a dick and too thin of semen can both ruin a dish.
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index 597770b741f354f355e827c9272242b6ea89d551..7ef0ca3ce40bd3610c6a6ab6700becb0951bdef3 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -247,7 +247,7 @@
<<set $fixedRace = "asian">>
<<set $fixedNationality = "Japanese">>
<<if $seeDicks != 100>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.faceShape = "cute">>
<<set $activeSlave.boobShape = "perky">>
<<set $activeSlave.nipples = "cute">>
@@ -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 0c18b661e1f6765a03d5082985da8a791ace63c2..ddf90f23e23549655ac6b7d1041bfbc3bc066ff2 100644
--- a/src/SpecialForce/TrickShotNight.tw
+++ b/src/SpecialForce/TrickShotNight.tw
@@ -76,9 +76,9 @@ Despite your direct elevator, interaction with the majority of your security for
<<set $fixedRace = _races.random()>>
<</if>>
<<if $seeDicks != 100>>
- <<include "Generate XX Slave">>
+ <<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/js/PenthouseNaming.js b/src/js/PenthouseNaming.js
index 2df44f652f07d3cc675630f57efad64c2aa24eff..6e85f6ab59a4e61cc0f9708a1031132165704503 100644
--- a/src/js/PenthouseNaming.js
+++ b/src/js/PenthouseNaming.js
@@ -1,7 +1,7 @@
/**
* @return {string}
*/
-window.MasterSuiteUIName = function () {
+window.MasterSuiteUIName = function() {
const V = State.variables;
const name = (V.masterSuiteNameCaps === "The Master Suite") ? "Master Suite" : V.masterSuiteNameCaps;
return `<<link "${name}""Master Suite">><</link>> `;
@@ -10,7 +10,7 @@ window.MasterSuiteUIName = function () {
/**
* @return {string}
*/
-window.HeadGirlSuiteUIName = function () {
+window.HeadGirlSuiteUIName = function() {
const V = State.variables;
const name = (V.HGSuiteNameCaps === "The Head Girl Suite") ? "Head Girl Suite" : V.HGSuiteNameCaps;
return `<<link "${name}""Head Girl Suite">><</link>> `;
@@ -19,7 +19,7 @@ window.HeadGirlSuiteUIName = function () {
/**
* @return {string}
*/
-window.ServantQuartersUIName = function () {
+window.ServantQuartersUIName = function() {
const V = State.variables;
const name = (V.servantsQuartersNameCaps === "The Servants' Quarters") ? "Servants' Quarters" : V.servantsQuartersNameCaps;
return `<<link "${name}""Servants' Quarters">><</link>> `;
@@ -37,7 +37,7 @@ window.SpaUIName = function() {
/**
* @return {string}
*/
-window.NurseryUIName = function () {
+window.NurseryUIName = function() {
const V = State.variables;
const name = (V.nurseryNameCaps === "The Nursery") ? "Nursery" : V.nurseryNameCaps;
return `<<link "${name}""Nursery">><</link>> `;
@@ -46,7 +46,7 @@ window.NurseryUIName = function () {
/**
* @return {string}
*/
-window.ClinicUIName = function () {
+window.ClinicUIName = function() {
const V = State.variables;
const name = (V.clinicNameCaps === "The Clinic") ? "Clinic" : V.clinicNameCaps;
return `<<link "${name}""Clinic">><</link>> `;
@@ -55,7 +55,7 @@ window.ClinicUIName = function () {
/**
* @return {string}
*/
-window.SchoolRoomUIName = function () {
+window.SchoolRoomUIName = function() {
const V = State.variables;
const name = (V.schoolroomNameCaps === "The Schoolroom") ? "Schoolroom" : V.schoolroomNameCaps;
return `<<link "${name}""Schoolroom">><</link>> `;
@@ -64,7 +64,7 @@ window.SchoolRoomUIName = function () {
/**
* @return {string}
*/
-window.CellblockUIName = function () {
+window.CellblockUIName = function() {
const V = State.variables;
const name = (V.cellblockNameCaps === "The Cellblock") ? "Cellblock" : V.cellblockNameCaps;
return `<<link "${name}""Cellblock">><</link>> `;
@@ -73,7 +73,7 @@ window.CellblockUIName = function () {
/**
* @return {string}
*/
-window.IncubatorUIName = function () {
+window.IncubatorUIName = function() {
const V = State.variables;
const name = (V.incubatorNameCaps === "The Incubator") ? "Incubator" : V.incubatorNameCaps;
return `<<link "${name}""Incubator">><</link>> `;
diff --git a/src/js/optionsMacro.js b/src/js/optionsMacro.js
index 25de71e2e3cd7fba75161cf3d1826d9199bb33a0..8f20091d84b6f360183a058ccc1756ad38a5495c 100644
--- a/src/js/optionsMacro.js
+++ b/src/js/optionsMacro.js
@@ -21,7 +21,7 @@ Macro.add('options', {
skipArgs : false,
tags : ['option', 'comment', 'optionlt', 'optionlte', 'optiongt', 'optiongte',
'optiondefault', 'optionif'],
- handler : function () {
+ handler : function() {
try {
var currentOption = this.payload[0].args[0];
var currentOptionIsNumber = typeof currentOption === "number";
@@ -111,9 +111,7 @@ Macro.add('options', {
} else {
throw new Error("Missing variable to <<options>>");
}
-
}
-
}
var showSelectedOption = true; //this.payload.length !== 3 || !description;
diff --git a/src/js/pregJS.js b/src/js/pregJS.js
index f9ddf6030ec983b663cea2838f5ae20140bee947..8b4d7eb1d511814346e5309ed7e4d556e5fa9fbf 100644
--- a/src/js/pregJS.js
+++ b/src/js/pregJS.js
@@ -7,12 +7,12 @@ window.getPregBellySize = function(s) {
var fetuses = s.pregType;
var phi = 1.618;
- if(gestastionWeek <= 32) {
+ if (gestastionWeek <= 32) {
targetLen = ((0.00006396 * Math.pow(gestastionWeek, 4)) - (0.005501 * Math.pow(gestastionWeek, 3)) + (0.161 * Math.pow(gestastionWeek, 2)) - (0.76 * gestastionWeek) + 0.208);
- } else if(gestastionWeek <= 106) {
+ } else if (gestastionWeek <= 106) {
targetLen = ((-0.0000004675 * Math.pow(gestastionWeek, 4)) + (0.0001905 * Math.pow(gestastionWeek, 3)) - (0.029 * Math.pow(gestastionWeek, 2)) + (2.132 * gestastionWeek) - 16.575);
} else {
- targetLen = ((-0.00003266 * Math.pow(gestastionWeek,2)) + (0.076 * gestastionWeek) + 43.843);
+ targetLen = ((-0.00003266 * Math.pow(gestastionWeek, 2)) + (0.076 * gestastionWeek) + 43.843);
}
var bellySize = ((4 / 3) * (Math.PI) * (phi / 2) * (Math.pow((targetLen / 2), 3)) * fetuses);
@@ -22,38 +22,38 @@ window.getPregBellySize = function(s) {
/** @param {App.Entity.SlaveState} slave */
window.bellyAdjective = function(slave) {
slave = slave || State.variables.activeSlave;
- if(slave.belly >= 1500) {
- if(slave.belly >= 1000000) {
- if(slave.preg > slave.pregData.normalBirth/4) {
+ if (slave.belly >= 1500) {
+ if (slave.belly >= 1000000) {
+ if (slave.preg > slave.pregData.normalBirth/4) {
return 'unfathomably distended, brimming with life';
} else {
return 'unfathomable';
}
- } else if(slave.belly >= 750000) {
- if(slave.preg > slave.pregData.normalBirth/4) {
+ } else if (slave.belly >= 750000) {
+ if (slave.preg > slave.pregData.normalBirth/4) {
return 'monolithic bulging';
} else {
return 'monolithic';
}
- } else if(slave.belly >= 600000) {
- if(slave.preg > slave.pregData.normalBirth/4) {
+ } else if (slave.belly >= 600000) {
+ if (slave.preg > slave.pregData.normalBirth/4) {
return 'titanic bulging';
} else {
return 'titanic';
}
- } else if(slave.belly >= 450000) {
- if(slave.preg > slave.pregData.normalBirth/4) {
+ } else if (slave.belly >= 450000) {
+ if (slave.preg > slave.pregData.normalBirth/4) {
return 'gigantic bulgy';
} else {
return 'gigantic';
}
- } else if(slave.belly >= 300000) {
+ } else if (slave.belly >= 300000) {
return 'massive';
- } else if(slave.belly >= 100000) {
+ } else if (slave.belly >= 100000) {
return 'giant';
- } else if(slave.belly >= 15000) {
+ } else if (slave.belly >= 15000) {
return 'huge';
- } else if(slave.belly >= 10000) {
+ } else if (slave.belly >= 10000) {
return 'big';
} else {
return 'swollen';
@@ -81,301 +81,301 @@ window.setPregType = function(actor) {
*/
- if(actor.broodmother < 1) { // Broodmothers should be not processed here. Necessary now.
- if(typeof actor.readyOva === "number" && actor.readyOva !== 0) {
+ if (actor.broodmother < 1) { // Broodmothers should be not processed here. Necessary now.
+ if (typeof actor.readyOva === "number" && actor.readyOva !== 0) {
ovum = actor.readyOva; //just single override; for delayed impregnation cases
- } else if(actor.ID === -1) {
- if(actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
- if(actor.fertDrugs === 1) {
+ } else if (actor.ID === -1) {
+ if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
+ if (actor.fertDrugs === 1) {
ovum += jsEither([2, 3, 3, 3, 3, 4, 4, 5]);
} else {
ovum += jsEither([1, 1, 2, 2, 3, 3, 4]);
}
- if(actor.forcedFertDrugs > 0) {
+ if (actor.forcedFertDrugs > 0) {
ovum += jsEither([3, 3, 4, 4, 5]);
}
- } else if(actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
- if(actor.fertDrugs === 1) {
+ } else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
+ if (actor.fertDrugs === 1) {
ovum += jsEither([1, 2, 2, 2, 2, 3, 3, 4]);
} else {
ovum += jsEither([0, 1, 1, 1, 1, 1, 2, 3]);
}
- if(actor.forcedFertDrugs > 0) {
+ if (actor.forcedFertDrugs > 0) {
ovum += jsEither([2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4]);
}
- } else if(actor.geneticQuirks.fertility === 2) { // Predisposed to twins
- if(actor.fertDrugs === 1) {
+ } else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
+ if (actor.fertDrugs === 1) {
ovum += jsEither([1, 1, 2, 2, 2, 2, 3, 3]);
} else {
ovum += jsEither([0, 0, 0, 1, 1, 1, 1, 1, 1, 2]);
}
- if(actor.forcedFertDrugs > 0) {
+ if (actor.forcedFertDrugs > 0) {
ovum += jsEither([1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4]);
}
} else {
- if(actor.fertDrugs === 1) {
+ if (actor.fertDrugs === 1) {
ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3]);
} else {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
}
- if(actor.forcedFertDrugs > 0) {
+ if (actor.forcedFertDrugs > 0) {
ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4]);
}
}
ovum = Math.clamp(ovum, 0, 8);
- } else if(actor.pregType === 0) {
- if(actor.eggType === "horse" || actor.eggType === "cow") {
- if(actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
+ } else if (actor.pregType === 0) {
+ if (actor.eggType === "horse" || actor.eggType === "cow") {
+ if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
ovum += jsEither([0, 0, 0, 0, 0, 0, 1]);
fertilityStack += .8;
- } else if(actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
+ } else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
fertilityStack += .4;
- } else if(actor.geneticQuirks.fertility === 2) { // Predisposed to twins
+ } else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
fertilityStack += .2;
}
- if(actor.ovaImplant === "fertility") {
+ if (actor.ovaImplant === "fertility") {
fertilityStack += .3;
}
- if(actor.hormones === 2) {
+ if (actor.hormones === 2) {
fertilityStack += .2;
}
- if(actor.hormoneBalance >= 200) {
+ if (actor.hormoneBalance >= 200) {
fertilityStack += .3;
}
- if(actor.diet === "fertility") {
+ if (actor.diet === "fertility") {
fertilityStack += .3;
}
- if(State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
+ if (State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
fertilityStack += .5;
}
- if(State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
+ if (State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
fertilityStack += .2;
}
- if(actor.drugs === "super fertility drugs") {
+ if (actor.drugs === "super fertility drugs") {
fertilityStack += 1.6;
- } else if(actor.drugs === "fertility drugs") {
+ } else if (actor.drugs === "fertility drugs") {
fertilityStack += .6;
}
fertilityStack = Math.floor(fertilityStack);
- if(State.variables.seeHyperPreg === 1) {
- if(actor.drugs === "super fertility drugs") {
+ if (State.variables.seeHyperPreg === 1) {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsRandom(0, fertilityStack*2);
} else {
ovum += jsRandom(0, fertilityStack);
}
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
}
} else {
ovum += jsRandom(0, fertilityStack);
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
- if(ovum > 4) {
+ if (ovum > 4) {
ovum = 4;
}
- } else if(ovum > 3) {
+ } else if (ovum > 3) {
ovum = 3;
}
}
- } else if(actor.eggType === "dog") {
- if(actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
+ } else if (actor.eggType === "dog") {
+ if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
ovum += jsEither([1, 2, 2, 3]);
fertilityStack++;
fertilityStack++;
fertilityStack++;
- } else if(actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
+ } else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
ovum += jsEither([0, 1, 1, 2]);
fertilityStack++;
fertilityStack++;
- } else if(actor.geneticQuirks.fertility === 2) { // Predisposed to twins
+ } else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
ovum += jsEither([0, 0, 0, 0, 1]);
fertilityStack++;
}
- if(actor.ovaImplant === "fertility") {
+ if (actor.ovaImplant === "fertility") {
ovum += jsEither([0, 0, 0, 0, 1]);
fertilityStack++;
}
- if(actor.hormones === 2) {
+ if (actor.hormones === 2) {
ovum += jsEither([0, 0, 0, 1, 1, 1, 1, 2]);
fertilityStack++;
}
- if(actor.hormoneBalance >= 200) {
+ if (actor.hormoneBalance >= 200) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2]);
fertilityStack++;
}
- if(actor.diet === "fertility") {
+ if (actor.diet === "fertility") {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
- if(State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
+ if (State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
ovum += jsEither([0, 0, 0, 1, 1, 2, 2, 2, 3, 3]);
fertilityStack++;
fertilityStack++;
}
- if(State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
+ if (State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
fertilityStack++;
}
- if(actor.drugs === "super fertility drugs") {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsEither([1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5]);
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
- } else if(actor.drugs === "fertility drugs") {
+ } else if (actor.drugs === "fertility drugs") {
ovum += jsEither([0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3]);
fertilityStack++;
}
- if(State.variables.seeHyperPreg === 1) {
- if(actor.drugs === "super fertility drugs") {
+ if (State.variables.seeHyperPreg === 1) {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsRandom(0, fertilityStack*2);
} else {
ovum += jsRandom(0, fertilityStack);
}
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
}
} else {
ovum += jsRandom(0, fertilityStack);
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
- if(ovum > 8) {
+ if (ovum > 8) {
ovum = jsEither([6, 8]);
}
- } else if(ovum > 8) {
+ } else if (ovum > 8) {
ovum = jsRandom(6, 8);
}
}
- } else if(actor.eggType === "pig") {
- if(actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
+ } else if (actor.eggType === "pig") {
+ if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
ovum += jsRandom(4, 8);
fertilityStack += 16;
- } else if(actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
+ } else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
ovum += jsRandom(2, 6);
fertilityStack += 10;
- } else if(actor.geneticQuirks.fertility === 2) { // Predisposed to twins
+ } else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
ovum += jsRandom(2, 4);
fertilityStack += 6;
}
- if(actor.ovaImplant === "fertility") {
+ if (actor.ovaImplant === "fertility") {
ovum += jsRandom(4, 12);
fertilityStack += 6;
}
- if(actor.hormones === 2) {
+ if (actor.hormones === 2) {
ovum += jsRandom(0, 4);
fertilityStack += 3;
}
- if(actor.hormoneBalance >= 200) {
+ if (actor.hormoneBalance >= 200) {
ovum += jsRandom(0, 4);
fertilityStack += 3;
}
- if(actor.diet === "fertility") {
+ if (actor.diet === "fertility") {
ovum += jsRandom(4, 10);
fertilityStack += 6;
}
- if(State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
+ if (State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
ovum += jsRandom(8, 16);
fertilityStack += 10;
}
- if(State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
+ if (State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
fertilityStack += 2;
}
- if(actor.drugs === "super fertility drugs") {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsRandom(10, 40);
fertilityStack += 32;
- } else if(actor.drugs === "fertility drugs") {
+ } else if (actor.drugs === "fertility drugs") {
ovum += jsRandom(10, 20);
fertilityStack += 16;
}
- if(State.variables.seeHyperPreg === 1) {
- if(actor.drugs === "super fertility drugs") {
+ if (State.variables.seeHyperPreg === 1) {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsRandom(fertilityStack/2, fertilityStack*2);
} else {
ovum += jsRandom(fertilityStack/4, fertilityStack);
}
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
}
} else {
ovum += jsRandom(0, fertilityStack);
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
- if(ovum > 76) {
+ if (ovum > 76) {
ovum = jsEither([70, 72, 74, 76]);
}
- } else if(ovum > 75) {
+ } else if (ovum > 75) {
ovum = jsRandom(60, 75);
}
}
} else {
- if(actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
+ if (actor.geneticQuirks.fertility === 2 && actor.geneticQuirks.hyperFertility === 2) { // Do not mix with sperm
ovum += jsEither([1, 2, 2, 3]);
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
- } else if(actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
+ } else if (actor.geneticQuirks.hyperFertility === 2) { // Predisposed to multiples
ovum += jsEither([0, 1, 1, 2]);
fertilityStack++;
fertilityStack++;
- } else if(actor.geneticQuirks.fertility === 2) { // Predisposed to twins
+ } else if (actor.geneticQuirks.fertility === 2) { // Predisposed to twins
ovum += jsEither([0, 0, 0, 0, 1]);
fertilityStack++;
} else {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins
}
- if(actor.ovaImplant === "fertility") {
+ if (actor.ovaImplant === "fertility") {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
- if(actor.hormones === 2) {
+ if (actor.hormones === 2) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2]);
fertilityStack++;
}
- if(actor.hormoneBalance >= 200) {
+ if (actor.hormoneBalance >= 200) {
ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 2]);
fertilityStack++;
}
- if(actor.diet === "fertility") {
+ if (actor.diet === "fertility") {
ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
fertilityStack++;
}
- if(State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
+ if (State.variables.masterSuitePregnancyFertilitySupplements === 1 && ((actor.assignment === "serve in the master suite" || actor.assignment === "be your Concubine"))) {
ovum += jsEither([0, 0, 0, 1, 1, 2, 2, 2, 3, 3]);
fertilityStack++;
fertilityStack++;
}
- if(State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
+ if (State.variables.reproductionFormula === 1 && (State.variables.week-actor.weekAcquired > 0)) {
fertilityStack++;
}
- if(actor.drugs === "super fertility drugs") {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsEither([1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5]);
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
fertilityStack++;
- } else if(actor.drugs === "fertility drugs") {
+ } else if (actor.drugs === "fertility drugs") {
ovum += jsEither([0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3]);
fertilityStack++;
}
- if(State.variables.seeHyperPreg === 1) {
- if(actor.drugs === "super fertility drugs") {
+ if (State.variables.seeHyperPreg === 1) {
+ if (actor.drugs === "super fertility drugs") {
ovum += jsRandom(0, fertilityStack*2);
} else {
ovum += jsRandom(0, fertilityStack);
}
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
}
} else {
ovum += jsRandom(0, fertilityStack);
- if(actor.ovaImplant === "sympathy") {
+ if (actor.ovaImplant === "sympathy") {
ovum *= 2;
- if(ovum > 12) {
+ if (ovum > 12) {
ovum = jsEither([10, 12]);
}
- } else if(ovum > 12) {
+ } else if (ovum > 12) {
ovum = jsRandom(6, 12);
}
}
@@ -406,9 +406,8 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
He = capFirstChar(pronouns.pronoun);
}
if (V.seePreg !== 0) {
- if (jsRandom(0,99) < (chance + (V.reproductionFormula*((target.pregSource <= 0) ? ((target.ID === -1) ? 0 : 10) : 20)))) {
+ if (jsRandom(0, 99) < (chance + (V.reproductionFormula*((target.pregSource <= 0) ? ((target.ID === -1) ? 0 : 10) : 20)))) {
if (target.mpreg === hole) {
-
if (target.pregWeek <= 0) {
target.preg = 1;
target.pregSource = (!fatherID ? 0 : fatherID);
@@ -432,9 +431,7 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
} else {
target.pregKnown = 1;
}
-
} else if (hole === 2) {
-
if (target.pregWeek <= 0) {
target.preg = 1;
target.pregSource = (!fatherID ? 0 : fatherID);
@@ -479,12 +476,10 @@ window.knockMeUp = function(target, chance, hole, fatherID, displayOverride) {
};
window.getIncubatorReserved = function(/*slaves*/) {
-
return FetusGlobalReserveCount("incubator");
};
-window.getNurseryReserved = function (/*slaves*/) {
-
+window.getNurseryReserved = function(/*slaves*/) {
return FetusGlobalReserveCount("nursery");
};
diff --git a/src/js/quickListJS.js b/src/js/quickListJS.js
index 66f91135143c858f09bd7aef04c43d3156ba3168..60ad59a54442e5d5155b8b0f844f6c24a97dee38 100644
--- a/src/js/quickListJS.js
+++ b/src/js/quickListJS.js
@@ -1,7 +1,7 @@
/* eslint-disable no-undef */
-window.sortDomObjects = function (objects, attrName, reverse = 0) {
+window.sortDomObjects = function(objects, attrName, reverse = 0) {
reverse = (reverse) ? -1 : 1;
- function sortingByAttr (a, b) {
+ function sortingByAttr(a, b) {
var aVal = a.getAttribute(attrName);
var bVal = b.getAttribute(attrName);
var aInt = parseInt(aVal);
@@ -14,21 +14,21 @@ window.sortDomObjects = function (objects, attrName, reverse = 0) {
return objects.toArray().sort(sortingByAttr);
};
-window.sortButtonsByDevotion = function () {
+window.sortButtonsByDevotion = function() {
var $sortedButtons = $('#qlWrapper button').remove();
$sortedButtons = sortDomObjects($sortedButtons, 'data-devotion');
$($sortedButtons).appendTo($('#qlWrapper'));
quickListBuildLinks();
};
-window.sortButtonsByTrust = function () {
+window.sortButtonsByTrust = function() {
var $sortedButtons = $('#qlWrapper button').remove();
$sortedButtons = sortDomObjects($sortedButtons, 'data-trust');
$($sortedButtons).appendTo($('#qlWrapper'));
quickListBuildLinks();
};
-window.quickListBuildLinks = function () {
+window.quickListBuildLinks = function() {
$("[data-scroll-to]").click(function() {
var $this = $(this), $toElement = $this.attr('data-scroll-to');
// note the * 1 enforces $offset to be an integer, without
@@ -42,31 +42,31 @@ window.quickListBuildLinks = function () {
});
};
-window.sortIncubatorPossiblesByName = function () {
+window.sortIncubatorPossiblesByName = function() {
var $sortedIncubatorPossibles = $('#qlIncubator div.possible').detach();
$sortedIncubatorPossibles = sortDomObjects($sortedIncubatorPossibles, 'data-name');
$($sortedIncubatorPossibles).appendTo($('#qlIncubator'));
};
-window.sortIncubatorPossiblesByPregnancyWeek = function () {
+window.sortIncubatorPossiblesByPregnancyWeek = function() {
var $sortedIncubatorPossibles = $('#qlIncubator div.possible').detach();
$sortedIncubatorPossibles = sortDomObjects($sortedIncubatorPossibles, 'data-preg-week');
$($sortedIncubatorPossibles).appendTo($('#qlIncubator'));
};
-window.sortIncubatorPossiblesByPregnancyCount = function () {
+window.sortIncubatorPossiblesByPregnancyCount = function() {
var $sortedIncubatorPossibles = $('#qlIncubator div.possible').detach();
$sortedIncubatorPossibles = sortDomObjects($sortedIncubatorPossibles, 'data-preg-count');
$($sortedIncubatorPossibles).appendTo($('#qlIncubator'));
};
-window.sortIncubatorPossiblesByReservedSpots = function () {
+window.sortIncubatorPossiblesByReservedSpots = function() {
var $sortedIncubatorPossibles = $('#qlIncubator div.possible').detach();
$sortedIncubatorPossibles = sortDomObjects($sortedIncubatorPossibles, 'data-reserved-spots');
$($sortedIncubatorPossibles).appendTo($('#qlIncubator'));
};
-window.sortIncubatorPossiblesByPreviousSort = function () {
+window.sortIncubatorPossiblesByPreviousSort = function() {
var sort = State.variables.sortIncubatorList;
if ('unsorted' !== sort) {
if ('Name' === sort) {
@@ -81,31 +81,31 @@ window.sortIncubatorPossiblesByPreviousSort = function () {
}
};
-window.sortNurseryPossiblesByName = function () {
+window.sortNurseryPossiblesByName = function() {
var $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-name');
$($sortedNurseryPossibles).appendTo($('#qlNursery'));
};
-window.sortNurseryPossiblesByPregnancyWeek = function () {
+window.sortNurseryPossiblesByPregnancyWeek = function() {
var $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-preg-week');
$($sortedNurseryPossibles).appendTo($('#qlNursery'));
};
-window.sortNurseryPossiblesByPregnancyCount = function () {
+window.sortNurseryPossiblesByPregnancyCount = function() {
var $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-preg-count');
$($sortedNurseryPossibles).appendTo($('#qlNursery'));
};
-window.sortNurseryPossiblesByReservedSpots = function () {
+window.sortNurseryPossiblesByReservedSpots = function() {
var $sortedNurseryPossibles = $('#qlNursery div.possible').detach();
$sortedNurseryPossibles = sortDomObjects($sortedNurseryPossibles, 'data-reserved-spots');
$($sortedNurseryPossibles).appendTo($('#qlNursery'));
};
-window.sortNurseryPossiblesByPreviousSort = function () {
+window.sortNurseryPossiblesByPreviousSort = function() {
var sort = State.variables.sortNurseryList;
if ('unsorted' !== sort) {
if ('Name' === sort) {
diff --git a/src/js/rbuttonJS.js b/src/js/rbuttonJS.js
index 8c37e7336e3da3cdf4b56975ae41eb9b304c04ba..dfc4bbf63676b7ee9d8e3677e6402756f641c9b5 100644
--- a/src/js/rbuttonJS.js
+++ b/src/js/rbuttonJS.js
@@ -60,37 +60,33 @@ Macro.add('rbutton', {
*/
jQuery(el)
.attr({
- id : `${this.name}-${varId}-${TempState[this.name][varId]++}`,
- name : `${this.name}-${varId}`,
- type : 'radio',
- tabindex : 0 // for accessibility
+ id: `${this.name}-${varId}-${TempState[this.name][varId]++}`,
+ name: `${this.name}-${varId}`,
+ type: 'radio',
+ tabindex: 0 // for accessibility
})
.addClass(`macro-${this.name}`)
- .on('change', function () {
+ .on('change', function() {
if (this.checked) {
Wikifier.setValue(varName, checkValue);
- if (replaceID.length > 0 && replaceText.length > 0){
-
+ if (replaceID.length > 0 && replaceText.length > 0) {
var replaceEl = document.getElementById(replaceID);
//alert (replaceEl);
if (replaceEl !== null) {
replaceEl.innerHTML = replaceText;
}
-
}
}
})
- .ready (function () {
+ .ready(function() {
//alert ("DOM finished");
- if (el.checked && replaceID.length > 0 && replaceText.length > 0){
-
+ if (el.checked && replaceID.length > 0 && replaceText.length > 0) {
var replaceEl = document.getElementById(replaceID);
//alert (replaceEl);
if (replaceEl !== null) {
replaceEl.innerHTML = replaceText;
}
-
}
})
.appendTo(this.output);
diff --git a/src/js/relationshipChecks.js b/src/js/relationshipChecks.js
index 4c8cd40cee79a6aa58570f1ba6d1a5338d4ab625..6507db75550936deff4929d2eed5760f90ca1a3b 100644
--- a/src/js/relationshipChecks.js
+++ b/src/js/relationshipChecks.js
@@ -1,4 +1,4 @@
-window.rivalryTerm = function (id) {
+window.rivalryTerm = function(id) {
if (id.rivalry === 1) {
return `growing rival`;
} else if (id.rivalry === 2) {
@@ -7,7 +7,7 @@ window.rivalryTerm = function (id) {
return `bitter rival`;
}
};
-window.relationshipTerm = function (id) {
+window.relationshipTerm = function(id) {
if (id.relationship === 1) {
return `friend`;
} else if (id.relationship === 2) {
@@ -20,7 +20,7 @@ window.relationshipTerm = function (id) {
return `slave wife`;
}
};
-window.relationshipTermShort = function (id) {
+window.relationshipTermShort = function(id) {
if (id.relationship === 1) {
return `friend`;
} else if (id.relationship === 2) {
diff --git a/src/js/rulesAssistant.js b/src/js/rulesAssistant.js
index e7de19f189f92cd5fc0bcf2ba942b4d96571c604..3e5f00e1fed25307841e426c16248445b6e40221 100644
--- a/src/js/rulesAssistant.js
+++ b/src/js/rulesAssistant.js
@@ -3,7 +3,7 @@
* @param {Object[]} rules
* @returns {boolean}
*/
-window.hasSurgeryRule = function (slave, rules) {
+window.hasSurgeryRule = function(slave, rules) {
return rules.some(
rule => ruleApplied(slave, rule) && rule.set.autoSurgery > 0);
};
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 6def7e4abbd192564625f28d3690e4e340e991b4..cb0de4b17f8beb346b64a8d675bfa588615c779b 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -479,7 +479,7 @@ window.rulesAssistantOptions = (function() {
constructor(root) {
super("Current rule", V.defaultRules.map(i => [i.name, i]));
this.setValue(current_rule.name);
- this.onchange = function (rule) {
+ this.onchange = function(rule) {
V.currentRule = rule.ID;
reload(root);
};
@@ -2271,7 +2271,7 @@ window.rulesAssistantOptions = (function() {
setValue(val) {
if (val === undefined) val = this.combine();
- this.label.innerText = val + " ";
+ this.label.innerText = `${val} `;
current_rule.set.eyeColor = val;
}
}
@@ -3541,7 +3541,7 @@ window.rulesAssistantOptions = (function() {
this.onchange = (value) => current_rule.set.surgery_holes = value;
}
}
-
+
class TummyTuckSurgeryList extends List {
constructor() {
const items = [
diff --git a/src/js/slaveStatsChecker.js b/src/js/slaveStatsChecker.js
index 2ecea065d7933c6a59f0dfd1d121cc4280ace806..6381032237a4fbe06a9d0374a27e8fb43b545629 100644
--- a/src/js/slaveStatsChecker.js
+++ b/src/js/slaveStatsChecker.js
@@ -156,7 +156,7 @@ window.SlaveStatsChecker = (function() {
}
}());
-window.isSlim = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+window.isSlim = /** @param {App.Entity.SlaveState} slave */ function(slave) {
let slim = false;
const ArcologyZero = State.variables.arcologies[0];
@@ -184,7 +184,7 @@ window.isSlim = /** @param {App.Entity.SlaveState} slave */ function (slave) {
return slim;
};
-window.slimPass = /** @param {App.Entity.SlaveState} slave */ function (slave) {
+window.slimPass = /** @param {App.Entity.SlaveState} slave */ function(slave) {
let slimPass = 0;
const ArcologyZero = State.variables.arcologies[0];
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 8a3a619f689ce1165dad83c007c9a77414e309fb..074ae80a31132dd6defb7362c93d7de9802348d8 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -18,10 +18,11 @@ window.SlaveSummary = /** @param {App.Entity.SlaveState} slave */ function Slave
}
//this.output.appendChild(setup.summaryCache[State.temporary.Slave.ID].cloneNode(true))
return setup.summaryCache[slave.ID];
- } else return SlaveSummaryUncached(slave);
+ }
+ return SlaveSummaryUncached(slave);
};
-window.SlaveSummaryUncached = (function () {
+window.SlaveSummaryUncached = (function() {
"use strict";
let V;
let r;
@@ -3850,7 +3851,7 @@ window.SlaveSummaryUncached = (function () {
function short_extended_family(slave) {
let handled = 0;
if (slave.mother > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.mother;
});
if (_ssj !== -1) {
@@ -3876,7 +3877,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.mother].fullName}'s daughter `;
}
if (slave.father > 0 && slave.father !== slave.mother) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.father;
});
if (_ssj !== -1) {
@@ -3902,7 +3903,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.father].fullName}'s daughter`;
}
if (slave.daughters === 1) {
- let _ssj = V.slaves.findIndex(function (s) {
+ let _ssj = V.slaves.findIndex(function(s) {
return s.mother === slave.ID;
});
if (_ssj !== -1) {
@@ -3914,7 +3915,7 @@ window.SlaveSummaryUncached = (function () {
}
}
r += " ";
- _ssj = V.slaves.findIndex(function (s) {
+ _ssj = V.slaves.findIndex(function(s) {
return s.father === slave.ID;
});
if (_ssj !== -1) {
@@ -3930,7 +3931,7 @@ window.SlaveSummaryUncached = (function () {
r += `multiple daughters `;
}
if (slave.sisters === 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return areSisters(s, slave) > 0;
});
if (_ssj !== -1) {
@@ -3946,7 +3947,7 @@ window.SlaveSummaryUncached = (function () {
r += `multiple sisters `;
}
if (slave.relationship > 0 && handled !== 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -3967,7 +3968,7 @@ window.SlaveSummaryUncached = (function () {
/** @param {App.Entity.SlaveState} slave */
function short_legacy_family(slave) {
if (slave.relation !== 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationTarget;
});
if (_ssj !== -1) {
@@ -3975,7 +3976,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.relationship > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4007,7 +4008,7 @@ window.SlaveSummaryUncached = (function () {
function short_rival(slave) {
if (slave.rivalry !== 0) {
r += ` `;
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.rivalryTarget;
});
if (_ssj !== -1) {
@@ -4028,7 +4029,7 @@ window.SlaveSummaryUncached = (function () {
function long_extended_family(slave) {
let handled = 0;
if (slave.mother > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.mother;
});
if (_ssj !== -1) {
@@ -4055,7 +4056,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.mother].fullName}'s <span class="lightgreen">daughter.</span> `;
}
if (slave.father > 0 && slave.father !== slave.mother) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.father;
});
if (_ssj !== -1) {
@@ -4082,7 +4083,7 @@ window.SlaveSummaryUncached = (function () {
r += `${V.missingTable[slave.father].fullName}'s <span class="lightgreen">daughter.</span> `;
}
if (slave.daughters === 1) {
- let _ssj = V.slaves.findIndex(function (s) {
+ let _ssj = V.slaves.findIndex(function(s) {
return s.mother === slave.ID;
});
if (_ssj !== -1) {
@@ -4094,7 +4095,7 @@ window.SlaveSummaryUncached = (function () {
}
r += `.</span> `;
}
- _ssj = V.slaves.findIndex(function (s) {
+ _ssj = V.slaves.findIndex(function(s) {
return s.father === slave.ID;
});
if (_ssj !== -1) {
@@ -4116,7 +4117,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.sisters === 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return areSisters(s, slave) > 0;
});
if (_ssj !== -1) {
@@ -4138,7 +4139,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.relationship > 0 && handled !== 1) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4158,7 +4159,7 @@ window.SlaveSummaryUncached = (function () {
/** @param {App.Entity.SlaveState} slave */
function long_legacy_family(slave) {
if (slave.relation !== 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationTarget;
});
if (_ssj !== -1) {
@@ -4174,7 +4175,7 @@ window.SlaveSummaryUncached = (function () {
}
}
if (slave.relationship > 0) {
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.relationshipTarget;
});
if (_ssj !== -1) {
@@ -4206,7 +4207,7 @@ window.SlaveSummaryUncached = (function () {
function long_rival(slave) {
if (slave.rivalry !== 0) {
r += ` `;
- const _ssj = V.slaves.findIndex(function (s) {
+ const _ssj = V.slaves.findIndex(function(s) {
return s.ID === slave.rivalryTarget;
});
if (_ssj !== -1) {
@@ -4615,7 +4616,7 @@ window.SlaveSummaryUncached = (function () {
break;
case "porcelain mask":
r += `Porcelain mask.`;
- break
+ break;
default:
break;
}
@@ -4826,16 +4827,16 @@ App.UI.PassageSlaveFilers = {
"Personal Attention Select": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0),
"Agent Select": s => ((s.fuckdoll === 0 && s.devotion > 20 && s.intelligence + s.intelligenceImplant > 15 && s.intelligenceImplant >= 15 && canWalk(s) && canSee(s) && canHear(s) && canTalk(s) && s.broodmother < 2 && (s.breedingMark !== 1 || State.variables.propOutcome === 0)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.arcologyAgent.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.arcologyAgent.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.arcologyAgent.manager.slaveHasExperience(s)))),
"BG Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.assignment !== "guard you" && canWalk(s) && canSee(s) && canHear(s) && (s.breedingMark !== 1 || State.variables.propOutcome === 0)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.armory.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.armory.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.armory.manager.slaveHasExperience(s)))),
"Recruiter Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.assignment !== "recruit girls" && canWalk(s) && canSee(s) && canTalk(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.penthouse.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.penthouse.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.penthouse.manager.slaveHasExperience(s)))),
"HG Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.assignment !== "be your Head Girl" && canWalk(s) && canHear(s) && canSee(s) && canTalk(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.headGirlSuite.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.headGirlSuite.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.headGirlSuite.manager.slaveHasExperience(s)))),
"Head Girl Suite": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "be your Head Girl" && s.indentureRestrictions <= 0 && (s.breedingMark !== 1 || State.variables.propOutcome === 0)) ||
(State.variables.SlaveSummaryFiler !== "assignable" && s.assignment === "live with your Head Girl"))),
@@ -4843,86 +4844,86 @@ App.UI.PassageSlaveFilers = {
"Spa": s => ((s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "rest in the spa") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "rest in the spa") ||
- (State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Attendant.ID))) ||
+ (State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Attendant.ID))) ||
(s.assignmentVisible === 0 && s.fuckdoll <= 0 && (
- (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "rest in the spa")))),
+ (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "rest in the spa")))),
"Attendant Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canHear(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.spa.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.spa.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.spa.manager.slaveHasExperience(s)))),
"Nursery": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (s.devotion > 20 || s.trust > 20) && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "work as a nanny") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "work as a nanny") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Matron.ID))),
"Matron Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canHear(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.nursery.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.nursery.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.nursery.manager.slaveHasExperience(s)))),
"Brothel": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "work in the brothel") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "work in the brothel") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Madam.ID))),
"Madam Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.intelligence + s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && canHear(s) && (s.breedingMark !== 1 || State.variables.propOutcome === 0)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.brothel.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.brothel.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.brothel.manager.slaveHasExperience(s)))),
"Club": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "serve in the club") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "serve in the club") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.DJ.ID))),
"DJ Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.intelligence + s.intelligenceImplant >= -50 && canTalk(s) && canHear(s) && canWalk(s) && (s.breedingMark !== 1 || State.variables.propOutcome === 0)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.club.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.club.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.club.manager.slaveHasExperience(s)))),
"Clinic": s => ((s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "get treatment in the clinic") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "get treatment in the clinic") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Nurse.ID))) ||
(s.assignmentVisible === 0 && s.fuckdoll <= 0 && (
- (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "get treatment in the clinic")))),
- "Nurse Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s)) &&
+ (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "get treatment in the clinic")))),
+ "Nurse Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.clinic.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.clinic.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.clinic.manager.slaveHasExperience(s)))),
"Schoolroom": s => ((s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.fetish !== "mindbroken" && s.assignment !== "learn in the schoolroom") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "learn in the schoolroom") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Schoolteacher.ID))) ||
(s.assignmentVisible === 0 && s.fuckdoll <= 0 && (
- (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "learn in the schoolroom")))),
+ (State.variables.SlaveSummaryFiler === "transferable" && s.assignment !== "learn in the schoolroom")))),
"Schoolteacher Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canTalk(s) && canHear(s) && canSee(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.schoolroom.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.schoolroom.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.schoolroom.manager.slaveHasExperience(s)))),
"Dairy": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "work in the dairy") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "work in the dairy") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Milkmaid.ID))),
"Milkmaid Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 20 && canWalk(s) && canSee(s) && canHear(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.dairy.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.dairy.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.dairy.manager.slaveHasExperience(s)))),
"Farmyard": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "work as a farmhand") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "work as a farmhand") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Farmer.ID))),
"Farmer Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s) && canHear(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.farm.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.farm.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.farm.manager.slaveHasExperience(s)))),
"Servants' Quarters": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "work as a servant") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "work as a servant") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Stewardess.ID))),
"Stewardess Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.intelligence + s.intelligenceImplant >= -50 && canWalk(s) && canSee(s) && canHear(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.servantsQuarters.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.servantsQuarters.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.servantsQuarters.manager.slaveHasExperience(s)))),
"Master Suite": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "serve in the master suite") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "serve in the master suite") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Concubine.ID))),
"Concubine Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && s.amp !== 1) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.masterSuite.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.masterSuite.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.masterSuite.manager.slaveHasExperience(s)))),
"Cellblock": s => (s.assignmentVisible === 1 && s.fuckdoll <= 0 && s.fetish !== "mindbroken" && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "be confined in the cellblock") ||
(State.variables.SlaveSummaryFiler === "occupying" && s.assignment === "be confined in the cellblock") ||
(State.variables.SlaveSummaryFiler === "leading" && s.ID === State.variables.Wardeness.ID))),
"Wardeness Select": s => ((s.assignmentVisible === 1 && s.fuckdoll === 0 && s.devotion > 50 && canWalk(s) && canSee(s) && canHear(s)) &&
((State.variables.SlaveSummaryFiler !== "experienced") ||
- (State.variables.SlaveSummaryFiler === "experienced" && (s.skill[App.Data.Facilities.cellblock.manager.skill] >= State.variables.masteredXP) || (typeof s.career === 'string' && App.Data.Facilities.cellblock.manager.careers.includes(s.career))))),
+ (State.variables.SlaveSummaryFiler === "experienced" && App.Entity.facilities.cellblock.manager.slaveHasExperience(s)))),
"Arcade": s => (s.assignmentVisible === 1 && (State.variables.arcade >= State.variables.arcadeSlaves || State.variables.arcadeUpgradeFuckdolls === 1) && (
(State.variables.SlaveSummaryFiler === "assignable" && s.assignment !== "be confined in the arcade") ||
(State.variables.SlaveSummaryFiler !== "assignable" && s.assignment === "be confined in the arcade"))),
@@ -4950,7 +4951,7 @@ App.UI.PassageSlaveFilers = {
* @param {string} passageName
* @returns {string}
*/
-App.UI.slaveSummaryList = function (passageName) {
+App.UI.slaveSummaryList = function(passageName) {
'use strict';
const V = State.variables;
@@ -5012,15 +5013,15 @@ App.UI.slaveSummaryList = function (passageName) {
return r.join("");
}
- const _filteredSlaveIdxs = slaves.map(function (slave, idx) {
+ const _filteredSlaveIdxs = slaves.map(function(slave, idx) {
return _passagePreFilter(slave) ? idx : null;
- }).filter(function (idx) {
+ }).filter(function(idx) {
return idx !== null;
});
- const _indexSlavesIdxs = slaves.map(function (slave, idx) {
+ const _indexSlavesIdxs = slaves.map(function(slave, idx) {
return _passagePreFilter(slave) ? idx : null;
- }).filter(function (idx) {
+ }).filter(function(idx) {
return idx !== null;
});
@@ -5124,10 +5125,10 @@ App.UI.slaveSummaryList = function (passageName) {
"HG Select": makeSelectionPassageInfo(App.Entity.facilities.headGirlSuite, "HG Workaround"),
"BG Select": makeSelectionPassageInfo(App.Entity.facilities.armory, "Bodyguard Workaround"),
"Attendant Select": makeSelectionPassageInfo(App.Entity.facilities.spa, "Attendant Workaround"),
- "Concubine Select": makeSelectionPassageInfo(App.Entity.facilities.masterSuite, "Concubine Workaround"),
+ "Concubine Select": makeSelectionPassageInfo(App.Entity.facilities.masterSuite, "Concubine Workaround"),
"Matron Select": makeSelectionPassageInfo(App.Entity.facilities.nursery, "Matron Workaround"),
"Madam Select": makeSelectionPassageInfo(App.Entity.facilities.brothel, "Madam Workaround"),
- "Milkmaid Select": makeSelectionPassageInfo(App.Entity.facilities.dairy, "Milkmaid Workaround"),
+ "Milkmaid Select": makeSelectionPassageInfo(App.Entity.facilities.dairy, "Milkmaid Workaround"),
"Nurse Select": makeSelectionPassageInfo(App.Entity.facilities.clinic, "Nurse Workaround"),
"DJ Select": makeSelectionPassageInfo(App.Entity.facilities.club, "DJ Workaround"),
"Farmer Select": makeSelectionPassageInfo(App.Entity.facilities.farmyard, "Farmer Workaround"),
@@ -5178,7 +5179,7 @@ App.UI.slaveSummaryList = function (passageName) {
let rejectString = rejects.length === 1 ?
rejects[0]:
`${_slaveName}: <ul>${rejects.map(e => `<li>${e}</li>`).join('')}</ul>`;
- res.push(rejectString + '</div>');
+ res.push(`${rejectString}</div>`);
continue;
} else {
res.push(dividerAndImage(_Slave));
@@ -5294,7 +5295,7 @@ App.UI.slaveSummaryList = function (passageName) {
}
const _numFacilities = V.brothel + V.club + V.dairy + V.farmyard + V.servantsQuarters + V.masterSuite + V.spa + V.clinic + V.schoolroom + V.cellblock + V.arcade + V.HGSuite;
-
+
if (_numFacilities > 0) {
if (passageName === "Main" || passageName === "Head Girl Suite" || passageName === "Spa" || passageName === "Brothel" || passageName === "Club" || passageName === "Arcade" || passageName === "Clinic" || passageName === "Schoolroom" || passageName === "Dairy" || passageName === "Farmyard" || passageName === "Servants' Quarters" || passageName === "Master Suite" || passageName === "Cellblock") {
V.returnTo = passageName;
@@ -5327,7 +5328,7 @@ App.UI.slaveSummaryList = function (passageName) {
res.push(`<<link "Send ${_Slave.object} to ${passageFacility.name}" "Assign">><<set $i = ${_ssi}>><</link>>`);
} else if (V.SlaveSummaryFiler === "occupying") {
res.push(`<<link "Remove ${_Slave.object} from ${passageFacility.name}" "Retrieve">><<set $i = ${_ssi}>><</link>>`);
- } else if (passageFacility.desc.manager !== null){
+ } else if (passageFacility.desc.manager !== null) {
const managerCapName = capFirstChar(passageFacility.desc.manager.position);
res.push(`[[Change or remove ${managerCapName}|${managerCapName} Select]]`);
}
@@ -5379,7 +5380,7 @@ App.UI.slaveSummaryList = function (passageName) {
* Adds/removes a slave with the given id to/from the personal attention array
* @param {number} id slave id
*/
-App.UI.selectSlaveForPersonalAttention = function (id) {
+App.UI.selectSlaveForPersonalAttention = function(id) {
const V = State.variables;
if (!Array.isArray(V.personalAttention)) {
@@ -5389,7 +5390,7 @@ App.UI.selectSlaveForPersonalAttention = function (id) {
trainingRegimen: "undecided"
}];
} else {
- const _pai = V.personalAttention.findIndex(function (s) {
+ const _pai = V.personalAttention.findIndex(function(s) {
return s.ID === id;
});
if (_pai === -1) {
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index df4bae5c0a8c9a98553ce6cfd5da8dfc838dbabf..5f7a1bddbaa089ea6c30f98e19f5b7ace05dc9c0 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)>>
@@ -301,7 +301,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlaveOneTimeMinAge = $fertilityAge>>
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(55,65)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.preg = random(1,40), $activeSlave.lactation = 1, $activeSlave.lactationDuration = 2>>
@@ -572,7 +572,7 @@ The previous owner seems to have left in something of a hurry.
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(55,65)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.preg = random(10,40), $activeSlave.pregType = random(3,8), $activeSlave.lactation = 1, $activeSlave.lactationDuration = 2>>
@@ -588,7 +588,7 @@ The previous owner seems to have left in something of a hurry.
<<case "HedonisticDecadence">>
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.devotion = random(25,45), $activeSlave.trust = random(-25,-45), $activeSlave.health = random(-20,20)>>
<<set $activeSlave.face = random(15,40)>>
<<set $activeSlave.boobs += 100*random(3,6)>>
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
index 638c5003cab004e3135568e9ba1dbe1c6c545590..85428f3fc3f6c2fdb481197d4692bff1fe707d91 100644
--- a/src/pregmod/eliteSlave.tw
+++ b/src/pregmod/eliteSlave.tw
@@ -26,7 +26,7 @@ You check to see if any potential breeding slaves are on auction. <<if $eliteAuc
<<set _races = _races.delete($arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was purchased from a member of the Elite.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.prestige = 1>>
diff --git a/src/pregmod/eliteTakeOverResult.tw b/src/pregmod/eliteTakeOverResult.tw
index 13fd792c24261ed16402ba5c9ff0d2b40e864a31..825eb7dac4e824f2af613d4ef343f6b5f13d11d4 100644
--- a/src/pregmod/eliteTakeOverResult.tw
+++ b/src/pregmod/eliteTakeOverResult.tw
@@ -127,13 +127,13 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<if $seeDicks == 0>>
- <<include "Generate XX Slave">>
+ <<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 */
- <<include "Generate XX Slave">>
+ <<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>>
@@ -171,13 +171,13 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<if $seeDicks == 0>>
- <<include "Generate XX Slave">>
+ <<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 */
- <<include "Generate XX Slave">>
+ <<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 4b13238863a27147ae9d3cf3d651d8e36d5484a7..9a72ac4f1c32fff34a3032fc508c40bdbed85711 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -10,7 +10,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 for the attempted rape of a free woman.">>
<<set $activeSlave.devotion = -100>>
<<set $activeSlave.trust = -100>>
@@ -138,6 +138,10 @@ It would be prudent to up security in your arcology. That or take a guard along
<<else>>
+<<<<<<< HEAD
+=======
+
+>>>>>>> 181465f486f48228842d09a1d4c287b6a5231e8f
<br><br>
Now the only question is what to do with the would-be rapist. You could toss them out of the arcology, but it might be more fun to turn the tables on them.
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index d770f1a5ce538284ad48d60d21e5170af7e7e57b..661b8ce49e9223b8663c713f37a7612b1dbaa3b7 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -240,7 +240,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.devotion = random(40,60)>>
<<set $activeSlave.weight = random(-10,10)>>
<<set $activeSlave.waist = random(-45,25)>>
@@ -287,7 +287,7 @@
<<set $activeSlaveOneTimeMaxAge = 20>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.weight = random(10,20)>>
<<set $activeSlave.waist = random(-25,25)>>
<<set $activeSlave.anus = 1>>
@@ -340,7 +340,7 @@
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.weight = random(20,40)>>
<<set $activeSlave.waist = random(-25,25)>>
<<set $activeSlave.boobs = (random(4,6)*100)>>
@@ -385,7 +385,7 @@
<<set $activeSlaveOneTimeMaxAge = 40>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.weight = random(20,90)>>
<<set $activeSlave.waist = random(-45,45)>>
<<set $activeSlave.boobs = (random(20,30)*50)>>
@@ -426,7 +426,7 @@
<<elseif $randShow == 6>> /* discount young hottie */
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.face = random(70,100)>>
<<set $activeSlave.weight = random(-5,10)>>
<<set $activeSlave.waist = random(-45,25)>>
@@ -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 3e8a54e1455a0ef6b7ee05eb2d80639c7ea49924..c8dd367ffed388162f543d56edfd63ce3aa1203a 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -9,11 +9,11 @@
<<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>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<</if>>
<<set $activeSlave.slaveName = "Doll">>
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index ec2f9eecdfedd4d105b25f292f0186b479c5a3b0..691aaf76893f91110b5179b159adbc38adc976da 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -119,7 +119,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was enslaved by you when you overcharged her for surgery.">>
<<set $activeSlave.devotion = random(-70,-55)>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -143,7 +143,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.devotion = 20>>
<<set $activeSlave.trust = 20>>
<<set $activeSlave.health = -30>>
@@ -164,7 +164,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was enslaved by you when you purchased her debt.">>
<<set $activeSlave.devotion = random(-55,0)>>
<<set $activeSlave.trust = random(-45,0)>>
@@ -190,7 +190,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was enslaved by you when you purchased her debt.">>
<<set $activeSlave.devotion = random(-90,-75)>>
<<set $activeSlave.trust = random(-45,-25)>>
diff --git a/src/uncategorized/REroyalblood.tw b/src/uncategorized/REroyalblood.tw
index 36c3e1ae6f7380728a6ba911be00278ad7a832de..8061f8cac1e2a3de5eeaaeab412a2ca9d8d60865 100644
--- a/src/uncategorized/REroyalblood.tw
+++ b/src/uncategorized/REroyalblood.tw
@@ -6,7 +6,7 @@
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a princess">>
<<set $activeSlave.prestige = 2>>
<<set $activeSlave.prestigeDesc = "She was the princess of an ancient kingdom.">>
@@ -331,7 +331,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was sold to you in exchange for credits.">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
@@ -382,7 +382,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
@@ -558,7 +558,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was sold for credits.">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
@@ -617,7 +617,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
@@ -674,7 +674,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was sold for credits.">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
@@ -752,7 +752,7 @@ Time is short, but you are well placed to acquire some choice slaves. With an ad
<<set $activeSlaveOneTimeMinAge = 21>>
<<set $activeSlaveOneTimeMaxAge = ($retirementAge-2)>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set _origin = "She was a member of the court in an ancient kingdom, till it was overthrown and she was acquired by "+$SF.Lower+".">>
<<set $activeSlave.origin = _origin>>
<<set $activeSlave.career = "a lady courtier">>
diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw
deleted file mode 100644
index f4c915d0f0b6d4696aff4dd52692c7179c3fe32a..0000000000000000000000000000000000000000
--- a/src/uncategorized/generateXXSlave.tw
+++ /dev/null
@@ -1,3 +0,0 @@
-:: Generate XX Slave [nobr]
-
-<<set $activeSlave = GenerateNewSlave("XX")>>
diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
deleted file mode 100644
index 47cf1b30672cb33dfff02328bb833871e7d19020..0000000000000000000000000000000000000000
--- 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 1c6d1878799e47a3b509879c749fe324ece866ce..f58bbf079ac3f905802309eb6ef034aa2210d767 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -252,7 +252,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlaveOneTimeMinAge = 30>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was the head of a religious community of women you enslaved.">>
<<set $activeSlave.career = "a nun">>
<<set $activeSlave.devotion = -20>>
@@ -280,7 +280,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<for $i = 0; $i < 3; $i++>>
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 24>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was an initiate in a religious community of women you enslaved.">>
<<set $activeSlave.career = "a nun">>
<<set $activeSlave.devotion = random(-90,-75)>>
@@ -306,7 +306,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was the principal of a girls' school whose remnants you enslaved. A strap-on and a large quantity of personal lubricant were found in her possession when she was enslaved.">>
<<set $activeSlave.intelligence = random(16,80)>>
<<set $activeSlave.intelligenceImplant = 15>>
@@ -335,7 +335,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<for $i = 0; $i < 3; $i++>>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was a student at a girls' school whose remnants you enslaved.">>
<<set $activeSlave.career = "a student">>
<<set $activeSlave.devotion = random(-90,-75)>>
@@ -367,7 +367,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>> /% Old enough to be pregnant. %/
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was an expectant mother you enslaved when you evacuated her from a threatened old world hospital.">>
<<set $activeSlave.career = "a housewife">>
<<set $activeSlave.devotion = random(-90,-75)>>
@@ -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>>
@@ -442,7 +442,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was an inmate at a religious orientation conversion therapy camp whose remnants you enslaved.">>
<<set $activeSlave.career = "a student">>
<<set $activeSlave.devotion = random(-90,-75)>>
@@ -469,7 +469,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 1, limitMult: [0, 2]}))>>
<<set $activeSlave.origin = "She was a volleyball player you enslaved when you evacuated her from a broken down bus.">>
<<set $activeSlave.career = "a student athlete">>
@@ -541,7 +541,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to be pregnant. %/
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "white">>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was a nun in a felled mission. Once claimed, she was reduced to nothing more than a cum dump for her black masters.">>
<<set $activeSlave.career = "a nun">>
<<set $activeSlave.intelligenceImplant = 15>>
@@ -586,7 +586,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to be pregnant. %/
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "white">>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was a nun in a felled mission. Once claimed, she was reduced to nothing more than a cum dump for her black masters.">>
<<set $activeSlave.career = "a nun">>
<<set $activeSlave.devotion = 50>>
@@ -692,7 +692,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was a wealthy housewife who you enslaved as she fled societal collapse.">>
<<set $activeSlave.career = "a housewife">>
<<set $activeSlave.devotion = -20>>
@@ -1135,7 +1135,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlaveOneTimeMaxAge = 28>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You won her at a shotgun match against other arcology owners.">>
<<set $activeSlave.lips = random(5,25)>>
<<set $activeSlave.anus = 1>>
@@ -1184,7 +1184,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlaveOneTimeMaxAge = 8>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You won her at a shotgun match against other arcology owners.">>
<<set $activeSlave.lips = random(5,25)>>
<<set $activeSlave.anus = 0>>
@@ -1243,7 +1243,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You won her at a shotgun match against other arcology owners.">>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.skill.vaginal = 15>>
@@ -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/householdLiquidator.tw b/src/uncategorized/householdLiquidator.tw
index cf921fe671dd4e39e618b9eb676250c6b9b520d1..506d5ca986fff1c67a04189ab7e0fe5bbf1c7698 100644
--- a/src/uncategorized/householdLiquidator.tw
+++ b/src/uncategorized/householdLiquidator.tw
@@ -53,7 +53,7 @@ The household liquidator is offering a mother and her daughter for sale. As usua
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a daughter who can be a slave. %/
/% End younger mothers submod. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<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 221200bddd9e15c9c4ce02a86ed50c49354d48b3..344f3bb43d58e90ac0f9b7d533526f1db507de47 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -9,7 +9,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She sold herself into slavery to buy medical care for her daughter.">>
<<set $activeSlave.devotion = random(25,30)>>
<<set $activeSlave.trust = $activeSlave.devotion-20>>
@@ -27,7 +27,7 @@
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was raised to be a mother.">>
<<set $activeSlave.career = "a breeder">>
<<set $activeSlave.devotion = random(10,25)>>
@@ -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 295f97d5916ce1e3fbd637f719da80cdcb221161..47a5680d037b6c172c158cd48f3617324124a89d 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)>>
@@ -79,7 +79,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.weight = random(-50,30)>>
<<set $activeSlave.muscles = random(0,80)>>
<<set $activeSlave.waist = random(-20,20)>>
@@ -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)>>
@@ -126,7 +126,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">>
<<set $activeSlave.weight = random(-50,30)>>
<<set $activeSlave.muscles = random(0,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)>>
@@ -175,7 +175,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She is an enslaved Daughter of Liberty.">>
<<set $activeSlave.weight = random(-50,30)>>
<<set $activeSlave.muscles = random(0,80)>>
diff --git a/src/uncategorized/pInvasion.tw b/src/uncategorized/pInvasion.tw
index e78f276641daa280640b44e3e603e210ad902aca..ece9b5931320b61ac206e52ae66e3cdd68329946 100644
--- a/src/uncategorized/pInvasion.tw
+++ b/src/uncategorized/pInvasion.tw
@@ -97,10 +97,10 @@ 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>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<</if>>
<<set $activeSlave.origin = "She is an enslaved prisoner of war.">>
<<set _newSlaves.push($activeSlave)>>
diff --git a/src/uncategorized/pRaidResult.tw b/src/uncategorized/pRaidResult.tw
index 5cd7d036ecc16ee63bb713c5de97f941522cef57..48d76ba24c9a74a5c6b4a4b21fa4cbd2410adef2 100644
--- a/src/uncategorized/pRaidResult.tw
+++ b/src/uncategorized/pRaidResult.tw
@@ -15,11 +15,11 @@ 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>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She is an enslaved refugee who participated in the defeated attack on your arcology.">>
<<set _newSlaves.push($activeSlave)>>
<</if>>
diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index 2ad6402d52c62c876b13bc1dbb030b8b14a2bb0d..8fd102042c293bcb329ed7f275b689b95893c07a 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">>
@@ -195,7 +195,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.face = 55>>
<<set $activeSlave.faceImplant = 0>>
<<set $activeSlave.faceShape = "androgynous">>
@@ -236,7 +236,7 @@
<</if>>
<<set $oneTimeDisableDisability = 1>>
<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.pubertyXX = 1>>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceImplant = 0>>
@@ -285,7 +285,7 @@
<<set $activeSlaveOneTimeMaxAge = 12>>
<<set $oneTimeDisableDisability = 1>>
<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceImplant = 0>>
<<set $activeSlave.faceShape = "cute">>
@@ -317,7 +317,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.face = 55>>
<<set $activeSlave.faceImplant = 0>>
<<set $activeSlave.faceShape = "cute">>
@@ -350,7 +350,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceImplant = 65>>
<<set $activeSlave.faceShape = "sensual">>
@@ -384,7 +384,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.face = 100>>
<<set $activeSlave.faceImplant = 15>>
<<set $activeSlave.muscles = 0>>
diff --git a/src/uncategorized/pRivalryHostage.tw b/src/uncategorized/pRivalryHostage.tw
index ad6e835abd4b555d6b2c01b99fe7d6f4cfebe6ca..c868025402c3bea1ae086eff81dc8700484855b5 100644
--- a/src/uncategorized/pRivalryHostage.tw
+++ b/src/uncategorized/pRivalryHostage.tw
@@ -11,7 +11,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You were acquainted with her before you were an arcology owner; your rival tried to use her to manipulate you, but you rescued her.">>
<<set $activeSlave.height += random(-5,5)>>
<<set $activeSlave.boobs = 400>>
diff --git a/src/uncategorized/pSlaveMedic.tw b/src/uncategorized/pSlaveMedic.tw
index 897cda1264f642b4842b29dc8b9f4f518ebd071c..7a3960e1ab250be912315254e400bdae3237d9d2 100644
--- a/src/uncategorized/pSlaveMedic.tw
+++ b/src/uncategorized/pSlaveMedic.tw
@@ -9,7 +9,7 @@
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was captured while caring for those injured in a failed attack on the Free City.">>
<<set $activeSlave.career = "a nurse">>
<<set $activeSlave.custom.desc = "She has a faint air of fatigue about her, and strength too: that of a survivor.">>
@@ -53,7 +53,7 @@
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = 42>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was captured while caring for those injured in a failed attack on the Free City.">>
<<set $activeSlave.career = "a nurse">>
<<set $activeSlave.custom.desc = "She has a faint air of fatigue about her, and strength too: that of a survivor.">>
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index 96159594924d88af8f014a3ce57bde2d495eabfb..3298a862413cc83f4d4ced0ecdf9873e1736bae7 100644
--- a/src/uncategorized/pSnatchAndGrabResult.tw
+++ b/src/uncategorized/pSnatchAndGrabResult.tw
@@ -6,7 +6,7 @@
<<set $activeSlaveOneTimeMaxAge = $minimumSlaveAge>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She is your share of a raid on an illegal laboratory by your mercenaries.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = 100>>
@@ -70,7 +70,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She is your share of a raid on an illegal laboratory by your mercenaries.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = 100>>
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index 25288a633fd4831c244a4e17c70cdc055ba1524e..f11272b6b0abaec2c45040cd4515244c86d7d0a0 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -45,7 +45,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlaveOneTimeMinAge = Math.min(24, $minimumSlaveAge + 6)>>
<<set $activeSlaveOneTimeMaxAge = 40>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<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.">>
@@ -88,7 +88,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<set $activeSlaveOneTimeMinAge = Math.min(19, Math.max($fertilityAge, $minimumSlaveAge) + 1)>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She was once the young trophy wife of a powerful man in the old world, but he sold her into slavery in revenge for her infidelity.">>
@@ -127,7 +127,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<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.">>
@@ -161,7 +161,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<case "young model">>
<<set $activeSlaveOneTimeMaxAge = 21>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<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.">>
@@ -190,7 +190,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<case "albino">>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<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.">>
@@ -214,7 +214,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<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.">>
@@ -266,7 +266,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<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.">>
@@ -303,7 +303,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<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.">>
@@ -334,7 +334,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<case "princess">>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 3>>
<<set $activeSlave.prestigeDesc = "She was born a daughter 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.">>
@@ -366,7 +366,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<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.">>
@@ -425,7 +425,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<case "streamer">>
<<set $activeSlaveOneTimeMaxAge = 28>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<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.">>
@@ -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.">>
@@ -489,7 +489,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
<<case "d young herm">>
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You bought her at auction.">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She is a natural-born hermaphrodite. She received treatment to ensure both her halves would be fully functional from an early age.">>
@@ -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 19c3425334a9619799d462d8c6e4c4e69eaa0241..62391c396ffaffbc99d6ef762865479b8c10ff36 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -17,9 +17,9 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<if $seeDicks != 100>>
- <<include "Generate XX Slave">>
+ <<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 e77a43c3411b3b115c1c52a9190b6443cae4777c..ea558d7caaff6cbe5aab42b46b9904913a97198b 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -30,7 +30,7 @@
<<set $activeSlaveOneTimeMinAge = random(14,16)>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She offered herself for voluntary enslavement, choosing you as her new owner because you treat lactating girls well.">>
<<set $activeSlave.health = random(-20,20)>>
<<set $activeSlave.devotion = random(-15,15)>>
@@ -54,7 +54,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She offered herself for voluntary enslavement, hoping to become a valuable source of milk for you.">>
<<set $activeSlave.age = random(32,$retirementAge-2)>>
<<set $activeSlave.health = random(-20,20)>>
@@ -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)>>
@@ -171,7 +171,7 @@
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough = be pregnant. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was sold to you as a way of disposing of an inconveniently pregnant young woman.">>
<<set $activeSlave.career = setup.youngCareers.random()>>
<<set $activeSlave.health = random(-20,20)>>
@@ -195,7 +195,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was raped and impregnated, then sold to you as a way of disposing of an inconveniently pregnant mother.">>
<<set $activeSlave.health = random(-20,20)>>
<<set $activeSlave.devotion = random(-45,-25)>>
@@ -248,7 +248,7 @@
<<set $activeSlaveOneTimeMinAge = 11>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was sold to you by an anonymous person who wanted her to suffer.">>
<<set $activeSlave.boobsImplant += random(4,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
@@ -289,7 +289,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was sold to you by an anonymous slave breaking group.">>
<<set $activeSlave.age = random(32,$retirementAge-2)>>
<<set $activeSlave.boobsImplant += random(3,6)*200>>
@@ -768,7 +768,7 @@
<<set $activeSlaveOneTimeMaxAge = 30>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She sold herself to you in the hopes that her body would help keep humanity alive.">>
<<set $activeSlave.career = setup.youngCareers.random()>>
<<set $activeSlave.health = random(40,60)>>
@@ -794,7 +794,7 @@
<<set $activeSlaveOneTimeMaxAge = 30>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She sold herself to you in the hope of someday bearing children.">>
<<set $activeSlave.health = random(40,60)>>
<<set $activeSlave.devotion = random(25,35)>>
@@ -817,7 +817,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She thought she was important; she was not.">>
<<set $activeSlave.career = "a student from a private school">>
<<set $activeSlave.intelligence = random(16,95)>>
@@ -860,7 +860,7 @@
<<set $activeSlaveOneTimeMinAge = 22>>
<<set $activeSlaveOneTimeMaxAge = 28>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She offered herself to you for enslavement because she was swept up in the romanticism of a revival of Rome.">>
<<set $activeSlave.devotion = random(-15,-5)>>
<<set $activeSlave.trust = random(5,15)>>
@@ -886,7 +886,7 @@
<<set $activeSlaveOneTimeMinAge = 22>>
<<set $activeSlaveOneTimeMaxAge = 28>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She offered herself to you for enslavement because she needs to feel a higher call.">>
<<set $activeSlave.devotion = random(25,50)>>
<<set $activeSlave.trust = random(25,50)>>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 02f4abca2f1c3c82cecc02d7cd5250cbca292586..2bbdfd1598cbf546581a85263a195552dc3d22f5 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -68,7 +68,7 @@
<<set $activeSlaveOneTimeMinAge = $fertilityAge>>
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for smuggling slaves within her body.">>
<<set $activeSlave.career = setup.uneducatedCareers.random()>>
<<set $activeSlave.devotion = random(-75,-50)>>
@@ -139,7 +139,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for fraud and theft.">>
<<set $activeSlave.career = "a criminal businesswoman">>
<<set $activeSlave.devotion = random(-75,-60)>>
@@ -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)>>
@@ -238,7 +238,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You sentenced her to enslavement for smuggling drugs into the arcology.">>
<<set $activeSlave.career = "a drug mule">>
<<set $activeSlave.devotion = random(-50,-20)>>
@@ -266,7 +266,7 @@
<<set $activeSlaveOneTimeMinAge = random(12,28)>>
<<set $activeSlaveOneTimeMaxAge = 43>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You sentenced her to enslavement as a punishment for attempted theft of a slave.">>
<<set $activeSlave.career = "an antislavery activist">>
<<set $activeSlave.devotion = random(-75,-60)>>
diff --git a/src/uncategorized/reMilfTourist.tw b/src/uncategorized/reMilfTourist.tw
index 3c4204c00b84324dba0965c798f8785b98e55034..4694bdab7f0f557108d3e05dd05555b5bcbdd8f8 100644
--- a/src/uncategorized/reMilfTourist.tw
+++ b/src/uncategorized/reMilfTourist.tw
@@ -17,7 +17,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She came to your arcology as a tourist and found herself 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 a8676a3ccc5482412465aff820355a3380373d67..e415f97174e92e5dc8251be3f7f47fad675a5dc4 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -70,9 +70,9 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<<set $fixedRace = _races.random()>>
<</if>>
<<if $seeDicks != 100>>
- <<include "Generate XX Slave">>
+ <<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 3fbc3a239eda882f0fd941973d8c99c4437be2c5..cd14e70d2112ea6645a90f08fe1356a9d7e5c458 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -35,7 +35,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<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)>>
@@ -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)>>
@@ -100,7 +100,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<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">>
<<set $activeSlave.devotion = random(25,45)>>
@@ -140,7 +140,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was enslaved after she fell into debt to you.">>
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.trust = random(-15,0)>>
@@ -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)>>
@@ -184,7 +184,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She sold herself into slavery out of fear that life on the streets was endangering her pregnancy.">>
<<set $activeSlave.devotion = random(0,15)>>
<<set $activeSlave.trust = random(0,15)>>
@@ -220,7 +220,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She offered herself as a slave to escape the horrors a blind girl faces on the streets.">>
<<set $activeSlave.devotion = random(20,30)>>
<<set $activeSlave.trust = random(0,15)>>
@@ -288,7 +288,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She sold herself into slavery to escape life on the streets.">>
<<set $activeSlave.devotion = random(0,15)>>
<<set $activeSlave.trust = random(0,15)>>
@@ -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)>>
@@ -331,7 +331,7 @@
<<set $activeSlaveOneTimeMaxAge = 16>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was raised in a radical slave school that treated her with drugs and surgery from a very young age.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = random(25,45)>>
@@ -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)>>
@@ -400,7 +400,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She asked to be enslaved out of naïve infatuation with you.">>
<<set $activeSlave.devotion = random(25,30)>>
<<set $activeSlave.trust = random(-15,-10)>>
@@ -426,7 +426,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She asked to be enslaved in the hope you'd treat a fellow woman well.">>
<<set $activeSlave.devotion = random(10,15)>>
<<set $activeSlave.trust = random(-15,-10)>>
@@ -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)>>
@@ -498,7 +498,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<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(-25,0)>>
<<set $activeSlave.trust = random(-20,-5)>>
@@ -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)>>
@@ -573,7 +573,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<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 = -100>>
<<set $activeSlave.trust = 60>>
@@ -627,7 +627,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She 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)>>
@@ -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>>
@@ -863,7 +863,7 @@
<<case "female runaway">>
<<set $activeSlaveOneTimeMaxAge = 24>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<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>>
@@ -909,7 +909,7 @@
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "white">>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was the private slave of a con artist cult leader before he had to abandon her and flee.">>
<<set $activeSlave.devotion = random(25,50)>>
<<set $activeSlave.trust = random(25,50)>>
@@ -955,7 +955,7 @@
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "white">>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was the private slave of a con artist cult leader before he had to abandon her and flee.">>
<<set $activeSlave.devotion = random(-45,15)>>
<<set $activeSlave.trust = random(25,50)>>
@@ -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.">>
@@ -1045,7 +1045,7 @@
<<set $activeSlaveOneTimeMaxAge = 21>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was a virgin runner in the slave races before being sold to you.">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "After her short but very promising slave racing career, during which she made it through several competitions as a virgin, many people fondly remember fantasizing about taking her.">>
@@ -1093,7 +1093,7 @@
<<set $activeSlaveOneTimeMinAge = (Math.min(21, Math.max(11,$minimumSlaveAge) + 3))>>
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was a famous virgin runner in the slave races before being sold to you.">>
<<set $activeSlave.prestige = 2>>
<<set $activeSlave.prestigeDesc = "For years, she delighted the watchers of slave girl racing with winning competition after competition with her virginity intact.">>
@@ -1132,7 +1132,7 @@
<<set $activeSlaveOneTimeMinAge = 18>>
<<set $activeSlaveOneTimeMaxAge = 23>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was the housekeeper and fucktoy of a frat house before being collected by repo-men and sold to you.">>
<<set $activeSlave.devotion = random(25,50)>>
<<set $activeSlave.trust = random(25,50)>>
@@ -1168,7 +1168,7 @@
<<set $activeSlaveOneTimeMinAge = 20>>
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was a nanny before being sold to you.">>
<<set $activeSlave.devotion = random(25,50)>>
<<set $activeSlave.trust = random(-50,-25)>>
@@ -1209,7 +1209,7 @@
<</if>>
<<set $activeSlaveOneTimeMaxAge = 30>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was a milk cow in the stable of a slaveholding farmer before being sold to you.">>
<<set $activeSlave.devotion = random(25,50)>>
<<set $activeSlave.trust = random(25,50)>>
@@ -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)>>
@@ -1296,7 +1296,7 @@
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was a virgin cow in the stable of a slaveholding farmer before being sold to you.">>
<<set $activeSlave.devotion = random(25,50)>>
<<set $activeSlave.trust = random(25,50)>>
@@ -1334,7 +1334,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was in an orphanage until reaching maturity, at which point she was sold to you.">>
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.trust = random(-25,0)>>
@@ -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)>>
@@ -1414,7 +1414,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "white">>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was captured in a raid on a gated community and quickly sold off.">>
<<set $activeSlave.devotion = -20>>
<<set $activeSlave.trust = 0>>
@@ -1457,7 +1457,7 @@
<<set $activeSlaveOneTimeMaxAge = 43>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Middle aged with two daughters. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She sold herself into slavery to pay for her children's education.">>
<<set $activeSlave.devotion = random(0,15)>>
<<set $activeSlave.trust = random(0,15)>>
@@ -1478,7 +1478,7 @@
<<set $activeSlaveOneTimeMinAge = 12>>
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She sold herself into slavery to spite her father.">>
<<set $activeSlave.devotion = 20>>
<<set $activeSlave.trust = 0>>
@@ -1547,7 +1547,7 @@
<<set $activeSlaveOneTimeMaxAge = 43>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Decades of service. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was the housekeeper and fucktoy of a frat house before being replaced in favor of fresher slaves and sold to you.">>
<<set $activeSlave.devotion = random(25,50)>>
<<set $activeSlave.trust = random(25,50)>>
@@ -1597,7 +1597,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "asian">>
<<set $fixedNationality = "Stateless">>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She offered to sell you her body and you graciously accepted.">>
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.trust = random(-15,0)>>
@@ -1641,7 +1641,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You helped her give birth, leaving her deeply indebted to you.">>
<<set $activeSlave.devotion = random(0,20)>>
<<set $activeSlave.trust = random(0,20)>>
@@ -1670,7 +1670,7 @@
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She sold herself into slavery to feed herself and her growing brood.">>
<<set $activeSlave.career = "a farm laborer">>
<<set $activeSlave.health = random(-35,-10)>>
@@ -1713,7 +1713,7 @@
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.PLimb = 1>>
<<set $activeSlave.origin = "You helped free her from a POW camp after being abandoned by her country, leaving her deeply indebted to you.">>
<<set $activeSlave.devotion = random(0,20)>>
@@ -1761,7 +1761,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "Her womb held a baby you desired.">>
<<set $activeSlave.face = 100>>
<<set $activeSlave.intelligence = random(96,100)>>
@@ -1783,7 +1783,7 @@
<<set $activeSlave.PLimb = 1>>
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = setup.bodyguardCareers.random()>>
<<set $activeSlave.origin = "She is an unsuccessful cyborg experiment that was set free.">>
<<set $activeSlave.devotion = random(0,20)>>
@@ -1827,7 +1827,7 @@
<</if>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was the virgin figurehead of a new religion and 'blessed' by their Lord.">>
<<set $activeSlave.devotion = random(-20,20)>>
<<set $activeSlave.trust = random(25,50)>>
@@ -1872,7 +1872,7 @@
<</if>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was the holy vessel of a new religion and 'blessed' by their Lord to bring forth His servants.">>
<<set $activeSlave.health = random(100,100)>>
<<set $activeSlave.face = random(20,90)>>
@@ -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>>
@@ -1935,7 +1935,7 @@
<<set $activeSlaveOneTimeMinAge = 14>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.face = random(90,100)>>
<<set $activeSlave.intelligence = random(60,100)>>
<<set $activeSlave.intelligenceImplant = 30>>
@@ -1967,7 +1967,7 @@
<<set $activeSlaveOneTimeMinAge = $fertilityAge>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.face = random(60,100)>>
<<set $activeSlave.intelligence = random(30,100)>>
<<set $activeSlave.intelligenceImplant = 15>>
@@ -2759,7 +2759,7 @@ He explains that one of his servant <<= $girl>>s was impregnated by his fool of
<<set $activeSlaveOneTimeMinAge = 8>>
<<set $activeSlaveOneTimeMaxAge = 32>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.face = random(20,100)>>
<<set $activeSlave.intelligence = random(20,60)>>
<<set $activeSlave.intelligenceImplant = 0>>
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index bebc851112629a3ef4d367cd5232f571b6383931..7fdafd9edbf825aa1385c9054c557253ef41355c 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -13,7 +13,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $contractCost = 10000>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She 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/uncategorized/reShippingContainer.tw b/src/uncategorized/reShippingContainer.tw
index 0f6c3f1147946bba62345f24834bf47e518e0594..74c8fcf268a432d4bbb65669c6032db962b34de3 100644
--- a/src/uncategorized/reShippingContainer.tw
+++ b/src/uncategorized/reShippingContainer.tw
@@ -8,7 +8,7 @@
<<set _newSlaves = []>>
<<for _reShip = 0; _reShip < 5; _reShip++>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She arrived at your arcology in an undocumented shipping container.">>
<<set $activeSlave.devotion = random(-90,-75)>>
<<set $activeSlave.trust = -20>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index d42682514adfd4147c0bf831e64c1fb9f769da1a..6bd2b758a3b136c4b0ec072897022984e6c194c2 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -71,7 +71,7 @@
<<set _races = setup.filterRacesLowercase.filter(race => race !== $arcologies[0].FSSubjugationistRace)>>
<<set $fixedRace = _races.random()>>
<</if>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was enslaved after you called in her business debts.">>
<<set $activeSlave.career = "a business owner">>
<<set $activeSlave.devotion = random(-15,15)>>
@@ -108,7 +108,7 @@
<<set $activeSlaveOneTimeMaxAge = 40>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a son who can knock her up. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She offered to become your slave to protect her incestuous relationship.">>
<<set $activeSlave.career = "a housewife">>
<<set $activeSlave.devotion = random(-15,15)>>
@@ -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)>>
@@ -182,7 +182,7 @@
<<set $activeSlaveOneTimeMaxAge = 20>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<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)>>
@@ -226,7 +226,7 @@
<<set $activeSlaveOneTimeMaxAge = 20>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<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)>>
@@ -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)>>
@@ -294,7 +294,7 @@
<<set $activeSlaveOneTimeMaxAge = 20>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<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)>>
@@ -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)>>
@@ -357,7 +357,7 @@
<<set $activeSlaveOneTimeMaxAge = 20>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.origin = "She offered to become your slave to protect her incestuous relationship.">>
<<set $activeSlave.devotion = random(-15,15)>>
@@ -390,7 +390,7 @@
<<set $activeSlaveOneTimeMaxAge = 40>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have a daughter. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She offered to become your slave to protect her incestuous relationship.">>
<<set $activeSlave.career = "a housewife">>
<<set $activeSlave.devotion = 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)>>
@@ -510,7 +510,7 @@
<<set $activeSlaveOneTimeMinAge = 12>>
<<set $activeSlaveOneTimeMaxAge = 21>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was brought up in a radical slave school to match her twin.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = random(25,45)>>
@@ -562,7 +562,7 @@
<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
<<set $activeSlaveOneTimeMaxAge = 21>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was brought up in a radical slave school to match her twin.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = random(25,45)>>
@@ -617,7 +617,7 @@
<<set $activeSlaveOneTimeMaxAge = 21>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was brought up in a radical slave school to match her twin.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.devotion = random(25,45)>>
@@ -687,7 +687,7 @@
<</if>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She begged to be enslaved in a desperate attempt to provide for her many children.">>
<<set $activeSlave.career = "homeless">>
<<set $activeSlave.health = random(-45,-30)>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index eb51edc28c7d3bfe51294ccd40a7907883959d44..06ce2f71aabcc9dbeccf85693ec27ddc83c56c8a 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -30,7 +30,7 @@
<<set $TSS.schoolAnnexed = 1>>
<<for $i = 0; $i < $slavesToAdd; $i++>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.butt = either(1, 2, 2, 3)>>
<<set $activeSlave.boobs = either(200, 300, 300, 400)>>
@@ -94,7 +94,7 @@
<<set $activeSlaveOneTimeMaxAge = 32>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.slaveName = setup.cowSlaveNames.random()>>
<<set $activeSlave.slaveSurname = 0>>
<<set $activeSlave.career = "a dairy cow">>
@@ -162,7 +162,7 @@
<<set $GRI.schoolAnnexed = 1>>
<<for $i = 0; $i < $slavesToAdd; $i++>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was given to you by a failed subsidiary lab of the Growth Research Institute right after her use as a test subject ended.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.intelligenceImplant = 0>>
@@ -216,7 +216,7 @@
<<set $SCP.schoolAnnexed = 1>>
<<for $i = 0; $i < $slavesToAdd; $i++>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was given to you by a failed branch campus of St. Claver Preparatory after she served as a plastic surgeon's passing final exam.">>
<<set $activeSlave.chem = 20>>
<<set $activeSlave.career = "a slave">>
@@ -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>>
@@ -418,7 +418,7 @@
<<set $HA.schoolAnnexed = 1>>
<<for $i = 0; $i < $slavesToAdd; $i++>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She was given to you by a failed branch campus of the Hippolyta 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 8fbf50998c2cf91d1b2d4883d4fe6d771feba819..c37f650dd0078ec932ce54e9fa0ededdf147cee6 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -102,7 +102,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<if $origin == "virgin">>
<<set $activeSlaveOneTimeMaxAge = 20>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.counter.anal += 1, $analTotal += 1>>
@@ -118,7 +118,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set $activeSlaveOneTimeMaxAge = 20>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to be pregnant. %/
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.counter.vaginal += 1, $vaginalTotal += 1>>
@@ -136,7 +136,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<set $activeSlaveOneTimeMinAge = 35>>
<<set $activeSlaveOneTimeMaxAge = 39>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.boobs += 800>>
<<set $activeSlave.boobsImplant += 800>>
<<set $activeSlave.butt += 1>>
@@ -157,7 +157,7 @@ You lead your lurcher $Lurcher.slaveName out on a leash, naked just like the har
<<elseif $origin == "disobedient young">>
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.counter.anal += 1, $analTotal += 1>>
@@ -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 ea30f3b6b46781283b6b1643e4f18daafd472690..2ff7f797bd697f1839de6e48d879d789fd8aee8d 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -111,13 +111,13 @@
<<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>>
<<set $activeSlave.foreskin = $activeSlave.dick>>
<<else>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<if $customSlave.virgin == 0>>
<<set $activeSlave.vagina = $customSlave.virgin>>
<</if>>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index 45bb7c7254158216676a1a1006388fc420d8055e..02e9fccae0617afeb52a53d557885a73ab4e3974 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -76,7 +76,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 39>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Not a young woman. %/
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.boobs += 800>>
<<set $activeSlave.boobsImplant += 800>>
<<set $activeSlave.butt += 1>>
@@ -110,7 +110,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 55>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Not a young woman. %/
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a professor">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
@@ -139,7 +139,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a student">>
<<set $activeSlave.face = random(-20,0)>>
<<set $activeSlave.anus = 0>>
@@ -170,7 +170,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 45>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a military officer">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
@@ -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>>
@@ -218,7 +218,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 25>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a soldier">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
@@ -248,7 +248,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 55>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a doctor">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
@@ -275,7 +275,7 @@ target
<<case "nun">>
<<set $activeSlaveOneTimeMaxAge = 70>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a nun">>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 0>>
@@ -295,7 +295,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 26>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a journalist">>
<<set $activeSlave.face = random(-20,0)>>
<<set $activeSlave.anus = 0>>
@@ -325,7 +325,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 39>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.boobs += 800>>
<<set $activeSlave.boobsImplant += 800>>
<<set $activeSlave.butt += 1>>
@@ -346,7 +346,7 @@ target
<<case "classical dancer">>
<<set $activeSlaveOneTimeMaxAge = 20>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a classical dancer">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She was the pride of renowned dance troupe.">>
@@ -371,7 +371,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 25>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a law enforcement officer">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
@@ -399,7 +399,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 43>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a classical musician">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She was the pride of a renowned orchestra.">>
@@ -434,7 +434,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 65>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a politician">>
<<set $activeSlave.prestige = 2>>
<<set $activeSlave.prestigeDesc = "She was a widely known politician in her former life. Her face has graced many campaign posters.">>
@@ -463,7 +463,7 @@ target
<<case "shut-in">>
<<set $activeSlaveOneTimeMaxAge = 43>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a shut-in">>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.face = random(15,100)>>
@@ -478,7 +478,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 65>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a procuress">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
@@ -493,7 +493,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 55>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "an investor">>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She is a reputable investor from a bygone age.">>
@@ -523,7 +523,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 55>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a scientist">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
@@ -540,7 +540,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 55>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a lawyer">>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index fbd6cf9e6a9418a143448fc1e25f20b00be935f7..ee1a94180df1f3246282ddce5a3b9284981b4ab3 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)>>
@@ -133,7 +133,7 @@
<<set $activeSlaveOneTimeMinAge = Math.max($fertilityAge, $minimumSlaveAge)>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to be pregnant. %/
<<set $oneTimeDisableDisability = 1>>
-<<include "Generate XX Slave">>
+<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "She submitted to enslavement to get access to modern prenatal care.">>
<<set $activeSlave.devotion = random(-15,5)>>
<<set $activeSlave.trust = random(-10,10)>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 129701343b035ef638bd9598f5708e31809085f3..0c96099dd8e688462ede498ae0ff00c91bacede7 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -943,9 +943,9 @@
<</if>>
<</if>>
- <br>Chastity device: ''<span id="chastity"><<if $activeSlave.chastityAnus == 1 && $activeSlave.chastityPenis == 1 && $activeSlave.chastityVagina == 1>>full chastity<<elseif $activeSlave.chastityPenis == 1 && $activeSlave.chastityVagina == 1>>genital chastity<<elseif $activeSlave.chastityAnus == 1 && $activeSlave.chastityPenis == 1>>combined chastity cage<<elseif $activeSlave.chastityAnus == 1 && $activeSlave.chastityVagina == 1>>combined chastity belt<<elseif $activeSlave.chastityVagina == 1>>chastity belt<<elseif $activeSlave.chastityPenis == 1>>chastity cage<<elseif $activeSlave.chastityAnus == 1>>anal bhastity<<elseif $activeSlave.chastityAnus == 0 && $activeSlave.chastityPenis == 0 && $activeSlave.chastityVagina == 0>>none<<else>>THERE HAS BEEN AN ERROR<</if>></span>.''
- <<link "None">><<set $activeSlave.chastityAnus = 0>><<set $activeSlave.chastityPenis = 0>><<set $activeSlave.chastityVagina = 0>><<replace "#chastity">>None<</replace>><<SlaveInteractAnalGropeOption>><<SlaveInteractAnalSexOption>><<SlaveInteractDickGropeOption>><<SlaveInteractFertility>><<SlaveInteractGropeOption>><<SlaveInteractImpreg>><<SlaveInteractSexOption>><</link>>
- | <<link "Anal chastity">><<set $activeSlave.choosesOwnChastity = 0>><<set $activeSlave.chastityAnus = 1>><<set $activeSlave.chastityPenis = 0>><<set $activeSlave.chastityVagina = 0>><<replace "#chastity">>Anal chastity<</replace>><<SlaveInteractAnalGropeOption>><<SlaveInteractAnalSexOption>><<SlaveInteractDickGropeOption>><<SlaveInteractFertility>><<SlaveInteractGropeOption>><<SlaveInteractImpreg>><<SlaveInteractSexOption>><</link>>
+ <br>Chastity device: ''<span id="chastity"><<if $activeSlave.chastityAnus == 1 && $activeSlave.chastityPenis == 1 && $activeSlave.chastityVagina == 1>>full chastity<<elseif $activeSlave.chastityPenis == 1 && $activeSlave.chastityVagina == 1>>genital chastity<<elseif $activeSlave.chastityAnus == 1 && $activeSlave.chastityPenis == 1>>combined chastity cage<<elseif $activeSlave.chastityAnus == 1 && $activeSlave.chastityVagina == 1>>combined chastity belt<<elseif $activeSlave.chastityVagina == 1>>chastity belt<<elseif $activeSlave.chastityPenis == 1>>chastity cage<<elseif $activeSlave.chastityAnus == 1>>anal chastity<<elseif $activeSlave.chastityAnus == 0 && $activeSlave.chastityPenis == 0 && $activeSlave.chastityVagina == 0>>none<<else>>THERE HAS BEEN AN ERROR<</if>></span>.''
+ <<link "None">><<set $activeSlave.chastityAnus = 0>><<set $activeSlave.chastityPenis = 0>><<set $activeSlave.chastityVagina = 0>><<replace "#chastity">>none<</replace>><<SlaveInteractAnalGropeOption>><<SlaveInteractAnalSexOption>><<SlaveInteractDickGropeOption>><<SlaveInteractFertility>><<SlaveInteractGropeOption>><<SlaveInteractImpreg>><<SlaveInteractSexOption>><</link>>
+ | <<link "Anal chastity">><<set $activeSlave.choosesOwnChastity = 0>><<set $activeSlave.chastityAnus = 1>><<set $activeSlave.chastityPenis = 0>><<set $activeSlave.chastityVagina = 0>><<replace "#chastity">>anal chastity<</replace>><<SlaveInteractAnalGropeOption>><<SlaveInteractAnalSexOption>><<SlaveInteractDickGropeOption>><<SlaveInteractFertility>><<SlaveInteractGropeOption>><<SlaveInteractImpreg>><<SlaveInteractSexOption>><</link>>
<<if $activeSlave.vagina > -1>>
| <<link "Chastity belt">><<set $activeSlave.choosesOwnChastity = 0>><<set $activeSlave.chastityAnus = 0>><<set $activeSlave.chastityPenis = 0>><<set $activeSlave.chastityVagina = 1>><<replace "#chastity">>Chastity belt<</replace>><<SlaveInteractAnalGropeOption>><<SlaveInteractAnalSexOption>><<SlaveInteractDickGropeOption>><<SlaveInteractFertility>><<SlaveInteractGropeOption>><<SlaveInteractImpreg>><<SlaveInteractSexOption>><</link>>
| <<link "Combined chastity belt">><<set $activeSlave.choosesOwnChastity = 0>><<set $activeSlave.chastityAnus = 1>><<set $activeSlave.chastityPenis = 0>><<set $activeSlave.chastityVagina = 1>><<replace "#chastity">>Combined chastity belt<</replace>><<SlaveInteractAnalGropeOption>><<SlaveInteractAnalSexOption>><<SlaveInteractDickGropeOption>><<SlaveInteractFertility>><<SlaveInteractGropeOption>><<SlaveInteractImpreg>><<SlaveInteractSexOption>><</link>>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index fd9ca71a5a8aad54fb694d7400c65107326dad93..14c04dcfeb7ccc3e061773a446798e5534acc50c 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -106,7 +106,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $activeSlaveOneTimeMinAge = 6>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "She was found unresponsive in the lower arcology with a gaping pussy and deflated belly. It is unclear what happened to her.">>
<<set $shelterSlave.career = "homeless">>
@@ -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">>
@@ -160,7 +160,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her previous owner forced her to cut off her breasts 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">>
@@ -270,7 +270,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her holes were cruelly stretched by constant plug use.">>
<<set $shelterSlave.career = "a slave">>
@@ -296,7 +296,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 XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "Her previous owner discarded her after many pregnancies.">>
<<set $shelterSlave.career = "a breeder">>
@@ -321,7 +321,7 @@ You contact the Slave Shelter to review the profile of the slave the Shelter is
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $one_time_age_overrides_pedo_mode = 1>> /% 20 years of brothel service. %/
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $shelterSlave = $activeSlave>>
<<set $shelterSlave.origin = "She was worn out by twenty years of brothel service.">>
<<set $shelterSlave.career = "a prostitute">>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 107cf0e4434a2ee810d39767bba0b8ad15974b2e..5dbf617ac10fc4d457e95ece399e5bd5f6021861 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -689,10 +689,10 @@
<</if>>
<<if $corpSpecGender == 1>>
Slaves without pussies are not trained.
- <<include "Generate XX Slave">>
+ <<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()>>
@@ -1900,7 +1900,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.butt = either(1, 2, 2, 3)>>
<<set $activeSlave.boobs = either(200, 300, 300, 400)>>
@@ -1956,7 +1956,7 @@
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You bought her from the Growth Research Institute right after her use as a test subject ended.">>
<<set $activeSlave.career = "a slave">>
<<set $activeSlave.intelligenceImplant = 0>>
@@ -2004,7 +2004,7 @@
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You bought her from St. Claver Preparatory after she served as a plastic surgeon's passing final exam.">>
<<set $activeSlave.chem = 20>>
<<set $activeSlave.career = "a slave">>
@@ -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>>
@@ -2190,7 +2190,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You bought her from The Cattle Ranch.">>
<<set $activeSlave.career = "a dairy slave">>
<<set $activeSlave.slaveName = setup.cowSlaveNames.random()>>
@@ -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.">>
@@ -2277,7 +2277,7 @@
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<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">>
@@ -2567,7 +2567,7 @@
<<set $activeSlaveOneTimeMaxAge = 26>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "You bought her from the prestigious Hippolyta Academy.">>
<<set $activeSlave.career = "a bodyguard">>
<<set $activeSlave.intelligenceImplant = 30>>
@@ -2651,7 +2651,7 @@
<</if>>
<</if>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XY Slave">>
+ <<set $activeSlave = GenerateNewSlave("XY")>>
<<set _criminal = setup.gangCriminalPool.random()>>
@@ -3549,7 +3549,7 @@
<<set $activeSlaveOneTimeMaxAge = 36>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
- <<include "Generate XX Slave">>
+ <<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.weight = random(-30,20), $activeSlave.waist = random(-30,10), $activeSlave.face = random(40,60)>>
<<if $activeSlave.faceShape == "masculine">>
<<set $activeSlave.faceShape = "sensual">>