From b1a6bd36e1d45501d875fc496ef24ea7af2721d8 Mon Sep 17 00:00:00 2001
From: Blank <blank@national.shitposting.agency>
Date: Thu, 11 Jul 2019 21:51:12 -0700
Subject: [PATCH] Menu-Fixes

---
 src/uncategorized/options.tw        |  4 +-
 src/uncategorized/summaryOptions.tw | 59 ++++++++++++-----------------
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index c33e7848415..1c1b6934425 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -421,8 +421,8 @@ This save was created using FC version $ver build $releaseID.
 			Will not affect existing pregnancies already in-game.
 		<</options>>
 
-		<<if $seeDicksAffectsPregnancy == 0>>
-			<<options $seePreg>>
+		<<if $seeDicksAffectsPregnancy > 0>>
+			<<options $adamPrinciple>>
 				XX slaves can have sons
 				<<option 1 "Enabled">>
 				<<option 0 "Disabled">>
diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw
index e17ff6f10bd..f76c33b7111 100644
--- a/src/uncategorized/summaryOptions.tw
+++ b/src/uncategorized/summaryOptions.tw
@@ -12,49 +12,38 @@
 
 <br><br>
 Line separations are
-	<<options $lineSeparations>>
-		<<option 1 "Shown">>
-		<<option 0 "Hidden">>
-	<</options>>
-
-	<br><br>Slaves are sorted on the main menu by:
-	<<options $sortSlavesOrder>>
-		<<option "Devotion" "Devotion">>
-		<<option "name" "name">>
-		<<option "seniority" "Date purchased">>
-		<<option "actualAge" "Age">>
-		<<option "visualAge" "How old they look">>
-		<<option "physicalAge" "Age of their body">>
-		<<option "assignment" "assignment">>
-	<</options>>
-	order.
-	<br>Slaves are sorted in
-	<<options $sortSlavesOrder>>
-		<<option "Ascending" "Ascending">>
-		<<option "Descending" "Descending">>
-	<</options>>
-	order.
+<<options $lineSeparations>>
+	<<option 1 "Shown">>
+	<<option 0 "Hidden">>
+<</options>>
 
-<br><br>Sort options are
+Slave sortting main menu options are
 <<options $sortSlavesMain>>
 	<<option 1 "Shown">>
 	<<option 0 "Hidden">>
 <</options>>
+
 <<if $sortSlavesMain > 0>>
+	<<options $sortSlavesOrder>>
+			<<option "ascending" "Ascending">>
+			<<option "descending" "Descending">>
+			<<comment>>
+			order.
+		<</options>>
+		
 	<br>
-	Sort by:
 	<<options $sortSlavesBy>>
-		<<option "Devotion" "Devotion">>
-		<<option "name" "name">>
+		<<option "devotion" "Devotion">>
+		<<option "name" "Name">>
 		<<option "seniority" "Date purchased">>
 		<<option "actualAge" "Age">>
 		<<option "visualAge" "How old they look">>
 		<<option "physicalAge" "Age of their body">>
-		<<option "assignment" "assignment">>
+		<<option "assignment" "Assignment">>
 	<</options>>
 <</if>>
 
-<br><br>The rules assistant is
+<br>Rules Assistant visability:
 <<options $rulesAssistantMain>>
 	<<option 1 "Shown">>
 	<<option 0 "Hidden">>
@@ -78,7 +67,7 @@ Granular slave stat numbers are
 	<<option 1 "Abbreviated">>
 	<<option 0 "Hidden">>
 <</options>>
-Mental attributes are
+<br>Mental attributes are
 <<options $OptionAbbreviateMental>>
 	<<option 2 "Summarized">>
 	<<option 1 "Abbreviated">>
@@ -93,7 +82,7 @@ Rules are
 	<<option 0 "Hidden">>
 <</options>>
 
-Health is
+<br>Health is
 <<options $abbreviateHealth>>
 	<<option 2 "Summarized">>
 	<<option 1 "Abbreviated">>
@@ -107,7 +96,7 @@ Diet and weight are
 	<<option 0 "Hidden">>
 <</options>>
 
-Drugs and addiction are
+<br>Drugs and addiction are
 <<options $abbreviateDrugs>>
 	<<option 2 "Summarized">>
 	<<option 1 "Abbreviated">>
@@ -121,7 +110,7 @@ Hormone balance is
 	<<option 0 "Hidden">>
 <</options>>
 
-Genitalia are
+<br>Genitalia are
 <<options $abbreviateGenitalia>>
 	<<option 2 "Summarized">>
 	<<option 1 "Abbreviated">>
@@ -135,7 +124,7 @@ Physical traits are
 	<<option 0 "Hidden">>
 <</options>>
 
-Skills are
+<br>Skills are
 <<options $abbreviateSkills>>
 	<<option 2 "Summarized">>
 	<<option 1 "Abbreviated">>
@@ -156,7 +145,7 @@ Race is
 	<<option 0 "Hidden">>
 <</options>>
 
-Origins are
+<br>Origins are
 <<options $abbreviateOrigins>>
 	<<option 2 "Summarized">>
 	<<option 0 "Hidden">>
@@ -168,7 +157,7 @@ Rules Assistant rulesets are
 	<<option 1 "Abbreviated">>
 <</options>>
 
-Facilities in the sidebar are
+<br>Facilities in the sidebar are
 <<options $abbreviateSidebar>>
 	<<option 2 "Summarized">>
 	<<option 1 "Abbreviated">>
-- 
GitLab