diff --git a/src/art/vector/Butt.tw b/src/art/vector/Butt.tw index 564e8a15d3430c0ed6e6b8de34379792688d0890..8ae6760177e1b977dd1a298b50990fc9d553b9b8 100644 --- a/src/art/vector/Butt.tw +++ b/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>> diff --git a/src/art/vector/Pubic_Hair.tw b/src/art/vector/Pubic_Hair.tw index ca6dd4f98e1d6b42c682255b80cafaa9299dcc5a..b839cb43ed16f3e0b785ef280729afd155162b88 100644 --- a/src/art/vector/Pubic_Hair.tw +++ b/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>>