Merge branch 'butt-merge' into 'pregmod-master'

butt merge

See merge request !4922

src/utility/descriptionWidgetsFlesh.tw

@@ -1209,33 +1209,33 @@ $He's got a
 	<<else>>
 		<<print either("skinny", "slim", "taut")>>
 	<</if>>
-	ass.
+	ass,
 <<elseif $activeSlave.butt <= 2>>
 	<<if $arcologies[0].FSSlimnessEnthusiast > 20 && $arcologies[0].FSHedonisticDecadence == "unset">>
 		<<print either("fashionable", "sleek and attractive", "small and enticing")>>
 	<<else>>
 		<<print either("rounded, small", "small but rounded", "small, sleek")>>
 	<</if>>
-	rear end.
-<<elseif $activeSlave.butt <= 3>><<print either("big and healthy", "curved and plump", "healthy and plump")>> derrière.
-<<elseif $activeSlave.butt <= 4>><<print either("big bubble", "curvy and enticing", "juicy and large")>> butt.
-<<elseif $activeSlave.butt <= 5>><<print either("huge", "juicy and huge", "massive and undeniable")>> rear end.
-<<elseif $activeSlave.butt <= 6>><<print either("enormous", "truly massive")>> posterior.
-<<elseif $activeSlave.butt <= 7>><<print either("gigantic", "titanic")>> ass.
-<<elseif $activeSlave.butt <= 10>><<print either("gigantic", "titanic")>> ass.
-	<<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so big it jiggles as the machine rapes $his asshole.
-	<<elseif !canWalk($activeSlave)>> It's so big it would jiggle as $he walked — if $he could walk.
-	<<else>> It's so big it jiggles as $he walks.
+	rear end,
+<<elseif $activeSlave.butt <= 3>><<print either("big and healthy", "curved and plump", "healthy and plump")>> derrière,
+<<elseif $activeSlave.butt <= 4>><<print either("big bubble", "curvy and enticing", "juicy and large")>> butt,
+<<elseif $activeSlave.butt <= 5>><<print either("huge", "juicy and huge", "massive and undeniable")>> rear end,
+<<elseif $activeSlave.butt <= 6>><<print either("enormous", "truly massive")>> posterior,
+<<elseif $activeSlave.butt <= 7>><<print either("gigantic", "titanic")>> ass,
+<<elseif $activeSlave.butt <= 10>><<print either("gigantic", "titanic")>> ass,
+	<<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so big it jiggles as the machine rapes $his asshole,
+	<<elseif !canWalk($activeSlave)>> It's so big it would jiggle as $he walked — if $he could walk,
+	<<else>> It's so big it jiggles as $he walks,
 	<</if>>
-<<elseif $activeSlave.butt <= 14>><<print either("cushion-like", "hall-crowding")>> ass.
-	<<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so big it massively jiggles as the machine rapes $his asshole.
-	<<elseif !canWalk($activeSlave)>> It's so big it would jiggle nonstop as $he walked — if $he could walk.
-	<<else>> It's so big it jiggles nonstop as $he walks.
+<<elseif $activeSlave.butt <= 14>><<print either("cushion-like", "hall-crowding")>> ass,
+	<<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so big it massively jiggles as the machine rapes $his asshole,
+	<<elseif !canWalk($activeSlave)>> It's so big it would jiggle nonstop as $he walked — if $he could walk,
+	<<else>> It's so big it jiggles nonstop as $he walks,
 	<</if>>
-<<else>><<print either("bean bag sized", "room-crowding")>> ass.
-	<<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so massive it jiggles endlessly as the machine rapes $his asshole.
-	<<elseif !canWalk($activeSlave)>> It's so massive it would jiggle endlessly as $he walked — if $he could walk.
-	<<else>> It's so massive it jiggles endlessly as $he walks.
+<<else>><<print either("bean bag sized", "room-crowding")>> ass,
+	<<if ($activeSlave.assignment == "work in the dairy") && ($dairyStimulatorsSetting > 1)>> It's so massive it jiggles endlessly as the machine rapes $his asshole,
+	<<elseif !canWalk($activeSlave)>> It's so massive it would jiggle endlessly as $he walked — if $he could walk,
+	<<else>> It's so massive it jiggles endlessly as $he walks,
 	<</if>>
 <</if>>
