diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 92b4c506081eedb92117460f9db40f8381e4368d..34a547f5fe7b63cf4a13054ba2d623d13be1bff4 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4647,4 +4647,9 @@ Pregmod 0.10.3.0
-fix
148
- -added settings to enable/disable lactation implants in flat slaves
\ No newline at end of file
+ -added settings to enable/disable lactation implants in flat slaves
+
+ 11/21/17
+
+ 149
+ -custom slave overhaul
\ No newline at end of file
diff --git a/src/events/intro/initNationalities.tw b/src/events/intro/initNationalities.tw
index 992bba3edfe2a33e0e8f85ea51b95d368bd33e28..5bb9b85f0b5d055e90d2afacb4228619dd78b84a 100644
--- a/src/events/intro/initNationalities.tw
+++ b/src/events/intro/initNationalities.tw
@@ -80,8 +80,6 @@
<<include "custom Slaves Database">>
<<HeroSlavesCleanup>>
-<<set $customSlave = clone($activeSlave)>>
-<<set $customSlave.slaveName: "custom", $customSlave.birthName: "custom", $customSlave.skin: 0, $customSlave.boobs = 500>>
<<set $activeSlave = 0>>
/*Nationalities Setup*/
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 669aaee9e9017d518a165d37f6fd623d73eb1c6d..a53ee2e3dea3c2ecf4904dc7f61b03110bd9d604 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -409,7 +409,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $dairySlimMaintain = 0>>
<<set $dairyHyperPregRemodel = 0>>
<<set $dairyWeightSetting = 0>>
-<<set dairyImplantsSetting = 1>>
+<<set $dairyImplantsSetting = 1>>
<<set $dairyUpgradeMenials = 0>>
<<set $createBioreactors = 0>>
<<set $bioreactorsAnnounced = 0>>
@@ -1064,7 +1064,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
<<set $nextLink = "EW Slaves">>
<<set $customSlaveOrdered = 0>>
-<<set $customSlave = {age: 18, health: 0, muscles: 0, lips: 15, heightMod: "normal", face: 0, race: "white", skin: 0, boobs: 500, butt: 3, sex: 1, virgin: 0, penis: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, whoreSkills: 15, combatSkills: 0, intelligence: 0, intelligenceImplant: 1, nationality: "Stateless", amp: 0, eyes: 1}>>
+<<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: 0, boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, whoreSkills: 15, combatSkills: 0, intelligence: 0, intelligenceImplant: 1, nationality: "Stateless", amp: 0, eyes: 1}>>
<<set $huskSlaveOrdered = 0>>
<<set $huskSlave = {age: 18, nationality: "Stateless", race: "white", sex: 1, virgin: 0}>>
@@ -1249,6 +1249,8 @@ erectileImplant: 0
<<set $secExp = 0>>
<<set $showSecExp = 0>>
<<set $wasToggledBefore = 0>>
+/*
<<include "secInit">>
+*/
<<goto "Alpha disclaimer">>
diff --git a/src/uncategorized/customSlave.tw b/src/uncategorized/customSlave.tw
index e554b19caf1426cd3ae6212a5cbb7b3e2c2af0f2..f2d13cc6a26adb527ed50148c00d7e38485fcc02 100644
--- a/src/uncategorized/customSlave.tw
+++ b/src/uncategorized/customSlave.tw
@@ -1,110 +1,88 @@
-:: Custom Slave
-
-<<set $nextButton = "Back">>\
-<<set $nextLink = "Buy Slaves">>\
-<<set $returnTo = "Buy Slaves">>\
-<<set $showEncyclopedia = 1>><<set $encyclopedia = "Kidnapped Slaves">>\
-<<if ($customSlave.dick == 0) && ($customSlave.vagina == -1)>><<set $customSlave.vagina = 0>><</if>>\
-\
+:: Custom Slave [nobr]
+
+<<set $nextButton = "Back", $nextLink = "Buy Slaves", $returnTo = "Buy Slaves", $showEncyclopedia = 1, $encyclopedia = "Kidnapped Slaves">>
+
<<if $customSlaveOrdered == 0>>You work up a new slave order for posting where slave merchants can work to fulfill it.<<else>>You review your posted slave order.<</if>> <<if $assistant == 1>>As you work, $assistantName makes lewd comments about what she looks forward to doing to this new slave. <</if>>Your order requests a slave with the following characteristics:
-<<nobr>>
+<br><br>
+
<span id = "age">
-<<if $customSlave.actualAge < 5>>3-4 years old.
-<<elseif $customSlave.actualAge < 7>>5-6 years old.
-<<elseif $customSlave.actualAge < 10>>7-9 years old.
-<<elseif $customSlave.actualAge < 13>>10-12 years old.
-<<elseif $customSlave.actualAge < 15>>13-14 years old.
-<<elseif $customSlave.actualAge < 18>>15-17 years old.
-<<elseif $customSlave.actualAge < 20>>18-19 years old.
-<<elseif $customSlave.actualAge < 30>>20-29 years old.
-<<elseif $customSlave.actualAge < 40>>30-39 years old.
+<<if $customSlave.age < 5>>3-4 years old.
+<<elseif $customSlave.age < 7>>5-6 years old.
+<<elseif $customSlave.age < 10>>7-9 years old.
+<<elseif $customSlave.age < 13>>10-12 years old.
+<<elseif $customSlave.age < 15>>13-14 years old.
+<<elseif $customSlave.age < 18>>15-17 years old.
+<<elseif $customSlave.age < 20>>18-19 years old.
+<<elseif $customSlave.age < 30>>20-29 years old.
+<<elseif $customSlave.age < 40>>30-39 years old.
<<else>>40+ years old.
<</if>>
</span>
<<if $minimumSlaveAge <= 3>>
<<link "3-4">>
- <<set $customSlave.actualAge = random(3,4)>>
- <<set $customSlave.physicalAge = $customSlave.actualAge>>
- <<set $customSlave.visualAge = $customSlave.actualAge>>
+ <<set $customSlave.age = 4>>
<<CustomSlaveAge>>
<</link>>
|
<</if>>
<<if $minimumSlaveAge <= 5>>
<<link "5-6">>
- <<set $customSlave.actualAge = random(5,6)>>
- <<set $customSlave.physicalAge = $customSlave.actualAge>>
- <<set $customSlave.visualAge = $customSlave.actualAge>>
+ <<set $customSlave.age = 6>>
<<CustomSlaveAge>>
<</link>>
|
<</if>>
<<if $minimumSlaveAge <= 7>>
<<link "7-9">>
- <<set $customSlave.actualAge = random(7,9)>>
- <<set $customSlave.physicalAge = $customSlave.actualAge>>
- <<set $customSlave.visualAge = $customSlave.actualAge>>
+ <<set $customSlave.age = 9>>
<<CustomSlaveAge>>
<</link>>
|
<</if>>
<<if $minimumSlaveAge <= 10>>
<<link "10-12">>
- <<set $customSlave.actualAge = random(10,12)>>
- <<set $customSlave.physicalAge = $customSlave.actualAge>>
- <<set $customSlave.visualAge = $customSlave.actualAge>>
+ <<set $customSlave.age = 12>>
<<CustomSlaveAge>>
<</link>>
|
<</if>>
<<if $minimumSlaveAge <= 13>>
<<link "13-14">>
- <<set $customSlave.actualAge = random(13,14)>>
- <<set $customSlave.physicalAge = $customSlave.actualAge>>
- <<set $customSlave.visualAge = $customSlave.actualAge>>
+ <<set $customSlave.age = 14>>
<<CustomSlaveAge>>
<</link>>
|
<</if>>
<<if $minimumSlaveAge <= 15>>
<<link "15-17">>
- <<set $customSlave.actualAge = random(15,17)>>
- <<set $customSlave.physicalAge = $customSlave.actualAge>>
- <<set $customSlave.visualAge = $customSlave.actualAge>>
+ <<set $customSlave.age = 17>>
<<CustomSlaveAge>>
<</link>>
|
<</if>>
<<link "18-19">>
- <<set $customSlave.actualAge = random(18,19)>>
- <<set $customSlave.physicalAge = $customSlave.actualAge>>
- <<set $customSlave.visualAge = $customSlave.actualAge>>
+ <<set $customSlave.age = 19>>
<<CustomSlaveAge>>
<</link>>
|
<<link "20-29">>
- <<set $customSlave.actualAge = random(20,29)>>
- <<set $customSlave.physicalAge = $customSlave.actualAge>>
- <<set $customSlave.visualAge = $customSlave.actualAge>>
+ <<set $customSlave.age = 29>>
<<CustomSlaveAge>>
<</link>>
|
<<link "30-39">>
- <<set $customSlave.actualAge = random(30,39)>>
- <<set $customSlave.physicalAge = $customSlave.actualAge>>
- <<set $customSlave.visualAge = $customSlave.actualAge>>
+ <<set $customSlave.age = 39>>
<<CustomSlaveAge>>
<</link>>
|
<<link "40+">>
- <<set $customSlave.actualAge = random(40,42)>>
- <<set $customSlave.physicalAge = $customSlave.actualAge>>
- <<set $customSlave.visualAge = $customSlave.actualAge>>
+ <<set $customSlave.age = 42>>
<<CustomSlaveAge>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "health">
<<if $customSlave.health == 0>>Healthy.
<<else>>Extremely healthy.
@@ -119,8 +97,9 @@
<<set $customSlave.health = 80>>
<<CustomSlaveHealth>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "muscles">
<<if $customSlave.muscles <= 5>>Normal musculature.
<<elseif $customSlave.muscles <= 30>>Toned.
@@ -141,8 +120,9 @@
<<set $customSlave.muscles = 50>>
<<CustomSlaveMuscles>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "lips">
<<if $customSlave.lips == 15>>Normal lips.
<<elseif $customSlave.lips == 35>>Plush lips.
@@ -157,48 +137,97 @@
<<set $customSlave.lips = 35>>
<<CustomSlaveLips>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "height">
-<<if $customSlave.height < 130>>Tiny.
-<<elseif $customSlave.height < 150>>Petite.
-<<elseif $customSlave.height < 160>>Short.
-<<elseif $customSlave.height < 170>>Average height.
-<<elseif $customSlave.height < 185>>Tall.
+<<if $customSlave.heightMod == "greatly below average">>Petite.
+<<elseif $customSlave.heightMod == "below average">>Short.
+<<elseif $customSlave.heightMod == "normal">>Average height.
+<<elseif $customSlave.heightMod == "above average">>Tall.
<<else>>Very tall.
<</if>>
</span>
-<<link "Tiny">>
- <<set $customSlave.height = 125>>
- <<CustomSlaveHeight>>
-<</link>>
-|
<<link "Petite">>
- <<set $customSlave.height = 145>>
+ <<set $customSlave.heightMod = "greatly below average">>
<<CustomSlaveHeight>>
<</link>>
|
<<link "Short">>
- <<set $customSlave.height = 155>>
+ <<set $customSlave.heightMod = "below average">>
<<CustomSlaveHeight>>
<</link>>
|
<<link "Average height">>
- <<set $customSlave.height = 165>>
+ <<set $customSlave.heightMod = "normal">>
<<CustomSlaveHeight>>
<</link>>
|
<<link "Tall">>
- <<set $customSlave.height = 175>>
+ <<set $customSlave.heightMod = "above average">>
<<CustomSlaveHeight>>
<</link>>
|
<<link "Very tall">>
- <<set $customSlave.height = 190>>
+ <<set $customSlave.heightMod = "greatly above average">>
<<CustomSlaveHeight>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
+<span id = "weight">
+<<if $customSlave.weight == -50>>Very thin.
+<<elseif $customSlave.weight == -15>>thin.
+<<elseif $customSlave.weight == 0>>Average weight.
+<<elseif $customSlave.weight == 15>>Chubby.
+<<elseif $customSlave.weight == 50>>Plump.
+<<elseif $customSlave.weight == 100>>Fat.
+<<elseif $customSlave.weight == 150>>Very Fat.
+<<else>>Immobile.
+<</if>>
+</span>
+<<link "Very thin">>
+ <<set $customSlave.weight = -50>>
+ <<CustomSlaveWeight>>
+<</link>>
+|
+<<link "Thin">>
+ <<set $customSlave.weight = -15>>
+ <<CustomSlaveWeight>>
+<</link>>
+|
+<<link "Average">>
+ <<set $customSlave.weight = 0>>
+ <<CustomSlaveWeight>>
+<</link>>
+|
+<<link "Chubby">>
+ <<set $customSlave.weight = 15>>
+ <<CustomSlaveWeight>>
+<</link>>
+|
+<<link "Plump">>
+ <<set $customSlave.weight = 50>>
+ <<CustomSlaveWeight>>
+<</link>>
+|
+<<link "Fat">>
+ <<set $customSlave.weight = 100>>
+ <<CustomSlaveWeight>>
+<</link>>
+|
+<<link "Very Fat">>
+ <<set $customSlave.weight = 150>>
+ <<CustomSlaveWeight>>
+<</link>>
+|
+<<link "Immobile">>
+ <<set $customSlave.weight = 200>>
+ <<CustomSlaveWeight>>
+<</link>>
+
+<br>
+
<span id = "face">
<<if $customSlave.face < -40>>Very unattractive face.
<<elseif $customSlave.face < -10>>Unattractive face.
@@ -208,12 +237,12 @@
<</if>>
</span>
<<link "Very unattractive">>
- <<set $customSlave.face to -55>>
+ <<set $customSlave.face = -55>>
<<CustomSlaveFace>>
<</link>>
|
<<link "Unattractive">>
- <<set $customSlave.face to -15>>
+ <<set $customSlave.face = -15>>
<<CustomSlaveFace>>
<</link>>
|
@@ -223,7 +252,7 @@
<</link>>
|
<<link "Attractive">>
- <<set $customSlave.face to 15>>
+ <<set $customSlave.face = 15>>
<<CustomSlaveFace>>
<</link>>
|
@@ -231,8 +260,9 @@
<<set $customSlave.face = 55>>
<<CustomSlaveFace>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "ethnicity">
<<textbox "$customSlave.race" $customSlave.race "Custom Slave">>
</span>
@@ -295,8 +325,9 @@
<<set $customSlave.race = "mixed race">>
<<CustomSlaveRace>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "skin">
<<textbox "$customSlave.skin" $customSlave.skin "Custom Slave">>
</span>
@@ -354,12 +385,21 @@
<<set $customSlave.skin = "extremely pale">>
<<CustomSlaveSkin>>
<</link>>
-<</nobr>>
-<<nobr>>
+|
+<<link "Left natural">>
+ <<set $customSlave.skin = 0>>
+ <<CustomSlaveSkin>>
+<</link>>
+
+<br>
+
<span id = "boobs">
<<if $customSlave.boobs == 200>>Flat chest.
<<elseif $customSlave.boobs <= 500>>Healthy breasts.
-<<else>>Big breasts.
+<<elseif $customSlave.boobs <= 800>>Big breasts.
+<<elseif $customSlave.boobs <= 1400>>Huge breasts.
+<<elseif $customSlave.boobs <= 2100>>Giant breasts.
+<<else>>Massive breasts.
<</if>>
</span>
<<link "Flat">>
@@ -376,12 +416,29 @@
<<set $customSlave.boobs = 800>>
<<CustomSlaveBoobs>>
<</link>>
-<</nobr>>
-<<nobr>>
+|
+<<link "Huge">>
+ <<set $customSlave.boobs = 1400>>
+ <<CustomSlaveBoobs>>
+<</link>>
+|
+<<link "Giant">>
+ <<set $customSlave.boobs = 2100>>
+ <<CustomSlaveBoobs>>
+<</link>>
+|
+<<link "Massive">>
+ <<set $customSlave.boobs = 6000>>
+ <<CustomSlaveBoobs>>
+<</link>>
+
+<br>
+
<span id = "butt">
<<if $customSlave.butt == 1>>Flat buttocks.
<<elseif $customSlave.butt < 4>>Healthy buttocks.
-<<else>>Huge buttocks.
+<<elseif $customSlave.butt < 6>>Huge buttocks.
+<<else>>Massive buttocks.
<</if>>
</span>
<<link "Flat">>
@@ -398,33 +455,54 @@
<<set $customSlave.butt = 5>>
<<CustomSlaveButt>>
<</link>>
-<</nobr>>
-<<nobr>>
-<span id = "vagina">
-<<if $customSlave.vagina == -1>>No vagina.
-<<elseif $customSlave.vagina == 0>>Vaginal virgin.
-<<else>>Normal vagina.
-<</if>>
-<<if $customSlave.dick > 0>>
-<<link "No vagina">>
- <<set $customSlave.vagina = -1, $customSlave.preg = 0, $customSlave.ovaries = 0>>
- <<CustomSlaveVagina>>
+|
+<<link "Massive">>
+ <<set $customSlave.butt = 8>>
+ <<CustomSlaveButt>>
<</link>>
-<<else>>//No vagina//
+
+<br>
+
+<span id = "sex">
+<<if $customSlave.sex == 1>>Female (cock & balls options not applied).
+<<elseif $customSlave.sex == 2>>Male (pussy options not applied).
+<<else>>Futanari (clit options not applied).
<</if>>
</span>
+<<link "Female">>
+ <<set $customSlave.sex = 1>>
+ <<CustomSlaveSex>>
+<</link>>
+|
+<<link "Male">>
+ <<set $customSlave.sex = 2>>
+ <<CustomSlaveSex>>
+<</link>>
|
+<<link "Both">>
+ <<set $customSlave.sex = 3>>
+ <<CustomSlaveSex>>
+<</link>>
+
+<br>
+
+<span id = "virgin">
+<<if $customSlave.virgin == 0>>Vaginal virgin.
+<<else>>Virginity not important.
+<</if>>
+</span>
<<link "Vaginal virgin">>
- <<set $customSlave.vagina = 0, $customSlave.preg = -1, $customSlave.ovaries = 1>>
- <<CustomSlaveVagina>>
+ <<set $customSlave.virgin = 0>>
+ <<CustomSlaveVirgin>>
<</link>>
|
-<<link "Normal">>
- <<set $customSlave.vagina = 1, $customSlave.preg = -1, $customSlave.ovaries = 1>>
- <<CustomSlaveVagina>>
+<<link "Not Important">>
+ <<set $customSlave.virgin = 1>>
+ <<CustomSlaveVirgin>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "dick">
<<if $customSlave.dick == 0>>No penis.
<<elseif $customSlave.dick == 2>>Small penis.
@@ -432,161 +510,212 @@
<</if>>
</span>
<<link "No penis">>
- <<set $customSlave.dick = 0,$customSlave.balls = 0,$customSlave.clit = 0>>
+ <<set $customSlave.dick = 0>>
<<CustomSlaveDick>>
- <<CustomSlaveClitBalls>>
- <<CustomSlaveVagina>>
<</link>>
|
<<link "Small penis">>
- <<set $customSlave.dick = 2,$customSlave.clit = 0>>
+ <<set $customSlave.dick = 2>>
<<CustomSlaveDick>>
- <<CustomSlaveClitBalls>>
- <<CustomSlaveVagina>>
<</link>>
|
<<link "Large penis">>
- <<set $customSlave.dick = 4,$customSlave.clit = 0>>
+ <<set $customSlave.dick = 4>>
<<CustomSlaveDick>>
- <<CustomSlaveClitBalls>>
- <<CustomSlaveVagina>>
-<</link>>
-<</nobr>>
-<<nobr>>
-<span id = "clitballs">
-<<if $customSlave.dick > 0>>
-<<if $customSlave.balls == 0>>No testicles.<<elseif $customSlave.balls == 2>>Small testicles.<<else>>Large testicles.<</if>>
+<</link>>
+
+<br>
+
+<span id = "balls">
+<<if $customSlave.balls == 0>>No testicles.
+<<elseif $customSlave.balls == 2>>Small testicles.
+<<elseif $customSlave.balls == 4>>Large testicles.
+<<else>>Huge Balls.
+<</if>>
+</span>
<<link "No testicles">>
- <<set $customSlave.balls = 0,$customSlave.clit = 0>>
- <<CustomSlaveClitBalls>>
+ <<set $customSlave.balls = 0>>
+ <<CustomSlaveBalls>>
<</link>>
|
<<link "Small testicles">>
- <<set $customSlave.balls = 2,$customSlave.clit = 0>>
- <<CustomSlaveClitBalls>>
+ <<set $customSlave.balls = 2>>
+ <<CustomSlaveBalls>>
<</link>>
|
<<link "Large testicles">>
- <<set $customSlave.balls = 4,$customSlave.clit = 0>>
- <<CustomSlaveClitBalls>>
+ <<set $customSlave.balls = 4>>
+ <<CustomSlaveBalls>>
<</link>>
-<<else>>
-<<if $customSlave.clit == 0>>Normal clitoris.<<elseif $customSlave.clit == 0>>Big clitoris.<<else>>Enormous clitoris.<</if>>
+|
+<<link "huge testicles">>
+ <<set $customSlave.balls = 6>>
+ <<CustomSlaveBalls>>
+<</link>>
+
+<br>
+
+<span id = "clit">
+<<if $customSlave.clit == 0>>Normal clitoris.
+<<elseif $customSlave.clit == 1>>Big clitoris.
+<<elseif $customSlave.clit == 3>>Enormous clitoris.
+<<else>>Pseudophallus.
+<</if>>
+</span>
<<link "Normal clitoris">>
<<set $customSlave.clit = 0>>
- <<CustomSlaveClitBalls>>
+ <<CustomSlaveClit>>
<</link>>
|
<<link "Big clitoris">>
<<set $customSlave.clit = 1>>
- <<CustomSlaveClitBalls>>
+ <<CustomSlaveClit>>
<</link>>
|
<<link "Enormous clitoris">>
- <<set $customSlave.clit = 2>>
- <<CustomSlaveClitBalls>>
+ <<set $customSlave.clit = 3>>
+ <<CustomSlaveClit>>
<</link>>
+|
+<<link "Clit dick">>
+ <<set $customSlave.clit = 5>>
+ <<CustomSlaveClit>>
+<</link>>
+
<br>
-<<if $customSlave.labia == 0>>Minimal labia<<elseif $customSlave.labia == 1>>Normal labia<<elseif $customSlave.labia == 2>>Huge labia.<<else>>Enormous labia.<</if>>
-<<link "Minimal labia">>
+
+<span id = "labia">
+<<if $customSlave.labia == 0>>Normal labia.
+<<elseif $customSlave.labia == 1>>big labia.
+<<elseif $customSlave.labia == 2>>Huge labia.
+<<else>>Enormous labia.
+<</if>>
+</span>
+<<link "Normal labia">>
<<set $customSlave.labia = 0>>
- <<CustomSlaveClitBalls>>
+ <<CustomSlaveLabia>>
<</link>>
|
-<<link "Normal labia">>
+<<link "Big labia">>
<<set $customSlave.labia = 1>>
- <<CustomSlaveClitBalls>>
+ <<CustomSlaveLabia>>
<</link>>
|
<<link "Huge labia">>
<<set $customSlave.labia = 2>>
- <<CustomSlaveClitBalls>>
+ <<CustomSlaveLabia>>
<</link>>
|
<<link "Enormous labia">>
<<set $customSlave.labia = 3>>
- <<CustomSlaveClitBalls>>
+ <<CustomSlaveLabia>>
<</link>>
+
+<br>
+
+<span id = "lube">
+<<if $customSlave.vaginaLube == 0>>Dry Vagina.
+<<elseif $customSlave.vaginaLube == 1>>Wet Vagina.
+<<else>>Sopping wet vagina.
<</if>>
</span>
-<</nobr>>
-<<nobr>>
+<<link "Dry vagina">>
+ <<set $customSlave.vaginaLube = 0>>
+ <<CustomSlaveLube>>
+<</link>>
+|
+<<link "Wet vagina">>
+ <<set $customSlave.vaginaLube = 1>>
+ <<CustomSlaveLube>>
+<</link>>
+|
+<<link "Sopping wet vagina">>
+ <<set $customSlave.vaginaLube = 2>>
+ <<CustomSlaveLube>>
+<</link>>
+
+<br>
+
<span id = "anus">
-<<if $customSlave.anus == 0>>Anal virgin.
-<<else>>Normal anus.
+<<if $customSlave.analVirgin == 0>>Anal virgin.
+<<else>>Anal virginity is not important.
<</if>>
</span>
<<link "Anal virgin">>
- <<set $customSlave.anus = 0>>
- <<CustomSlaveAnus>>
+ <<set $customSlave.analVirgin = 0>>
+ <<CustomSlaveAnalVirginity>>
<</link>>
|
-<<link "Normal anus">>
- <<set $customSlave.anus = 1>>
- <<CustomSlaveAnus>>
+<<link "Anal virginity is not important">>
+ <<set $customSlave.analVirgin = 1>>
+ <<CustomSlaveAnalVirginity>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "skills">
-<<if $customSlave.analSkill <= 10>>Sexually unskilled.
-<<elseif $customSlave.analSkill <= 10>>Basic sex skills.
-<<else>>Sexual skilled.
+<<if $customSlave.skills <= 10>>Sexually unskilled.
+<<elseif $customSlave.skills <= 15>>Basic sex skills.
+<<else>>Sexually skilled.
<</if>>
</span>
<<link "Unskilled">>
- <<set $customSlave.analSkill = 0,$customSlave.oralSkill = 0,$customSlave.vaginalSkill = 0>>
+ <<set $customSlave.skills = 0>>
<<CustomSlaveSkills>>
<</link>>
|
<<link "Skilled">>
- <<set $customSlave.analSkill = 15,$customSlave.oralSkill = 15,$customSlave.vaginalSkill = 15>>
+ <<set $customSlave.skills = 15>>
<<CustomSlaveSkills>>
<</link>>
|
<<link "Expert">>
- <<set $customSlave.analSkill = 35,$customSlave.oralSkill = 35,$customSlave.vaginalSkill = 35>>
+ <<set $customSlave.skills = 35>>
<<CustomSlaveSkills>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "whoreskills">
-<<if $customSlave.whoreSkill <= 10>>Unskilled at prostitution and entertainment.
-<<elseif $customSlave.whoreSkill <= 10>>Basic skills at prostitution and entertainment.
+<<if $customSlave.whoreSkills <= 10>>Unskilled at prostitution and entertainment.
+<<elseif $customSlave.whoreSkills <= 15>>Basic skills at prostitution and entertainment.
<<else>>Skilled at prostitution and entertainment.
<</if>>
</span>
<<link "Unskilled">>
- <<set $customSlave.whoreSkill = 0,$customSlave.entertainSkill = 0>>
+ <<set $customSlave.whoreSkills = 0>>
<<CustomSlaveWhoreSkills>>
<</link>>
|
<<link "Skilled">>
- <<set $customSlave.whoreSkill = 15,$customSlave.entertainSkill = 15>>
+ <<set $customSlave.whoreSkills = 15>>
<<CustomSlaveWhoreSkills>>
<</link>>
|
<<link "Expert">>
- <<set $customSlave.whoreSkill = 35,$customSlave.entertainSkill = 35>>
+ <<set $customSlave.whoreSkills = 35>>
<<CustomSlaveWhoreSkills>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "combatskills">
-<<if $customSlave.combatSkill == 0>>Unskilled at combat.
+<<if $customSlave.combatSkills == 0>>Unskilled at combat.
<<else>>Skilled at combat.
<</if>>
</span>
<<link "Unskilled">>
- <<set $customSlave.combatSkill = 0>>
+ <<set $customSlave.combatSkills = 0>>
<<CustomSlaveCombatSkills>>
<</link>>
|
<<link "Skilled">>
- <<set $customSlave.combatSkill = 1>>
+ <<set $customSlave.combatSkills = 1>>
<<CustomSlaveCombatSkills>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "intelligence">
<<if $customSlave.intelligence >= 3>>Brilliant.
<<elseif $customSlave.intelligence == 2>>Very smart..
@@ -631,8 +760,9 @@
<<set $customSlave.intelligence = -3>>
<<CustomSlaveIntelligence>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
<span id = "education">
<<if $customSlave.intelligenceImplant == 1>>Educated.
<<else>>Uneducated.
@@ -647,8 +777,49 @@
<<set $customSlave.intelligenceImplant = 0>>
<<CustomSlaveEducation>>
<</link>>
-<</nobr>>
-<<nobr>>
+
+<br>
+
+<span id = "eyes">
+<<if $customSlave.eyes == 1>>Normal vision.
+<<elseif $customSlave.eyes == -1>>Nearsighted.
+<<else>>Blind.
+<</if>>
+</span>
+<<link "Normal Vision">>
+ <<set $customSlave.eyes = 1>>
+ <<CustomSlaveEyes>>
+<</link>>
+|
+<<link "Nearsighted">>
+ <<set $customSlave.eyes = -1>>
+ <<CustomSlaveEyes>>
+<</link>>
+|
+<<link "Blind">>
+ <<set $customSlave.eyes = -2>>
+ <<CustomSlaveEyes>>
+<</link>>
+
+<br>
+
+<span id = "amputation">
+<<if $customSlave.amp == 1>>Limbless.
+<<else>>Limbed.
+<</if>>
+</span>
+<<link "Limbless">>
+ <<set $customSlave.amp = 1>>
+ <<CustomSlaveAmp>>
+<</link>>
+|
+<<link "Limbed">>
+ <<set $customSlave.amp = 0>>
+ <<CustomSlaveAmp>>
+<</link>>
+
+<br>
+
<span id = "nationality">
Nationality: $customSlave.nationality.
</span>
@@ -665,12 +836,18 @@ Nationality: $customSlave.nationality.
|
<</if>>
<</for>>
-<</nobr>>
-<<nobr>>
+<br><br>
+
+<<link "Reset custom order form">>
+ <<set $customSlave = {age: 19, health: 0, muscles: 0, lips: 15, heightMod: "normal", weight: 0, face: 0, race: "white", skin: 0, boobs: 500, butt: 3, sex: 1, virgin: 0, dick: 2, balls: 2, clit: 0, labia: 0, vaginaLube: 1, analVirgin: 0, skills: 15, whoreSkills: 15, combatSkills: 0, intelligence: 0, intelligenceImplant: 1, nationality: "Stateless", amp: 0, eyes: 1}>>
+ <<goto "Custom Slave">>
+<</link>>
+
+<br><br>
+
<<if $customSlaveOrdered == 1>>
[[Withdraw custom slave order|Main][$customSlaveOrdered = 0]]
<<else>>
[[Post custom slave order|Main][$customSlaveOrdered = 1]]
<</if>>
-<</nobr>>
diff --git a/src/uncategorized/pCoupAttempt.tw b/src/uncategorized/pCoupAttempt.tw
index a746c60f5f8898e92dfdd40d8f4637b8c5f12d9e..9ca8cce7ff269e694b4637d5e1b051236dfc30b7 100644
--- a/src/uncategorized/pCoupAttempt.tw
+++ b/src/uncategorized/pCoupAttempt.tw
@@ -28,7 +28,7 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $rep += 2000>>
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 32>>
- <<for $i = 0; $i < 8; $i++>>
+ <<for _pca = 0; _pca < 8; _pca++>>
<<if random(0,99) < $seeDicks>>
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 32>>
@@ -57,13 +57,13 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $arcologies[0].prosperity = Math.trunc($arcologies[0].prosperity*0.7)>>
<<set $rep += 1000>>
<<if $seeDicks > 50>>
- <<set $j = 5>>
+ <<set _pcaj = 5>>
<<elseif $seeDicks > 0>>
- <<set $j = 2>>
+ <<set _pcaj = 2>>
<<else>>
- <<set $j = 0>>
+ <<set _pcaj = 0>>
<</if>>
- <<for $i = 0; $i < $j; $i++>>
+ <<for _pca = 0; _pca < _pcaj; _pca++>>
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 32>>
<<include "Generate XY Slave">>
@@ -74,13 +74,13 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set _newSlaves.push($activeSlave)>>
<</for>>
<<if $seeDicks > 50>>
- <<set $j = 0>>
+ <<set _pcaj = 0>>
<<elseif $seeDicks > 0>>
- <<set $j = 3>>
+ <<set _pcaj = 3>>
<<else>>
- <<set $j = 5>>
+ <<set _pcaj = 5>>
<</if>>
- <<for $i = 0; $i < $j; $i++>>
+ <<for _pca = 0; _pca < _pcaj; _pca++>>
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 32>>
<<include "Generate XX Slave">>
@@ -104,13 +104,13 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set $arcologies[0].prosperity = Math.trunc($arcologies[0].prosperity*0.5)>>
<<set $rep += 500>>
<<if $seeDicks > 50>>
- <<set $j = 3>>
+ <<set _pcaj = 3>>
<<elseif $seeDicks > 0>>
- <<set $j = 1>>
+ <<set _pcaj = 1>>
<<else>>
- <<set $j = 0>>
+ <<set _pcaj = 0>>
<</if>>
- <<for $i = 0; $i < $j; $i++>>
+ <<for _pca = 0; _pca < _pcaj; _pca++>>
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 32>>
<<include "Generate XY Slave">>
@@ -121,13 +121,13 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<<set _newSlaves.push($activeSlave)>>
<</for>>
<<if $seeDicks > 50>>
- <<set $j = 0>>
+ <<set _pcaj = 0>>
<<elseif $seeDicks > 0>>
- <<set $j = 2>>
+ <<set _pcaj = 2>>
<<else>>
- <<set $j = 3>>
+ <<set _pcaj = 3>>
<</if>>
- <<for $i = 0; $i < $j; $i++>>
+ <<for _pca = 0; _pca < _pcaj; _pca++>>
<<set $activeSlaveOneTimeMinAge = 16>>
<<set $activeSlaveOneTimeMaxAge = 32>>
<<include "Generate XX Slave">>
@@ -196,8 +196,8 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<span id="result">
<<link "Sell your prisoners immediately">>
<<replace "#result">>
- <<for $i = 0; $i < _newSlaves.length; $i++>>
- <<slaveCost _newSlaves[$i]>>
+ <<for _pca = 0; _pca < _newSlaves.length; _pca++>>
+ <<slaveCost _newSlaves[_pca]>>
<<set $cash += $slaveCost>>
<</for>>
Prisoners sold.
@@ -205,8 +205,8 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<</link>> <<if $traitor != 0>>//$traitor.slaveName will not be sold.//<</if>>
<br><<link "Give your prisoners to those who suffered property damage">>
<<replace "#result">>
- <<for $i = 0; $i < _newSlaves.length; $i++>>
- <<slaveCost _newSlaves[$i]>>
+ <<for _pca = 0; _pca < _newSlaves.length; _pca++>>
+ <<slaveCost _newSlaves[_pca]>>
<<set $rep += Math.trunc($slaveCost/10)>>
<</for>>
Prisoners @@.green;given away.@@
@@ -214,8 +214,8 @@ You are awakened in the middle of the night by a jolt that shakes the entire arc
<</link>> <<if $traitor != 0>>//$traitor.slaveName will not be given away.//<</if>>
<br><<link "Enslave all of your prisoners">>
<<replace "#result">>
- <<for $i = 0; $i < _newSlaves.length; $i++>>
- <<AddSlave _newSlaves[$i]>> /* skip New Slave Intro */
+ <<for _pca = 0; _pca < _newSlaves.length; _pca++>>
+ <<AddSlave _newSlaves[_pca]>> /* skip New Slave Intro */
<</for>>
You simply enslave all of the prisoners yourself. You will make them pay for attacking your arcology.
<</replace>>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 518817338e70d41261574d626f5c6cd720561afa..7ccdc2a0b6d4ad1e88ee6a994d4c040b11fcd503 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -1,74 +1,137 @@
:: SE custom slave delivery [nobr]
-<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Enslaving People">>
-
-<<set $customSlaveOrdered = 0>>
-
-<<set $activeSlave = $customSlave>>
+<<set $nextButton = "Continue", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event", $showEncyclopedia = 1, $encyclopedia = "Enslaving People", $customSlaveOrdered = 0>>
+
+<<if $customSlave.age == 4>>
+ <<set $activeSlaveOneTimeMinAge = 3>>
+ <<set $activeSlaveOneTimeMaxAge = 4>>
+<<elseif $customSlave.age == 6>>
+ <<set $activeSlaveOneTimeMinAge = 5>>
+ <<set $activeSlaveOneTimeMaxAge = 6>>
+<<elseif $customSlave.age == 9>>
+ <<set $activeSlaveOneTimeMinAge = 7>>
+ <<set $activeSlaveOneTimeMaxAge = 9>>
+<<elseif $customSlave.age == 12>>
+ <<set $activeSlaveOneTimeMinAge = 10>>
+ <<set $activeSlaveOneTimeMaxAge = 12>>
+<<elseif $customSlave.age == 14>>
+ <<set $activeSlaveOneTimeMinAge = 13>>
+ <<set $activeSlaveOneTimeMaxAge = 14>>
+<<elseif $customSlave.age == 17>>
+ <<set $activeSlaveOneTimeMinAge = 15>>
+ <<set $activeSlaveOneTimeMaxAge = 17>>
+<<elseif $customSlave.age == 19>>
+ <<set $activeSlaveOneTimeMinAge = 18>>
+ <<set $activeSlaveOneTimeMaxAge = 19>>
+<<elseif $customSlave.age == 29>>
+ <<set $activeSlaveOneTimeMinAge = 20>>
+ <<set $activeSlaveOneTimeMaxAge = 29>>
+<<elseif $customSlave.age == 39>>
+ <<set $activeSlaveOneTimeMinAge = 30>>
+ <<set $activeSlaveOneTimeMaxAge = 39>>
+<<else>>
+ <<set $activeSlaveOneTimeMinAge = 40>>
+ <<set $activeSlaveOneTimeMaxAge = $retirementAge-1>>
+<</if>>
+<<set $one_time_age_overrides_pedo_mode = 1>>
+<<set $fixedNationality = $customSlave.nationality>>
+<<if $customSlave.sex == 2>>
+ <<include "Generate XY Slave">>
+ <<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">>
+ <<if $customSlave.virgin == 0>>
+ <<set $activeSlave.vagina = $customSlave.virgin>>
+ <</if>>
+ <<set $activeSlave.labia = $customSlave.labia>>
+ <<set $activeSlave.vaginaLube = $customSlave.vaginaLube>>
+ <<set $activeSlave.vaginalSkill = $customSlave.skills>>
+ <<if $customSlave.sex == 3>>
+ <<set $activeSlave.dick = $customSlave.dick>>
+ <<set $activeSlave.balls = $customSlave.balls>>
+ <<set $activeSlave.scrotum = $activeSlave.balls>>
+ <<set $activeSlave.foreskin = $activeSlave.dick>>
+ <<if $activeSlave.dick == 0>>
+ <<set $activeSlave.clit = $customSlave.clit>>
+ <<set $activeSlave.foreskin = $activeSlave.clit>>
+ <</if>>
+ <<else>>
+ <<set $activeSlave.clit = $customSlave.clit>>
+ <</if>>
+<</if>>
-<<set $activeSlave.ID = $IDNumber>>
-<<set $IDNumber += 1>>
+/* I have no clue what I'm doing here */
+<<if $customSlave.heightMod == "greatly below average">>
+ <<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: -5, spread: .2, limitMult: [0, -30]}))>>
+<<elseif $customSlave.heightMod == "below average">>
+ <<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: -1, limitMult: [0, -5]}))>>
+<<elseif $customSlave.heightMod == "normal">>
+ <<set $activeSlave.height = Math.round(Height.random($activeSlave))>>
+<<elseif $customSlave.heightMod == "above average">>
+ <<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 1, limitMult: [0, 5]}))>>
+<<else>>
+ <<set $activeSlave.height = Math.round(Height.random($activeSlave, {skew: 5, spread: .2, limitMult: [0, 30]}))>>
+<</if>>
+<<if $customSlave.analVirgin == 0>>
+ <<set $activeSlave.anus = $customSlave.analVirgin>>
+<</if>>
+<<set $activeSlave.health = $customSlave.health>>
+<<set $activeSlave.muscles = $customSlave.muscles>>
+<<set $activeSlave.weight = $customSlave.weight>>
+<<set $activeSlave.face = $customSlave.face>>
+<<set $activeSlave.lips = $customSlave.lips>>
+<<set $activeSlave.race = $customSlave.race>>
+<<set $activeSlave.skin = $customSlave.skin>>
+<<set $activeSlave.boobs = $customSlave.boobs>>
+<<set $activeSlave.butt = $customSlave.butt>>
+<<set $activeSlave.analSkill = $customSlave.skills>>
+<<set $activeSlave.oralSkill = $customSlave.skills>>
+<<set $activeSlave.entertainSkill = $customSlave.whoreSkills>>
+<<set $activeSlave.whoreSkill = $customSlave.whoreSkills>>
+<<set $activeSlave.combatSkill = $customSlave.combatSkills>>
+<<set $activeSlave.intelligence = $customSlave.intelligence>>
+<<set $activeSlave.intelligenceImplant = $customSlave.intelligenceImplant>>
+<<set $activeSlave.eyes = $customSlave.eyes>>
+<<set $activeSlave.amp = $customSlave.amp>>
<<set $activeSlave.weekAcquired = $week>>
<<set $activeSlave.origin = "You purchased her by special order.">>
-
-<<RandomizeAttraction>>
-<<set $activeSlave.fetishStrength = random(0,90)>>
-<<set $activeSlave.fetish = either("none", "none", "none", "none", "none", "none", "submissive", "cumslut", "humiliation", "buttslut", "boobs", "pregnancy")>>
-
+<<set $activeSlave.career = "a slave">>
<<set $activeSlave.sexualFlaw = either("none")>>
<<set $activeSlave.behavioralFlaw = either("none")>>
-
<<set $activeSlave.devotion = random(-10,10)>>
<<set $activeSlave.trust = random(-10,10)>>
-<<NationalityToName $activeSlave>>
-<<NationalityToAccent $activeSlave>>
-
<<if $activeSlave.race == "black">>
- <<if $activeSlave.skin == 0>><<set $activeSlave.skin = either("black", "brown", "light brown")>><</if>>
+ <<if $customSlave.skin == 0>><<set $activeSlave.skin = either("black", "brown", "light brown")>><</if>>
<<set $activeSlave.hColor = either("black", "black", "black", "brown")>>
<<set $activeSlave.hStyle = either("shoulder-length", "short", "very short", "shaved bald", "crinkled")>>
<<elseif $activeSlave.race == "white">>
- <<if $activeSlave.skin == 0>><<set $activeSlave.skin = either("pale", "tanned", "fair")>><</if>>
+ <<if $customSlave.skin == 0>><<set $activeSlave.skin = either("pale", "tanned", "fair")>><</if>>
<<set $activeSlave.eyeColor = either("blue", "brown", "green")>>
<<set $activeSlave.hColor = either("black", "blonde", "red", "brown")>>
<<set $activeSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
<<elseif $activeSlave.race == "latina">>
- <<if $activeSlave.skin == 0>><<set $activeSlave.skin = either("olive", "brown", "light brown", "tanned", "fair")>><</if>>
+ <<if $customSlave.skin == 0>><<set $activeSlave.skin = either("olive", "brown", "light brown", "tanned", "fair")>><</if>>
<<set $activeSlave.hColor = either("black", "black", "brown", "brown")>>
<<set $activeSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
<<elseif $activeSlave.race == "asian">>
- <<if $activeSlave.skin == 0>><<set $activeSlave.skin = either("pale", "dark", "light")>><</if>>
+ <<if $customSlave.skin == 0>><<set $activeSlave.skin = either("pale", "dark", "light")>><</if>>
<<set $activeSlave.hColor = either("black")>>
<<set $activeSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
<<elseif ($activeSlave.race == "indo-aryan") || ($activeSlave.race == "malay") || ($activeSlave.race == "pacific islander") || ($activeSlave.race == "amerindian")>>
- <<if $activeSlave.skin == 0>><<set $activeSlave.skin = either("pale", "dark", "light")>><</if>>
+ <<if $customSlave.skin == 0>><<set $activeSlave.skin = either("pale", "dark", "light")>><</if>>
<<set $activeSlave.hColor = either("black")>>
<<set $activeSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
<<elseif ($activeSlave.race == "middle eastern") || ($activeSlave.race == "semitic") || ($activeSlave.race == "southern european")>>
- <<if $activeSlave.skin == 0>><<set $activeSlave.skin = either("pale", "dark", "light")>><</if>>
+ <<if $customSlave.skin == 0>><<set $activeSlave.skin = either("pale", "dark", "light")>><</if>>
<<set $activeSlave.hColor = either("black")>>
<<set $activeSlave.hStyle = either("ass-length", "long", "shoulder-length", "short", "very short", "shaved bald")>>
<</if>>
-<<set $activeSlave.slaveName = $activeSlave.birthName>>
-
-<<if $activeSlave.anus == 0>>
- <<set $activeSlave.analSkill = 0>>
-<</if>>
-
-<<if $activeSlave.balls > 0>>
- <<set $activeSlave.scrotum = $activeSlave.balls >>
-<</if>>
-
-<<if $activeSlave.vagina == -1>>
- <<set $activeSlave.vaginalSkill = 0>>
- <<set $activeSlave.clit = 0>>
- <<set $activeSlave.preg = 0>>
- <<if $activeSlave.fetish == "pregnancy">><<set $activeSlave.fetish = "none">><</if>>
-<</if>>
-
<<slaveCost $activeSlave>>
<<set $slaveCost = $slaveCost*2>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 1d4669f37eeb45ee225b24377d37c1dc15cc3300..f971c09cb7afc4b4690543fb2bac6ad0421616b3 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -1470,15 +1470,15 @@
%/
<<widget "CustomSlaveAge">>
<<replace #age>>
- <<if $customSlave.actualAge < 5>>3-4 years old.
- <<elseif $customSlave.actualAge < 7>>5-6 years old.
- <<elseif $customSlave.actualAge < 10>>7-9 years old.
- <<elseif $customSlave.actualAge < 13>>10-12 years old.
- <<elseif $customSlave.actualAge < 15>>13-14 years old.
- <<elseif $customSlave.actualAge < 18>>15-17 years old.
- <<elseif $customSlave.actualAge < 20>>18-19 years old.
- <<elseif $customSlave.actualAge < 30>>20-29 years old.
- <<elseif $customSlave.actualAge < 40>>30-39 years old.
+ <<if $customSlave.age < 5>>3-4 years old.
+ <<elseif $customSlave.age < 7>>5-6 years old.
+ <<elseif $customSlave.age < 10>>7-9 years old.
+ <<elseif $customSlave.age < 13>>10-12 years old.
+ <<elseif $customSlave.age < 15>>13-14 years old.
+ <<elseif $customSlave.age < 18>>15-17 years old.
+ <<elseif $customSlave.age < 20>>18-19 years old.
+ <<elseif $customSlave.age < 30>>20-29 years old.
+ <<elseif $customSlave.age < 40>>30-39 years old.
<<else>>40+ years old.
<</if>>
<</replace>>
@@ -1527,16 +1527,32 @@
%/
<<widget "CustomSlaveHeight">>
<<replace #height>>
- <<if $customSlave.height < 130>>Tiny.
- <<elseif $customSlave.height < 150>>Petite.
- <<elseif $customSlave.height < 160>>Short.
- <<elseif $customSlave.height < 170>>Average height.
- <<elseif $customSlave.height < 185>>Tall.
+ <<if $customSlave.heightMod == "greatly below average">>Petite.
+ <<elseif $customSlave.heightMod == "below average">>Short.
+ <<elseif $customSlave.heightMod == "normal">>Average height.
+ <<elseif $customSlave.heightMod == "above average">>Tall.
<<else>>Very tall.
<</if>>
<</replace>>
<</widget>>
+/%
+ Call as <<CustomSlaveWeight>>
+%/
+<<widget "CustomSlaveWeight">>
+ <<replace #weight>>
+ <<if $customSlave.weight == -50>>Very thin.
+ <<elseif $customSlave.weight == -15>>thin.
+ <<elseif $customSlave.weight == 0>>Average weight.
+ <<elseif $customSlave.weight == 15>>Chubby.
+ <<elseif $customSlave.weight == 50>>Plump.
+ <<elseif $customSlave.weight == 100>>Fat.
+ <<elseif $customSlave.weight == 150>>Very Fat.
+ <<else>>Immobile.
+ <</if>>
+ <</replace>>
+<</widget>>
+
/%
Call as <<CustomSlaveFace>>
%/
@@ -1576,7 +1592,10 @@
<<replace #boobs>>
<<if $customSlave.boobs == 200>>Flat chest.
<<elseif $customSlave.boobs <= 500>>Healthy breasts.
- <<else>>Big breasts.
+ <<elseif $customSlave.boobs <= 800>>Big breasts.
+ <<elseif $customSlave.boobs <= 1400>>Huge breasts.
+ <<elseif $customSlave.boobs <= 2100>>Giant breasts.
+ <<else>>Massive breasts.
<</if>>
<</replace>>
<</widget>>
@@ -1588,7 +1607,31 @@
<<replace #butt>>
<<if $customSlave.butt == 1>>Flat buttocks.
<<elseif $customSlave.butt < 4>>Healthy buttocks.
- <<else>>Huge buttocks.
+ <<elseif $customSlave.butt < 6>>Huge buttocks.
+ <<else>>Massive buttocks.
+ <</if>>
+ <</replace>>
+<</widget>>
+
+/%
+ Call as <<CustomSlaveSex>>
+%/
+<<widget "CustomSlaveSex">>
+ <<replace #sex>>
+ <<if $customSlave.sex == 1>>Female (cock & balls options not applied).
+ <<elseif $customSlave.sex == 2>>Male (pussy options not applied).
+ <<else>>Futanari (clit options not applied).
+ <</if>>
+ <</replace>>
+<</widget>>
+
+/%
+ Call as <<CustomSlaveVirgin>>
+%/
+<<widget "CustomSlaveVirgin">>
+ <<replace #virgin>>
+ <<if $customSlave.virgin == 0>>Vaginal virgin.
+ <<else>>Virginity not important.
<</if>>
<</replace>>
<</widget>>
@@ -1621,6 +1664,45 @@
<</replace>>
<</widget>>
+/%
+ Call as <<CustomSlaveBalls>>
+%/
+<<widget "CustomSlaveBalls">>
+ <<replace #balls>>
+ <<if $customSlave.balls == 0>>No testicles.
+ <<elseif $customSlave.balls == 2>>Small testicles.
+ <<elseif $customSlave.balls == 4>>Large testicles.
+ <<else>>Huge Balls.
+ <</if>>
+ <</replace>>
+<</widget>>
+
+/%
+ Call as <<CustomSlaveClit>>
+%/
+<<widget "CustomSlaveClit">>
+ <<replace #balls>>
+ <<if $customSlave.clit == 0>>Normal clitoris.
+ <<elseif $customSlave.clit == 1>>Big clitoris.
+ <<elseif $customSlave.clit == 3>>Enormous clitoris.
+ <<else>>Pseudophallus.
+ <</if>>
+ <</replace>>
+<</widget>>
+
+/%
+ Call as <<CustomSlaveLabia>>
+%/
+<<widget "CustomSlaveLabia">>
+ <<replace #labia>>
+ <<if $customSlave.labia == 0>>Normal labia.
+ <<elseif $customSlave.labia == 1>>big labia.
+ <<elseif $customSlave.labia == 2>>Huge labia.
+ <<else>>Enormous labia.
+ <</if>>
+ <</replace>>
+<</widget>>
+
/%
Call as <<CustomSlaveClitBalls>>
%/
@@ -1683,6 +1765,29 @@
<</replace>>
<</widget>>
+/%
+ Call as <<CustomSlaveLube>>
+%/
+<<widget "CustomSlaveLube">>
+ <<replace #labia>>
+ <<if $customSlave.vaginaLube == 0>>Dry Vagina.
+ <<elseif $customSlave.vaginaLube == 1>>Wet Vagina.
+ <<else>>Sopping wet vagina.
+ <</if>>
+ <</replace>>
+<</widget>>
+
+/%
+ Call as <<CustomSlaveAnalVirginity>>
+%/
+<<widget "CustomSlaveAnalVirginity">>
+ <<replace #anus>>
+ <<if $customSlave.analVirgin == 0>>Anal virgin.
+ <<else>>Anal virginity is not important.
+ <</if>>
+ <</replace>>
+<</widget>>
+
/%
Call as <<CustomSlaveAnus>>
%/
@@ -1699,10 +1804,9 @@
%/
<<widget "CustomSlaveSkills">>
<<replace #skills>>
- <<if $customSlave.analSkill <= 10>>Sexually unskilled.
- <<elseif $customSlave.analSkill <= 30>>Basic skills.
- <<elseif $customSlave.analSkill <= 60>>Sexually skilled.
- <<else>>Sexual expert.
+ <<if $customSlave.skills <= 10>>Sexually unskilled.
+ <<elseif $customSlave.skills <= 15>>Basic sex skills.
+ <<else>>Sexually skilled.
<</if>>
<</replace>>
<</widget>>
@@ -1712,10 +1816,9 @@
%/
<<widget "CustomSlaveWhoreSkills">>
<<replace #whoreskills>>
- <<if $customSlave.whoreSkill <= 10>>Unskilled at prostitution and entertainment.
- <<elseif $customSlave.whoreSkill <= 30>>Basic prostitution and entertainment skills.
- <<elseif $customSlave.whoreSkill <= 60>>Skilled at prostitution and entertainment.
- <<else>>Prostitution and entertainment expert.
+ <<if $customSlave.whoreSkills <= 10>>Unskilled at prostitution and entertainment.
+ <<elseif $customSlave.whoreSkills <= 15>>Basic prostitution and entertainment skills.
+ <<else>>Skilled at prostitution and entertainment.
<</if>>
<</replace>>
<</widget>>
@@ -1725,7 +1828,7 @@
%/
<<widget "CustomSlaveCombatSkills">>
<<replace #combatskills>>
- <<if $customSlave.combatSkill == 0>>Unskilled at combat.
+ <<if $customSlave.combatSkills == 0>>Unskilled at combat.
<<else>>Skilled at combat.
<</if>>
<</replace>>
@@ -1767,6 +1870,29 @@
<</replace>>
<</widget>>
+/%
+ Call as <<CustomSlaveEyes>>
+%/
+<<widget "CustomSlaveEyes">>
+ <<replace #eyes>>
+ <<if $customSlave.eyes == 1>>Normal vision.
+ <<elseif $customSlave.eyes == -1>>Nearsighted.
+ <<else>>Blind.
+ <</if>>
+ <</replace>>
+<</widget>>
+
+/%
+ Call as <<CustomSlaveAmp>>
+%/
+<<widget "CustomSlaveAmp">>
+ <<replace #amputation>>
+ <<if $customSlave.amp == 1>>Limbless.
+ <<else>>Limbed.
+ <</if>>
+ <</replace>>
+<</widget>>
+
/%
Call as <<GenerateMarketSlave 'market' ['arcology']>>
If $args[0] is undefined, will generate a kidnapper's market slave.