From 62ec0c3fd23f0e83ed96d45feaf03cd699ec4fcd Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Tue, 15 Jan 2019 02:19:54 -0500
Subject: [PATCH] Convert Collar.tw

---
 src/art/artJS.tw         | 34 ++++++++++++++++++++++++++++++++++
 src/art/vector/Collar.tw | 35 +----------------------------------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/art/artJS.tw b/src/art/artJS.tw
index de7c0d34bb5..a6f6f799812 100644
--- a/src/art/artJS.tw
+++ b/src/art/artJS.tw
@@ -2488,3 +2488,37 @@ window.ArtVectorChastityBelt = function(slave) {
 	}
 	return r;
 };
+
+window.ArtVectorCollar = function(slave) {
+	/* TODO": find out where "uncomfortable leather" collar art went */
+	switch (slave.collar) {
+		case "leather with cowbell":
+			return jsInclude("Art_Vector_Collar_Cowbell");
+		case "heavy gold":
+			return jsInclude("Art_Vector_Collar_Gold_Heavy");
+		case "neck corset":
+			return jsInclude("Art_Vector_Collar_Neck_Corset");
+		case "pretty jewelry":
+			return jsInclude("Art_Vector_Collar_Pretty_Jewelry");
+		case "cruel retirement counter":
+			return jsInclude("Art_Vector_Collar_Retirement_Cruel");
+		case "nice retirement counter":
+			return jsInclude("Art_Vector_Collar_Retirement_Nice");
+		case "satin choker":
+			return jsInclude("Art_Vector_Collar_Satin_Choker");
+		case "shock punishment":
+			return jsInclude("Art_Vector_Collar_Shock_Punishment");
+		case "stylish leather":
+			return jsInclude("Art_Vector_Collar_Stylish_Leather");
+		case "tight steel":
+			return jsInclude("Art_Vector_Collar_Tight_Steel");
+		case "uncomfortable leather":
+			return jsInclude("Art_Vector_Collar_Leather_Cruel");
+		case "silk ribbon":
+			return jsInclude("Art_Vector_Collar_Silk_Ribbon");
+		case "bowtie":
+			return jsInclude("Art_Vector_Collar_Bowtie");
+		case "ancient Egyptian":
+			return jsInclude("Art_Vector_Collar_Ancientegyptian");
+	}
+};
diff --git a/src/art/vector/Collar.tw b/src/art/vector/Collar.tw
index c204f81734e..0914d2acfd4 100644
--- a/src/art/vector/Collar.tw
+++ b/src/art/vector/Collar.tw
@@ -1,36 +1,3 @@
 :: Art_Vector_Collar_ [nobr]
 
-/* TODO: find out where "uncomfortable leather" collar art went */
-
-<<switch _artSlave.collar>>
-<<case "leather with cowbell">>
-<<include Art_Vector_Collar_Cowbell >>
-<<case "heavy gold">>
-<<include Art_Vector_Collar_Gold_Heavy >>
-<<case "neck corset">>
-<<include Art_Vector_Collar_Neck_Corset >>
-<<case "pretty jewelry">>
-<<include Art_Vector_Collar_Pretty_Jewelry >>
-<<case "cruel retirement counter">>
-<<include Art_Vector_Collar_Retirement_Cruel >>
-<<case "nice retirement counter">>
-<<include Art_Vector_Collar_Retirement_Nice >>
-<<case "satin choker">>
-<<include Art_Vector_Collar_Satin_Choker >>
-<<case "shock punishment">>
-<<include Art_Vector_Collar_Shock_Punishment >>
-<<case "stylish leather">>
-<<include Art_Vector_Collar_Stylish_Leather >>
-<<case "tight steel">>
-<<include Art_Vector_Collar_Tight_Steel >>
-<<case "uncomfortable leather">>
-<<include Art_Vector_Collar_Leather_Cruel >>
-<<case "silk ribbon">>
-<<include Art_Vector_Collar_Silk_Ribbon >>
-<<case "bowtie">>
-<<include Art_Vector_Collar_Bowtie >>
-<<case "ancient Egyptian">>
-<<include Art_Vector_Collar_Ancientegyptian >>
-<<default>>
-/* collar not supported - don't display anything */
-<</switch>>
+<<= ArtVectorCollar(_artSlave)>>
-- 
GitLab