From 2ff6caf2105e76d6a4cf1ef4a036c56b8a6406ef Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Tue, 18 Sep 2018 22:18:24 -0400
Subject: [PATCH] Fixes

---
 sanityCheck                            |  2 +-
 src/art/vector/Head.tw                 | 34 ------------------
 src/art/vector/Pussy.tw                |  2 +-
 src/art/vector/Set_Colour_Outfit_JS.tw | 48 +++++++++++++++++++++++++-
 4 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/sanityCheck b/sanityCheck
index 9945eb4e653..e6509e577f0 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -50,7 +50,7 @@ $GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
 # Check for too many <<<.  e.g.: <<</if>>
 $GREP "<<<[^<>]*[<>]\?[^<>]*>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
 # Check for wrong capitalization on 'activeslave' and other common typos
-$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|activeUnits\)" -- "src/*" | myprint "WrongCapitilization"
+$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|activeUnits\|activeCanine\|activeHooved\|activeFeline\)" -- "src/*" | myprint "WrongCapitilization"
 $GREP  "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|pregBelly\|bellyimplant\|bellyfluid\|pronounCaps\)" -- 'src/*' | myprint "SpellCheck"
 $GREP  "\(recieve\|recieves\)" -- 'src/*' | myprint "PregmodderCannotSpellReceive"
 $GREP "\$slave\[" -- 'src/*' | myprint "ShouldBeSlaves"
diff --git a/src/art/vector/Head.tw b/src/art/vector/Head.tw
index 56dce4c77bd..d43f1491977 100644
--- a/src/art/vector/Head.tw
+++ b/src/art/vector/Head.tw
@@ -261,37 +261,3 @@
 		<<include Art_Vector_Head_Outfit_SluttyNurse>>
 	<</if>>
 <</if>>
-
-<<switch _artSlave.eye>>
-<<case "blue">>
-	<<set _eyeColor = "#0579ff">>
-<<case "black">>
-	<<set _eyeColor = "#0b0907">>
-<<case "brown">>
-	<<set _eyeColor = "#795548">>
-<<case "red">>
-	<<set _eyeColor = "#af1c1c">>
-<<case "green">>
-	<<set _eyeColor = "#66b266">>
-<<case "turquois">>
-	<<set _eyeColor = "#39c6b8">>
-<<case "sky-blue">>
-	<<set _eyeColor = "#89b7ff">>
-<<case "hazel">>
-	<<set _eyeColor = "#8d6f1f">>	
-<<case "pale-grey">>
-	<<set _eyeColor = "#b2babb">>
-<<case "white">>
-	<<set _eyeColor = "#ffffff">>
-<<case "pink">>
-	<<set _eyeColor = "#ffb7c4">>
-<<case "yellow">>
-	<<set _eyeColor = "#ffff00">>	
-<<case "orange">>
-	<<set _eyeColor = "#ffa500">>
-<<case "amber">>
-	<<set _eyeColor = "#ffbf00">>		
-<<default>>
-	/* use color for "eyes" by default */
-	<<set _eyeColor = "#89b7ff">>
-<</switch>>
\ No newline at end of file
diff --git a/src/art/vector/Pussy.tw b/src/art/vector/Pussy.tw
index 8451a4be954..4a3012f1004 100644
--- a/src/art/vector/Pussy.tw
+++ b/src/art/vector/Pussy.tw
@@ -1,6 +1,6 @@
 :: Art_Vector_Pussy_ [nobr]
 
-<<if _artSlave.vagina >= 0 && _artSlave.clothes != "a latex catsuit" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a cybersuit">>>>
+<<if _artSlave.vagina >= 0 && _artSlave.clothes != "a latex catsuit" && _artSlave.clothes != "a comfortable bodysuit" && _artSlave.clothes != "a cybersuit">>
 	<<include Art_Vector_Pussy>>
 <</if>>
 
diff --git a/src/art/vector/Set_Colour_Outfit_JS.tw b/src/art/vector/Set_Colour_Outfit_JS.tw
index 21518062211..e1d4f085abd 100644
--- a/src/art/vector/Set_Colour_Outfit_JS.tw
+++ b/src/art/vector/Set_Colour_Outfit_JS.tw
@@ -48,7 +48,53 @@ if (artSlave.glassesColor) {
 }
 
 if (artSlave.eyeColor) {
-	s.eyeColor = artSlave.eyeColor; /* eye colour selected by user */
+	switch (artSlave.eyeColor) {
+		case "blue":
+			s.eyeColor = "#0579ff";
+			break;
+		case "black":
+			s.eyeColor = "#0b0907";
+			break;
+		case "brown":
+			s.eyeColor = "#795548";
+			break;
+		case "red":
+			s.eyeColor = "#af1c1c";
+			break;
+		case "green":
+			s.eyeColor = "#66b266";
+			break;
+		case "turquoise":
+			s.eyeColor = "#39c6b8";
+			break;
+		case "sky-blue":
+			s.eyeColor = "#89b7ff";
+			break;
+		case "hazel":
+			s.eyeColor = "#8d6f1f";	
+			break;
+		case "pale-grey":
+			s.eyeColor = "#b2babb";
+			break;
+		case "white":
+			s.eyeColor = "#ffffff";
+			break;
+		case "pink":
+			s.eyeColor = "#ffb7c4";
+			break;
+		case "yellow":
+			s.eyeColor = "#ffff00";
+			break;
+		case "orange":
+			s.eyeColor = "#ffa500";
+			break;
+		case "amber":
+			s.eyeColor = "#ffbf00";
+			break;
+		default:
+			/* use color for "eyes" by default */
+			s.eyeColor = "#89b7ff";
+	}
 }
 
 return s;
-- 
GitLab