diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index 0cd19685b849353ae5a0b9e1081a107ae921533b..82b21dcdd90557303994cc58fbe140cc4569995e 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -2919,6 +2919,31 @@ eyebrowHStyle: eyebrow hair style accepts string +"bald" +"shaved" +"straight" +"rounded" +"natural" +"slanted inwards" +"slanted outwards" +"high-arched" +"elongated" +"shortened" +"curved" + +eyebrowFullness: + +eyebrow thickness +accepts string + +"pencil-thin" +"thin" +"threaded" +"natural" +"tapered" +"thick" +"bushy" + bodySwap: Slave is in original body. diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw index 8139705db10695c55ca3a6fe75eaa8eb8dbb49ee..104b39d500fff95588899e10960e8e4728a1813b 100644 --- a/src/js/DefaultRules.tw +++ b/src/js/DefaultRules.tw @@ -1882,7 +1882,37 @@ window.DefaultRules = (function() { } } } - + + if (rule.eyebrowHColor !== undefined && (rule.eyebrowHColor !== "no default setting")) { + if (slave.eyebrowHStyle != "bald") { + if ((slave.eyebrowHColor !== rule.eyebrowHColor)) { + slave.eyebrowHColor = rule.eyebrowHColor; + V.cash -= V.modCost; + r += `<br>${slave.slaveName}'s eyebrow hair, if present, has been dyed ${rule.eyebrowHColor}.`; + } + } + } + + if (rule.eyebrowHStyle !== undefined && (rule.eyebrowHStyle !== "no default setting")) { + if (slave.eyebrowHStyle != "bald") { + if ((slave.eyebrowHStyle !== rule.eyebrowHStyle)) { + slave.eyebrowHStyle = rule.eyebrowHStyle; + V.cash -= V.modCost; + r += `<br>${slave.slaveName}'s eyebrow hair has been restyled; it is now ${rule.eyebrowHStyle}.`; + } + } + } + + if (rule.eyebrowFullness !== undefined && (rule.eyebrowFullness !== "no default setting")) { + if (slave.eyebrowHStyle != "bald") { + if ((slave.eyebrowFullness !== rule.eyebrowFullness)) { + slave.eyebrowFullness = rule.eyebrowFullness; + V.cash -= V.modCost; + r += `<br>${slave.slaveName}'s eyebrow hair has been reshaped; it is now ${rule.eyebrowFullness}.`; + } + } + } + if (rule.skinColor !== undefined && rule.skinColor !== "no default setting" && rule.skinColor !== slave.skin) { slave.skin = rule.skinColor; r += `<br>${slave.slaveName}'s skin color has been set to ${rule.skinColor}.`; diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw index 7bb65489aa991803b9cd60192bef1fc0e30844c3..a3654719c3362a2068290dc4205aae00184ebb04 100644 --- a/src/js/assayJS.tw +++ b/src/js/assayJS.tw @@ -1568,7 +1568,7 @@ window.DegradingName = function DegradingName(slave) { names.push("Gaping", "Hallway", "Slit", "Wideopen"); } if (slave.weight > 160) { - names.push("Cow", "Fat", "Whale", "Fatass", "Blimp"); + names.push("Blimp", "Cow", "Fat", "Fatass", "Whale"); } else if (slave.weight > 30) { names.push("Chubby", "Fat", "Whale"); } else if (slave.weight <= -30) { diff --git a/src/js/rulesAutosurgery.tw b/src/js/rulesAutosurgery.tw index be9ad3f584ec00873ad80354e16773e8df513598..4db8ec176f0e9ba4fb1cef19ba7af2a47e026f65 100644 --- a/src/js/rulesAutosurgery.tw +++ b/src/js/rulesAutosurgery.tw @@ -228,8 +228,9 @@ window.rulesAutosurgery = (function() { if (slave.pubicHStyle != "hairless") slave.pubicHStyle = "bald"; V.cash -= V.surgeryCost; - } else if ((slave.bald == 0 || slave.hStyle != "bald") && (thisSurgery.surgery_hair == 2)) { + } else if ((slave.bald == 0 || slave.hStyle != "bald" || slave.eyebrowHStyle != "bald") && (thisSurgery.surgery_hair == 2)) { surgeries.push("hair removal"); + slave.eyebrowHStyle = "bald"; slave.hStyle = "bald"; slave.bald = 1; V.cash -= V.surgeryCost; diff --git a/src/uncategorized/generateXXSlave.tw b/src/uncategorized/generateXXSlave.tw index 15b1913c8a0deebbffb65242f35ba1812604cefb..5c50147160a4ca0da2f92a75d90dc07576e6ffbe 100644 --- a/src/uncategorized/generateXXSlave.tw +++ b/src/uncategorized/generateXXSlave.tw @@ -296,7 +296,8 @@ <<set $activeSlave.pubicHStyle = "hairless", $activeSlave.underArmHStyle = "hairless">> <</if>> <<set $activeSlave.eyebrowHColor = $activeSlave.hColor>> -<<set $activeSlave.eyebrowHStyle = either("hairless", "bald", "bald", "waxed", "waxed", "waxed", "waxed", "shaved", "shaved", "shaved", "shaved", "shaved", "neat", "neat", "neat", "neat", "neat", "bushy", "bushy", "bushy")>> +<<set $activeSlave.eyebrowHStyle = either("bald", "shaved", "straight", "rounded", "natural", "slanted inwards", "slanted outwards", "high-arched", "elongated", "shortened", "curved")>> +<<set $activeSlave.eyebrowFullness = either("pencil-thin", "pencil-thin", "thin", "thin", "thin", "threaded", "threaded", "threaded", "threaded", "natural", "natural", "natural", "natural", "natural", "natural", "tapered", "tapered", "tapered", "tapered", "thick", "thick", "thick", "bushy", "bushy")>> /*LM*/ <<if ($activeSlave.physicalAge <= 10)>> diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw index a1c17a67dbcfdb7e75100ea1739aec18567d35b3..f3c9dce6f17fe32ea0391900e60e79bbab1ad058 100644 --- a/src/uncategorized/generateXYSlave.tw +++ b/src/uncategorized/generateXYSlave.tw @@ -310,6 +310,7 @@ <</if>> <<set $activeSlave.eyebrowHColor = $activeSlave.hColor>> <<set $activeSlave.eyebrowHStyle = either("hairless", "bald", "bald", "waxed", "waxed", "waxed", "waxed", "shaved", "shaved", "shaved", "shaved", "shaved", "neat", "neat", "neat", "neat", "neat", "neat", "neat", "bushy", "bushy", "bushy", "bushy", "bushy")>> +<<set $activeSlave.eyebrowFullness = either("pencil-thin", "thin", "thin", "threaded", "threaded", "threaded", "natural", "natural", "natural", "natural", "natural", "tapered", "tapered", "tapered", "thick", "thick", "bushy")>> <<if ($weightAffectsAssets != 0)>> diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw index 9bfe8fd9c97f4122398a29f7e41aa113b85dfbac..00bf780aedc733e150f633794159f26db737fbbc 100644 --- a/src/uncategorized/prestigiousSlave.tw +++ b/src/uncategorized/prestigiousSlave.tw @@ -201,6 +201,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres <<set $activeSlave.hColor = "white">> <<set $activeSlave.pubicHColor = "white">> <<set $activeSlave.underArmHColor = "white">> + <<set $activeSlave.eyebrowHColor = "white">> <<set $activeSlave.eyes = -1>> <<set $activeSlave.eyeColor = "pale grey">> <<set $activeSlave.skin = "pure white">> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 19da574a95495c70b631fac87ee48ed0fc8a8486..83db2b3be668952101f7fe2cf161e683d7d742f1 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -1071,7 +1071,7 @@ Apply a retro-virus treatment: Deal with $his hair: <br> -<<if $activeSlave.bald == 0 || $activeSlave.hStyle != "bald">> +<<if $activeSlave.bald == 0 || $activeSlave.hStyle != "bald" || $activeSlave.eyebrowHStyle != "hairless">> $He naturally grows $activeSlave.origHColor hair from $his head. [["Surgically remove " + $his + " ability to grow hair"|Surgery Degradation][$cash -= $surgeryCost,$activeSlave.bald = 1,$surgeryType = "hair removal"]] <<else>> diff --git a/src/uncategorized/salon.tw b/src/uncategorized/salon.tw index 25518f338241644e38dbf70e3be5c167086a376e..a8520353d584cde3aa80ac9c266178c5e5278433 100644 --- a/src/uncategorized/salon.tw +++ b/src/uncategorized/salon.tw @@ -34,7 +34,7 @@ <<if $activeSlave.eyewear == "none">> has no eyewear. <<else>> - is wearing $activeSlave.eyewear. [[Remove|Salon][$activeSlave.eyewear = "none"]] + is wearing $activeSlave.eyewear. [[Remove|Salon][$activeSlave.eyewear = "none"]] <</if>> //Blurring options are annoying and impede performance on some assignments.// <br> @@ -45,7 +45,7 @@ <<if $activeSlave.eyewear == "none">> has no eyewear. <<else>> - is wearing $activeSlave.eyewear. [[Remove|Salon][$activeSlave.eyewear = "none"]] + is wearing $activeSlave.eyewear. [[Remove|Salon][$activeSlave.eyewear = "none"]] <</if>> //Blurring options are annoying and impede performance on some assignments.// <br> @@ -55,7 +55,7 @@ <<if $activeSlave.eyewear == "none">> has no eyewear. <<else>> - is wearing $activeSlave.eyewear. [[Remove|Salon][$activeSlave.eyewear = "none"]] + is wearing $activeSlave.eyewear. [[Remove|Salon][$activeSlave.eyewear = "none"]] <</if>> //Blurring options are annoying and impede performance on some assignments.// <br> @@ -67,7 +67,7 @@ <<if $activeSlave.eyewear == "none">> has no eyewear. <<else>> - is wearing $activeSlave.eyewear. [[Remove|Salon][$activeSlave.eyewear = "none"]] + is wearing $activeSlave.eyewear. [[Remove|Salon][$activeSlave.eyewear = "none"]] <</if>> //Nearsightedness will impede performance on some assignments.// <br> @@ -89,9 +89,9 @@ <</if>> <<else>> <<if $activeSlave.eyeColor == "empty">> - $He has no eyes. //Choose what kind of eyes you want $him to have:// + $He has no eyes. //Choose what kind of eyes you want $him to have:// <<else>> - $His glass eyes are $activeSlave.eyeColor. [[Remove eyes|Salon][$activeSlave.eyeColor = "empty"]] or //choose new ones:// + $His glass eyes are $activeSlave.eyeColor. [[Remove eyes|Salon][$activeSlave.eyeColor = "empty"]] or //choose new ones:// <</if>> <</if>> @@ -165,7 +165,7 @@ <<if $activeSlave.earwear == "none">> which are unobstructed. <<else>> - and is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]] + and is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]] <</if>> //Muffling options are annoying and impede performance on some assignments.// <br> @@ -178,7 +178,7 @@ <<if $activeSlave.earwear == "none">> is wearing nothing on $his ears. <<else>> - is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]] + is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]] <</if>> //Muffling options are annoying and impede performance on some assignments.// <br> @@ -190,7 +190,7 @@ <<if $activeSlave.earwear == "none">> has nothing in $his ears. <<else>> - is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]] + is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]] <</if>> //Muffling options are annoying and impede performance on some assignments.// <br> @@ -202,7 +202,7 @@ <<if $activeSlave.earwear == "none">> wears nothing to correct or worsen this. <<else>> - is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]] + is wearing $activeSlave.earwear. [[Remove|Salon][$activeSlave.earwear = "none"]] <</if>> //Hearing impairment will impede performance on some assignments.// <br> @@ -340,10 +340,9 @@ <<else>> <<if $activeSlave.hStyle == "bald">> $He is completely bald. - <br> <<else>> $His current wig is $activeSlave.hColor. - <<if $activeSlave.origHColor == "bald" && $activeSlave.hStyle != "bald">> + <<if $activeSlave.hStyle != "bald">> [[Remove wig|Salon][$activeSlave.hStyle = "bald",$activeSlave.hLength = 0,$cash -= $modCost]] or //choose a new one:// <<else>> //Choose a wig color:// @@ -556,6 +555,69 @@ Dye or paint: [[Bleach it|Salon][$activeSlave.markings = "none",$cash -= $modCost]] <</if>> + +/* EYEBROW HAIR */ + +<<if $activeSlave.eyebrowHStyle != "bald">> + + <br><br>$His $activeSlave.eyebrowHLength, $activeSlave.eyebrowHStyle eyebrows + <<if $activeSlave.eyebrowHStyle == "shaved">> + would be $activeSlave.eyebrowHColor if present. + <<else>> + are $activeSlave.eyebrowHColor. + <</if>> + <<if $activeSlave.eyebrowHColor != $activeSlave.hColor>> + [[Match the hair?|Salon][$activeSlave.eyebrowHColor = $activeSlave.hColor,$cash -= $modCost]] + <</if>> + + <br> + Dye $his eyebrow hair: + [[Blonde|Salon][$activeSlave.eyebrowHColor = "blonde",$cash -= $modCost]] + | [[Golden|Salon][$activeSlave.eyebrowHColor = "golden",$cash -= $modCost]] + | [[Platinum Blonde|Salon][$activeSlave.eyebrowHColor = "platinum blonde",$cash -= $modCost]] + | [[Strawberry-Blonde|Salon][$activeSlave.eyebrowHColor = "strawberry-blonde",$cash -= $modCost]] + | [[Copper|Salon][$activeSlave.eyebrowHColor = "copper",$cash -= $modCost]] + | [[Ginger|Salon][$activeSlave.eyebrowHColor = "ginger",$cash -= $modCost]] + | [[Red|Salon][$activeSlave.eyebrowHColor = "red",$cash -= $modCost]] + | [[Deep Red|Salon][$primaryHairColor = "deep red"]] + | [[Green|Salon][$activeSlave.eyebrowHColor = "green",$cash -= $modCost]] + | [[Blue|Salon][$activeSlave.eyebrowHColor = "blue",$cash -= $modCost]] + | [[Pink|Salon][$activeSlave.eyebrowHColor = "pink",$cash -= $modCost]] + | [[Dark Brown|Salon][$activeSlave.eyebrowHColor = "dark brown",$cash -= $modCost]] + | [[Brown|Salon][$activeSlave.eyebrowHColor = "brown",$cash -= $modCost]] + | [[Auburn|Salon][$activeSlave.eyebrowHColor = "auburn",$cash -= $modCost]] + | [[Burgundy|Salon][$activeSlave.eyebrowHColor = "burgundy",$cash -= $modCost]] + | [[Chocolate|Salon][$activeSlave.eyebrowHColor = "chocolate brown",$cash -= $modCost]] + | [[Chestnut|Salon][$activeSlave.eyebrowHColor = "chestnut",$cash -= $modCost]] + | [[Hazel|Salon][$activeSlave.eyebrowHColor = "hazel",$cash -= $modCost]] + | [[Black|Salon][$activeSlave.eyebrowHColor = "black",$cash -= $modCost]] + | [[Grey|Salon][$activeSlave.eyebrowHColor = "grey",$cash -= $modCost]] + | [[Silver|Salon][$activeSlave.eyebrowHColor = "silver",$cash -= $modCost]] + | [[White|Salon][$activeSlave.eyebrowHColor = "white",$cash -= $modCost]] + | [[Blue-Violet|Salon][$activeSlave.eyebrowHColor = "blue-violet",$cash -= $modCost]] + | [[Blazing Red|Salon][$activeSlave.eyebrowHColor = "blazing red",$cash -= $modCost]] + | [[Neon Green|Salon][$activeSlave.eyebrowHColor = "neon green",$cash -= $modCost]] + | [[Neon Blue|Salon][$activeSlave.eyebrowHColor = "neon blue",$cash -= $modCost]] + | [[Neon Pink|Salon][$activeSlave.eyebrowHColor = "neon pink",$cash -= $modCost]] + + <br> + Style $his eyebrow hair: + [[Waxed|Salon][$activeSlave.eyebrowHStyle = "waxed",$cash -= $modCost]] + | [[Shaved|Salon][$activeSlave.eyebrowHStyle = "shaved",$cash -= $modCost]] + | [[Neat|Salon][$activeSlave.eyebrowHStyle = "neat",$cash -= $modCost]] + | [[Bushy|Salon][$activeSlave.eyebrowHStyle = "bushy",$cash -= $modCost]] + + <br> + Shape $his eyebrow hair: + [[Waxed|Salon][$activeSlave.eyebrowHStyle = "waxed",$cash -= $modCost]] + | [[Shaved|Salon][$activeSlave.eyebrowHStyle = "shaved",$cash -= $modCost]] + | [[Neat|Salon][$activeSlave.eyebrowHStyle = "neat",$cash -= $modCost]] + | [[Bushy|Salon][$activeSlave.eyebrowHStyle = "bushy",$cash -= $modCost]] + +<<else>> + <br><br>$His eyebrows are completely hairless. +<</if>> + /* PUBIC HAIR */ <<if $activeSlave.pubicHStyle != "bald" && $activeSlave.pubicHStyle != "hairless" && $activeSlave.physicalAge >= 12>> @@ -624,10 +686,11 @@ Dye or paint: is $activeSlave.underArmHColor. <</if>> <<if $activeSlave.underArmHColor != $activeSlave.hColor>> - [[Match the curtains?|Salon][$activeSlave.underArmHColor = $activeSlave.hColor,$cash -= $modCost]] + [[Match the hair?|Salon][$activeSlave.underArmHColor = $activeSlave.hColor,$cash -= $modCost]] <</if>> - <br> Dye $his armpit hair: + <br> + Dye $his armpit hair: [[Blonde|Salon][$activeSlave.underArmHColor = "blonde",$cash -= $modCost]] | [[Golden|Salon][$activeSlave.underArmHColor = "golden",$cash -= $modCost]] | [[Platinum Blonde|Salon][$activeSlave.underArmHColor = "platinum blonde",$cash -= $modCost]] diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index d72010e82bd0a3f249bf9f5236062d7c9ac0a538..e6c9b77380c41171226f64db097ffe3b7dbbc925 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -2239,6 +2239,7 @@ As the remote surgery's long recovery cycle completes, <<case "hair removal">> <<set $activeSlave.hStyle = "bald">> + <<set $activeSlave.eyebrowHStyle = "hairless">> 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> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index aa48d1302ce49187813bcac50608fd9e299a617e..0443138f7d751c52750fe556c22fdaa15514be1e 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -349,7 +349,7 @@ <</if>> <<elseif ($arcologies[0].FSGenderRadicalistLawFuta == 4)>> <<if $args[0].dick > 0 && $args[0].vagina == -1 && $args[0].faceShape != "masculine">> - <<if $args[0].boobs < 500 && $args[0].dick < 4 && $args[0].balls < 4>> + <<if $args[0].boobs < 500 && $args[0].dick < 4 && $args[0].balls < 4>> <<if $arcologies[0].FSSlimnessEnthusiast == "unset">> /*balance with slimness*/ <<set $beauty += 20>> <<if $args[0].boobs < 300>> @@ -1024,7 +1024,7 @@ <<set $beauty += 2>> <<elseif $args[0].underArmHStyle == "bald">> <<set $beauty += 2>> -<<elseif ($args[0].underArmHStyle == "waxed")>> +<<elseif $args[0].underArmHStyle == "waxed">> <<set $beauty += 2>> <<elseif $args[0].underArmHStyle == "shaved">> <<set $beauty += 2>> @@ -1045,7 +1045,7 @@ <<set $beauty += 2>> <<elseif $args[0].pubicHStyle == "bald">> <<set $beauty += 2>> -<<elseif ($args[0].pubicHStyle == "waxed")>> +<<elseif $args[0].pubicHStyle == "waxed">> <<set $beauty += 2>> <<elseif $args[0].pubicHStyle == "bushy">> <<if $arcologies[0].FSBodyPurist > 0>> @@ -1223,9 +1223,9 @@ <</if>> <<if $args[0].amp == 0>> - <<if !canWalk($args[0])>> - <<set $deadliness -= 20>> - <</if>> + <<if !canWalk($args[0])>> + <<set $deadliness -= 20>> + <</if>> <<elseif $args[0].amp == 1>> <<set $deadliness -= 20>> <<elseif $args[0].amp == -5>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 5d674d98bf8e2c8a48f4a619e9c43a3f9245aa33..54aa550357f6561940f024e923c370fbcfc408ab 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -2242,7 +2242,7 @@ $He's got a <<if ($activeSlave.pubicHStyle == "bushy" || $activeSlave.pubicHStyle == "very bushy")>> <<if ($activeSlave.physicalAge >= 13)>> - Since $he has been left natural $he has some light $activeSlave.pubicHColor pubic hair around $his ass. + Since $he has been left natural, $he has some light $activeSlave.pubicHColor pubic hair around $his ass. <</if>> <</if>> @@ -14182,8 +14182,6 @@ $He has $He has spent so much time in the Free Cities that their statelessness is effectively $his nationality; ethnically, $he's <<elseif $activeSlave.nationality == "Zimbabwean" && $activeSlave.race == "white">> $He's originally @@.tan;Rhodesian@@; ethnically, $he's - <<elseif $activeSlave.nationality == "Vatican">> - $He's originally @@.tan;from Vatican City@@; ethnically, $he's <<else>> $He's originally @@.tan;<<print $activeSlave.nationality>>@@; ethnically, $he's <</if>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index 327f95fa2df24c5a9c2aff84c27b140743e8854a..97003b98d9ebc96e6e2d777b756e5b341f93b5c0 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -745,97 +745,142 @@ $activeSlave.slaveName is $His <<if $activeSlave.fuckdoll == 0>> -<<switch $activeSlave.hStyle>> + <<switch $activeSlave.hStyle>> -<<case "bald">> - hair no longer grows. If it did, it would be $activeSlave.origHColor. + <<case "bald">> + hair no longer grows. If it did, it would be $activeSlave.origHColor. -<<case "shaved bald">> - hair has been shaved. If $his hair were visible, it would be $activeSlave.hColor. + <<case "shaved bald">> + hair has been shaved. If $his hair were visible, it would be $activeSlave.hColor. -<<case "buzzcut">> - $activeSlave.hColor hair is a short buzzcut. + <<case "buzzcut">> + $activeSlave.hColor hair is a short buzzcut. -<<case "trimmed">> - $activeSlave.hColor hair is trimmed short. + <<case "trimmed">> + $activeSlave.hColor hair is trimmed short. -<<case "afro">> - $activeSlave.hColor hair is in a - <<if $activeSlave.hLength > 100>> - gigantic puffed-up afro and looks ridiculous. - <<elseif $activeSlave.hLength > 30>> - puffy afro. - <<else>> - short afro. - <</if>> - -<<case "cornrows">> - $activeSlave.hColor hair is formed tightly into cornrows in a decorative pattern on $his head, dangling - <<if $activeSlave.hLength >= 150>> - down calf-length, - <<elseif $activeSlave.hLength >= 100>> - down ass-length, - <<elseif $activeSlave.hLength >= 30>> - down long, - <<elseif $activeSlave.hLength >= 10>> - down shoulder-length, - <<else>> - down, - <</if>> - with colorful beads interspersed in them. - -<<case "bun">> - $activeSlave.hColor hair is - <<if $activeSlave.hLength >= 100>> - packed tightly into a huge puffy - <<elseif $activeSlave.hLength >= 30>> - packed into a large - <<elseif $activeSlave.hLength >= 10>> - tied into a small - <<else>> - tied into a - <</if>> - bun. + <<case "afro">> + $activeSlave.hColor hair is in a + <<if $activeSlave.hLength > 100>> + gigantic puffed-up afro and looks ridiculous. + <<elseif $activeSlave.hLength > 30>> + puffy afro. + <<else>> + short afro. + <</if>> + + <<case "cornrows">> + $activeSlave.hColor hair is formed tightly into cornrows in a decorative pattern on $his head, dangling + <<if $activeSlave.hLength >= 150>> + down calf-length, + <<elseif $activeSlave.hLength >= 100>> + down ass-length, + <<elseif $activeSlave.hLength >= 30>> + down long, + <<elseif $activeSlave.hLength >= 10>> + down shoulder-length, + <<else>> + down, + <</if>> + with colorful beads interspersed in them. + + <<case "bun">> + $activeSlave.hColor hair is + <<if $activeSlave.hLength >= 100>> + packed tightly into a huge puffy + <<elseif $activeSlave.hLength >= 30>> + packed into a large + <<elseif $activeSlave.hLength >= 10>> + tied into a small + <<else>> + tied into a + <</if>> + bun. -<<case "messy bun">> - $activeSlave.hColor hair is - <<if $activeSlave.hLength >= 100>> - packed tightly into a huge messy - <<elseif $activeSlave.hLength >= 30>> - packed into a large messy - <<elseif $activeSlave.hLength >= 10>> - tied into a small messy - <<else>> - tied into a messy - <</if>> - bun. - -<<case "neat" "strip" "tails" "up" "ponytail" "braided" "dreadlocks" "permed" "curled" "luxurious">> - <<set $seed = $activeSlave.hLength/$activeSlave.height>> - <<if $seed > 0.9>> - floor-length, - <<elseif $seed > 0.8>> - calf-length, - <<elseif $seed > 0.7>> - knee-length, - <<elseif $seed >= 0.6>> - thigh-length, - <<elseif $seed >= 0.4>> - ass-length, - <<elseif $seed >= 0.2>> - long, - <<elseif $seed >= 15>> - shoulder-length, - <<else>> - short, - <</if>> - $activeSlave.hColor hair - <<HairClothingDescription>> + <<case "messy bun">> + $activeSlave.hColor hair is + <<if $activeSlave.hLength >= 100>> + packed tightly into a huge messy + <<elseif $activeSlave.hLength >= 30>> + packed into a large messy + <<elseif $activeSlave.hLength >= 10>> + tied into a small messy + <<else>> + tied into a messy + <</if>> + bun. + + <<case "neat" "strip" "tails" "up" "ponytail" "braided" "dreadlocks" "permed" "curled" "luxurious">> + <<set $seed = $activeSlave.hLength/$activeSlave.height>> + <<if $seed > 0.9>> + floor-length, + <<elseif $seed > 0.8>> + calf-length, + <<elseif $seed > 0.7>> + knee-length, + <<elseif $seed >= 0.6>> + thigh-length, + <<elseif $seed >= 0.4>> + ass-length, + <<elseif $seed >= 0.2>> + long, + <<elseif $seed >= 15>> + shoulder-length, + <<else>> + short, + <</if>> + $activeSlave.hColor hair + <<HairClothingDescription>> -<<default>> - $activeSlave.hColor hair is $activeSlave.hStyle. + <<default>> + $activeSlave.hColor hair is $activeSlave.hStyle. -<</switch>> + <</switch>> + $His + <<if $activeSlave.eyebrowHStyle == "bald">> + brows do not grow hair. $His eyebrows would be $activeSlave.eyebrowHColor in color if they did. + <<elseif $activeSlave.eyebrowHStyle == "shaved">> + eyebrows have been shaved off. If they were visible, they would be $activeSlave.eyebrowHColor in color. + <<else>> + $activeSlave.eyebrowHColor eyebrows + <<switch $activeSlave.eyebrowHStyle>> + <<case "slanted inwards">> + slant inwards from the sides of $his forehead down to the center of $his head. + <<case "slanted outwards">> + slant outwards from the center of $his head down to the sides of $his forehead. + <<case "rounded">> + form perfect semicircles. + <<case "natural">> + naturally contour to the shape of $his brow. + <<case "curved">> + form small "S"-shaped curves above $his eyes. + <<case "elongated>> + are elongated to cover far more of $his brow than what would be considered average. + <<case "shortened>> + are shortened to cover far less of $his brow than what would be considered average. + <<default>> + are styled to be $activeSlave.eyebrowHStyle. + <</switch>> + They're + <<switch $activeSlave.eyebrowFullness>> + <<case "pencil-thin">> + incredibly and unnaturally light and thin. + <<case "thin">> + considerably thinner than what would be considered average. + <<case "threaded">> + styled to be thinner on the sides but otherwise normal. + <<case "natural">> + kept to a natural level of fullness. + <<case "tapered">> + styled to be thicker in the center but otherwise normal. + <<case "thin">> + considerably thicker than what would be considered average. + <<case "bushy">> + incredibly and unnaturally full and bushy. + <<default>> + $activeSlave.eyebrowFullness. + <</switch>> + <</if>> <<else>> <<if $activeSlave.hLength > 20>> hair sticks out of the suit in two <<if $activeSlave.hLength > 100>>extremely long<<elseif $activeSlave.hLength > 40>>long<<else>>short<</if>> tails, which can be used as handles when using the Fuckdoll's <<if $activeSlave.vagina > -1>>lower holes<<else>>rear hole<</if>>. diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw index c39e2705f910faaeb20e93427d6d8e2d04872296..a75bed76ab7d884f00be0aba6752154ea4b8658c 100644 --- a/src/utility/descriptionWidgetsTattoos.tw +++ b/src/utility/descriptionWidgetsTattoos.tw @@ -73,6 +73,8 @@ <<case "permanent makeup">> <<if $activeSlave.makeup != 0>> $His normal makeup is difficult to distinguish from the underlying tattoo. + <<else>> + $his face has been tattooed so that $he appears to be wearing makeup. <</if>> <<case "sacrilege">> $His face is subtly tattooed to give $him a decidedly demonic appearance. diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index b115711918acf68ff2f74932a21e6694d58224e1..0ce39c96094f4ad3e2b1fde8933a41a73bf88bde 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", origRace: "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", underArmHColor: "brown", eyebrowHColor: "brown", origSkin: "light", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", underArmHStyle: "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, areolaeShape: "circle", 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, override_Race: 0, override_Skin: 0, override_Eye_Color: 0, override_H_Color: 0, override_Pubic_H_Color: 0, override_Arm_H_Color: 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", origRace: "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", underArmHColor: "brown", eyebrowHColor: "brown", origSkin: "light", skin: "light", hLength: 60, eyebrowFullness: "natural", hStyle: "short", pubicHStyle: "neat", underArmHStyle: "neat", eyebrowHStyle: "natural", 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, areolaeShape: "circle", 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, 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, override_Race: 0, override_Skin: 0, override_Eye_Color: 0, override_H_Color: 0, override_Pubic_H_Color: 0, override_Arm_H_Color: 0}>> <</widget>> /%