From 6bb4c091d4e2f112100d421e00dff493d1b41b89 Mon Sep 17 00:00:00 2001
From: amevarashi <kp-karasu@yandex.ru>
Date: Sat, 25 Mar 2023 14:17:47 +0500
Subject: [PATCH] Removed HideGizmoWithRJW setting

---
 Languages/English/Keyed/RJW_Sexperience.xml          | 2 --
 Source/RJWSexperience/Configurations.cs              | 1 -
 Source/RJWSexperience/Settings/SettingsContainer.cs  | 3 +--
 Source/RJWSexperience/Settings/SettingsTabHistory.cs | 4 +---
 Source/RJWSexperience/SexHistory/SexHistoryComp.cs   | 3 ---
 5 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Languages/English/Keyed/RJW_Sexperience.xml b/Languages/English/Keyed/RJW_Sexperience.xml
index 1a7c52c..daa7bc3 100644
--- a/Languages/English/Keyed/RJW_Sexperience.xml
+++ b/Languages/English/Keyed/RJW_Sexperience.xml
@@ -84,8 +84,6 @@
   <RSOption_EnableSexHistory_Desc>* Needs a game restart\n\nEnables Sex History window, information collection for the said window and save/load of this information. Also enables sex partners count in the pawn's records.\n\n[Caution] Disabling this mid save will result in the loss of previously collected histories.</RSOption_EnableSexHistory_Desc>
   <RSOption_HideGizmoWhenDrafted_Label>Hide Sex History button when drafted</RSOption_HideGizmoWhenDrafted_Label>
   <RSOption_HideGizmoWhenDrafted_Desc>Hides Sex History Gizmo for currently drafted pawns</RSOption_HideGizmoWhenDrafted_Desc>
-  <RSOption_HideGizmoWithRJW_Label>Hide Sex History button with RJW designators</RSOption_HideGizmoWithRJW_Label>
-  <RSOption_HideGizmoWithRJW_Desc>Hides Sex History Gizmo if RJW designators are hidden</RSOption_HideGizmoWithRJW_Desc>
 
   <!-- Mod settings: Debug -->
   <RSOption_Debug_Label>Debug</RSOption_Debug_Label>
diff --git a/Source/RJWSexperience/Configurations.cs b/Source/RJWSexperience/Configurations.cs
index 9f439a9..b53be31 100644
--- a/Source/RJWSexperience/Configurations.cs
+++ b/Source/RJWSexperience/Configurations.cs
@@ -24,7 +24,6 @@ namespace RJWSexperience
 		public readonly SettingHandle<bool> SlavesBeenRapedExp = new SettingHandle<bool>("SlavesBeenRapedExp", true);
 		public readonly SettingHandle<bool> EnableSexHistory = new SettingHandle<bool>("EnableSexHistory", true);
 		public readonly SettingHandle<bool> HideGizmoWhenDrafted = new SettingHandle<bool>("HideGizmoWhenDrafted", true);
-		public readonly SettingHandle<bool> HideGizmoWithRJW = new SettingHandle<bool>("HideGizmoWithRJW", false);
 
 		public readonly SettingHandle<bool> DevMode = new SettingHandle<bool>("DevMode", false);
 
diff --git a/Source/RJWSexperience/Settings/SettingsContainer.cs b/Source/RJWSexperience/Settings/SettingsContainer.cs
index 7c595ee..c055aeb 100644
--- a/Source/RJWSexperience/Settings/SettingsContainer.cs
+++ b/Source/RJWSexperience/Settings/SettingsContainer.cs
@@ -31,8 +31,7 @@ namespace RJWSexperience.Settings
 				settings.VirginRatio,
 				settings.SlavesBeenRapedExp,
 				settings.EnableSexHistory,
-				settings.HideGizmoWhenDrafted,
-				settings.HideGizmoWithRJW
+				settings.HideGizmoWhenDrafted
 				}
 			);
 	}
diff --git a/Source/RJWSexperience/Settings/SettingsTabHistory.cs b/Source/RJWSexperience/Settings/SettingsTabHistory.cs
index 3f25c7e..db6a725 100644
--- a/Source/RJWSexperience/Settings/SettingsTabHistory.cs
+++ b/Source/RJWSexperience/Settings/SettingsTabHistory.cs
@@ -21,8 +21,7 @@ namespace RJWSexperience.Settings
 				settings.VirginRatio,
 				settings.SlavesBeenRapedExp,
 				settings.EnableSexHistory,
-				settings.HideGizmoWhenDrafted,
-				settings.HideGizmoWithRJW
+				settings.HideGizmoWhenDrafted
 			}
 		) { }
 
@@ -63,7 +62,6 @@ namespace RJWSexperience.Settings
 			if (settings.EnableSexHistory)
 			{
 				listmain.CheckboxLabeled(Keyed.Option_HideGizmoWhenDrafted_Label, settings.HideGizmoWhenDrafted, Keyed.Option_HideGizmoWhenDrafted_Desc);
-				listmain.CheckboxLabeled(Keyed.Option_HideGizmoWithRJW_Label, settings.HideGizmoWithRJW, Keyed.Option_HideGizmoWithRJW_Desc);
 			}
 
 			if (listmain.ButtonText(Keyed.Button_ResetToDefault))
diff --git a/Source/RJWSexperience/SexHistory/SexHistoryComp.cs b/Source/RJWSexperience/SexHistory/SexHistoryComp.cs
index 2b05842..3598d3a 100644
--- a/Source/RJWSexperience/SexHistory/SexHistoryComp.cs
+++ b/Source/RJWSexperience/SexHistory/SexHistoryComp.cs
@@ -432,9 +432,6 @@ namespace RJWSexperience.SexHistory
 			if (Find.Selector.NumSelected > 1)
 				yield break;
 
-			if (SexperienceMod.Settings.HideGizmoWithRJW && !RJWSettings.show_RJW_designation_box)
-				yield break;
-
 			yield return Gizmo;
 		}