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

Pubic Hair Fix

See merge request pregmodfan/fc-pregmod!2373

src/art/vector/Butt.tw

@@ -3,7 +3,7 @@
 /* BEWARE: _buttSize is also used in Art_Vector_Leg_ */
 
 <<if _artSlave.amp != 1>>
-  <<if _artSlave.butt == 7>>
+  <<if _artSlave.butt >= 7>>
     <<set _buttSize = 6>>
   <<elseif _artSlave.butt == 6>>
     <<set _buttSize = 5>>

src/art/vector/Pubic_Hair.tw

@@ -22,17 +22,37 @@
 	<</if>>
 <</if>>
 
-<<if _artSlave.physicalAge > 13 && _artSlave.weight < 11>>
+<<if _artSlave.physicalAge > 13 >>
 	<<if _artSlave.pubicHStyle == "strip" || _artSlave.pubicHStyle == "in a strip">>
-		<<include Art_Vector_Pubic_Hair_Strip >>
+		<<if _torsoSize == "Obese" || _torsoSize == "Fat">>
+			<<include Art_Vector_Pubic_Hair_StripFat >>
+		<<elseif _torsoSize == "Chubby" || _torsoSize == "Normal" || _torsoSize == "Unnatural" || _torsoSize == "Hourglass" >>	
+			<<include Art_Vector_Pubic_Hair_Strip >>
+		<</if>>
 	<<elseif _artSlave.pubicHStyle == "bush" || _artSlave.pubicHStyle == "bushy in the front and neat in the rear">>
-		<<include Art_Vector_Pubic_Hair_Bush >>
+		<<if _torsoSize == "Obese" || _torsoSize == "Fat">>
+			<<include Art_Vector_Pubic_Hair_BushFat >>
+		<<elseif _torsoSize == "Chubby" || _torsoSize == "Normal" || _torsoSize == "Unnatural" || _torsoSize == "Hourglass" >>	
+			<<include Art_Vector_Pubic_Hair_Bush >>
+		<</if>>
 	<<elseif _artSlave.pubicHStyle == "neat">>
-		<<include Art_Vector_Pubic_Hair_Neat >>
+		<<if _torsoSize == "Obese" || _torsoSize == "Fat">>
+			<<include Art_Vector_Pubic_Hair_NeatFat >>
+		<<elseif _torsoSize == "Chubby" || _torsoSize == "Normal" || _torsoSize == "Unnatural" || _torsoSize == "Hourglass" >>	
+			<<include Art_Vector_Pubic_Hair_Neat >>
+		<</if>>
 	<<elseif _artSlave.pubicHStyle =="bushy">>
-		<<include Art_Vector_Pubic_Hair_Bushy >>
+		<<if _torsoSize == "Obese" || _torsoSize == "Fat">>
+			<<include Art_Vector_Pubic_Hair_BushyFat >>
+		<<elseif _torsoSize == "Chubby" || _torsoSize == "Normal" || _torsoSize == "Unnatural" || _torsoSize == "Hourglass" >>	
+			<<include Art_Vector_Pubic_Hair_Bushy >>
+		<</if>>
 	<<elseif _artSlave.pubicHStyle =="very bushy">>
-		<<include Art_Vector_Pubic_Hair_Very_Bushy >>
+		<<if _torsoSize == "Obese" || _torsoSize == "Fat">>
+			<<include Art_Vector_Pubic_Hair_Very_BushyFat >>
+		<<elseif _torsoSize == "Chubby" || _torsoSize == "Normal" || _torsoSize == "Unnatural" || _torsoSize == "Hourglass" >>	
+			<<include Art_Vector_Pubic_Hair_Very_Bushy >>
+		<</if>>
 	<<elseif _artSlave.pubicHStyle =="waxed">>
 		<<include Art_Vector_Pubic_Hair_None >>					
 	<</if>>