From e0a18a6a5bca3184e0136bdbf969a5809e112c8d Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Wed, 14 Oct 2020 20:09:01 -0700
Subject: [PATCH] Job fulfillment tweaking [Ready for merge]

---
 js/003-data/gameVariableData.js               |   2 +-
 .../backwardsCompatibility.js                 |   4 +-
 .../JobFulfillmentCenterOrder.js              |   6 +-
 .../JobFulfillmentCenterDelivery.tw           |  39 ++---
 .../generateJobFulfillmentSlave.js            | 155 ++++++++++++++++++
 src/uncategorized/scheduledEvent.tw           |   2 +-
 src/utility/slaveCreationWidgets.tw           | 124 --------------
 7 files changed, 176 insertions(+), 156 deletions(-)
 create mode 100644 src/pregmod/JobFulfillmentCenter/generateJobFulfillmentSlave.js

diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index a594b16cb08..c3c7d868575 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1260,7 +1260,7 @@ App.Data.resetOnNGPlus = {
 	/* Job Fulfillment Center */
 	JFC: {
 		order: 0,
-		role: ""
+		reorder: 0
 	},
 
 	cheatMode: 0,
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 4f5296958b4..3420fdeba79 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -1249,10 +1249,12 @@ App.Update.globalVariables = function(node) {
 
 	// Job Fulfillment Center (JFC)
 	V.JFC.order = V.JFC.order || V.JFCOrder || 0;
-	V.JFC.role = V.JFC.role || V.Role || "";
 	if (V.JFCReorder) { // Property removed if not in use
 		V.JFC.reorder = V.JFCReorder;
 	}
+	if (jsDef(V.JFC.role) && V.JFC.role === "") {
+		delete V.JFC.role;
+	}
 
 	// eventResults
 	V.eventResults.shoot = V.eventResults.shoot || V.PShoot  || 0;
diff --git a/src/markets/specificMarkets/JobFulfillmentCenterOrder.js b/src/markets/specificMarkets/JobFulfillmentCenterOrder.js
index 48817d570b8..4c1f8907be4 100644
--- a/src/markets/specificMarkets/JobFulfillmentCenterOrder.js
+++ b/src/markets/specificMarkets/JobFulfillmentCenterOrder.js
@@ -14,8 +14,7 @@ App.Markets.JobFulfillmentCenterOrder = function() {
 
 		if (V.JFC.order === 0) {
 			r.push(`You work up a new slave order for posting where slave merchants can work to fulfill it.`);
-		}
-		if (V.JFC.order === 1) {
+		} else {
 			r.push(`You review your posted slave order for a <span class="bold">${V.JFC.role}</span>.`);
 		}
 		if (V.assistant.personality === 1) {
@@ -77,8 +76,7 @@ App.Markets.JobFulfillmentCenterOrder = function() {
 				App.UI.DOM.link(
 					"Withdraw slave order",
 					() => {
-						V.JFC.order = 0;
-						V.JFC.role = "";
+						V.JFC = {order: 0, reorder: 0};
 						refresh();
 					}
 				)
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
index e405a2d5521..eacddecee66 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
@@ -1,38 +1,27 @@
 :: JobFulfillmentCenterDelivery [nobr]
 
-<<set $JFC.order = 0, $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $encyclopedia = "Enslaving People">>
+<<set $JFC.order = 0, $nextButton = "Continue", $nextLink = "Scheduled Event", $encyclopedia = "Enslaving People">>
+<<set _slave = generateJobFulfillmentSlave()>>
+<<set _slaveCost = slaveCost(_slave) * 6>> 
+<<setLocalPronouns _slave>>
+<<run App.Utils.setLocalPronouns(_slave)>>
 
-<<JFCSlave>>
-<<set _slaveCost = slaveCost($activeSlave)>>
-<<set _slaveCost = _slaveCost*6>>
-<<run App.Utils.setLocalPronouns($activeSlave)>>
+A slave dealer has submitted a slave to satisfy your ''$JFC.role'' order for <<print cashFormat(_slaveCost)>>.
+<br>//As usual, the asking price is quite high, to cover training costs. However, you can freely decline the slave should $he not meet your standards or the job has already been filled.//
+<br><<includeDOM App.Desc.longSlave(_slave, {market: "generic"})>>
 
-A slave dealer has submitted a slave to satisfy your ''$JFC.role'' order.
-
-<br><br>//As usual, the asking price is quite high, to cover the costs of training a proper <<print $JFC.role>>. In compensation, you can freely decline the slave should $he not meet your standards or the job has already been filled.//
-
-<br><br><<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
-
-<br><br>$His price is <<print cashFormat(_slaveCost)>>.
-
-<br><br><span id="result">
+<br><span id="result">
 <<if $cash >= _slaveCost>>
 	<<link "Accept the offered slave">>
-		<<run cashX(forceNeg(_slaveCost), "slaveTransfer", $activeSlave)>>
+		<<set $JFC = {order: 0, reorder: 0}>>
+		<<run cashX(-_slaveCost, "slaveTransfer", _slave)>>
 		<<replace "#result">>
 			$He has been very well trained by the dealer that offered $him to you. $He has also picked up on the fact that $he was specially selected, and is a little hopeful that this means $he may be treated well. $He is now eagerly awaiting your instructions.
-			<<includeDOM App.UI.newSlaveIntro($activeSlave)>>
-			<<set $JFC.role = "">>
-			<<run delete $JFC.reorder>>
+			<<includeDOM App.UI.newSlaveIntro(_slave)>>
 		<</replace>>
 	<</link>>
 <<else>>
 	//You lack the necessary funds to accept the offered slave.//
 <</if>>
-<br>
-<<link "Reject this offer and place the same order again">>
-	<<set $JFC.order = 1>>
-	<<set $JFC.reorder = 1>>
-	<<goto $nextLink>>
-<</link>>
-</span>
+<br>[[Reject and repost this offer|$nextLink][$JFC.order = 1, $JFC.reorder = 1]]
+</span>
\ No newline at end of file
diff --git a/src/pregmod/JobFulfillmentCenter/generateJobFulfillmentSlave.js b/src/pregmod/JobFulfillmentCenter/generateJobFulfillmentSlave.js
new file mode 100644
index 00000000000..a0633d688da
--- /dev/null
+++ b/src/pregmod/JobFulfillmentCenter/generateJobFulfillmentSlave.js
@@ -0,0 +1,155 @@
+globalThis.generateJobFulfillmentSlave = function() {
+	const applyMaleGenitalia = function({dick, balls, prostate}) {
+		if (V.seeDicks > 0) {
+			slave.dick = dick; 
+			slave.scrotum = slave.balls = balls; 
+			slave.prostate = prostate;
+		}
+	};
+	let slave = GenerateNewSlave("XX", {minAge: 20, maxAge: 36, ageOverridesPedoMode: 1, disableDisability: 1});
+	const {his} = getPronouns(slave);
+	slave.trust = 80; slave.devotion = 80;
+	slave.weight = jsRandom(-30, 20); 
+	slave.waist = jsRandom(-30, 10); 
+	slave.face = jsRandom(40, 60);
+	if (slave.faceShape === "masculine") {
+		slave.faceShape = "sensual";
+	}
+	if (slave.boobShape === "saggy" || slave.boobShape === "downward-facing") {
+		slave.boobShape = "perky";
+	}
+	eyeSurgery(slave, "both", "normal");
+	slave.hears = 0; 
+	slave.voice = 2;
+	slave.intelligenceImplant = 30; slave.intelligence = jsRandom(20, 100);
+	setHealth(slave, jsRandom(80, 95), 0, 0, 0, 0);
+	slave.origin = `The Job Fulfillment Center offered ${his} contract to fill your request for a ${V.JFC.role}.`;
+	switch (V.JFC.role) {
+	// Security
+	case "Bodyguard":
+		slave.devotion = 90; 
+		slave.muscles = jsRandom(30, 70); 
+		slave.height = Math.round(Height.random(slave, {skew: 3, spread: .2, limitMult: [1, 4]})); 
+		slave.weight = jsRandom(-10, 10); 
+		slave.teeth = either("normal", "pointy"); 
+		slave.skill.combat = 1;
+		if (jsRandom(0, 2) === 0) {
+			configureLimbs(slave, "all", 5);
+		}
+		slave.career = either("a bodyguard", "a kunoichi", "a law enforcement officer", "a military brat", "a revolutionary", "a soldier", "a transporter", "an assassin", "in a militia");
+		break;
+	case "Wardeness":
+		slave.energy = jsRandom(80, 100); 
+		slave.sexualFlaw = either("malicious", "none", "none", "none", "none"); 
+		slave.fetish = "sadist"; slave.fetishStrength = 100; 
+		slave.muscles = jsRandom(50, 80); 
+		slave.skill.combat = 1;
+		applyMaleGenitalia({dick: jsRandom(3, 6), balls: jsRandom(3, 6), prostate: either(1, 1, 1, 2, 2, 3)});
+		slave.career = either("a bouncer", "a bounty hunter", "a gang member", "a mercenary", "a prison guard", "a private detective", "a security guard", "a street thug", "an enforcer");
+		break;
+	// Management 
+	case "Headgirl":
+		slave = GenerateNewSlave("XX", {minAge: V.AgePenalty === 1 ? 36 : 20, maxAge: V.retirementAge-5, ageOverridesPedoMode: 1, disableDisability: 1});
+		slave.devotion = 90; slave.trust = 100, 
+		slave.fetish = "dom"; slave.fetishStrength = 100; 
+		slave.energy = jsRandom(70, 90); 
+		slave.intelligence = jsRandom(60, 100); 
+		Object.assign(slave.skill, {entertainment: 100, whoring: 100, anal: 100, oral: 100, vaginal: 100});
+		slave.vagina = jsRandom(3, 4);
+		applyMaleGenitalia({dick: jsRandom(3, 5), balls: jsRandom(3, 6), prostate: either(1, 1, 2)});
+		slave.career = either("a lawyer", "a military officer", "a politician");
+		break;
+	case "Teacher":
+		slave = GenerateNewSlave("XX", {minAge: 36, maxAge: V.retirementAge-3, ageOverridesPedoMode: 1, disableDisability: 1});
+		slave.fetish = "dom"; slave.fetishStrength = 100; 
+		slave.energy = jsRandom(70, 90); 
+		slave.intelligence = 100; 
+		Object.assign(slave.skill, {entertainment: 100, whoring: 100, anal: 100, oral: 100, vaginal: 100});
+		slave.face = jsRandom(41, 90); 
+		slave.vagina = jsRandom(3, 4);
+		applyMaleGenitalia({dick: jsRandom(3, 5), balls: jsRandom(3, 6), prostate: either(1, 1, 1, 2, 2, 3)});
+		slave.career = either("a librarian", "a principal", "a private instructor", "a professor", "a scholar", "a scientist", "a teacher", "a teaching assistant");
+		break;
+	case "Nurse":
+		slave.fetish = "dom"; slave.fetishStrength = 100; 
+		slave.muscles = jsRandom(6, 50); 
+		slave.face = jsRandom(41, 90); 
+		slave.sexualQuirk = "caring";
+		slave.intelligence = jsRandom(40, 90);
+		slave.career = either("a doctor", "a medic", "a medical student", "a nurse", "a paramedic");
+		break;
+	case "Motherly Attendant":
+		slave = GenerateNewSlave("XX", {minAge: 36, maxAge: V.retirementAge-3, ageOverridesPedoMode: 1, disableDisability: 1});
+		slave.devotion = 90; slave.trust = 90; 
+		slave.fetish = "submissive"; slave.fetishStrength = 100; 
+		slave.face = jsRandom(60, 90);
+		slave.counter.birthsTotal = jsRandom(1, 3); 
+		slave.pregKnown = 1; slave.preg = jsRandom(20, 35); slave.pregWeek = slave.preg; slave.pregType = 1;
+		SetBellySize(slave);
+		slave.vagina = jsRandom(3, 4);
+		slave.career = either("a counselor", "a dispatch officer", "a lifeguard", "a masseuse", "a psychologist", "a therapist");
+		break;
+	case "Attendant":
+		slave = GenerateNewSlave("XX", {minAge: 26, maxAge: V.retirementAge-3, ageOverridesPedoMode: 1, disableDisability: 1});
+		slave.devotion = 90; slave.trust = 90; 
+		slave.fetish = "submissive"; slave.fetishStrength = 100; 
+		slave.preg = 0; 
+		slave.face = jsRandom(60, 90);
+		eyeSurgery(slave, "both", either(0, 2, 2) === 2 ? "normal" : "blind");
+		slave.career = either("a counselor", "a masseuse", "a therapist");
+		break;
+	case "Matron":
+		slave = GenerateNewSlave("XX", {minAge: 24, maxAge: V.retirementAge-3, ageOverridesPedoMode: 1, disableDisability: 1});
+		slave.devotion = 90; slave.trust = 90; 
+		slave.sexualQuirk = "caring"; 
+		slave.counter.birthsTotal = jsRandom(2, 4); slave.vagina = 3; 
+		slave.face = jsRandom(60, 90); 
+		slave.career = either( "a nanny", "a practitioner");
+		break;
+	case "Stewardess":
+		slave = GenerateNewSlave("XX", {minAge: V.AgePenalty === 1 ? 36 : 20, maxAge: V.retirementAge-5, ageOverridesPedoMode: 1, disableDisability: 1});
+		slave.energy = jsRandom(70, 90); 
+		slave.fetish = "dom"; slave.fetishStrength = 100; 
+		slave.career = either("a barista", "a bartender", "a caregiver", "a charity worker", "a professional bartender", "a secretary", "a wedding planner", "an air hostess", "an estate agent", "an investor", "an office worker");
+		break;
+	case "Milkmaid":
+		slave.muscles = jsRandom(31, 60); 
+		slave.skill.oral = jsRandom(31, 60); 
+		slave.sexualQuirk = "caring"; slave.behavioralQuirk = "funny";
+		slave.intelligence = jsRandom(20, 70);
+		applyMaleGenitalia({dick: jsRandom(3, 5), balls: jsRandom(4, 9), prostate: either(1, 1, 1, 2)});
+		slave.career = either("a cowgirl", "a dairy worker", "a milkmaid", "a farmer's daughter", "a shepherd", "a veterinarian");
+		break;
+	case "Farmer":
+		slave = GenerateNewSlave("XX", {minAge: V.AgePenalty === 1 ? 36 : 20, maxAge: V.retirementAge-5, ageOverridesPedoMode: 1, disableDisability: 1});
+		slave.muscles = jsRandom(41, 70); 
+		slave.sexualQuirk = "caring"; 
+		slave.weight = jsRandom(0, 30);
+		slave.intelligence = jsRandom(20, 70); 
+		slave.height = Math.round(Height.random(slave, {skew: 3, spread: .2, limitMult: [1, 4]}));
+		applyMaleGenitalia({dick: jsRandom(3, 5), balls: jsRandom(4, 9), prostate: either(1, 1, 1, 2)});
+		slave.career = either("a farmer", "a farmer's daughter", "a rancher", "a farmhand", "a zookeeper");
+		break;
+	// Entertain
+	case "DJ":
+		slave.skill.entertainment = 100; 
+		slave.muscles = jsRandom(6, 30); 
+		slave.face = jsRandom(80, 100); 
+		slave.career = either("a classical dancer", "a classical musician", "a dancer", "a house DJ", "a musician", "an aspiring pop star");
+		break;
+	case "Madam":
+		slave = GenerateNewSlave("XX", {minAge: V.AgePenalty === 1 ? 36 : 20, maxAge: V.retirementAge-5, ageOverridesPedoMode: 1, disableDisability: 1});
+		slave.skill.whoring = 100;
+		applyMaleGenitalia({dick: jsRandom(3, 5), balls: jsRandom(3, 5), prostate: either(1, 1, 1, 2)});
+		slave.career = either("a business owner", "a manager", "a pimp", "a procuress", "an innkeeper");
+		break;
+	case "Concubine":
+		slave.devotion = jsRandom(90, 95); slave.trust = jsRandom(90, 100);
+		slave.prestige = 3; 
+		slave.energy = jsRandom(80, 100); 
+		Object.assign(slave.skill, {entertainment: 100, whoring: 100, anal: 100, oral: 100, vaginal: 100});
+		slave.face = 100; 
+		break;
+	}
+	return slave;
+};
diff --git a/src/uncategorized/scheduledEvent.tw b/src/uncategorized/scheduledEvent.tw
index 2021e6e228e..922b5d46bba 100644
--- a/src/uncategorized/scheduledEvent.tw
+++ b/src/uncategorized/scheduledEvent.tw
@@ -162,7 +162,7 @@
 	<<set $nicaea.achievement = either("devotion", "slaves", "trust")>>
 	<<goto "SE nicaea council">>
 <<else>>
-	<<set $JFC.reorder = "unset">>
+	<<set $JFC.reorder = 0>>
 	<<run delete $customSlaveOrderedReorder>>
 	<<goto "Nonrandom Event">>
 <</if>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index cf5894f5e1d..4d43fe50b41 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -128,127 +128,3 @@
 
 <</switch>>
 <</widget>>
-
-/%
- Call as <<JFCSlave>>
-%/
-<<widget "JFCSlave">>
-	<<set $activeSlave = GenerateNewSlave("XX", {minAge: 20, maxAge: 36, ageOverridesPedoMode: 1, disableDisability: 1})>>
-	<<set $activeSlave.weight = random(-30,20), $activeSlave.waist = random(-30,10), $activeSlave.face = random(40,60)>>
-	<<if $activeSlave.faceShape == "masculine">>
-		<<set $activeSlave.faceShape = "sensual">>
-	<</if>>
-	<<if $activeSlave.boobShape == "saggy" || $activeSlave.boobShape == "downward-facing">>
-		<<set $activeSlave.boobShape = "perky">>
-	<</if>>
-	<<run eyeSurgery($activeSlave, "both", "normal")>>
-	<<set $activeSlave.hears = 0, $activeSlave.voice = 2>>
-	<<set $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(20,100)>>
-	<<set $activeSlave.trust = 80, $activeSlave.devotion = 80>>
-	<<run setHealth($activeSlave, jsRandom(80,95), 0, 0, 0, 0)>>
-	<<set $activeSlave.origin = "The Job Fulfillment Center offered $his contract to fill your request for a ">>
-	<<set $activeSlave.origin += $JFC.role>>
-	<<set $activeSlave.origin += ".">>
-	<<switch $JFC.role>>
-	/* Opens security */
-		<<case "Lieutenant Colonel">>
-			<<set $activeSlave.devotion = random(96,100), $activeSlave.trust = random(96, 100), $activeSlave.energy = random(96,100), $activeSlave.intelligence = 70, $activeSlave.skill.combat = 1>>
-			<<set $activeSlave.career = either("a bodyguard", "a bouncer", "a bounty hunter", "a gang member", "a law enforcement officer", "a mercenary", "a prison guard", "a private detective", "a revolutionary", "a security guard", "a soldier", "a street thug", "a transporter", "an assassin", "an enforcer", "in a militia")>>
-		<<case "Bodyguard">>
-			<<set $activeSlave.devotion = 90, $activeSlave.muscles = random(30,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.weight = random(-10,10), $activeSlave.teeth = either("normal", "pointy"), $activeSlave.skill.combat = 1>>
-			<<if jsRandom(0, 2) === 0>>
-				<<run configureLimbs($activeSlave, "all", 5)>>
-			<</if>>
-			<<set $activeSlave.career = either("a bodyguard", "a kunoichi", "a law enforcement officer", "a military brat", "a revolutionary", "a soldier", "a transporter", "an assassin", "in a militia")>>
-		<<case "Wardeness">>
-			<<set $activeSlave.energy = random(80,100), $activeSlave.sexualFlaw = either("malicious", "none", "none", "none", "none"), $activeSlave.fetish = "sadist", $activeSlave.fetishStrength = 100, $activeSlave.muscles = random(50,80), $activeSlave.skill.combat = 1>>
-			<<set $activeSlave.career = either("a bouncer", "a bounty hunter", "a gang member", "a mercenary", "a prison guard", "a private detective", "a security guard", "a street thug", "an enforcer")>>
-			<<if $seeDicks > 0>>
-				<<set $activeSlave.dick = random(3,6), $activeSlave.balls = random(3,6), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2,2,3)>>
-			<</if>>
-	/* Closes Security */
-	/* Opens management */
-		<<case "Headgirl">>
-			<<set $activeSlave.devotion = 90, $activeSlave.trust = 100, $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = random(60,100), $activeSlave.skill.entertainment = 100, $activeSlave.skill.whoring = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.career = either("a lawyer", "a military officer", "a politician")>>
-			<<if $seeDicks > 0>>
-				<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,6), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,2)>>
-			<</if>>
-			<<set $activeSlave.vagina = random(3,4)>>
-			<<if $AgePenalty == 1>>
-				<<set $activeSlave.actualAge = random(36,$retirementAge-5)>>
-			<<else>>
-				<<set $activeSlave.actualAge = random(20,$retirementAge-5)>>
-			<</if>>
-			<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
-		<<case "Teacher">>
-			<<set $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.energy = random(70,90), $activeSlave.intelligence = 100, $activeSlave.skill.entertainment = 100, $activeSlave.skill.whoring = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.face = random(41,90), $activeSlave.career = either("a librarian", "a principal", "a private instructor", "a professor", "a scholar", "a scientist", "a teacher", "a teaching assistant")>>
-			<<if $seeDicks > 0>>
-				<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,6), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2,2,3)>>
-			<</if>>
-			<<set $activeSlave.actualAge = random(36,$retirementAge-3)>>
-			<<set $activeSlave.vagina = random(3,4)>>
-			<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
-		<<case "Nurse">>
-			<<set $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.muscles = random(6,50), $activeSlave.face = random(41,90), $activeSlave.sexualQuirk = "caring", $activeSlave.career = either("a doctor", "a medic", "a medical student", "a nurse", "a paramedic"), $activeSlave.intelligence = random(40,90)>>
-		<<case "Motherly Attendant">>
-			<<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.fetish = "submissive", $activeSlave.fetishStrength = 100, $activeSlave.face = random(60,90)>>
-			<<set $activeSlave.career = either("a counselor", "a dispatch officer", "a lifeguard", "a masseuse", "a psychologist", "a therapist"), $activeSlave.counter.birthsTotal = random(1,3), $activeSlave.pregKnown = 1, $activeSlave.preg = random(20,35), $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregType = 1>>
-			<<run SetBellySize($activeSlave)>>
-			<<set $activeSlave.actualAge = random(36,$retirementAge-3)>>
-			<<set $activeSlave.vagina = random(3,4)>>
-			<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
-		<<case "Attendant">>
-			<<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.fetish = "submissive", $activeSlave.fetishStrength = 100, $activeSlave.preg = 0, $activeSlave.face = random(60,90), $activeSlave.career = either("a counselor", "a masseuse", "a therapist")>>
-			<<run eyeSurgery($activeSlave, "both", either(0, 2, 2) === 2 ? "normal" : "blind")>>
-			<<set $activeSlave.actualAge = random(26,$retirementAge-3)>>
-			<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
-		<<case "Matron">>
-			<<set $activeSlave.devotion = 90, $activeSlave.trust = 90, $activeSlave.sexualQuirk = "caring", $activeSlave.counter.birthsTotal = random(2,4), $activeSlave.vagina = 3, $activeSlave.face = random(60,90), $activeSlave.career = either( "a nanny", "a practitioner")>>
-			<<run eyeSurgery($activeSlave, "both", "normal")>>
-			<<set $activeSlave.actualAge = random(24,$retirementAge-3)>>
-			<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
-		<<case "Stewardess">>
-			<<set $activeSlave.energy = random(70,90), $activeSlave.fetish = "dom", $activeSlave.fetishStrength = 100, $activeSlave.career = either("a barista", "a bartender", "a caregiver", "a charity worker", "a professional bartender", "a secretary", "a wedding planner", "an air hostess", "an estate agent", "an investor", "an office worker")>>
-			<<if $AgePenalty == 1>>
-				<<set $activeSlave.actualAge = random(36,$retirementAge-5)>>
-			<<else>>
-				<<set $activeSlave.actualAge = random(20,$retirementAge-5)>>
-			<</if>>
-			<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
-		<<case "Milkmaid">>
-			<<set $activeSlave.muscles = random(31,60), $activeSlave.skill.oral = random(31,60), $activeSlave.sexualQuirk = "caring", $activeSlave.behavioralQuirk = "funny", $activeSlave.career = either("a cowgirl", "a dairy worker", "a milkmaid", "a farmer's daughter", "a shepherd", "a veterinarian"), $activeSlave.intelligence = random(20,70)>>
-			<<if $seeDicks > 0>>
-				<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(4,9), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2)>>
-			<</if>>
-		<<case "Farmer">>
-			<<set $activeSlave.devotion = 80, $activeSlave.trust = 80, $activeSlave.muscles = random(41,70), $activeSlave.sexualQuirk = "caring", $activeSlave.career = either("a farmer", "a farmer's daughter", "a rancher", "a farmhand", "a zookeeper"), $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(20,70), $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 3, spread: .2, limitMult: [1, 4]})), $activeSlave.weight = random(0,30)>>
-			<<run setHealth($activeSlave, jsRandom(80, 95), 0, 0, 0, 0)>>
-			<<if $seeDicks > 0>>
-				<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(4,9), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2)>>
-			<</if>>
-			<<if $AgePenalty == 1>>
-				<<set $activeSlave.actualAge = random(36,$retirementAge-5)>>
-			<<else>>
-				<<set $activeSlave.actualAge = random(20,$retirementAge-5)>>
-			<</if>>
-			<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
-	/* Closes management */
-	/* Opens entertain */
-		<<case "DJ">>
-			<<set $activeSlave.skill.entertainment = 100, $activeSlave.muscles = random(6,30), $activeSlave.face = random(80,100), $activeSlave.career = either("a classical dancer", "a classical musician", "a dancer", "a house DJ", "a musician", "an aspiring pop star")>>
-		<<case "Madam">>
-			<<set $activeSlave.skill.whoring = 100, $activeSlave.career = either("a business owner", "a manager", "a pimp", "a procuress", "an innkeeper")>>
-			<<if $seeDicks > 0>>
-				<<set $activeSlave.dick = random(3,5), $activeSlave.balls = random(3,5), $activeSlave.scrotum = $activeSlave.balls, $activeSlave.prostate = either(1,1,1,2)>>
-			<</if>>
-			<<if $AgePenalty == 1>>
-				<<set $activeSlave.actualAge = random(36,$retirementAge-5)>>
-			<<else>>
-				<<set $activeSlave.actualAge = random(20,$retirementAge-5)>>
-			<</if>>
-			<<set $activeSlave.physicalAge = $activeSlave.actualAge, $activeSlave.visualAge = $activeSlave.actualAge, $activeSlave.ovaryAge = $activeSlave.actualAge>>
-		<<case "Concubine">>
-			<<set $activeSlave.prestige = 3, $activeSlave.energy = random(80,100), $activeSlave.skill.entertainment = 100, $activeSlave.skill.whoring = 100, $activeSlave.skill.anal = 100, $activeSlave.skill.oral = 100, $activeSlave.skill.vaginal = 100, $activeSlave.face = 100, $activeSlave.devotion = random(90,95), $activeSlave.trust = random(90,100)>>
-		/* Closes Entertain */
-		<</switch>>
-<</widget>>
-- 
GitLab