Merge branch 'pregmod-dev' into 'pregmod-master'

ear cleaning

Closes #499

See merge request pregmodfan/fc-pregmod!3628

src/utility/descriptionWidgetsFlesh.tw

@@ -5322,37 +5322,80 @@ $He's got a
 <<widget "earDescription">>
 /* ear shape description here */
 <<if $activeSlave.earShape == "none">>
-		<<if $activeSlave.earImplant == 1>>
-			<<if $activeSlave.earT != "none">>
+	<<if $activeSlave.earImplant == 1>>
+		<<if $activeSlave.earT != "none">>
 			$He has smooth skin where $his ears should be as $his hearing has been cybernetically rerouted to $his secondary ears. 
-			<<else>>
+		<<else>>
 			$He has nothing but small, perforated metal disks where $his ears should be.
-			<</if>>
+		<</if>>
+	<<elseif $activeSlave.earWear == "none">>
+		$He has small unsightly holes on the sides of $his head. /*That can't be sanitary.*/
+	<<else>>
+		The sides of $his head are smooth where $his ears should be, but upon closer inspection it is revealed that
+		<<if $activeSlave.earWear == "hearing aids">>
+			$his ear canals are fitted with hearing aids capped with a skin-matching sheet to obscure the hole.
 		<<else>>
