diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt index fd738724ae3fe01aadbdc3fb6d073cca9e350d8f..d74d8091844a600ac3b2f9152b4222fbe378e327 100644 --- a/player variables documentation - Pregmod.txt +++ b/player variables documentation - Pregmod.txt @@ -317,7 +317,7 @@ eyeColor: your eye color accepts string -origEyeColor: +origEye: your original eye color accepts string diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index 0b58e40ef60bcda4760ab88caa5fa7f137e7ead9..5f3f2023049dd34bb83986ba9b3b25e17e931737 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -3088,7 +3088,7 @@ custom: Encapsulates various custom properties, set by users -custom.tatto: +custom.tattoo: adds a custom tattoo accepts string diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js index 1929e3b90510eae0046b88b25fd1488d45ccd93e..3c26b059cc366df9d1089f3c7b3865324fbfaeee 100644 --- a/src/js/eventSelectionJS.js +++ b/src/js/eventSelectionJS.js @@ -484,7 +484,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) { if (eventSlave.devotion > 50) { if (eventSlave.speechRules !== "restrictive") { if (eventSlave.birthWeek >= 51) { - /* lets give this a much higher chance of appearing */ + /* let's give this a much higher chance of appearing */ State.variables.RESSevent.push("birthday"); State.variables.RESSevent.push("birthday"); State.variables.RESSevent.push("birthday"); @@ -2072,7 +2072,7 @@ window.generateRandomEventPoolServant = function(eventSlave) { if (eventSlave.devotion > 50) { if (eventSlave.speechRules !== "restrictive") { if (eventSlave.birthWeek >= 51) { - /* lets give this a much higher chance of appearing */ + /* let's give this a much higher chance of appearing */ State.variables.RESSevent.push("birthday"); State.variables.RESSevent.push("birthday"); State.variables.RESSevent.push("birthday"); diff --git a/src/npc/startingGirls/moreCustomOptions.tw b/src/npc/startingGirls/moreCustomOptions.tw index 664a695c2100f55f62a555abf23af6aa0c1815b3..02a6492ed245423f3c2fdb8f5ac15a60a6e25fff 100644 --- a/src/npc/startingGirls/moreCustomOptions.tw +++ b/src/npc/startingGirls/moreCustomOptions.tw @@ -1,5 +1,6 @@ :: More customization options [nobr] +<<set $activeSlave.eyebrowHColor = $activeSlave.hColor>> <<set $activeSlave.pubicHColor = $activeSlave.hColor>> <<set $activeSlave.underArmHColor = $activeSlave.hColor>> <<set $activeSlave.origHColor = $activeSlave.hColor>> @@ -20,7 +21,7 @@ <br>''Career:'' <<textbox "$activeSlave.career" $activeSlave.career "More customization options">> <br>''Nationality:'' <<textbox "$activeSlave.nationality" $activeSlave.nationality "More customization options">> //This will not alter name or race.// <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>''Hair color:'' <<textbox "$activeSlave.hColor" $activeSlave.hColor "More customization options">> //This will also set eyebrow, 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">> @@ -40,6 +41,31 @@ <br><br> +''Eyebrow hair style:'' $activeSlave.eyebrowHStyle. +[[Natural|More customization options][$activeSlave.eyebrowHStyle = "natural"]] +| [[Curved|More customization options][$activeSlave.eyebrowHStyle = "curved"]] +| [[Elongated|More customization options][$activeSlave.eyebrowHStyle = "elongated"]] +| [[High-Arched|More customization options][$activeSlave.eyebrowHStyle = "high-arched"]] +| [[Rounded|More customization options][$activeSlave.eyebrowHStyle = "rounded"]] +| [[Shaved|More customization options][$activeSlave.eyebrowHStyle = "shaved",$activeSlave.eyebrowFullness = "natural"]] +| [[Shortened|More customization options][$activeSlave.eyebrowHStyle = "shortened"]] +| [[Slanted Inwards|More customization options][$activeSlave.eyebrowHStyle = "slanted inwards"]] +| [[Slanted Outwards|More customization options][$activeSlave.eyebrowHStyle = "slanted outwards"]] +| [[Straight|More customization options][$activeSlave.eyebrowHStyle = "straight"]] + +<br> + +''Eyebrow hair maintenance:'' $activeSlave.eyebrowFullness +[[Natural|More customization options][$activeSlave.eyebrowFullness = "natural"]] +| [[Bushy|More customization options][$activeSlave.eyebrowFullness = "bushy"]] +| [[Thick|More customization options][$activeSlave.eyebrowFullness = "thick"]] +| [[Tapered|More customization options][$activeSlave.eyebrowFullness = "tapered"]] +| [[Threaded|More customization options][$activeSlave.eyebrowFullness = "threaded"]] +| [[Thin|More customization options][$activeSlave.eyebrowFullness = "thin"]] +| [[Pencil-Thin|More customization options][$activeSlave.eyebrowFullness = "pencil-thin"]] + +<br><br> + ''Pubic hair maintenance:'' $activeSlave.pubicHStyle. [[Waxed|More customization options][$activeSlave.pubicHStyle = "waxed"]] | [[Naturally hairless|More customization options][$activeSlave.pubicHStyle = "hairless"]] diff --git a/src/npc/uploadSlave.tw b/src/npc/uploadSlave.tw index b5f53d89ff269f368893f3ece823ee775aa4f8bc..2e8309e14bf7761829001b0198896785a2d9b2d5 100644 --- a/src/npc/uploadSlave.tw +++ b/src/npc/uploadSlave.tw @@ -200,7 +200,7 @@ analCount: 0, mammaryCount: 0, penetrativeCount: 0, pitKills: 0, -custom.tatto: "$activeSlave.custom.tattoo", +custom.tattoo: "$activeSlave.custom.tattoo", custom.label: "", custom.desc: "$activeSlave.custom.desc", custom.image.filename: "", diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 88fbc7338e0f46bdb346156fb7cc7b1e34d7cead..92383d0cf792a2140e767e5d64d5b9b75d3c8472 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -1472,7 +1472,7 @@ Deal with $his hair: $He is no longer capable of growing hair on $his head. <</if>> <br> -<<if ($activeSlave.eyebrowStyle != "bald" && $activeSlave.eyebrowStyle != "hairless")>> +<<if ($activeSlave.eyebrowStyle != "bald")>> $He has $activeSlave.origHColor eyebrows. [["Surgically remove " + $his + " ability to grow eyebrows"|Surgery Degradation][cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave),$surgeryType = "eyebrow removal"]] <<else>> diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw index 99641825de8b6877b490f20c1347e220ffdf10d7..0da0cffcf42f5a168e90e9fede2a232eb5dc07b4 100644 --- a/src/uncategorized/salon.tw +++ b/src/uncategorized/salon.tw @@ -783,7 +783,7 @@ Dye or paint: <<if $activeSlave.eyebrowHStyle != "bald">> - <br><br>$His <<if $activeSlave.eyebrowFullness != "natural" && $activeSlave.eyebrowHStyle != "natural">>$activeSlave.eyebrowFullness, $activeSlave.eyebrowHStyle<</if>> eyebrows + <br><br>$His <<if $activeSlave.eyebrowFullness != "natural">>$activeSlave.eyebrowFullness<<if $activeSlave.eyebrowHStyle != "natural">>,<</if>> <</if>><<if $activeSlave.eyebrowHStyle != "natural">>$activeSlave.eyebrowHStyle <</if>> eyebrows <<if $activeSlave.eyebrowHStyle == "shaved">> would be $activeSlave.eyebrowHColor if present. <<else>> @@ -836,7 +836,7 @@ Dye or paint: | [[Elongated|Salon][$activeSlave.eyebrowHStyle = "elongated",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[High-Arched|Salon][$activeSlave.eyebrowHStyle = "high-arched",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[Rounded|Salon][$activeSlave.eyebrowHStyle = "rounded",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] - | [[Shaved|Salon][$activeSlave.eyebrowHStyle = "shaved",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] + | [[Shaved|Salon][$activeSlave.eyebrowHStyle = "shaved",$activeSlave.eyebrowFullness = "natural",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[Shortened|Salon][$activeSlave.eyebrowHStyle = "shortened",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[Slanted Inwards|Salon][$activeSlave.eyebrowHStyle = "slanted inwards",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] | [[Slanted Outwards|Salon][$activeSlave.eyebrowHStyle = "slanted outwards",cashX(forceNeg($modCost), "slaveMod", $activeSlave)]] diff --git a/src/uncategorized/slaveStats.tw b/src/uncategorized/slaveStats.tw index 07e275ab91ef569889938e1278c0151c334a020f..899edfba6716ad3c17aa14c35ef7fce8520717de 100644 --- a/src/uncategorized/slaveStats.tw +++ b/src/uncategorized/slaveStats.tw @@ -293,9 +293,9 @@ slaveName: $activeSlave.slaveName /* TODO: figure out why this is being inden <br>penetrativeCount: $activeSlave.counter.penetrative <br>publicCount: $activeSlave.counter.publicUse <br>pitKills: $activeSlave.counter.pitKills -<br>custom.tatto: $activeSlave.custom.tattoo +<br>custom.tattoo: $activeSlave.custom.tattoo <br>custom.label: $activeSlave.custom.label -<br>custom.ddesc: $activeSlave.custom.desc +<br>custom.desc: $activeSlave.custom.desc <br>custom.title: $activeSlave.custom.title <br>custom.titleLisp: $activeSlave.custom.titleLisp <br>rudeTitle: $activeSlave.rudeTitle diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index f16a9c82f10305d3c3b57551ee187439f66ae139..60bb37a600c85ef3a103a178988e03d7d0289510 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -2493,7 +2493,7 @@ As the remote surgery's long recovery cycle completes, <<case "body hair removal">> <<if $activeSlave.underArmHStyle != "hairless">><<set $activeSlave.underArmHStyle = "bald">><</if>> <<if $activeSlave.pubicHStyle != "hairless">><<set $activeSlave.pubicHStyle = "bald">><</if>> - When $he <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $he feels the breeze on $his skin and realizes that <<if $activeSlave.origHColor != "bald">>all hair below $his neck is missing<<else>>$he is now completely hairless<</if>>. + When $he <<if $activeSlave.amp == 1>>is carried<<elseif canWalk($activeSlave)>>walks<<else>>is escorted<</if>> out of the surgery $he feels the breeze on $his skin and realizes that <<if $activeSlave.hStyle != "bald" && $activeSlave.eyebrowHStyle != "bald">>all hair below $his neck is missing<<else>>$he is now completely hairless<</if>>. <<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> <br> <<if $activeSlave.devotion > 50>> @@ -2507,11 +2507,11 @@ As the remote surgery's long recovery cycle completes, <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>> <</if>> <</if>> - <br><br>As this was a non-invasive procedure $his health was not affected. + <br><br>As this was a non-invasive procedure, $his health was not affected. <<case "eyebrow removal">> <<set $activeSlave.eyebrowHStyle = "bald">> - When $he <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $he feels the breeze on $his face and realizes that $his eyebrows are gone, permanantly. + When $he <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $he feels the breeze on $his face and realizes that $his eyebrows are gone, permanently. <<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> <br> <<if $activeSlave.devotion > 50>> @@ -2525,11 +2525,11 @@ As the remote surgery's long recovery cycle completes, <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>> <</if>> <</if>> - <br><br>As this was a non-invasive procedure $his health was not affected. + <br><br>As this was a non-invasive procedure, $his health was not affected. <<case "hair removal">> <<set $activeSlave.hStyle = "bald">> - <<set $activeSlave.eyebrowHStyle = "hairless">> + <<set $activeSlave.eyebrowHStyle = "bald">> When $he <<if $activeSlave.amp == 1>>is carried<<else>>walks<</if>> out of the surgery $he immediately notices the chill on $his head and realizes that $he is bald. <<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>> <br> @@ -2554,7 +2554,7 @@ As the remote surgery's long recovery cycle completes, <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>> <</if>> <</if>> - <br><br>As this was a non-invasive procedure $his health was not affected. + <br><br>As this was a non-invasive procedure, $his health was not affected. <<case "womb">> It's not immediately apparent to $him what kind of surgery $he received, since all $he's left with is a terrible nonspecific ache in $his lower belly. As with all invasive surgery @@.red;$his health has been greatly affected.@@ diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index 1b2819d556b0d308bcf4bf16906d53c8233bcc7e..42b6b7c030ff2a4e959cad5b8ebc08bd5ea3995b 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -1039,7 +1039,7 @@ $His kept to a natural level of fullness. <<case "tapered">> styled to be thicker in the center but otherwise normal. - <<case "thin">> + <<case "thick">> considerably thicker than what would be considered average. <<case "bushy">> incredibly and unnaturally full and bushy.