diff --git a/src/facilities/nursery/longChildDescription.tw b/src/facilities/nursery/longChildDescription.tw index 155a7d06d0d5b8bb592e8b9e898dd1d8b48246c1..da74a5742ecffffceeeadb6e4c406846714818e5 100644 --- a/src/facilities/nursery/longChildDescription.tw +++ b/src/facilities/nursery/longChildDescription.tw @@ -1686,8 +1686,9 @@ $He is <</if>> <</if>> - <<if ($activeSlave.physicalAge < 11 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> - $He is too young to have armpit hair. + <<set _pubertyAge = Math.max($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>> + <<if ($activeSlave.physicalAge < _pubertyAge-2)>> + $He is too sexually immature to have armpit hair. <<elseif $activeSlave.underArmHStyle == "hairless">> $His armpits are perfectly smooth and naturally hairless. <<elseif $activeSlave.underArmHStyle == "bald">> @@ -1698,10 +1699,10 @@ $He is <<else>> $His armpits are waxed and smooth. <</if>> - <<elseif ($activeSlave.physicalAge < 12 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> + <<elseif ($activeSlave.physicalAge < _pubertyAge-1)>> $He has a few $activeSlave.underArmHColor wisps of armpit hair. - <<elseif ($activeSlave.physicalAge < 13 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> - Because of $his young age $he has barely any $activeSlave.underArmHColor armpit hair. + <<elseif ($activeSlave.physicalAge < _pubertyAge)>> + $He is on the verge of puberty and has a small patch of $activeSlave.underArmHColor armpit hair. <<elseif $activeSlave.underArmHStyle == "shaved">> $His armpits appear hairless, but closer inspection reveals light, $activeSlave.underArmHColor stubble. <<elseif $activeSlave.underArmHStyle == "neat">> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index 83203fb4f8d79a05a809c4634b763184d818339a..222207808bcda1d50be21796f463f8bd64eefbf0 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -2071,8 +2071,9 @@ $He is <</if>> <</if>> - <<if ($activeSlave.physicalAge < 11 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> - $He is too young to have armpit hair. + <<set _pubertyAge = Math.max($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>> + <<if ($activeSlave.physicalAge < _pubertyAge-2)>> + $He is too sexually immature to have armpit hair. <<elseif $activeSlave.underArmHStyle == "hairless">> $His armpits are perfectly smooth and naturally hairless. <<elseif $activeSlave.underArmHStyle == "bald">> @@ -2083,10 +2084,10 @@ $He is <<else>> $His armpits are waxed and smooth. <</if>> - <<elseif ($activeSlave.physicalAge < 12 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> + <<elseif ($activeSlave.physicalAge < _pubertyAge-1)>> $He has a few $activeSlave.underArmHColor wisps of armpit hair. - <<elseif ($activeSlave.physicalAge < 13 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> - Because of $his young age $he has barely any $activeSlave.underArmHColor armpit hair. + <<elseif ($activeSlave.physicalAge < _pubertyAge)>> + $He is on the verge of puberty and has a small patch of $activeSlave.underArmHColor armpit hair. <<elseif $activeSlave.underArmHStyle == "shaved">> $His armpits appear hairless, but closer inspection reveals light, $activeSlave.underArmHColor stubble. <<elseif $activeSlave.underArmHStyle == "neat">> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index dee3d67904954b468ae021f72d5aae83dfa86ec5..5d3257b24b17eb53aff83a37a9a30cb62c5797ad 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -4881,8 +4881,9 @@ $He's got a Society looks fondly on $his complete inability to reproduce. <</if>> -<<if ($activeSlave.physicalAge < 11 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> - $He is too young to have pubic hair. +<<set _pubertyAge = Math.max($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>> +<<if ($activeSlave.physicalAge < _pubertyAge-2)>> + $He is too sexually immature to have pubic hair. <<elseif ($activeSlave.pubicHStyle == "hairless")>> $He's naturally smooth and hairless. <<elseif ($activeSlave.pubicHStyle == "bald")>> @@ -4895,10 +4896,10 @@ $He's got a <<else>> $He's waxed and smooth. <</if>> -<<elseif ($activeSlave.physicalAge < 12 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> +<<elseif ($activeSlave.physicalAge < _pubertyAge-1)>> $He has a few wisps of pubic hair. -<<elseif ($activeSlave.physicalAge < 13 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> - Because of $his young age $he has barely any pubic hair. +<<elseif ($activeSlave.physicalAge < _pubertyAge)>> + $He is on the verge of puberty and has a small patch of $activeSlave.pubicHColor pubic hair above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>. <<elseif ($activeSlave.pubicHStyle == "in a strip")>> $His $activeSlave.pubicHColor pubic hair is waxed into a narrow strip above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>. <<elseif ($activeSlave.pubicHStyle == "neat")>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index b132ad24b429789cd9dbadfe8fe7d3cda41794a6..d72d329e915a65111cd466f1f19b37f86fc87319 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -4681,6 +4681,9 @@ <<set $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(20,100)>> <<set $activeSlave.trust = 80, $activeSlave.devotion = 80>> <<set $activeSlave.health = random(80,95)>> + <<set $activeSlave.origin = "The Job Fulfillment Center offered her contract to fill your request for a ">> + <<set $activeSlave.origin += $Role>> + <<set $activeSlave.origin += ".">> <<switch $Role>> /* Opens security */ <<case "Lieutenant Colonel">>