-			$He has small unsightly holes on the sides of $his head. /*That can't be sanitary.*/
-		<</if>>	
-	<<elseif $activeSlave.earShape == "damaged">>
-		$His outer ears have been severely damaged.
-	<<elseif $activeSlave.earShape == "normal">>
-		$He has perfectly ordinary ears. 
-	<<elseif $activeSlave.earShape == "robot">>
-		$He has high tech cyber-ears that could be mistaken for headphones. /*not yet implemented*/
-	<<elseif $activeSlave.earShape == "pointy">>
-		$His small, <<print either("pointed", "leaf-shaped", "elfin")>> ears are quite cute and give her an exotic apearance.
-	<<elseif $activeSlave.earShape == "elven">>
-		$He has long, thin elven ears that <<print either("tend waggle up and down when $he is exicited", "twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>.
-	<<elseif $activeSlave.earShape == "ushi">>
-		$He has long, floppy cow ears that <<print either("tend waggle up and down when $he is exicited", "twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>.
+			$his ear canals are filled with plugs with skin-matching caps.
+		<</if>>
+	<</if>>
+<<elseif $activeSlave.earShape == "damaged">>
+	$His outer ears have been severely damaged.
+<<elseif $activeSlave.earShape == "normal" && $activeSlave.earT>> /* Ears are expected, so lets only mention them if we have two sets */
+	$He has perfectly ordinary ears. 
+<<elseif $activeSlave.earShape == "robot">>
+	$He has high tech cyber-ears that could be mistaken for headphones. /*not yet implemented*/
+<<elseif $activeSlave.earShape == "pointy">>
+	$His small, <<print either("pointed", "leaf-shaped", "elfin")>> ears are quite cute and give $him an exotic apearance.
+<<elseif $activeSlave.earShape == "elven">>
+	$He has long, thin elven ears that <<print either("tend to waggle up and down when $he is exicited", "twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>.
+<<elseif $activeSlave.earShape == "ushi">>
+	$He has long, floppy cow ears. /* that <<print either("tend waggle up and down when $he is exicited", "twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>. These don't make sense for the most part. */
 <</if>>
 <<if $activeSlave.earT == "neko">>
-		$He has cute, $activeSlave.earTColor cat ears on $his head, they <<if $activeSlave.earImplant == 1>>perk up at<<if $activeSlave.devotion > 20>>the sound of your voice and<<else>>sudden noises and <</if>><</if>><<print either("twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>
-	<<elseif $activeSlave.earT == "inu">>
-		$He has cute, $activeSlave.earTColor dog ears on $his head, they <<if $activeSlave.earImplant == 1>>perk up at<<if $activeSlave.devotion > 20>>the sound of your voice and<<else>>sudden noises and <</if>><</if>><<print either("twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>
-	<<elseif $activeSlave.earT == "kit">>
-		$He has elegant, $activeSlave.earTColor fox ears on $his head, they <<if $activeSlave.earImplant == 1>>perk up at<<if $activeSlave.devotion > 20>>the sound of your voice and<<else>>sudden noises and <</if>><</if>><<print either("twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>
-	<<elseif $activeSlave.earT == "tanuki">>
-		$He has adorable, $activeSlave.earTColor, round tanuki ears on $his head, they <<if $activeSlave.earImplant == 1>>perk up at<<if $activeSlave.devotion > 20>>the sound of your voice and <<else>>sudden noises and <</if>><</if>><<print either("twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>
+	$He has cute, $activeSlave.earTColor cat ears on $his head, they
+	<<if $activeSlave.earImplant == 1>>
+		perk up at
+		<<if $activeSlave.devotion > 20>>
+			the sound of your voice and
+		<<else>>
+			sudden noises and
+		<</if>>
+	<</if>>
+	<<print either("twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>.
+<<elseif $activeSlave.earT == "inu">>
+	$He has cute, $activeSlave.earTColor dog ears on $his head, they
+	<<if $activeSlave.earImplant == 1>>
+		perk up at
+		<<if $activeSlave.devotion > 50>>
+			the sound of your voice and
+		<<else>>
+			sudden noises and
+		<</if>>
+	<</if>>
+	<<print either("twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>.
+<<elseif $activeSlave.earT == "kit">>
+	$He has elegant, $activeSlave.earTColor fox ears on $his head, they
+	<<if $activeSlave.earImplant == 1>>
+		perk up at
+		<<if $activeSlave.devotion > 50>>
+			the sound of your voice and
+		<<else>>
+			sudden noises and
+		<</if>>
+	<</if>>
+	<<print either("twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>.
+<<elseif $activeSlave.earT == "tanuki">>
+	$He has adorable, $activeSlave.earTColor, round tanuki ears on $his head; they
+	<<if $activeSlave.earImplant == 1>>
+		perk up at
+		<<if $activeSlave.devotion > 50>>
+			the sound of your voice and
+		<<else>>
+			sudden noises and
+		<</if>>
+	<</if>>
+	<<print either("twitch at the slightest touch", "tend to droop when $he is relaxed or sad")>>.
 <</if>>
 <<if $activeSlave.hears < 0>>
@@ -5361,7 +5404,11 @@ $He's got a
 	<<elseif $activeSlave.hears < -1>>
 		$He is completely deaf,
 	<</if>>
-	but this isn't obvious just by looking at $his ears.
+	<<if $activeSlave.hears < -1 && $activeSlave.earShape == "none">>
+		which is fitting due to $his lack of ears.
+	<<else>>
+		but this isn't obvious just by looking at $his ears.
+	<</if>>
 <</if>>
 <</widget>>
@@ -16928,21 +16975,21 @@ $He has
 <</if>>
 <<if $activeSlave.tailShape == "neko">>
-		$He has a long, slender, $activeSlave.tailColor cat tail which tends to sway side to side when $he is focused on a task.
-	<<elseif $activeSlave.tailShape == "inu">>
-		$He has a bushy, $activeSlave.tailColor dog tail which tends to wag energetically when $he gets exited.
-	<<elseif $activeSlave.tailShape == "kit">>
-		$He has a soft, fluffy, $activeSlave.tailColor fox tail.
-	<<elseif $activeSlave.tailShape == "kitsune">>
-		$He has three incredibly soft, fluffy, $activeSlave.tailColor fox tails, they feel heavenly to the touch.
-	<<elseif $activeSlave.tailShape == "tanuki">>
-		$He has a long, fluffy, $activeSlave.tailColor tanuki tail with a dark stripe running down the middle.
-	<<elseif $activeSlave.tailShape == "ushi">>
-		$He has a long, $activeSlave.tailColor cow tail, it has a small tuft of hair at the end and tends to swat at things absentminedly.
-	<<elseif $activeSlave.tail == "combat">>
-		$He has a very long $activeSlave.tailColor metallic tail that can lash out, constrict, and deploy razor sharp spikes on command.
-	<<elseif $activeSlave.tail == "sex">>
-		$He has a long, slender, $activeSlave.tailColor tail. While not strong it is very dextrous and has a small fleshy spade-shaped tip that can vibrate and dispense lube on command.
+	$He has a long, slender, $activeSlave.tailColor cat tail which tends to sway side to side when $he is focused on a task.
+<<elseif $activeSlave.tailShape == "inu">>
+	$He has a bushy, $activeSlave.tailColor dog tail which tends to wag energetically when $he gets exited.
+<<elseif $activeSlave.tailShape == "kit">>
+	$He has a soft, fluffy, $activeSlave.tailColor fox tail.
+<<elseif $activeSlave.tailShape == "kitsune">>
+	$He has three incredibly soft, fluffy, $activeSlave.tailColor fox tails, they feel heavenly to the touch.
+<<elseif $activeSlave.tailShape == "tanuki">>
+	$He has a long, fluffy, $activeSlave.tailColor tanuki tail with a dark stripe running down the middle.
+<<elseif $activeSlave.tailShape == "ushi">>
+	$He has a long, $activeSlave.tailColor cow tail, it has a small tuft of hair at the end and tends to swat at things absentminedly.
+<<elseif $activeSlave.tail == "combat">>
+	$He has a very long $activeSlave.tailColor metallic tail that can lash out, constrict, and deploy razor sharp spikes on command.
+<<elseif $activeSlave.tail == "sex">>
+	$He has a long, slender, $activeSlave.tailColor tail. While not strong it is very dextrous and has a small fleshy spade-shaped tip that can vibrate and dispense lube on command.
 <</if>>
 <</widget>>