Skip to content
Snippets Groups Projects
Commit 855f044a authored by Pregmodder's avatar Pregmodder
Browse files

change new pubic hair descriptions to use pubertyAgeX_ instead of a check.

parent 87252e0b
No related branches found
No related tags found
1 merge request!3139change new pubic hair descriptions to use pubertyAgeX_ instead of a check.
Hide whitespace changes
Inline Side-by-side
src/facilities/nursery/longChildDescription.tw
+ 6
− 5
View file @ 855f044a
...@@ -1686,8 +1686,9 @@ $He is ...@@ -1686,8 +1686,9 @@ $He is
<</if>> <</if>>
<</if>> <</if>>
<<if ($activeSlave.physicalAge < 11 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> <<set _pubertyAge = Math.max($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
$He is too young to have armpit hair. <<if ($activeSlave.physicalAge < _pubertyAge-2)>>
$He is too sexually immature to have armpit hair.
<<elseif $activeSlave.underArmHStyle == "hairless">> <<elseif $activeSlave.underArmHStyle == "hairless">>
$His armpits are perfectly smooth and naturally hairless. $His armpits are perfectly smooth and naturally hairless.
<<elseif $activeSlave.underArmHStyle == "bald">> <<elseif $activeSlave.underArmHStyle == "bald">>
...@@ -1698,10 +1699,10 @@ $He is ...@@ -1698,10 +1699,10 @@ $He is
<<else>> <<else>>
$His armpits are waxed and smooth. $His armpits are waxed and smooth.
<</if>> <</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. $He has a few $activeSlave.underArmHColor wisps of armpit hair.
<<elseif ($activeSlave.physicalAge < 13 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> <<elseif ($activeSlave.physicalAge < _pubertyAge)>>
Because of $his young age $he has barely any $activeSlave.underArmHColor armpit hair. $He is on the verge of puberty and has a small patch of $activeSlave.underArmHColor armpit hair.
<<elseif $activeSlave.underArmHStyle == "shaved">> <<elseif $activeSlave.underArmHStyle == "shaved">>
$His armpits appear hairless, but closer inspection reveals light, $activeSlave.underArmHColor stubble. $His armpits appear hairless, but closer inspection reveals light, $activeSlave.underArmHColor stubble.
<<elseif $activeSlave.underArmHStyle == "neat">> <<elseif $activeSlave.underArmHStyle == "neat">>
......
src/uncategorized/longSlaveDescription.tw
+ 6
− 5
View file @ 855f044a
...@@ -2071,8 +2071,9 @@ $He is ...@@ -2071,8 +2071,9 @@ $He is
<</if>> <</if>>
<</if>> <</if>>
<<if ($activeSlave.physicalAge < 11 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> <<set _pubertyAge = Math.max($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
$He is too young to have armpit hair. <<if ($activeSlave.physicalAge < _pubertyAge-2)>>
$He is too sexually immature to have armpit hair.
<<elseif $activeSlave.underArmHStyle == "hairless">> <<elseif $activeSlave.underArmHStyle == "hairless">>
$His armpits are perfectly smooth and naturally hairless. $His armpits are perfectly smooth and naturally hairless.
<<elseif $activeSlave.underArmHStyle == "bald">> <<elseif $activeSlave.underArmHStyle == "bald">>
...@@ -2083,10 +2084,10 @@ $He is ...@@ -2083,10 +2084,10 @@ $He is
<<else>> <<else>>
$His armpits are waxed and smooth. $His armpits are waxed and smooth.
<</if>> <</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. $He has a few $activeSlave.underArmHColor wisps of armpit hair.
<<elseif ($activeSlave.physicalAge < 13 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> <<elseif ($activeSlave.physicalAge < _pubertyAge)>>
Because of $his young age $he has barely any $activeSlave.underArmHColor armpit hair. $He is on the verge of puberty and has a small patch of $activeSlave.underArmHColor armpit hair.
<<elseif $activeSlave.underArmHStyle == "shaved">> <<elseif $activeSlave.underArmHStyle == "shaved">>
$His armpits appear hairless, but closer inspection reveals light, $activeSlave.underArmHColor stubble. $His armpits appear hairless, but closer inspection reveals light, $activeSlave.underArmHColor stubble.
<<elseif $activeSlave.underArmHStyle == "neat">> <<elseif $activeSlave.underArmHStyle == "neat">>
......
src/utility/descriptionWidgetsFlesh.tw
+ 6
− 5
View file @ 855f044a
...@@ -4881,8 +4881,9 @@ $He's got a ...@@ -4881,8 +4881,9 @@ $He's got a
Society looks fondly on $his complete inability to reproduce. Society looks fondly on $his complete inability to reproduce.
<</if>> <</if>>
   
<<if ($activeSlave.physicalAge < 11 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> <<set _pubertyAge = Math.max($activeSlave.pubertyAgeXX, $activeSlave.pubertyAgeXY)>>
$He is too young to have pubic hair. <<if ($activeSlave.physicalAge < _pubertyAge-2)>>
$He is too sexually immature to have pubic hair.
<<elseif ($activeSlave.pubicHStyle == "hairless")>> <<elseif ($activeSlave.pubicHStyle == "hairless")>>
$He's naturally smooth and hairless. $He's naturally smooth and hairless.
<<elseif ($activeSlave.pubicHStyle == "bald")>> <<elseif ($activeSlave.pubicHStyle == "bald")>>
...@@ -4895,10 +4896,10 @@ $He's got a ...@@ -4895,10 +4896,10 @@ $He's got a
<<else>> <<else>>
$He's waxed and smooth. $He's waxed and smooth.
<</if>> <</if>>
<<elseif ($activeSlave.physicalAge < 12 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> <<elseif ($activeSlave.physicalAge < _pubertyAge-1)>>
$He has a few wisps of pubic hair. $He has a few wisps of pubic hair.
<<elseif ($activeSlave.physicalAge < 13 && $activeSlave.pubertyXX < 1 && $activeSlave.pubertyXY < 1)>> <<elseif ($activeSlave.physicalAge < _pubertyAge)>>
Because of $his young age $he has barely any pubic hair. $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")>> <<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>>. $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")>> <<elseif ($activeSlave.pubicHStyle == "neat")>>
src/utility/slaveCreationWidgets.tw
+ 3
− 0
View file @ 855f044a
...@@ -4681,6 +4681,9 @@ ...@@ -4681,6 +4681,9 @@
<<set $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(20,100)>> <<set $activeSlave.intelligenceImplant = 30, $activeSlave.intelligence = random(20,100)>>
<<set $activeSlave.trust = 80, $activeSlave.devotion = 80>> <<set $activeSlave.trust = 80, $activeSlave.devotion = 80>>
<<set $activeSlave.health = random(80,95)>> <<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>> <<switch $Role>>
/* Opens security */ /* Opens security */
<<case "Lieutenant Colonel">> <<case "Lieutenant Colonel">>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment