diff --git a/src/art/artJS.tw b/src/art/artJS.tw
index d01f80a90fc25fd4420e78f7efee85381bcaa20b..6b0aaae4a696dcfb7f2becf056072bccec9c8a53 100644
--- a/src/art/artJS.tw
+++ b/src/art/artJS.tw
@@ -1731,3 +1731,154 @@ window.skinColorCatcher = function (artSlave) {
}
return colorSlave;
};
+
+window.ArtVectorAnalAccessories = function(slave) {
+ let r = "";
+
+ if (slave.buttplug == "long plug")
+ r += Story.get("Art_Vector_Plug_Long").processText();
+ else if (slave.buttplug == "large plug")
+ r += Story.get("Art_Vector_Plug_Large").processText();
+ else if (slave.buttplug == "long, large plug")
+ r += Story.get("Art_Vector_Plug_Large_Long").processText();
+ else if (slave.buttplug == "huge plug")
+ r += Story.get("Art_Vector_Plug_Huge").processText();
+ else if (slave.buttplug == "long, huge plug")
+ r += Story.get("Art_Vector_Plug_Huge_Long").processText();
+
+ if (slave.buttplugAttachment == "tail")
+ r += Story.get("Art_Vector_Plug_Tail").processText();
+ else if (slave.buttplugAttachment == "cat tail")
+ r += Story.get("Art_Vector_Cat_Tail").processText();
+
+ return r;
+};
+
+window.ArtVectorBoobAddons = function(slave) {
+ let r = "";
+
+ if (slave.boobs < 300) {
+ /* boobs too small: do not show boob-related art */
+ /* BEWARE: this threshold should be kept in sync with the one in Art_Vector_Boob_ */
+ } else {
+ let clothes = slave.clothes;
+
+ switch (slave.clothes) {
+ case "a chattel habit":
+ case "a comfortable bodysuit":
+ case "a cybersuit":
+ case "a fallen nuns habit":
+ case "a latex catsuit":
+ case "a nice pony outfit":
+ case "a skimpy loincloth":
+ case "a slutty pony outfit":
+ case "a succubus outfit":
+ case "a thong":
+ case "body oil":
+ case "boyshorts":
+ case "cutoffs":
+ case "jeans":
+ case "leather pants":
+ case "no clothing":
+ case "panties":
+ case "restrictive latex":
+ case "sport shorts":
+ case "striped panties":
+ break; /* do nothing for these choices */
+ default:
+ if (slave.clothes === "a slutty schutzstaffel uniform") /* slutty schutzstaffel uniform uses schutzstaffel uniform art */
+ clothes = "a schutzstaffel uniform";
+ else if (slave.clothes === "a niqab and abaya" || slave.clothes === "a burqa")
+ clothes = "a hijab and abaya";
+ r += Story.get(`Art_Vector_Boob_Outfit_${clothing2artSuffix(clothes)}`).processText();
+ }
+ }
+ if (State.variables.showBodyMods === 1 && (slave.nipplesPiercing > 0 || slave.areolaePiercing > 0)) {
+ /* shows nipple piercings in game when selected; piercings will show on the outfits listed below */
+ switch (slave.clothes) {
+ case "a chattel habit":
+ case "a comfortable bodysuit":
+ case "a cybersuit":
+ case "a fallen nuns habit":
+ case "a latex catsuit":
+ case "a monokini":
+ case "a nice pony outfit":
+ case "a penitent nuns habit":
+ case "a skimpy loincloth":
+ case "a slutty pony outfit":
+ case "a string bikini":
+ case "a succubus outfit":
+ case "a thong":
+ case "an apron":
+ case "attractive lingerie":
+ case "attractive lingerie for a pregnant woman":
+ case "body oil":
+ case "boyshorts":
+ case "chains":
+ case "cutoffs":
+ case "jeans":
+ case "leather pants":
+ case "leather pants and a tube top":
+ case "leather pants and pasties":
+ case "no clothing":
+ case "panties":
+ case "restrictive latex":
+ case "shibari ropes":
+ case "slutty jewelry":
+ case "sport shorts":
+ case "striped panties":
+ case "uncomfortable straps":
+ if (slave.nipplesPiercing === 1)
+ r += Story.get("Art_Vector_Boob_Piercing").processText();
+ else if (slave.nipplesPiercing > 1)
+ r += Story.get("Art_Vector_Boob_Piercing_Heavy").processText();
+
+ if (slave.areolaePiercing === 1)
+ r += Story.get("Art_Vector_Boob_Areola_Piercing").processText();
+ else if (slave.areolaePiercing > 1)
+ r += Story.get("Art_Vector_Boob_Areola_Piercingheavy").processText();
+ }
+ }
+ return r;
+};
+
+window.ArtVectorButt = function(slave) {
+ const T = State.temporary;
+ let r;
+
+ /* TODO: turn _buttSize into a scoped JS variable */
+ /* BEWARE: _buttSize is also used in Art_Vector_Leg_ */
+ /* Updated 2018-10-25 by Fr0g */
+ /* - changed size calculation block */
+
+ /* Size calculations - needs to be done even for amputees */
+ if (slave.butt > 6)
+ T.buttSize = 6;
+ else if (slave.butt === 6)
+ T.buttSize = 5;
+ else if (slave.butt === 5)
+ T.buttSize = 4;
+ else if (slave.butt === 4)
+ T.buttSize = 3;
+ else if (slave.butt === 3)
+ T.buttSize = 2;
+ else if (slave.butt === 2)
+ T.buttSize = 1;
+ else
+ T.buttSize = 0;
+
+ if (slave.amp == 0)
+ r = `Art_Vector_Butt_${T.buttSize}`;
+ else if (slave.amp == -1)
+ r = `Art_Vector_Butt_ProstheticBasic_${T.buttSize}`;
+ else if (slave.amp == -2)
+ r = `Art_Vector_Butt_ProstheticSexy_${T.buttSize}`;
+ else if (slave.amp == -3) /* reverted to regular SVG to match description */
+ r = `Art_Vector_Butt_ProstheticBeauty_${T.buttSize}`;
+ else if (slave.amp == -4)
+ r = `Art_Vector_Butt_ProstheticCombat_${T.buttSize}`;
+ else if (slave.amp == -5)
+ r = `Art_Vector_Butt_ProstheticSwiss_${T.buttSize}`;
+
+ return Story.get(r).processText();
+};
diff --git a/src/art/vector/Anal_Accessories.tw b/src/art/vector/Anal_Accessories.tw
index ee7d4de02a13aee9e07535204421a3d546be976b..fe579b8040602c46634dd19a1cde0540ff9cca48 100644
--- a/src/art/vector/Anal_Accessories.tw
+++ b/src/art/vector/Anal_Accessories.tw
@@ -1,18 +1,3 @@
:: Art_Vector_Anal_Accessories_ [nobr]
-<<if _artSlave.buttplug == "long plug">>
- <<include Art_Vector_Plug_Long>>
-<<elseif _artSlave.buttplug == "large plug">>
- <<include Art_Vector_Plug_Large>>
-<<elseif _artSlave.buttplug == "long, large plug">>
- <<include Art_Vector_Plug_Large_Long>>
-<<elseif _artSlave.buttplug == "huge plug">>
- <<include Art_Vector_Plug_Huge>>
-<<elseif _artSlave.buttplug == "long, huge plug">>
- <<include Art_Vector_Plug_Huge_Long>>
-<</if>>
-<<if _artSlave.buttplugAttachment == "tail">>
- <<include Art_Vector_Plug_Tail>>
-<<elseif _artSlave.buttplugAttachment == "cat tail">>
- <<include Art_Vector_Cat_Tail>>
-<</if>>
+<<= ArtVectorAnalAccessories(_artSlave)>>
diff --git a/src/art/vector/Boob_Addons.tw b/src/art/vector/Boob_Addons.tw
index 2cd26186e150b871eab25cbaee9ca4cd59a44999..e99bee936676d7cd6fbc0f44656774ae2bb6bb19 100644
--- a/src/art/vector/Boob_Addons.tw
+++ b/src/art/vector/Boob_Addons.tw
@@ -5,49 +5,7 @@
/* load _art_transform from _art_boob_transform */
<<set _art_transform = _art_boob_transform>>
-<<if _artSlave.boobs < 300 >>
- /* boobs too small: do not show boob-related art */
- /* BEWARE: this threshold should be kept in sync with the one in Art_Vector_Boob_ */
-<<else>>
- <<set _clothes = _artSlave.clothes>>
- <<switch _artSlave.clothes >>
- /* handling special cases */
- <<case "a slutty schutzstaffel uniform" >>
- <<set _clothes = "a schutzstaffel uniform">> /* slutty schutzstaffel uniform uses schutzstaffel uniform art */
- <<case "a niqab and abaya" "a burqa">>
- <<set _clothes = "a hijab and abaya" >>
- <<case "a hijab and blouse">>
- <<set _clothes = "a hijab and blouse" >>
- <</switch>>
- <<switch _clothes >> /* select available clothes */
- <<case "a ball gown" "a bunny outfit" "a cheerleader outfit" "a halter top dress" "a hijab and abaya" "a huipil" "a kimono" "a leotard" "a maternity dress" "a military uniform" "a mini dress" "a monokini" "an apron" "a nice maid outfit" "a nice nurse outfit" "a penitent nuns habit" "a red army uniform" "a scalemail bikini" "a schoolgirl outfit" "a schutzstaffel uniform" "a slave gown" "a slutty maid outfit" "a slutty nurse outfit" "a slutty outfit" "a slutty qipao" "a slutty schutzstaffel uniform" "a string bikini" "a toga" "attractive lingerie" "attractive lingerie for a pregnant woman" "battledress" "chains" "clubslut netting" "conservative clothing" "cutoffs and a t-shirt" "harem gauze" "nice business attire" "shibari ropes" "slutty business attire" "slutty jewelry" "spats and a tank top" "stretch pants and a crop-top" "uncomfortable straps" "Western clothing" "a long qipao" "battlearmor" "a biyelgee costume" "lederhosen" "a dirndl" "a mounty outfit" "a klan robe" "a hijab and blouse" "panties and pasties" "a burkini" "a bra" "a slutty klan robe" "a striped bra" "striped underwear" "a button-up shirt" "a button-up shirt and panties" "a sports bra" "sport shorts and a t-shirt" "sport shorts and a sports bra" "a t-shirt" "a t-shirt and thong" "a t-shirt and panties" "leather pants and a tube top" "leather pants and pasties" "a tube top" "a tube top and thong" "a tank-top" "a tank-top and panties" "a t-shirt and jeans" "an oversized t-shirt" "an oversized t-shirt and boyshorts" "a sweater" "a sweater and cutoffs" "a sweater and panties" "a one-piece swimsuit" "a police uniform" "a hanbok" "a gothic lolita dress" "kitty lingerie">>
- <<set _art = "Art_Vector_Boob_Outfit_"+clothing2artSuffix(_clothes) >>
- <<include _art>>
- <</switch>>
-<</if>>
-
-<<set _showNipplePiercings = $showBodyMods == 1 && _artSlave.clothes != "restrictive latex" && _artSlave.clothes != "a latex catsuit" >>
-
-/* shows nipple piercings in game when selected; piercings wont show on the outfits listed below */
-<<if _artSlave.nipplesPiercing > 0>>
- <<if _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a niqab and abaya" && _artSlave.clothes != "a burqa" && _artSlave.clothes != "a klan robe" && _artSlave.clothes != "a hijab and blouse" && _artSlave.clothes != "a burkini" && _artSlave.clothes != "panties and pasties" && _artSlave.clothes != "a bra" && _artSlave.clothes != "a slutty klan robe" && _artSlave.clothes != "striped underwear" && _artSlave.clothes != "a button-up shirt and panties" && _artSlave.clothes != "a striped bra" && _artSlave.clothes != "a button-up shirt" && _artSlave.clothes != "a sports bra" && _artSlave.clothes != "sport shorts and a sports bra" && _artSlave.clothes != "sport shorts and a t-shirt" && _artSlave.clothes != "a t-shirt" && _artSlave.clothes != "a t-shirt and panties" && _artSlave.clothes != "a t-shirt and thong" && _artSlave.clothes != "a tube top" && _artSlave.clothes != "a tube top and thong" && _artSlave.clothes != "a tank-top" && _artSlave.clothes != "a tank-top and panties" && _artSlave.clothes != "a t-shirt and jeans" && _artSlave.clothes != "an oversized t-shirt" && _artSlave.clothes != "an oversized t-shirt and boyshorts" && _artSlave.clothes != "a sweater and cutoffs" && _artSlave.clothes != "a sweater and panties" && _artSlave.clothes != "a sweater" && _artSlave.clothes != "a police uniform" && _artSlave.clothes != "a one-piece swimsuit" && _artSlave.clothes != "a hanbok" && _artSlave.clothes != "a gothic lolita dress" && _artSlave.clothes != "kitty lingerie">>
- <<if _artSlave.nipplesPiercing == 1>>
- <<include Art_Vector_Boob_Piercing>>
- <<else>>
- <<include Art_Vector_Boob_Piercing_Heavy>>
- <</if>>
-<</if>>
-<</if>>
-
-<<if _artSlave.areolaePiercing > 0>>
- <<if _artSlave.clothes != "a cheerleader outfit" && _artSlave.clothes != "a hijab and abaya" && _artSlave.clothes != "cutoffs and a t-shirt" && _artSlave.clothes != "a halter top dress" && _artSlave.clothes != "a mini dress" && _artSlave.clothes != "a leotard" && _artSlave.clothes != "a nice maid outfit" && _artSlave.clothes != "a slutty maid outfit" && _artSlave.clothes != "a military uniform" && _artSlave.clothes != "a nice nurse outfit" && _artSlave.clothes != "a schoolgirl outfit" && _artSlave.clothes != "a scalemail bikini" && _artSlave.clothes != "a slutty nurse outfit" && _artSlave.clothes != "a ball gown" && _artSlave.clothes != "battledress" && _artSlave.clothes != "spats and a tank top" && _artSlave.clothes != "nice business attire" && _artSlave.clothes != "slutty business attire" && _artSlave.clothes != "a bunny outfit" && _artSlave.clothes != "conservative clothing" && _artSlave.clothes != "a huipil" && _artSlave.clothes != "a kimono" && _artSlave.clothes != "a slave gown" && _artSlave.clothes != "stretch pants and a crop-top" && _artSlave.clothes != "a maternity dress" && _artSlave.clothes != "a slutty qipao" && _artSlave.clothes != "a toga" && _artSlave.clothes != "Western clothing" && _artSlave.clothes != "clubslut netting" && _artSlave.clothes != "a slutty outfit" && _artSlave.clothes != "harem gauze" && _artSlave.clothes != "a penitent nuns outfit" && _artSlave.clothes != "a schutzstaffel uniform" && _artSlave.clothes != "a slutty schutzstaffel uniform" && _artSlave.clothes != "a red army uniform" && _artSlave.clothes != "a long qipao" && _artSlave.clothes != "battlearmor" && _artSlave.clothes != "a mounty outfit" && _artSlave.clothes != "lederhosen" && _artSlave.clothes != "a dirndl" && _artSlave.clothes != "a biyelgee costume" && _artSlave.clothes != "a niqab and abaya" && _artSlave.clothes != "a burqa" && _artSlave.clothes != "a klan robe" && _artSlave.clothes != "a hijab and blouse" && _artSlave.clothes != "a burkini" && _artSlave.clothes != "panties and pasties" && _artSlave.clothes != "a bra" && _artSlave.clothes != "a slutty klan robe" && _artSlave.clothes != "striped underwear" && _artSlave.clothes != "a button-up shirt and panties" && _artSlave.clothes != "a striped bra" && _artSlave.clothes != "a button-up shirt" && _artSlave.clothes != "a sports bra" && _artSlave.clothes != "sport shorts and a sports bra" && _artSlave.clothes != "sport shorts and a t-shirt" && _artSlave.clothes != "a t-shirt" && _artSlave.clothes != "a t-shirt and panties" && _artSlave.clothes != "a t-shirt and thong" && _artSlave.clothes != "a tube top" && _artSlave.clothes != "a tube top and thong" && _artSlave.clothes != "a tank-top" && _artSlave.clothes != "a tank-top and panties" && _artSlave.clothes != "a t-shirt and jeans" && _artSlave.clothes != "an oversized t-shirt" && _artSlave.clothes != "an oversized t-shirt and boyshorts" && _artSlave.clothes != "a sweater and cutoffs" && _artSlave.clothes != "a sweater and panties" && _artSlave.clothes != "a sweater" && _artSlave.clothes != "a police uniform" && _artSlave.clothes != "a one-piece swimsuit" && _artSlave.clothes != "a hanbok" && _artSlave.clothes != "a gothic lolita dress" && _artSlave.clothes != "kitty lingerie">>
- <<if _artSlave.areolaePiercing == 1>>
- <<include Art_Vector_Boob_Areola_Piercing>>
- <<else>>
- <<include Art_Vector_Boob_Areola_Piercingheavy>>
- <</if>>
- <</if>>
-<</if>>
+<<= ArtVectorBoobAddons(_artSlave)>>
/* set _art_transform to empty string so stray SVG groups in other passages are not affected */
<<set _art_transform = "">>
diff --git a/src/art/vector/Butt.tw b/src/art/vector/Butt.tw
index 8935d6043a7ec49bf48afa586e910d0650481014..b02003cec1fdb31996c7c92386758fe2ae29a334 100644
--- a/src/art/vector/Butt.tw
+++ b/src/art/vector/Butt.tw
@@ -1,53 +1,3 @@
:: Art_Vector_Butt_ [nobr]
-/* BEWARE: _buttSize is also used in Art_Vector_Leg_ */
-/* Updated 2018-10-25 by Fr0g */
-/* - changed size calculation block */
-
-/* Size calculations - needs to be done even for amputees */
-<<if _artSlave.butt >= 7>>
- <<set _buttSize = 6>>
-<<elseif _artSlave.butt >= 6>>
- <<set _buttSize = 5>>
-<<elseif _artSlave.butt >= 5>>
- <<set _buttSize = 4>>
- <<elseif _artSlave.butt >= 4>>
- <<set _buttSize = 3>>
- <<elseif _artSlave.butt >= 3>>
- <<set _buttSize = 2>>
- <<elseif _artSlave.butt >= 2>>
- <<set _buttSize = 1>>
- <<else>>
- <<set _buttSize = 0>>
-<</if>>
-
-<<if _artSlave.amp == 0>>
- <<set _art = "Art_Vector_Butt_"+_buttSize >>
- <<include _art >>
-<</if>>
-
-<<if _artSlave.amp == -1>>
- <<set _art = "Art_Vector_Butt_ProstheticBasic_"+_buttSize >>
- <<include _art >>
-<</if>>
-
-<<if _artSlave.amp == -2>>
- <<set _art = "Art_Vector_Butt_ProstheticSexy_"+_buttSize >>
- <<include _art >>
-<</if>>
-
-<<if _artSlave.amp == -3>>
-/* reverted to regular SVG to match description */
- <<set _art = "Art_Vector_Butt_ProstheticBeauty_"+_buttSize >>
- <<include _art >>
-<</if>>
-
-<<if _artSlave.amp == -4>>
- <<set _art = "Art_Vector_Butt_ProstheticCombat_"+_buttSize >>
- <<include _art >>
-<</if>>
-
-<<if _artSlave.amp == -5>>
- <<set _art = "Art_Vector_Butt_ProstheticSwiss_"+_buttSize >>
- <<include _art >>
-<</if>>
\ No newline at end of file
+<<= ArtVectorButt(_artSlave)>>