From 7380bd5a6cb5d67a03df75cf7241a12fee39b228 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Thu, 17 Dec 2020 19:32:05 -0500
Subject: [PATCH] Move marks, boobShape, and anal area into new options system

---
 src/npc/startingGirls/startingGirls.tw | 71 ++++++++++++++------------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index bd226398705..4bf26fbf2ab 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -337,13 +337,22 @@
 	<</if>>
 
 	<<run _options.addOption("$His skin color is", "origSkin", $activeSlave).showTextBox()
-	.addValueList([["Pure White", "pure white"], ["Ivory", "ivory"], ["White", "white"], ["Extremely Pale", "extremely pale"],
+		.addValueList([["Pure White", "pure white"], ["Ivory", "ivory"], ["White", "white"], ["Extremely Pale", "extremely pale"],
 			["Very Pale", "very pale"], ["Pale", "pale"], ["Extremely Fair", "extremely fair"], ["Very Fair", "very fair"],
 			["Fair", "fair"], ["Light", "light"], ["Light Olive", "light olive"], ["Tan", "tan"], ["Olive", "olive"], ["Bronze", "bronze"],
 			["Dark Olive", "dark olive"], ["Dark", "dark"], ["Light Beige", "light beige"], ["Beige", "beige"],
 			["Dark Beige", "dark beige"], ["Light Brown", "light brown"], ["Brown", "brown"], ["Dark Brown", "dark brown"],
 			["Black", "black"], ["Ebony", "ebony"], ["Pure Black", "pure black"]])>>
 
+	<<run _options.addOption("$His skin distinctiveness is", "markings", $activeSlave)
+		.addValueList([
+			["None", "none"],
+			["Freckles", "freckles"],
+			["Heavily freckled", "heavily freckled"],
+			["Beauty mark", "beauty mark"],
+			["Birthmark", "birthmark"],
+		])>>
+
 	<<run _options.addOption("Intelligence", "intelligence", $activeSlave)
 	.addValueList([["Moronic", -100], ["Very stupid", -60], ["Stupid", -30], ["Average", 0], ["Smart", 30], ["Very smart", 60], ["Brilliant", 100]])>>
 
@@ -471,6 +480,18 @@
 	.addRange(6000, 6000, "<=", "Monstrous")
 	.addRange(8000, 6000, ">", "Science Experiment")>>
 
+	<<run _options.addOption("Natural shape", "boobShape", $activeSlave)
+	.addValueList([
+		["Normal", "normal"],
+		["Perky", "perky"],
+		["Torpedo-shaped", "torpedo-shaped"],
+		["Wide-set", "wide-set"],
+		["Downward-facing", "downward-facing"],
+		["Saggy", "saggy"]
+	])>>
+
+
+
 	<<run _options.addOption("Lactation", "lactation", $activeSlave)
 	.addValue("Artificial", 2, () => V.activeSlave.lactationDuration = 2)
 	.addValue("Natural", 1, () => V.activeSlave.lactationDuration = 2)
@@ -494,6 +515,22 @@
 	<<run _options.addOption("Anus", "anus", $activeSlave)
 	.addValueList([["Virgin", 0], ["Normal", 1], ["Veteran", 2], ["Gaping", 3]])>>
 
+	<<if $activeSlave.anus > 0>>
+		<<if $activeSlave.analArea <= $activeSlave.anus>>
+			<<set _comment = "Recently stretched to current size.">>"
+		<<elseif $activeSlave.analArea - $activeSlave.anus == 1>>
+			<<set _comment = "Used to current size."">>
+		<<else>>
+			<<set _comment = "Very broad."">>
+		<</if>>
+		<<run _options.addOption("External anus appearance", "anus", $activeSlave)
+		.addValueList([
+			["Recently stretched", $activeSlave.analArea = $activeSlave.anus],
+			["Used to current size", $activeSlave.analArea = $activeSlave.anus+1],
+			["Very broad", $activeSlave.analArea = $activeSlave.anus+2],
+		]).addComment(_comment)>>
+	<</if>>
+
 	<<run _options.addOption("Vagina", "vagina", $activeSlave)
 	.addValue("No vagina", -1, () => {
 		V.activeSlave.preg = 0;
@@ -946,38 +983,6 @@
 	<br>Custom description: <<textbox "$activeSlave.custom.desc" $activeSlave.custom.desc "Starting Girls">> //Use complete, capitalized and punctuated sentences.//
 	<br>Custom label: <<textbox "$activeSlave.custom.label" $activeSlave.custom.label "Starting Girls">> //Use a short phrase.//
 
-	<br><br>
-	''Natural skin distinctiveness:'' $activeSlave.markings.
-	[[None|Starting Girls][$activeSlave.markings = "none"]]
-	| [[Freckles|Starting Girls][$activeSlave.markings = "freckles"]]
-	| [[Heavily freckled|Starting Girls][$activeSlave.markings = "heavily freckled"]]
-	| [[Beauty mark|Starting Girls][$activeSlave.markings = "beauty mark"]]
-	| [[Birthmark|Starting Girls][$activeSlave.markings = "birthmark"]]
-
-	<<if $activeSlave.anus > 0>>
-		<br><br>
-		''External appearance of anus:''
-		<<if $activeSlave.analArea <= $activeSlave.anus>>
-			Recently stretched to current size.
-		<<elseif $activeSlave.analArea - $activeSlave.anus == 1>>
-			Used to current size.
-		<<else>>
-			Very broad.
-		<</if>>
-		[[Recently stretched|Starting Girls][$activeSlave.analArea = $activeSlave.anus]]
-		| [[Used to current size|Starting Girls][$activeSlave.analArea = $activeSlave.anus+1]]
-		| [[Very broad|Starting Girls][$activeSlave.analArea = $activeSlave.anus+2]]
-	<</if>>
-
-	<br><br>
-	''Natural breast shape:'' $activeSlave.boobShape.
-	[[Normal|Starting Girls][$activeSlave.boobShape = "normal"]]
-	| [[Perky|Starting Girls][$activeSlave.boobShape = "perky"]]
-	| [[Torpedo-shaped|Starting Girls][$activeSlave.boobShape = "torpedo-shaped"]]
-	| [[Wide-set|Starting Girls][$activeSlave.boobShape = "wide-set"]]
-	| [[Downward-facing|Starting Girls][$activeSlave.boobShape = "downward-facing"]]
-	| [[Saggy|Starting Girls][$activeSlave.boobShape = "saggy"]]
-
 	<br><br>
 	''Births:'' <<textbox "$activeSlave.counter.birthsTotal" $activeSlave.counter.birthsTotal "Starting Girls">> //How many times $he has already given birth, not necessarily while owned by you.//
 
-- 
GitLab