From 8ab4fc3de56dedca027181018133a0de2c755f5d Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 17 Jul 2020 18:39:28 -0400
Subject: [PATCH] Apply generateSalonModifications()
---
src/npc/generate/generateMarketSlave.js | 4 +++
src/uncategorized/genericPlotEvents.tw | 3 ++
src/uncategorized/pCoupAttempt.tw | 6 ++++
src/uncategorized/reFSAcquisition.tw | 30 ++++++++++++++++++
.../reFSEgyptianRevivalistAcquisition.tw | 1 +
src/uncategorized/reRecruit.tw | 31 +++++++++++++++++--
src/uncategorized/seCoursing.tw | 5 +++
src/uncategorized/seRaiding.tw | 5 +++
src/uncategorized/seRecruiterSuccess.tw | 5 +++
9 files changed, 87 insertions(+), 3 deletions(-)
diff --git a/src/npc/generate/generateMarketSlave.js b/src/npc/generate/generateMarketSlave.js
index 5044821bd43..96b1e0d13d9 100644
--- a/src/npc/generate/generateMarketSlave.js
+++ b/src/npc/generate/generateMarketSlave.js
@@ -59,6 +59,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.devotion = jsRandom(-30, 0);
slave.trust = jsRandom(-45, -25);
setHealth(slave, jsRandom(25, 50), Math.max(normalRandInt(0, 4), 0), Math.max(normalRandInt(0, 4), 0), Math.max(normalRandInt(0, 0.5), 0), jsRandom(10, 40));
+ generateSalonModifications(slave);
if (V.corp.SpecDevotion > 0) {
slave.devotion = jsRandom(-120, -90) + V.corp.SpecDevotion * 30;
if (V.corp.SpecDevotion === 1) {
@@ -1294,6 +1295,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.origin = "You bought $him from the kidnappers' slave market, so $he was probably forced into slavery.";
slave.devotion -= 5;
slave.trust = jsRandom(-45, -25);
+ generateSalonModifications(slave);
slave.intelligence = Intelligence.random({limitIntelligence: [-90, 45]});
setHealth(slave, jsRandom(-80, 20), Math.max(normalRandInt(5, 4), 0), Math.max(normalRandInt(5, 4), 0), Math.max(normalRandInt(0, 0.7), 0), jsRandom(30, 70));
if (slave.vagina > 1 && isFertile(slave)) {
@@ -1408,6 +1410,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.trust -= 25;
setHealth(slave, jsRandom(-30, 70), Math.max(normalRandInt(10, 4), 0), Math.max(normalRandInt(0, 2), 0), Math.max(normalRandInt(0, 0.7), 0), jsRandom(20, 60));
slave.career = setup.veryYoungCareers.random();
+ generateSalonModifications(slave);
slave.birthWeek = 0;
if (slave.vagina !== -1) {
slave.skill.vaginal = 0;
@@ -1431,6 +1434,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slave.trust -= 25;
setHealth(slave, jsRandom(-30, 70), Math.max(normalRandInt(10, 4), 0), Math.max(normalRandInt(0, 3), 0), Math.max(normalRandInt(0, 0.7), 0), jsRandom(30, 70));
slave.career = jsEither(["a cheerleader", "a farm laborer", "a party girl", "a student", "a student", "a student", "a student", "a student"]);
+ generateSalonModifications(slave);
slave.birthWeek = 0;
if (slave.vagina !== -1) {
if (jsRandom(1, 2) === 1) {
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index d231f04529c..17495884f2a 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -336,6 +336,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "$He was a student at a girls' school whose remnants you enslaved.">>
<<set $activeSlave.career = "a student">>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.devotion = random(-90,-75)>>
<<set $activeSlave.trust = -20>>
<<run setHealth($activeSlave, jsRandom(-10, 10))>>
@@ -405,6 +406,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "$He was a student you enslaved when you evacuated $him from a threatened old world grade school.">>
<<set $activeSlave.career = "a student">>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.devotion = random(-90,-75)>>
<<set $activeSlave.trust = random(-90,-75)>>
<<run setHealth($activeSlave, jsRandom(-10, 10))>>
@@ -471,6 +473,7 @@ When the aircraft lands at your penthouse pad, the would-be escapees are still u
<<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 1, limitMult: [0, 2]}))>>
<<set $activeSlave.origin = "$He was a volleyball player you enslaved when you evacuated $him from a broken down bus.">>
<<set $activeSlave.career = "a student athlete">>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.devotion = random(-90,-75)>>
<<set $activeSlave.trust = random(-90,-75)>>
<<run setHealth($activeSlave, jsRandom(20, 60), 0, 0)>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index 1b4a812c7d0..2e6e059c1ee 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -90,11 +90,13 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<for _pca = 0; _pca < 8; _pca++>>
<<if random(0,99) < $seeDicks>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.weight = random(-20,30)>>
<<set $activeSlave.muscles = random(20,80)>>
<<set $activeSlave.waist = random(10,80)>>
<<else>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.weight = random(-50,30)>>
<<set $activeSlave.muscles = random(0,80)>>
<<set $activeSlave.waist = random(-20,20)>>
@@ -124,6 +126,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $activeSlaveOneTimeMaxAge = 32>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He is an enslaved Daughter of Liberty.">>
<<set $activeSlave.weight = random(-20,30)>>
<<set $activeSlave.muscles = random(20,80)>>
@@ -142,6 +145,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $activeSlaveOneTimeMaxAge = 32>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He is an enslaved Daughter of Liberty.">>
<<set $activeSlave.weight = random(-50,30)>>
<<set $activeSlave.muscles = random(0,80)>>
@@ -173,6 +177,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $activeSlaveOneTimeMaxAge = 32>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He is an enslaved Daughter of Liberty.">>
<<set $activeSlave.weight = random(-20,30)>>
<<set $activeSlave.muscles = random(20,80)>>
@@ -191,6 +196,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $activeSlaveOneTimeMaxAge = 32>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He is an enslaved Daughter of Liberty.">>
<<set $activeSlave.weight = random(-50,30)>>
<<set $activeSlave.muscles = random(0,80)>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 07b8472bd5d..4dcdc870ac7 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -31,6 +31,7 @@
<</if>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself for voluntary enslavement, choosing you as $his new owner because you treat lactating girls well.">>
<<run setHealth($activeSlave, jsRandom(-20, 20))>>
<<set $activeSlave.devotion = random(-15,15)>>
@@ -78,6 +79,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He was captured and enslaved in a conflict zone and fenced to you by a mercenary group.">>
<<set $activeSlave.devotion -= 40>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -109,6 +111,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = $arcologies[0].FSSubjugationistRace>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He was beaten, sexually assaulted, and finally enslaved for being stupid enough to visit an arcology that doesn't like $his kind.">>
<<run setHealth($activeSlave, jsRandom(-50, -20), jsRandom(20, 30), jsRandom(0, 10), Math.max(normalRandInt(1, 0.5), 0), jsRandom(40, 90))>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -124,6 +127,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = $arcologies[0].FSSubjugationistRace>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He came to your arcology to be enslaved out of a sense of self-loathing for $his kind.">>
<<run setHealth($activeSlave, jsRandom(-70, -60))>>
<<set $activeSlave.trust = random(-25,-15)>>
@@ -137,6 +141,7 @@
<<set _ContractCost = 1000>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself for voluntary enslavement to escape life in an area that disapproved of $his sexual tendencies.">>
<<run setHealth($activeSlave, jsRandom(-20, 20))>>
<<set $activeSlave.devotion = random(15,20)>>
@@ -154,6 +159,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself for voluntary enslavement after a lifetime as an outcast due to $his sexual tendencies.">>
<<run setHealth($activeSlave, jsRandom(-20, 20))>>
<<set $activeSlave.devotion = random(15,20)>>
@@ -173,6 +179,7 @@
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "$He was sold to you as a way of disposing of an inconveniently pregnant young $woman.">>
<<set $activeSlave.career = setup.youngCareers.random()>>
+<<run generateSalonModifications($activeSlave)>>
<<run setHealth($activeSlave, jsRandom(-20, 20))>>
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.trust = random(-45,-25)>>
@@ -236,6 +243,7 @@
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "$He was voluntarily enslaved after $he decided that your paternalistic arcology was a better place to live than the old world.">>
<<run setHealth($activeSlave, jsRandom(40, 60))>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.devotion = random(25,45)>>
<<set $activeSlave.trust = random(25,45)>>
<<set _slaveCost = slaveCost($activeSlave)>>
@@ -249,6 +257,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "$He was sold to you by an anonymous person who wanted $him to suffer.">>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.boobsImplant += random(4,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
<<set $activeSlave.boobsImplantType = "normal">>
@@ -292,6 +301,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "$He was sold to you by an anonymous slave breaking group.">>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.boobsImplant += random(3,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
<<set $activeSlave.boobsImplantType = "normal">>
@@ -353,6 +363,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He was voluntarily enslaved after $he overdosed on psychosuppressant-laced aphrodisiacs and fried $his brain.">>
<<set $activeSlave.dullIntelligence = 1>>
<<set _geneticInt = $activeSlave.intelligence>> /* for longSlaveDescription to report what the intelligence will be while keeping the original value safe for $genePool[] */
@@ -377,6 +388,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a porn star">>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself for voluntary enslavement after realizing $his career was over.">>
<<set $activeSlave.boobsImplant += random(4,6)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
@@ -480,6 +492,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He came to you for enslavement out of desperation, terrified that $he was about to be enslaved into a worse situation by $his abusive family.">>
<<run setHealth($activeSlave, jsRandom(-40, 30))>>
<<set $activeSlave.devotion = random(10,15)>>
@@ -504,6 +517,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He came to you for enslavement out of desperation, terrified that $he was about to be asked to do something with $his life by $his family.">>
<<run setHealth($activeSlave, jsRandom(-40, 30), 0, 0, 0, jsRandom(20, 40))>>
<<set $activeSlave.devotion = random(10,15)>>
@@ -582,6 +596,7 @@
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself for voluntary enslavement to avoid being singled out by ruthless slavers.">>
<<if $activeSlave.height >= 150>>
<<set $activeSlave.height = Math.trunc(Height.random($activeSlave, {limitMult: [-2, 0]}))>>
@@ -611,6 +626,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a porn star">>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself to you for enslavement because $he felt your arcology would be a nice place to retire to.">>
<<set $activeSlave.height = random(90,100)>>
<<set $activeSlave.geneticQuirks.dwarfism = 2>>
@@ -651,6 +667,7 @@
<<set _ContractCost = 1000>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself for voluntary enslavement to avoid being singled out by ruthless slavers.">>
<<set $activeSlave.height = random(200,264)>>
<<set $activeSlave.geneticQuirks.gigantism = 2>>
@@ -684,6 +701,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "You received $him from a surgeon who botched an implant operation on $him and needed to get $him out of sight.">>
<<set $activeSlave.boobsImplant += random(10,20)*200>>
<<set $activeSlave.boobs += $activeSlave.boobsImplant>>
@@ -744,6 +762,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself to you for enslavement because $he felt your arcology was the best place for a $woman of $his appearance.">>
<<set $activeSlave.boobs = random(4,6)*50>>
<<set $activeSlave.weight = -20>>
@@ -770,6 +789,7 @@
<<set $activeSlaveOneTimeMaxAge = 24>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself to you for enslavement to escape having plastic surgery foisted on $him.">>
<<set $activeSlave.boobs = random(4,6)*50>>
<<set $activeSlave.weight = -20>>
@@ -793,6 +813,7 @@
<<set $activeSlaveOneTimeMaxAge = 19>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself to you for enslavement after following a dangerous, illegal growth hormone regimen.">>
<<set $activeSlave.boobs += random(10,20)*200>>
<<set $activeSlave.nipples = "inverted">>
@@ -818,6 +839,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself to you to escape enslavement in $his homeland for being older and unmarried.">>
<<set $activeSlave.boobs += random(6,15)*200>>
<<set $activeSlave.nipples = "inverted">>
@@ -841,6 +863,7 @@
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "$He was voluntarily enslaved after $he decided that your arcology was the best place for $him to get the steroids that $he'd allowed to define $his life.">>
<<set $activeSlave.career = setup.uneducatedCareers.random()>>
+<<run generateSalonModifications($activeSlave)>>
<<run setHealth($activeSlave, jsRandom(20, 60))>>
<<set $activeSlave.muscles = 100>>
<<set $activeSlave.addict = 1>>
@@ -857,6 +880,7 @@
<<set $activeSlaveOneTimeMaxAge = 42>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He was voluntarily enslaved after $he decided that your arcology was the best place for $him to get the steroids that $he'd allowed to define $his life.">>
<<run setHealth($activeSlave, jsRandom(20, 60))>>
<<set $activeSlave.muscles = 100>>
@@ -874,6 +898,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "$He offered $himself for enslavement out of religious conviction.">>
+<<run generateSalonModifications($activeSlave)>>
<<run setHealth($activeSlave, jsRandom(10, 30))>>
<<set $activeSlave.devotion = -100>>
<<set $activeSlave.trust = -100>>
@@ -921,6 +946,7 @@
<</if>>
<<set $activeSlave = GenerateNewSlave()>>
<<set $activeSlave.origin = "$He sold $himself to you to escape those who condemned $his lifestyle.">>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.career = "a shut-in">>
<<run setHealth($activeSlave, jsRandom(-40, 20))>>
<<set $activeSlave.devotion = random(35,45)>>
@@ -994,6 +1020,7 @@
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "$He sold $himself to you in the hopes that $his body would help keep humanity alive.">>
<<set $activeSlave.career = setup.youngCareers.random()>>
+<<run generateSalonModifications($activeSlave)>>
<<run setHealth($activeSlave, jsRandom(40, 60))>>
<<set $activeSlave.devotion = random(25,35)>>
<<set $activeSlave.trust = random(20,25)>>
@@ -1088,6 +1115,7 @@
<<set $activeSlave.devotion = random(-15,-5)>>
<<set $activeSlave.trust = random(5,15)>>
<<set $activeSlave.career = "a student">>
+<<run generateSalonModifications($activeSlave)>>
<<run setHealth($activeSlave, jsRandom(-10, 10))>>
<<set $activeSlave.face = random(-20,0)>>
<<set $activeSlave.anus = 0>>
@@ -1148,6 +1176,7 @@
<<set $activeSlave.devotion = random(-15,-5)>>
<<set $activeSlave.trust = random(5,15)>>
<<set $activeSlave.career = "a student">>
+<<run generateSalonModifications($activeSlave)>>
<<run setHealth($activeSlave, jsRandom(-20, 0))>>
<<set $activeSlave.face = random(-60,10)>>
<<set $activeSlave.weight = random(20,100)>>
@@ -1178,6 +1207,7 @@
<<set $activeSlave.devotion = random(30,35)>>
<<set $activeSlave.trust = random(30,35)>>
<<set $activeSlave.career = "a professor">>
+<<run generateSalonModifications($activeSlave)>>
<<run setHealth($activeSlave, jsRandom(10, 30))>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.skill.oral = 35>>
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index bc685690550..94686e0d8f9 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -10,6 +10,7 @@
<<set $activeSlaveOneTimeMinAge = Math.max(16, $minimumSlaveAge + 3)>>
<<set $activeSlaveOneTimeMaxAge = 29>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself to you for enslavement hoping you would preserve $his incestuous relationship with $his sibling.">>
<<set $activeSlave.devotion = random(5,15)>>
<<set $activeSlave.trust = random(-15,-5)>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index c24fed15d32..331070fcb62 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -51,6 +51,7 @@
<<set $activeSlave.eyebrowPiercing = 1>>
<<set $activeSlave.navelPiercing = 1>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.hStyle = "fashionable for a Free Cities $girl, long, with the left half shaved">>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
@@ -84,6 +85,7 @@
<<set $activeSlave.eyebrowPiercing = 1>>
<<set $activeSlave.navelPiercing = 1>>
<<set $activeSlave.behavioralFlaw = "arrogant">>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.hStyle = "fashionable for a Free Cities trap, long, with the right half shaved">>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
@@ -128,6 +130,7 @@
<<set $activeSlave.navelPiercing = 1>>
<<set $activeSlave.nipplesPiercing = 1>>
<<set $activeSlave.clitPiercing = 1>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.hStyle = "strip">>
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
@@ -187,6 +190,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He sold $himself into slavery out of fear that life on the streets was endangering $his pregnancy.">>
<<set $activeSlave.devotion = random(0,15)>>
<<set $activeSlave.trust = random(0,15)>>
@@ -316,7 +320,9 @@
<<set $activeSlave.origin = "You tricked $him into enslavement, manipulating $him based on $his surgical addiction.">>
<<set $activeSlave.devotion = random(-75,-60)>>
<<set $activeSlave.trust = random(-15,0)>>
-<<set $activeSlave.hStyle = either("short", "very short")>>
+<<set $activeSlave.hStyle = either("neat")>>
+<<set $activeSlave.hLength = random(10,30)>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.weight = random(-40,5)>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.skill.vaginal = 0>>
@@ -407,6 +413,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He asked to be enslaved out of naïve infatuation with you.">>
<<set $activeSlave.devotion = random(25,30)>>
<<set $activeSlave.trust = random(-15,-10)>>
@@ -433,6 +440,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He 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)>>
@@ -463,6 +471,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He asked to be enslaved since $he felt you were $his only hope of becoming a prettier woman.">>
<<set $activeSlave.devotion = random(10,15)>>
<<set $activeSlave.trust = random(-15,-10)>>
@@ -507,6 +516,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He got into debt for damaging someone's property during a student protest and you bought out $his debt.">>
<<set $activeSlave.devotion = random(-25,0)>>
<<set $activeSlave.trust = random(-20,-5)>>
@@ -543,6 +553,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He got into debt for damaging someone's property during a student protest and you bought out $his debt.">>
<<set $activeSlave.devotion = random(-30,-5)>>
<<set $activeSlave.trust = random(-25,-5)>>
@@ -752,6 +763,7 @@
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He 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)>>
@@ -762,7 +774,7 @@
<<set $activeSlave.skill.oral = 0>>
<<set $activeSlave.skill.whoring = 0>>
<<set $activeSlave.skill.combat = 1>>
-<<set $activeSlave.hStyle = either("short", "very short")>>
+<<set $activeSlave.hLength = random(10,30)>>
<<set $activeSlave.boobs = 150>>
<<set $activeSlave.vagina = -1>>
<<set $activeSlave.clit = 0>>
@@ -788,6 +800,7 @@
<<set $activeSlave.origin = "$He was a runaway slave captured by a gang outside your arcology. You bought $him cheap after $he was harshly used by them.">>
<<set $activeSlave.devotion = random(0,25)>>
<<set $activeSlave.trust = -20>>
+<<run generateSalonModifications($activeSlave)>>
<<run setHealth($activeSlave, jsRandom(-50, -30), normalRandInt(10, 3), normalRandInt(10, 3), Math.max(normalRandInt(1, 0.5), 0))>>
<<set $activeSlave.face = random(0,20)>>
<<set $activeSlave.skill.vaginal = 0>>
@@ -828,6 +841,7 @@
<<set $activeSlave.origin = "$He was a runaway slave captured by a gang outside your arcology. You bought $him cheap after $he was harshly used by them.">>
<<set $activeSlave.devotion = random(0,25)>>
<<set $activeSlave.trust = -20>>
+<<run generateSalonModifications($activeSlave)>>
<<run setHealth($activeSlave, jsRandom(-50, -30), normalRandInt(10, 3), normalRandInt(10, 3), Math.max(normalRandInt(1, 0.5), 0))>>
<<set $activeSlave.face = random(0,20)>>
<<set $activeSlave.skill.vaginal = 15>>
@@ -874,6 +888,7 @@
<<set $activeSlave.origin = "$He was a runaway slave captured by a gang outside your arcology. You bought $him cheap after $he was harshly used by them.">>
<<set $activeSlave.devotion = random(0,25)>>
<<set $activeSlave.trust = -20>>
+<<run generateSalonModifications($activeSlave)>>
<<run setHealth($activeSlave, jsRandom(-50, -30), normalRandInt(10, 3), normalRandInt(10, 3), Math.max(normalRandInt(1, 0.5), 0))>>
<<set $activeSlave.face = random(0,20)>>
<<set $activeSlave.skill.vaginal = 15>>
@@ -1140,6 +1155,7 @@
<<set $activeSlaveOneTimeMaxAge = 23>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He 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)>>
@@ -1342,6 +1358,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He was in an orphanage until reaching maturity, at which point $he was sold to you.">>
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.trust = random(-25,0)>>
@@ -1378,6 +1395,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He was in an orphanage until reaching maturity, at which point $he was sold to you.">>
<<set $activeSlave.devotion = random(10,40)>>
<<set $activeSlave.trust = random(-25,0)>>
@@ -1422,6 +1440,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $fixedRace = "white">>
<<set $activeSlave = GenerateNewSlave("XX")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He was captured in a raid on a gated community and quickly sold off.">>
<<set $activeSlave.devotion = -20>>
<<set $activeSlave.trust = 0>>
@@ -1487,6 +1506,7 @@
<<set $activeSlaveOneTimeMaxAge = 18>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He sold $himself into slavery to spite $his father.">>
<<set $activeSlave.devotion = 20>>
<<set $activeSlave.trust = 0>>
@@ -1529,6 +1549,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He offered $himself to you for enslavement out of devotion to $his artistic 'craft'.">>
<<set $activeSlave.boobs = random(4,6)*50>>
<<set $activeSlave.weight = -20>>
@@ -1593,6 +1614,7 @@
<<set $fixedRace = _races.random()>>
<</if>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He sold $himself into slavery to pay $his immigration costs.">>
<<set $activeSlave.devotion = random(-45,-25)>>
<<set $activeSlave.trust = random(-15,0)>>
@@ -1601,6 +1623,7 @@
<<case "starving migrant">>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He begged to be enslaved to avoid starvation.">>
<<set $activeSlave.career = "a refugee">>
<<set $activeSlave.devotion = random(21,40)>>
@@ -1666,6 +1689,7 @@
<</if>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "You helped $him give birth, leaving $him deeply indebted to you.">>
<<set $activeSlave.devotion = random(0,20)>>
<<set $activeSlave.trust = random(0,20)>>
@@ -1697,6 +1721,7 @@
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.origin = "$He sold $himself into slavery to feed $himself and $his growing brood.">>
<<set $activeSlave.career = "a farm laborer">>
+<<run generateSalonModifications($activeSlave)>>
<<run setHealth($activeSlave, jsRandom(-35, 10), -1, -1, -1, 50)>>
<<set $activeSlave.devotion = random(35,45)>>
<<set $activeSlave.trust = random(15,25)>>
@@ -2769,7 +2794,7 @@ He explains that one of his servant <<= $girl>>s was impregnated by his fool of
<<case "blessed virgin">>
Winning out in the auction, you have the young $woman brought to you straight away. $He is helped into your penthouse in semitransparent shimmering gown — some sort of cult garb that was thrown into the sale as a bonus. It certainly looks amazing on $him, but you want to see all of your new acquisition so you order $him to strip. With shaking hands, $he slides the fabric off and lets it fall to the floor, then submits to biometric scanning, registering $him as your property. When $he's taken away to the office of the slave broker you sold $him on to, the young $woman lets out a little sob, as if fearful of $his future.
<<case "blessed vessel">>
- Winning out in the auction, you have the $girl brought to you straight away. $He is rolled into your penthouse completely nude giving you a full view of $his cavernous pussy and how it is barely holding back a flood of life from being released upon your floor. Pondering whether or not this was worth it, you submit $him to biometric scanning, registering $him, and $his coming brood, as your property. The purchasing agent groans at that sight of $him, not eager at the amount of effort it will take him to roll $him to the volume breeder that purchased $him.
+ Winning out in the auction, you have the $girl brought to you straight away. $He is rolled into your penthouse completely nude giving you a full view of $his cavernous pussy and how it is barely holding back a flood of life from being released upon your floor. Pondering whether or not this was worth it, you submit $him to biometric scanning, registering $him, and $his coming brood, as your property. The purchasing agent groans at the sight of $him, not eager at the amount of effort it will take him to roll $him to the volume breeder that purchased $him.
<<case "spoiled daughter">>
A few days after granting your assent to the $girl's offer, $he appears at your penthouse laden with luggage and handbags. $activeSlave.slaveName bounces happily in $his heels and eagerly explains $his expectations regarding $his new life with you. Your response appears in the form of a purchasing agent, here to take $him away. As he restrains the disbelieving $girl, you tell $him $he's been purchased by a brothel, so $he's soon going to have more sugar daddies than $his holes can take. $He releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over $his head.
<<case "desperate university milf">>
diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw
index 10aab1e74e2..97c8b720698 100644
--- a/src/uncategorized/seCoursing.tw
+++ b/src/uncategorized/seCoursing.tw
@@ -102,6 +102,7 @@ You lead your lurcher _activeLurcher.slaveName out on a leash, naked just like t
<<set $activeSlaveOneTimeMaxAge = 20>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.vagina = 0>>
<<set $activeSlave.counter.anal += 1, $analTotal += 1>>
@@ -161,6 +162,7 @@ You lead your lurcher _activeLurcher.slaveName out on a leash, naked just like t
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.counter.anal += 1, $analTotal += 1>>
@@ -182,6 +184,7 @@ You lead your lurcher _activeLurcher.slaveName out on a leash, naked just like t
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.anus = 2>>
<<set $activeSlave.counter.anal += 1, $analTotal += 1>>
<<set $activeSlave.dick = random(2,4)>>
@@ -200,6 +203,7 @@ You lead your lurcher _activeLurcher.slaveName out on a leash, naked just like t
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.anus = 1>>
<<set $activeSlave.counter.anal += 1, $analTotal += 1>>
<<set $activeSlave.balls = 5>>
@@ -213,6 +217,7 @@ You lead your lurcher _activeLurcher.slaveName out on a leash, naked just like t
<<set $activeSlaveOneTimeMaxAge = 25>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.boobs += 800>>
<<set $activeSlave.boobsImplant += 800>>
<<set $activeSlave.boobsImplantType = "fillable">>
diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw
index 5c478147c7f..b5d2a80cb02 100644
--- a/src/uncategorized/seRaiding.tw
+++ b/src/uncategorized/seRaiding.tw
@@ -77,6 +77,7 @@ target
<<set $one_time_age_overrides_pedo_mode = 1>> /% Not a young $woman. %/
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.boobs += 800>>
<<set $activeSlave.boobsImplant += 800>>
<<set $activeSlave.boobsImplantType = "normal">>
@@ -143,6 +144,7 @@ target
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a student">>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 1>>
@@ -174,6 +176,7 @@ target
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a military officer">>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.face = random(15,100)>>
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.skill.oral = 35>>
@@ -299,6 +302,7 @@ target
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
<<set $activeSlave.career = "a journalist">>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.face = random(-20,0)>>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.vagina = 1>>
@@ -470,6 +474,7 @@ target
<<set $activeSlaveOneTimeMaxAge = 43>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+ <<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.career = "a shut-in">>
<<set $activeSlave.anus = 0>>
<<set $activeSlave.face = random(15,100)>>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index fa2b50e64cb..00ab9d91985 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -7,6 +7,7 @@
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He submitted to enslavement for a better chance at survival than $he had as a migrant.">>
<<set $activeSlave.devotion = random(-15,5)>>
<<set $activeSlave.trust = random(-10,10)>>
@@ -43,6 +44,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He submitted to enslavement as $his only way to obtain surgery to transform $him into a woman.">>
<<set $activeSlave.devotion = random(-15,5)>>
<<set $activeSlave.trust = random(-10,10)>>
@@ -60,6 +62,7 @@
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XY")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He 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)>>
@@ -88,6 +91,7 @@
<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to be pregnant. %/
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave("XX")>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He submitted to enslavement to get access to modern prenatal care.">>
<<set $activeSlave.devotion = random(-15,5)>>
<<set $activeSlave.trust = random(-10,10)>>
@@ -112,6 +116,7 @@
<<set $activeSlaveOneTimeMaxAge = 22>>
<<set $oneTimeDisableDisability = 1>>
<<set $activeSlave = GenerateNewSlave()>>
+<<run generateSalonModifications($activeSlave)>>
<<set $activeSlave.origin = "$He submitted to enslavement to escape the hard life of an old world whore.">>
<<set $activeSlave.career = "a prostitute">>
<<set $activeSlave.devotion = random(-15,5)>>
--
GitLab