diff --git a/src/art/artWidgets.tw b/src/art/artWidgets.tw index 27a152a7f6aef4cd2ca6ddfbef4c65e095b09971..3947be34e5de534950da1c5a4ca36aefe2cc6398 100644 --- a/src/art/artWidgets.tw +++ b/src/art/artWidgets.tw @@ -88,7 +88,7 @@ vector art added later is drawn over previously added art (what is listed on the bottom in the code appears on the top of the image) */ <<include Art_Vector_Hair_Back_>> -<<include Art_Vector_Arm_>> +<<if _artSlave.amp != 1>><<include Art_Vector_Arm_>><</if>> <<include Art_Vector_Butt_>> <<include Art_Vector_Leg_>> <<include Art_Vector_Feet_>> /* includes shoes and leg outfits*/ diff --git a/src/art/vector/Arm.tw b/src/art/vector/Arm.tw index d6bba4c535eeb84f588a939c741430a8921e329b..edfa568c6201ab6bc48f8509e75a70d8f0725da8 100644 --- a/src/art/vector/Arm.tw +++ b/src/art/vector/Arm.tw @@ -27,67 +27,65 @@ /* Arms position switch courtesy of Nov-X */ -<<if $args[0].amp != 1>> - <<if _artSlave.weight <= 20>> - <<if $args[0].devotion > 50>> - <<set _leftArmType = "High">> - <<set _rightArmType = "High">> - <<elseif $args[0].trust >= -20>> - <<if $args[0].devotion < -20>> - <<set _leftArmType = "Rebel">> - <<set _rightArmType = "Low">> - <<elseif $args[0].devotion <= 20>> - <<set _leftArmType = "Low">> - <<set _rightArmType = "Low">> - <<else>> - <<set _leftArmType = "Mid">> - <<set _rightArmType = "High">> - <</if>> +<<if _artSlave.weight <= 20>> + <<if $args[0].devotion > 50>> + <<set _leftArmType = "High">> + <<set _rightArmType = "High">> + <<elseif $args[0].trust >= -20>> + <<if $args[0].devotion < -20>> + <<set _leftArmType = "Rebel">> + <<set _rightArmType = "Low">> + <<elseif $args[0].devotion <= 20>> + <<set _leftArmType = "Low">> + <<set _rightArmType = "Low">> <<else>> <<set _leftArmType = "Mid">> - <<set _rightArmType = "Mid">> - <</if>> - <<elseif _artSlave.weight > 20>> - <<if $args[0].devotion > 50>> - <<set _leftArmType = "High">> <<set _rightArmType = "High">> - <<elseif $args[0].trust >= -20>> - <<if $args[0].devotion < -20>> - <<set _leftArmType = "Rebel">> - <<set _rightArmType = "Low">> - <<elseif $args[0].devotion <= 20>> - <<set _leftArmType = "Low">> - <<set _rightArmType = "Low">> - <<else>> - <<set _leftArmType = "Mid">> - <<set _rightArmType = "High">> - <</if>> + <</if>> + <<else>> + <<set _leftArmType = "Mid">> + <<set _rightArmType = "Mid">> + <</if>> +<<elseif _artSlave.weight > 20>> + <<if $args[0].devotion > 50>> + <<set _leftArmType = "High">> + <<set _rightArmType = "High">> + <<elseif $args[0].trust >= -20>> + <<if $args[0].devotion < -20>> + <<set _leftArmType = "Rebel">> + <<set _rightArmType = "Low">> + <<elseif $args[0].devotion <= 20>> + <<set _leftArmType = "Low">> + <<set _rightArmType = "Low">> <<else>> <<set _leftArmType = "Mid">> - <<set _rightArmType = "Mid">> + <<set _rightArmType = "High">> <</if>> + <<else>> + <<set _leftArmType = "Mid">> + <<set _rightArmType = "Mid">> <</if>> - - <<set _art = "Art_Vector_Arm_Right_"+_rightArmType >> - <<include _art>> - <<set _art = "Art_Vector_Arm_Left_"+_leftArmType >> - <<include _art>> - - /* shiny clothings */ - <<if $seeVectorArtHighlights == 1>> - <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">> - /* only some arm positions have art (feel free to add more) */ - <<switch _leftArmType>> - <<case "High">> - <<include Art_Vector_Arm_Outfit_Shine_Left_High>> - <<case "Mid">> - <<include Art_Vector_Arm_Outfit_Shine_Left_Mid>> - <<case "Low">> - <<include Art_Vector_Arm_Outfit_Shine_Left_Low>> - <<default>> - /* no art for this arm position */ - <</switch>> - <</if>> +<</if>> + +<<set _art = "Art_Vector_Arm_Right_"+_rightArmType >> +<<include _art>> +<<set _art = "Art_Vector_Arm_Left_"+_leftArmType >> +<<include _art>> + +/* shiny clothings */ +<<if $seeVectorArtHighlights == 1>> + <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">> + /* only some arm positions have art (feel free to add more) */ + <<switch _leftArmType>> + <<case "High">> + <<include Art_Vector_Arm_Outfit_Shine_Left_High>> + <<case "Mid">> + <<include Art_Vector_Arm_Outfit_Shine_Left_Mid>> + <<case "Low">> + <<include Art_Vector_Arm_Outfit_Shine_Left_Low>> + <<default>> + /* no art for this arm position */ + <</switch>> <</if>> <</if>>