@@ -3832,42 +3832,6 @@ $He's got a
 	Society looks fondly on $his complete inability to reproduce.
 <</if>>
-<<set _pubertyAge = Math.min($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")>>
-	$He is no longer able to grow pubic hair leaving $him hairless and smooth.
-<<elseif ($activeSlave.pubicHStyle == "waxed")>>
-	<<if $activeSlave.fuckdoll > 0>>
-	$His pubic hair has been removed to prevent chafing.
-	<<elseif ($activeSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting > 1)>>
-	$His pubic hair has been removed to prevent chafing.
-	<<else>>
-	$He's waxed and smooth.
-	<</if>>
-<<elseif ($activeSlave.physicalAge < _pubertyAge-1)>>
-	$He has a few wisps of 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")>>
-	$His $activeSlave.pubicHColor pubic hair is waxed into a neat patch above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
-<<elseif ($activeSlave.pubicHStyle == "bushy in the front and neat in the rear")>>
-	$His $activeSlave.pubicHColor pubic hair forms a natural bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
-<<elseif ($activeSlave.pubicHStyle == "bushy")>>
-	$His $activeSlave.pubicHColor pubic hair forms a natural bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
-<<elseif ($activeSlave.pubicHStyle == "very bushy")>>
-	$His $activeSlave.pubicHColor pubic hair forms a dense bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>> that trails up to $his navel.
-<</if>>
-
-<<if $activeSlave.fuckdoll == 0>>
-	<<if $showBodyMods == 1>>
-		<<= App.Desc.brand($activeSlave, "pubic mound")>>
-	<</if>>
-<</if>>
 <<if ($activeSlave.dick == 0)>>
 	<<if ($activeSlave.clit > 0)>>
@@ -4124,6 +4088,43 @@ $He's got a
 	<</if>>
 <</if>>
+<<if $activeSlave.fuckdoll == 0>>
+	<<if $showBodyMods == 1>>
+		<<= App.Desc.brand($activeSlave, "pubic mound")>>
+	<</if>>
+<</if>>
+
+<<set _pubertyAge = Math.min($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")>>
+	$He is no longer able to grow pubic hair leaving $him hairless and smooth.
+<<elseif ($activeSlave.pubicHStyle == "waxed")>>
+	<<if $activeSlave.fuckdoll > 0>>
+	$His pubic hair has been removed to prevent chafing.
+	<<elseif ($activeSlave.assignment == "work in the dairy") && ($dairyRestraintsSetting > 1)>>
+	$His pubic hair has been removed to prevent chafing.
+	<<else>>
+	$He's waxed and smooth.
+	<</if>>
+<<elseif ($activeSlave.physicalAge < _pubertyAge-1)>>
+	$He has a few wisps of 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")>>
+	$His $activeSlave.pubicHColor pubic hair is waxed into a neat patch above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
+<<elseif ($activeSlave.pubicHStyle == "bushy in the front and neat in the rear")>>
+	$His $activeSlave.pubicHColor pubic hair forms a natural bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
+<<elseif ($activeSlave.pubicHStyle == "bushy")>>
+	$His $activeSlave.pubicHColor pubic hair forms a natural bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>>.
+<<elseif ($activeSlave.pubicHStyle == "very bushy")>>
+	$His $activeSlave.pubicHColor pubic hair forms a dense bush above $his <<if $activeSlave.dick > 0>>cock<<elseif $activeSlave.vagina == -1>>smoothness<<else>>pussy<</if>> that trails up to $his navel.
+<</if>>
+
 <</widget>>
 <<widget "earDescription">>
@@ -16671,7 +16672,6 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
 <<if $activeSlave.hips < -1>>
 	<<if $activeSlave.butt > 2>>
-		$His butt is
 		<<if $arcologies[0].FSHedonisticDecadence != "unset">>
 			disproportionately large for $his narrow hips, but your hedonistic arcology finds this attractive.
 		<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
@@ -16682,11 +16682,10 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
 			@@.red;disproportionately large@@ for $his narrow hips.
 		<</if>>
 	<<else>>
-		$His hips are very narrow.
+		and $his hips are very narrow.
 	<</if>>
 <<elseif $activeSlave.hips < 0>>
 	<<if $activeSlave.butt > 4>>
-		$His butt is
 		<<if $arcologies[0].FSHedonisticDecadence != "unset">>
 			disproportionately large for $his trim hips, but your hedonistic arcology finds this attractive.
 		<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
@@ -16697,23 +16696,22 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
 			@@.red;disproportionately large@@ for $his trim hips.
 		<</if>>
 	<<else>>
-		$His butt is complemented by $his trim hips.
+		complemented by $his trim hips.
 	<</if>>
 <<elseif $activeSlave.hips > 2>>
 	<<if $activeSlave.butt <= 8>>
-		$His butt is @@.red;disproportionately small@@ for $his monstrous hips.
+		@@.red;disproportionately small@@ for $his monstrous hips.
 	<<else>>
-		$His butt is fitting for $his monstrous hips.
+		fitting for $his monstrous hips.
 	<</if>>
 <<elseif $activeSlave.hips > 1>>
 	<<if $activeSlave.butt <= 3 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || ($activeSlave.boobs >= 500))>>
-		$His butt is @@.red;disproportionately small@@ for $his very wide hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
+		@@.red;disproportionately small@@ for $his very wide hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
 	<<else>>
-		$His butt is flattered by $his very wide hips.
+		flattered by $his very wide hips.
 	<</if>>
 <<elseif $activeSlave.hips > 0>>
 	<<if $activeSlave.butt > 8>>
-		$His butt is
 		<<if $arcologies[0].FSHedonisticDecadence != "unset">>
 			disproportionately large for $his broad hips, but your hedonistic arcology finds this attractive.
 		<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
@@ -16724,13 +16722,12 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
 			@@.red;disproportionately large@@ for $his broad hips.
 		<</if>>
 	<<elseif $activeSlave.butt <= 2 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || ($activeSlave.boobs >= 500))>>
