From e21aa40bdbfa1c674f5ac98985e8b1e0914f073a Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Wed, 29 Aug 2018 12:44:01 -0500
Subject: [PATCH] EBrow Begin

---
 slave variables documentation - Pregmod.txt | 14 ++++++++
 src/pregmod/widgets/pregmodWidgets.tw       |  6 ++++
 src/uncategorized/BackwardsCompatibility.tw | 39 +++++++++++++++++++--
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 5fde0153482..0cd19685b84 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -2895,8 +2895,12 @@ In a eugenics society, this slave is a designated breeder.
 
 underArmHColor:
 
+color of armpit hair
+accepts string
+
 underArmHStyle:
 
+armpit hair style
 accepts string
 "hairless"
 "waxed"
@@ -2905,6 +2909,16 @@ accepts string
 "bushy"
 "bald"
 
+eyebrowHColor:
+
+color of eyebrows
+accepts string
+
+eyebrowHStyle:
+
+eyebrow hair style
+accepts string
+
 bodySwap:
 
 Slave is in original body.
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index c8e9a25b1c7..5dfe7ec7c10 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -92,6 +92,12 @@
 <<if ndef $args[0].underArmHStyle>>
 	<<set $args[0].underArmHStyle = "waxed">>
 <</if>>
+<<if ndef $args[0].eyebrowHColor>>
+	<<set $args[0].eyebrowHColor = $args[0].hColor>>
+<</if>>
+<<if ndef $args[0].eyebrowHStyle>>
+	<<set $args[0].eyebrowHStyle = "waxed">>
+<</if>>
 <<if def $args[0].prostateImplant>>
 	<<if ($args[0].prostateImplant == 1)>>
 		<<set $args[0].prostate = 3>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index f90e3de72a0..29e53efe91a 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -283,7 +283,42 @@
 	<<set $PC.origEye = $PC.eyeColor>>
 <</if>>
 <<if ndef $PC.pupil>>
-	<<set $PC.pupil = "circular">>
+	<<if $PC.eyeColor == "catlike">>
+		<<set $PC.pupil = "catlike">>
+		<<set $PC.eyeColor = "blue">>
+	<<elseif $PC.eyeColor == "serpent-like">>
+		<<set $PC.pupil = "serpent-like">>
+		<<set $PC.eyeColor = "blue">>
+	<<elseif $PC.eyeColor == "devilish">>
+		<<set $PC.pupil = "devilish">>
+		<<set $PC.eyeColor = "blue">>
+	<<elseif $PC.eyeColor == "demonic">>
+		<<set $PC.pupil = "demonic">>
+		<<set $PC.eyeColor = "blue">>
+	<<elseif $PC.eyeColor == "hypnotic">>
+		<<set $PC.pupil = "hypnotic">>
+		<<set $PC.eyeColor = "blue">>
+	<<elseif $PC.eyeColor == "heart-shaped">>
+		<<set $PC.pupil = "heart-shaped">>
+		<<set $PC.eyeColor = "blue">>
+	<<elseif $PC.eyeColor == "wide-eyed">>
+		<<set $PC.pupil = "wide-eyed">>
+		<<set $PC.eyeColor = "blue">>
+	<<elseif $PC.eyeColor == "almond-shaped">>
+		<<set $PC.pupil = "almond-shaped">>
+		<<set $PC.eyeColor = "blue">>
+	<<elseif $PC.eyeColor == "bright">>
+		<<set $PC.pupil = "bright">>
+		<<set $PC.eyeColor = "blue">>
+	<<elseif $PC.eyeColor == "teary">>
+		<<set $PC.pupil = "teary">>
+		<<set $PC.eyeColor = "blue">>
+	<<elseif $PC.eyeColor == "vacant">>
+		<<set $PC.pupil = "vacant">>
+		<<set $PC.eyeColor = "blue">>
+	<<else>>
+		<<set $PC.pupil = "circular">>
+	<</if>>
 <</if>>
 <<if ndef $PC.sclerae>>
 	<<set $PC.sclerae = "white">>
@@ -2559,7 +2594,7 @@ Setting missing slave variables:
 	<</if>>
 <</if>>
 
-<<if ndef _Slave.hStyle>>
+<<if ndef _Slave.hColor>>
 	<<set _Slave.hColor = either("black", "blonde", "red", "brown")>>
 <</if>>
 
-- 
GitLab