From d3b2cbf7702dd1fa38c7f5f4bd0eb4689bfddc10 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Sat, 18 Aug 2018 17:18:06 -0500
Subject: [PATCH] PupilSclera
---
player variables documentation - Pregmod.txt | 8 +-
slave variables documentation - Pregmod.txt | 22 +--
src/cheats/mod_EditSlaveCheat.tw | 14 +-
src/cheats/mod_editSlaveCheatNew.tw | 144 +++++++++++++------
src/npc/startingGirls/moreCustomOptions.tw | 2 +
src/uncategorized/BackwardsCompatibility.tw | 38 +++--
src/uncategorized/salon.tw | 58 +++++---
src/uncategorized/slaveInteract.tw | 2 +-
src/utility/descriptionWidgetsStyle.tw | 6 +-
src/utility/slaveCreationWidgets.tw | 2 +-
10 files changed, 196 insertions(+), 100 deletions(-)
diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index 260574abde0..59c033ddc82 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -292,14 +292,14 @@ origEyeColor:
your original eye color
accepts string
-eyeShape:
+pupil:
-your eye shape
+your pupil shape
accepts string
-origEyeShape:
+sclerae:
-your original eye shape
+your sclerae color
accepts string
hColor:
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index c172b104f51..d744f6b94ac 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -1095,6 +1095,7 @@ eyeColor:
eye color
accepts string
+
"blue"
"black"
"brown"
@@ -1108,11 +1109,10 @@ accepts string
"amber"
"red"
-origEyeShape:
-
-slave's original eye shape, defaults to their initial eye shape.
+pupil:
-eyeShape:
+shape of slave pupils
+accepts string
"catlike"
"serpent-like"
@@ -1125,12 +1125,14 @@ eyeShape:
"bright"
"teary"
"vacant"
-"round"
-"upturned"
-"downturned"
-"close-set"
-"wide-set"
-"deep-set"
+"circular"
+"star-shaped"
+"goat-like"
+
+sclerae:
+
+color of slave sclerae
+accepts string
eyeWear:
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 7be911b207f..a57b8df1e95 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -242,9 +242,21 @@ Custom pubic hair color: <<textbox "$activeSlave.pubicHColor" $activeSlave.pubic
<br><br>
-''Her eyes are $activeSlave.eyeColor in color''
+''Her eyes are currently $activeSlave.eyeColor in color''
Custom eye color: <<textbox "$activeSlave.eyeColor" $activeSlave.eyeColor>>
+<br>
+''Her eyes are originally $activeSlave.origEye in color''
+Custom eye color: <<textbox "$activeSlave.origEye" $activeSlave.origEye>>
+
+<br>
+''Her pupils are $activeSlave.pupil in shape''
+Custom pupil shape: <<textbox "$activeSlave.pupil" $activeSlave.pupil>>
+
+<br>
+''Her sclerae are $activeSlave.sclerae in color''
+Custom sclera color: <<textbox "$activeSlave.sclerae" $activeSlave.sclerae>>
+
<br>
''Her vision is (-1: nearsighted, 1: normal): $activeSlave.eyes''
<br>Eyes: <<textbox "$activeSlave.eyes" $activeSlave.eyes>>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 0349445dbc6..e47e98db98f 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -76,6 +76,24 @@
<</link>>
<</widget>>
+<<widget POptions>>
+ <<link "[$args[0]]">>
+ <<replace #ppil>>
+ <<set $tempSlave.origEye = $args[0]>>
+ <<set _ppilR = 0>>
+ <</replace>>
+ <</link>>
+<</widget>>
+
+<<widget ScOptions>>
+ <<link "[$args[0]]">>
+ <<replace #sclr>>
+ <<set $tempSlave.origEye = $args[0]>>
+ <<set _sclrR = 0>>
+ <</replace>>
+ <</link>>
+<</widget>>
+
<<widget NameTab>>
<br>''Legal status:''<br>
<<if $tempSlave.indenture == -1>>
@@ -1196,7 +1214,7 @@
<br>
- ''Skin color: (@@.yellow;$tempSlave.skin@@)''
+ ''Skin Color: (@@.yellow;$tempSlave.skin@@)''
<<textbox "$tempSlave.skin" $tempSlave.skin>>
<br>
<<radiobutton "$tempSlave.skin" "pure white">> Pure White
@@ -1593,14 +1611,7 @@
<<E1Options "white" >>
<<E1Options "pink" >>
<<E1Options "amber" >>
- <br>
<<E1Options "red" >>
- <<E1Options "catlike" >>
- <<E1Options "serpent-like" >>
- <<E1Options "devilish" >>
- <<E1Options "demonic" >>
- <<E1Options "hypnotic" >>
- <<E1Options "heart-shaped" >>
<br>
<</replace>>
<<else>>
@@ -1628,14 +1639,7 @@
<<E2Options "white" #ecol2 _ecol2R >>
<<E2Options "pink" #ecol2 _ecol2R >>
<<E2Options "amber" #ecol2 _ecol2R >>
- <br>
<<E2Options "red" #ecol2 _ecol2R >>
- <<E2Options "catlike" #ecol2 _ecol2R >>
- <<E2Options "serpent-like" #ecol2 _ecol2R >>
- <<E2Options "devilish" #ecol2 _ecol2R >>
- <<E2Options "demonic" #ecol2 _ecol2R >>
- <<E2Options "hypnotic" #ecol2 _ecol2R >>
- <<E2Options "heart-shaped" #ecol2 _ecol2R >>
<br>
<</replace>>
<<else>>
@@ -1648,6 +1652,64 @@
<br>Custom eye color: <<textbox "$tempSlave.origEye" $tempSlave.origEye>>
<<radiobutton "$tempSlave.origEye" "implant">> Artificial Eyes
<br><br>
+ ''Her pupils are @@.yellow;$tempSlave.pupil@@ in shape''
+ <<link "Pupil Shape">>
+ <<if (ndef _ppilR) || (_ppilR == 0) >>
+ <<replace "#ppil">>
+ <<set _ppilR = 1>>
+ <br>
+ <<POptions "circular" >>
+ <<POptions "catlike" >>
+ <<POptions "serpent-like" >>
+ <<POptions "devilish" >>
+ <<POptions "demonic" >>
+ <<POptions "hypnotic" >>
+ <<POptions "heart-shaped" >>
+ <<POptions "wide-eyed" >>
+ <<POptions "almond-shaped" >>
+ <<POptions "bright" >>
+ <<POptions "teary" >>
+ <<POptions "vacant" >>
+ <<POptions "star-shaped" >>
+ <br>
+ <</replace>>
+ <<else>>
+ <<replace "#ppil">>
+ <<set _ppilR = 0>>
+ <</replace>>
+ <</if>>
+ <</link>>
+ <span id=ppil></span>
+ <br>Custom pupil shape: <<textbox "$tempSlave.pupil" $tempSlave.pupil>>
+ <br><br>
+ ''Her sclerae are @@.yellow;$tempSlave.sclerae@@ in color''
+ <<link "Sclera Colors">>
+ <<if (ndef _sclrR) || (_sclrR == 0) >>
+ <<replace "#sclr">>
+ <<set _sclrR = 1>>
+ <br>
+ <<ScOptions "white" >>
+ <<ScOptions "blue" >>
+ <<ScOptions "black" >>
+ <<ScOptions "brown" >>
+ <<ScOptions "green" >>
+ <<ScOptions "turquoise" >>
+ <<ScOptions "sky-blue" >>
+ <<ScOptions "pale-grey" >>
+ <<ScOptions "pink" >>
+ <<ScOptions "amber" >>
+ <<ScOptions "red" >>
+ <br>
+ <</replace>>
+ <<else>>
+ <<replace "#sclr">>
+ <<set _sclrR = 0>>
+ <</replace>>
+ <</if>>
+ <</link>>
+ <span id=sclr></span>
+ <br>Custom sclera color: <<textbox "$tempSlave.sclerae" $tempSlave.sclerae>>
+ <br><br>
''Her vision is :''
<<switch $tempSlave.eyes>>
<<case -2>>@@.yellow;Blind@@
@@ -3402,7 +3464,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 1>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<NameTab>>
<<FamilyTab>>
<<NationalTab>>
@@ -3443,7 +3505,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<NameTab>>
<</replace>>
<<else>>
@@ -3461,7 +3523,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<FamilyTab>>
<</replace>>
<<else>>
@@ -3479,7 +3541,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<NationalTab>>
<</replace>>
<<else>>
@@ -3497,7 +3559,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<AgeTab>>
<</replace>>
<<else>>
@@ -3515,7 +3577,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<DevoTab>>
<</replace>>
<<else>>
@@ -3533,7 +3595,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<FaceTab>>
<</replace>>
<<else>>
@@ -3551,7 +3613,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<HairTab>>
<</replace>>
<<else>>
@@ -3569,7 +3631,7 @@
<<set _descR = 0>><<set _eyesR = 1>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<EyesTab>>
<</replace>>
<<else>>
@@ -3587,7 +3649,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 1>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<MouthTab>>
<</replace>>
<<else>>
@@ -3605,7 +3667,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 1>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<BodyTab>>
<</replace>>
<<else>>
@@ -3623,7 +3685,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 1>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<BellyTab>>
<</replace>>
<<else>>
@@ -3641,7 +3703,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 1>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<BreastsTab>>
<</replace>>
<<else>>
@@ -3659,7 +3721,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 1>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<ButtTab>>
<</replace>>
<<else>>
@@ -3677,7 +3739,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 1>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<VagTab>>
<</replace>>
<<else>>
@@ -3695,7 +3757,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 1>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<PenisTab>>
<</replace>>
<<else>>
@@ -3713,7 +3775,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 1>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<SkillsTab>>
<</replace>>
<<else>>
@@ -3731,7 +3793,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 1>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<InteliTab>>
<</replace>>
<<else>>
@@ -3749,7 +3811,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 1>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<FetSexTab>>
<</replace>>
<<else>>
@@ -3767,7 +3829,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 1>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<FlaQuiTab>>
<</replace>>
<<else>>
@@ -3785,7 +3847,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 1>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<StatisticTab>>
<</replace>>
<<else>>
@@ -3803,7 +3865,7 @@
<<set _descR = 1>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<br>
<<PrestTab>>
<</replace>>
@@ -3822,7 +3884,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 1>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<TattoTab>>
<</replace>>
<<else>>
@@ -3840,7 +3902,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 0>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 1>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<BrandTab>>
<</replace>>
<<else>>
@@ -3858,7 +3920,7 @@
<<set _descR = 0>><<set _eyesR = 0>><<set _mouthR = 0>><<set _bodyR = 0>><<set _titsR = 0>><<set _buttR = 0>><<set _vagR = 0>>
<<set _dickR = 0>><<set _skillsR = 0>><<set _intR = 0>><<set _sexR = 0>><<set _flawR = 0>><<set _tatsR = 0>><<set _piercR = 1>>
<<set _sAllR = 0>><<set _natR = 0>><<set _carR = 0>><<set _bellyR = 0>><<set _useR = 0>><<set _brandR = 0>><<set _hcol4R = 0>>
- <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>>
+ <<set _hcol3R = 0>><<set _hcol2R = 0>><<set _hcol1R = 0>><<set _ecol1R = 0>><<set _ecol2R = 0>><<set _ppilR = 0>><<set _sclrR = 0>>
<<PiercTab>>
<</replace>>
<<else>>
@@ -3872,6 +3934,6 @@
<span id="spot"></span><br>
/* ------------------------------------------------------------------------- Used Variables: ------------------------------------------------------------------------------------------------*/
/*.visualAge .ageImplant .birthWeek .health .chem .addict .devotion .oldDevotion .trust .oldTrust .face .faceShape .faceImplant .markings .bald .hLength .hStyle .hColor .origHColor */
-/*.pubicHColor .pubicHStyle .underArmHColor .underArmHStyle .eyeColor .origEye .eyes .lips .lipsImplant .teeth .voiceImplant .voice .accent .genes .amp .fuckdoll .muscles .weight */
+/*.pubicHColor .pubicHStyle .underArmHColor .underArmHStyle .eyeColor .origEye .eyes .hears .lips .lipsImplant .teeth .voiceImplant .voice .accent .genes .amp .fuckdoll .muscles .weight */
/*.waist .height .heightImplant .shoulders .shouldersImplant .hips .hipsImplant .bellyImplant .bellySag .burst .boobs .boobsImplant .boobsImplantType .lactation .boobShape .nipples .areolae */
/*.butt .buttImplant .anus .mpreg .vagina .vaginaLube .clit .labia .pubertyXX .pubertyAgeXX .crevixImplant .csec .breedingMark .ovaries .preg .pregType .pregSource .dick .foreskin .balls */
diff --git a/src/npc/startingGirls/moreCustomOptions.tw b/src/npc/startingGirls/moreCustomOptions.tw
index 8edf14a7ab0..2e3821f6327 100644
--- a/src/npc/startingGirls/moreCustomOptions.tw
+++ b/src/npc/startingGirls/moreCustomOptions.tw
@@ -20,6 +20,8 @@
<br>''Ethnicity:'' <<textbox "$activeSlave.race" $activeSlave.race "More customization options">> //This will not apply phenotypes.//
<br>''Hair color:'' <<textbox "$activeSlave.hColor" $activeSlave.hColor "More customization options">> //This will also set pubic and underarm hair color.//
<br>''Eye color:'' <<textbox "$activeSlave.eyeColor" $activeSlave.eyeColor "More customization options">>
+<br>''Pupil shape:'' <<textbox "$activeSlave.pupil" $activeSlave.pupil "More customization options">>
+<br>''Sclera color:'' <<textbox "$activeSlave.sclerae" $activeSlave.sclerae "More customization options">>
<br>Custom tattoo: <<textbox "$activeSlave.customTat" $activeSlave.customTat "More customization options">> //Use complete, capitalized and punctuated sentences.//
<br>Custom origin story: <<textbox "$activeSlave.origin" $activeSlave.origin "More customization options">> //Use complete, capitalized and punctuated sentences.//
<br>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 5a365c8b1b0..91820e96c4e 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -2452,53 +2452,49 @@ Setting missing slave variables:
<</if>>
<</if>>
-<<if ndef _Slave.eyeShape>>
+<<if ndef _Slave.pupil>>
<<if _Slave.eyeColor == "catlike">>
- <<set _Slave.eyeShape = "catlike">>
+ <<set _Slave.pupil = "catlike">>
<<set _Slave.eyeColor = "brown">>
<<elseif _Slave.eyeColor == "serpent-like">>
- <<set _Slave.eyeShape = "serpent-like">>
+ <<set _Slave.pupil = "serpent-like">>
<<set _Slave.eyeColor = "brown">>
<<elseif _Slave.eyeColor == "devilish">>
- <<set _Slave.eyeShape = "devilish">>
+ <<set _Slave.pupil = "devilish">>
<<set _Slave.eyeColor = "brown">>
<<elseif _Slave.eyeColor == "demonic">>
- <<set _Slave.eyeShape = "demonic">>
+ <<set _Slave.pupil = "demonic">>
<<set _Slave.eyeColor = "brown">>
<<elseif _Slave.eyeColor == "hypnotic">>
- <<set _Slave.eyeShape = "hypnotic">>
- <<set _Slave.eyeColor = "brown">>
+ <<set _Slave.pupil = "hypnotic">>
<<set _Slave.eyeColor = "brown">>
<<elseif _Slave.eyeColor == "heart-shaped">>
- <<set _Slave.eyeShape = "heart-shaped">>
+ <<set _Slave.pupil = "heart-shaped">>
<<set _Slave.eyeColor = "brown">>
<<elseif _Slave.eyeColor == "wide-eyed">>
- <<set _Slave.eyeShape = "wide-eyed">>
+ <<set _Slave.pupil = "wide-eyed">>
<<set _Slave.eyeColor = "brown">>
<<elseif _Slave.eyeColor == "almond-shaped">>
- <<set _Slave.eyeShape = "almond-shaped">>
+ <<set _Slave.pupil = "almond-shaped">>
<<set _Slave.eyeColor = "brown">>
<<elseif _Slave.eyeColor == "bright">>
- <<set _Slave.eyeShape = "bright">>
+ <<set _Slave.pupil = "bright">>
<<set _Slave.eyeColor = "brown">>
<<elseif _Slave.eyeColor == "teary">>
- <<set _Slave.eyeShape = "teary">>
+ <<set _Slave.pupil = "teary">>
<<set _Slave.eyeColor = "brown">>
<<elseif _Slave.eyeColor == "vacant">>
- <<set _Slave.eyeShape = "vacant">>
- <<set _Slave.eyeColor = "brown">>
- <<elseif _Slave.eyeColor == "empty">>
- <<set _Slave.eyeShape = "empty">>
+ <<set _Slave.pupil = "vacant">>
<<set _Slave.eyeColor = "brown">>
<<else>>
- <<if _Slave.race == "asian" || _Slave.race == "malay" || _Slave.race == "pacific islander">>
- <<set _Slave.eyeShape = almond-shaped">
- <<else>>
- <<set _Slave.eyeShape = "round">>
- <</if>>
+ <<set _Slave.pupil = "circular">>
<</if>>
<</if>>
+<<if ndef _Slave.sclerae>>
+ <<set _Slave.sclerae = "white">>
+<</if>>
+
<<if ndef _Slave.eyewear>>
<<set _Slave.eyewear = "none">>
<</if>>
diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw
index fc7caf217e3..f0a1eb0706b 100644
--- a/src/uncategorized/salon.tw
+++ b/src/uncategorized/salon.tw
@@ -23,7 +23,12 @@
<<if $activeSlave.eyes > -3>> /* Begin eye check */
<br><br>
-
+<<if $activeSlave.pupil == "">>
+ <<set $activeSlave.pupil = "circular">>
+<</if>>
+<<if $activeSlave.sclerae == "">>
+ <<set $activeSlave.sclerae = "white">>
+<</if>>
<<if $activeSlave.origEye == "implant">>
$He has artificial eyes, and $he
<<if $activeSlave.eyewear == "none">>
@@ -91,7 +96,7 @@
<</if>>
<br>
- Color:
+ Iris:
[[Blue|Salon][$artificialEyeColor = "blue"]]
| [[Black|Salon][$artificialEyeColor = "black"]]
| [[Brown|Salon][$artificialEyeColor = "brown"]]
@@ -104,10 +109,13 @@
| [[Pink|Salon][$artificialEyeColor = "pink"]]
| [[Amber|Salon][$artificialEyeColor = "amber"]]
| [[Red|Salon][$artificialEyeColor = "red"]]
+ | [[Yellow|Salon][$artificialEyeColor = "yellow"]]
+ | [[Orange|Salon][$artificialEyeColor = "orange"]]
<br>
- Shape:
- [[Catlike|Salon][$artificialEyeShape = "catlike"]]
+ Pupil:
+ [[Circular|Salon][$artificialEyeShape = "circular"]]
+ | [[Catlike|Salon][$artificialEyeShape = "catlike"]]
| [[Serpent-Like|Salon][$artificialEyeShape = "serpent-like"]]
| [[Devilish|Salon][$artificialEyeShape = "devilish"]]
| [[Demonic|Salon][$artificialEyeShape = "demonic"]]
@@ -118,17 +126,31 @@
| [[Bright|Salon][$artificialEyeShape = "bright"]]
| [[Teary|Salon][$artificialEyeShape = "teary"]]
| [[Vacant|Salon][$artificialEyeShape = "vacant"]]
-
- <<if $artificialEyeColor == "" && $artificialEyeShape != "">>
- <br>
- [[Give|Salon][$activeSlave.eyeShape = ($artificialEyeShape), $cash -= $modCost, $artificialEyeColor = "", $artificialEyeShape = ""]] her $artificialEyeShape $artificialEyeColor <<if $activeSlave.origEye == "none">>glass eyes<<else>>lenses<</if>>? //This will be applied in addition to eyewear choices.//
- <<if $artificialEyeColor != "" && $artificialEyeShape == "">>
- <br>
- [[Give|Salon][$activeSlave.eyeColor = ($artificialEyeColor), $cash -= $modCost, $artificialEyeColor = "", $artificialEyeShape = ""]] her $artificialEyeShape $artificialEyeColor <<if $activeSlave.origEye == "none">>glass eyes<<else>>lenses<</if>>? //This will be applied in addition to eyewear choices.//
- <<elseif $artificialEyeColor != "" || $artificialEyeShape != "">>
- <br>
- [[Give|Salon][$activeSlave.eyeColor = ($artificialEyeColor), $activeSlave.eyeShape = ($artificialEyeShape), $cash -= $modCost, $artificialEyeColor = "", $artificialEyeShape = ""]] her $artificialEyeShape $artificialEyeColor <<if $activeSlave.origEye == "none">> glass eyes<<else>>lenses<</if>>? //This will be applied in addition to eyewear choices.//
+ | [[Star-Shaped|Salon][$artificialEyeShape = "star-shaped"]]
+ | [[Goat-Like|Salon][$artificialEyeShape = "goat-like"]]
+
+ <br>
+ Sclera:
+ [[White|Salon][$artificialEyeFill = "white"]]
+ | [[Blue|Salon][$artificialEyeFill = "blue"]]
+ | [[Black|Salon][$artificialEyeFill = "black"]]
+ | [[Brown|Salon][$artificialEyeFill = "brown"]]
+ | [[Green|Salon][$artificialEyeFill = "green"]]
+ | [[Turquoise|Salon][$artificialEyeFill = "turquoise"]]
+ | [[Sky-Blue|Salon][$artificialEyeFill = "sky-blue"]]
+ | [[Hazel|Salon][$artificialEyeFill = "hazel"]]
+ | [[Pale-Grey|Salon][$artificialEyeFill = "pale-grey"]]
+ | [[Pink|Salon][$artificialEyeFill = "pink"]]
+ | [[Amber|Salon][$artificialEyeFill = "amber"]]
+ | [[Red|Salon][$artificialEyeFill = "red"]]
+ | [[Yellow|Salon][$artificialEyeFill = "yellow"]]
+ | [[Orange|Salon][$artificialEyeFill = "orange"]]
+
+ <<if $artificialEyeColor != "">>
+ <br>
+ [[Give|Salon][$activeSlave.eyeColor = ($artificialEyeColor),$activeSlave.pupil = ($artificialEyeShape),$activeSlave.sclerae = ($artificialEyeFill),$cash -= $modCost, $artificialEyeColor = "", $artificialEyeShape = "", $artificialEyeFill = ""]] $him $artificialEyeColor <<if $activeSlave.origEye == "none">>glass eyes<<else>>lenses<</if>><<if $artificialEyeShape != "" || $artificialEyeFill != "">> with <<if $artificialEyeShape != "" >>$artificialEyeShape pupils<</if>><<if $artificialEyeShape != "" && $artificialEyeFill != "">> and <</if>><<if $artificialEyeFill != "" >>$artificialEyeFill sclerae<</if>><</if>>? //This will be applied in addition to eyewear choices.//
<</if>>
+
<<else>>
$His eyes are artificial and can't be set here.
<</if>>
@@ -168,7 +190,7 @@
<<if $activeSlave.earwear == "none">>
has nothing in $his ears.
<<else>>
- is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.eyewear = "none"]]
+ is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]]
<</if>>
//Muffling options are annoying and impede performance on some assignments.//
<br>
@@ -201,7 +223,7 @@
<<if $activeSlave.origHColor != $activeSlave.hColor>>
[[Restore natural color|Salon][$activeSlave.hColor = $activeSlave.origHColor]] or //choose a new one://
<<else>>
- //Choose a dye color before dyeing her hair://
+ //Choose a dye color before dyeing $his hair://
<</if>>
<br>
Colors:
@@ -250,7 +272,7 @@
<<if $primaryHairColor != 0>>
<br>
- [[Dye her hair|Salon][$activeSlave.hColor = ($primaryHairColor + $secondaryHairColor),$cash -= $modCost, $primaryHairColor = 0, $secondaryHairColor = ""]] $primaryHairColor $secondaryHairColor now?
+ [[Dye $his hair|Salon][$activeSlave.hColor = ($primaryHairColor + $secondaryHairColor),$cash -= $modCost, $primaryHairColor = 0, $secondaryHairColor = ""]] $primaryHairColor $secondaryHairColor now?
<</if>>
<br><br>$His $activeSlave.hStyle hair is <<= lengthToEitherUnit($activeSlave.hLength)>> long. //General hairstyles will conform to hair length and clothing choices.//
@@ -400,7 +422,7 @@
<<if $activeSlave.hStyle != "bald">>
Set wig style:
<<else>>
- Give her a wig:
+ Give $him a wig:
<</if>>
[[Ponytail|Salon][$activeSlave.hStyle = "ponytail",$cash -= $modCost]]
| [[Bun|Salon][$activeSlave.hStyle = "bun",$cash -= $modCost]]
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 23cacae55b6..d4eae737ca7 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -52,7 +52,7 @@
<br><br>__Take slave to another room:__
[[Wardrobe|Wardrobe Use][$degradation = 0]]
-| [[Auto salon|Salon][$degradation = 0,$primaryHairColor = "",$secondaryHairColor = "",$artificialEyeColor = "",$artificialEyeShape = "",$tattooChoice = "",$piercingLevel = ""]]
+| [[Auto salon|Salon][$degradation = 0,$primaryHairColor = "",$secondaryHairColor = "",$artificialEyeColor = "",$artificialEyeShape = "",$artificialEyeFill = "",$tattooChoice = "",$piercingLevel = ""]]
| [[Body mod studio|Body Modification][$degradation = 0, $tattooChoice = undefined]]
| [[Remote surgery|Remote Surgery][$degradation = 0]]
<<if $cyberMod == 1>>| [[Configure cybernetics|cyberConfig][$temp = 0]]<</if>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 35b2cf9bdac..9a9f8da3409 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -2652,7 +2652,7 @@ $His
<</if>> /* CLOSES EYEWEAR */
<<if ($activeSlave.earwear == "hearing aids") || ($activeSlave.earwear == "muffling ear plugs") || ($activeSlave.earwear == "deafening ear plugs")>>
In $his ears, $he wears
- <<if $activeSlave.eyewear == "hearing aids">>
+ <<if $activeSlave.earwear == "hearing aids">>
a pair of hearing aids,
<<if $activeSlave.hears > -1>>
which do little to correct $his already adequate hearing.
@@ -2661,7 +2661,7 @@ $His
<<elseif $activeSlave.hears < -1>>
which, due to $his @@.red;deafness@@, are useless.
<</if>>
- <<elseif $activeSlave.eyewear == "muffling ear plugs">>
+ <<elseif $activeSlave.earwear == "muffling ear plugs">>
a pair of small foam ear plugs,
<<if $activeSlave.hears > -1>>
which noticeably @@.yellow;muffle $his hearing@@.
@@ -2670,7 +2670,7 @@ $His
<<elseif $activeSlave.hears < -1>>
which are pointless, as $he is totally @@.red;deaf@@.
<</if>>
- <<elseif $activeSlave.eyewear == "deafening ear plugs">>
+ <<elseif $activeSlave.earwear == "deafening ear plugs">>
a pair of large silicone ear plugs,
<<if $activeSlave.hears > -1>>
which @@.red;nullify $his sense of hearing@@.
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index faa430c948b..f28e9eca46a 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -6,7 +6,7 @@
Called from Gen XX, Gen XY, CheatMode DB, InitNationalities.
%/
<<widget "BaseSlave">>
- <<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", possessivePronoun: "hers", objectReflexive: "herself", object: "her", noun: "girl", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFeed: 0, pornFame: 0, pornFameSpending: 0, pornPrestige: 0, pornPrestigeDesc: 0, pornFameType: "none", pornFocus: "none", pornTypeGeneral: 0, pornTypeFuckdoll: 0, pornTypeRape: 0, pornTypePreggo: 0, pornTypeBBW: 0, pornTypeGainer: 0, pornTypeStud: 0, pornTypeLoli: 0, pornTypeDeepThroat: 0, pornTypeStruggleFuck: 0, pornTypePainal: 0, pornTypeTease: 0, pornTypeRomantic: 0, pornTypePervert: 0, pornTypeCaring: 0, pornTypeUnflinching: 0, pornTypeSizeQueen: 0, pornTypeNeglectful: 0, pornTypeCumAddict: 0, pornTypeAnalAddict: 0, pornTypeAttentionWhore: 0, pornTypeBreastGrowth: 0, pornTypeAbusive: 0, pornTypeMalicious: 0, pornTypeSelfHating: 0, pornTypeBreeder: 0, pornTypeSub: 0, pornTypeCumSlut: 0, pornTypeAnal: 0, pornTypeHumiliation: 0, pornTypeBoobs: 0, pornTypeDom: 0, pornTypeSadist: 0, pornTypeMasochist: 0, pornTypePregnancy: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, pregAdaptation: 50, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", origBodyOwnerID: 0, death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, inducedNCS: 0, NCSyouthening: 0}>>
+ <<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", possessivePronoun: "hers", objectReflexive: "herself", object: "her", noun: "girl", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFeed: 0, pornFame: 0, pornFameSpending: 0, pornPrestige: 0, pornPrestigeDesc: 0, pornFameType: "none", pornFocus: "none", pornTypeGeneral: 0, pornTypeFuckdoll: 0, pornTypeRape: 0, pornTypePreggo: 0, pornTypeBBW: 0, pornTypeGainer: 0, pornTypeStud: 0, pornTypeLoli: 0, pornTypeDeepThroat: 0, pornTypeStruggleFuck: 0, pornTypePainal: 0, pornTypeTease: 0, pornTypeRomantic: 0, pornTypePervert: 0, pornTypeCaring: 0, pornTypeUnflinching: 0, pornTypeSizeQueen: 0, pornTypeNeglectful: 0, pornTypeCumAddict: 0, pornTypeAnalAddict: 0, pornTypeAttentionWhore: 0, pornTypeBreastGrowth: 0, pornTypeAbusive: 0, pornTypeMalicious: 0, pornTypeSelfHating: 0, pornTypeBreeder: 0, pornTypeSub: 0, pornTypeCumSlut: 0, pornTypeAnal: 0, pornTypeHumiliation: 0, pornTypeBoobs: 0, pornTypeDom: 0, pornTypeSadist: 0, pornTypeMasochist: 0, pornTypePregnancy: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", pupil: "circular", sclerae: "white", eyewear: "none", hears: 0, earwear: "none", earImplant: 0, origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, pregAdaptation: 50, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", origBodyOwnerID: 0, death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, skillS: 0, skillE: 0, skillW: 0, tankBaby: 0, inducedNCS: 0, NCSyouthening: 0}>>
<</widget>>
/%
--
GitLab