From d21e0450a34d72701db31c4886feccb6e1df8485 Mon Sep 17 00:00:00 2001
From: faraen <faraen@protonmail.com>
Date: Fri, 16 Feb 2018 18:15:09 +0200
Subject: [PATCH] Vector art piercing bugfixes
Fixed piercings showing when body part is covered with clothing.
---
src/art/vector_revamp/Body_Clothing_Control.tw | 14 ++++++++++----
src/art/vector_revamp/Head.tw | 14 +++++++-------
src/art/vector_revamp/Penis.tw | 2 +-
3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/art/vector_revamp/Body_Clothing_Control.tw b/src/art/vector_revamp/Body_Clothing_Control.tw
index 174a257074e..188559748db 100644
--- a/src/art/vector_revamp/Body_Clothing_Control.tw
+++ b/src/art/vector_revamp/Body_Clothing_Control.tw
@@ -114,6 +114,8 @@
<<set _showBellyPiercings = 1>>
<<set _showNipplePiercings = 1>>
<<set _showPussyPiercings = 1>>
+<<set _showDickPiercings = 1>>
+<<set _showHeadPiercings = 1>>
<<set _bellyDetailsOpacity = 1>>
<<set _bellyColor = _skinColour>>
<<set _bellyUpperColor = _skinColour>>
@@ -133,7 +135,7 @@
<<set _showLegHighlight = 1>>
<<set _showHeadHighlight = 1>>
<<set _skinColour to _outfitBaseColour>>
- <<set _areolaStyle to "fill:rgba(0,0,0,0.3);">>
+ <<set _areolaStyle to "fill:rgba(56,56,56,1);">> /* areolae are represented by a darker area */
<<set _labiaStyle to _areolaStyle >>
<<set _bellyColor = "#FFFFFF">>
<<set _bellyUpperColor = _bellyColor>>
@@ -170,7 +172,8 @@
<<set _showLegHighlight = 1>>
<<set _showHeadHighlight = 1>>
<<set _showBellyPiercings = 0>>
-
+ <<set _showHeadPiercings = 0>>
+
/* nice latex does not cover any privates. */
<<set _torsoSkinStyle to _outfitBaseColour>>
<<set _boobSkinStyle to "fill:"+_skinColour+";">>
@@ -195,13 +198,14 @@
<<set _showNipplePiercings = 0>>
<<set _chastityAnal = 0>>
<<set _chastityVaginal = 0>>
-
+ <<set _showDickPiercings = 0>>
+ <<set _showPussyPiercings = 0>>
/* nice latex does not cover head. */
<<set _headSkinStyle to "fill:"+_skinColour+";">>
/* rest of body is covered in latex */
<<set _skinColour to _outfitBaseColour>>
/* catsuit covers areolae and crotch, too */
- <<set _areolaStyle to "fill:rgba(0,0,0,0.3);">> /* areolae are represented by a darker area */
+ <<set _areolaStyle to "fill:rgba(56,56,56,1);">> /* areolae are represented by a darker area */
/* todo: gain control over piercings to do the same with them ^^ */
<<set _labiaStyle to _areolaStyle >>
@@ -225,6 +229,8 @@
<<set _showNipplePiercings = 0>>
<<set _showBellyPiercings = 0>>
<<set _showPussyPiercings = 0>>
+ <<set _showDickPiercings = 0>>
+ <<set _showHeadPiercings = 0>>
<</if>>
<<if $seeVectorArtHighlights == 0>>
diff --git a/src/art/vector_revamp/Head.tw b/src/art/vector_revamp/Head.tw
index dff04c2ee8c..2e980d4051d 100644
--- a/src/art/vector_revamp/Head.tw
+++ b/src/art/vector_revamp/Head.tw
@@ -9,7 +9,7 @@
<<if _showEyesHighlight == 1>>
<<include Art_Vector_Revamp_Eyes_Happy_Highlights>>
<</if>>
- <<if $showBodyMods>>
+ <<if _showHeadPiercings>>
<<if _artSlave.eyebrowPiercing == 1>>
<<include Art_Vector_Revamp_Head_Eyebrow_Happy_Piercing>>
<<elseif _artSlave.eyebrowPiercing == 2>>
@@ -21,7 +21,7 @@
<<if _showEyesHighlight == 1>>
<<include Art_Vector_Revamp_Eyes_Shy_Highlights>>
<</if>>
- <<if $showBodyMods>>
+ <<if _showHeadPiercings>>
<<if _artSlave.eyebrowPiercing == 1>>
<<include Art_Vector_Revamp_Head_Eyebrow_Shy_Piercing>>
<<elseif _artSlave.eyebrowPiercing == 2>>
@@ -30,7 +30,7 @@
<</if>>
<<elseif _artSlave.devotion >= -50>>
<<include Art_Vector_Revamp_Eyes_Closed>>
- <<if $showBodyMods>>
+ <<if _showHeadPiercings>>
<<if _artSlave.eyebrowPiercing == 1>>
<<include Art_Vector_Revamp_Head_Eyebrow_Closed_Piercing>>
<<elseif _artSlave.eyebrowPiercing == 2>>
@@ -42,7 +42,7 @@
<<if _showEyesHighlight == 1>>
<<include Art_Vector_Revamp_Eyes_Angry_Highlights>>
<</if>>
- <<if $showBodyMods>>
+ <<if _showHeadPiercings>>
<<if _artSlave.eyebrowPiercing == 1>>
<<include Art_Vector_Revamp_Head_Eyebrow_Angry_Piercing>>
<<elseif _artSlave.eyebrowPiercing == 2>>
@@ -73,7 +73,7 @@
<<include Art_Vector_Revamp_Makeup_Mouth_Happy_Thin>>
<<include Art_Vector_Revamp_Mouth_Happy_Thin>>
<</if>>
- <<if $showBodyMods>>
+ <<if _showHeadPiercings>>
<<if _artSlave.lipsPiercing == 1>>
<<include Art_Vector_Revamp_Head_Mouth_Happy_Piercing>>
<<elseif _artSlave.lipsPiercing == 2>>
@@ -100,7 +100,7 @@
<<include Art_Vector_Revamp_Makeup_Mouth_Angry_Thin>>
<<include Art_Vector_Revamp_Mouth_Angry_Thin>>
<</if>>
- <<if $showBodyMods>>
+ <<if _showHeadPiercings>>
<<if _artSlave.lipsPiercing == 1>>
<<include Art_Vector_Revamp_Head_Mouth_Angry_Piercing>>
<<elseif _artSlave.lipsPiercing == 2>>
@@ -115,7 +115,7 @@
<</if>>
/* ADDONS */
-<<if $showBodyMods>>
+<<if _showHeadPiercings>>
<<if _artSlave.earPiercing == 1>>
<<include Art_Vector_Revamp_Head_Ear_Piercing>>
<<elseif _artSlave.earPiercing == 2>>
diff --git a/src/art/vector_revamp/Penis.tw b/src/art/vector_revamp/Penis.tw
index 90b3f493421..4b99254f942 100644
--- a/src/art/vector_revamp/Penis.tw
+++ b/src/art/vector_revamp/Penis.tw
@@ -24,7 +24,7 @@
<<if canAchieveErection(_artSlave) && (_artSlave.dickAccessory != "chastity") && (_artSlave.dickAccessory != "combined chastity") >>
<<set _art = "Art_Vector_Revamp_Penis_"+_penisSize>>
<<include _art>>
- <<if $showBodyMods>>
+ <<if _showDickPiercings == 1>>
<<if _artSlave.dickPiercing == 1>>
<<set _art = "Art_Vector_Revamp_Penis_" + _penisSize + "_Piercing">>
<<include _art>>
--
GitLab