-		$His butt is @@.red;disproportionately small@@ for $his broad hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
+		@@.red;disproportionately small@@ for $his broad hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
 	<<else>>
-		$His butt is complemented by $his broad hips.
+		complemented by $his broad hips.
 	<</if>>
 <<else>>
 	<<if $activeSlave.butt > 6>>
-		$His butt is
 		<<if $arcologies[0].FSHedonisticDecadence != "unset">>
 			disproportionately large for $his womanly hips, but your hedonistic arcology finds this attractive.
 		<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
@@ -16741,9 +16738,9 @@ $His womb contains <<= num(_slaveWD.litters.length)>> separate pregnancies;
 			@@.red;disproportionately large@@ for $his womanly hips.
 		<</if>>
 	<<elseif $activeSlave.butt <= 1 && ($arcologies[0].FSSlimnessEnthusiast == "unset" || ($activeSlave.boobs >= 500))>>
-		$His butt is @@.red;disproportionately small@@ for $his ample hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
+		@@.red;disproportionately small@@ for $his ample hips<<if $arcologies[0].FSSlimnessEnthusiast != "unset">>, which your arcology finds unattractive on busty slaves.<<else>>.<</if>>
 	<<else>>
-		$His butt is complemented by $his ample hips.
+		complemented by $his ample hips.
 	<</if>>
 <</if>>