New settings handling

Source/RJWSexperience/Settings/IResettable.cs

@@ -1,6 +1,6 @@
 namespace RJWSexperience.Settings
 {
-	internal interface IResettable
+	public interface IResettable
 	{
 		void Reset();
 	}

Source/RJWSexperience/Settings/ISettingHandle.cs

@@ -0,0 +1,7 @@
+namespace RJWSexperience.Settings
+{
+	public interface ISettingHandle : IResettable
+	{
+		void Scribe();
+	}
+}

Source/RJWSexperience/Settings/SettingHandle.cs

@@ -0,0 +1,35 @@
+using Verse;
+
+namespace RJWSexperience.Settings
+{
+	public class SettingHandle<T> : ISettingHandle
+	{
+		public T Value { get; set; }
+		public readonly string XmlLabel;
+		public readonly T DefaultValue;
+
+		public SettingHandle(string xmlLabel, T defaultValue)
+		{
+			XmlLabel = xmlLabel;
+			DefaultValue = defaultValue;
+			Value = defaultValue;
+		}
+
+		public void Reset()
+		{
+			Value = DefaultValue;
+		}
+
+		public void Scribe()
+		{
+			T value = Value;
+			Scribe_Values.Look(ref value, XmlLabel, DefaultValue);
+			Value = value;
+		}
+
+		public static implicit operator T(SettingHandle<T> settingHandle)
+		{
+			return settingHandle.Value;
+		}
+	}
+}

Source/RJWSexperience/Settings/SettingsContainer.cs

@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using Verse;
+
+namespace RJWSexperience.Settings
+{
+	public class SettingsContainer : IExposable
+	{
+		public List<ISettingHandle> Handles { get; }
+
+		public SettingsContainer(List<ISettingHandle> handles)
+		{
+			Handles = handles;
+		}
+
+		public void ExposeData()
+		{
+			foreach (ISettingHandle setting in Handles)
+			{
+				setting.Scribe();
+			}
+		}
+
+		public static SettingsContainer CreateHistoryContainer(Configurations settings) => new SettingsContainer(new List<ISettingHandle> {
+				settings.EnableRecordRandomizer,
+				settings.MaxLustDeviation,
+				settings.AvgLust,
+				settings.MaxSexCountDeviation,
+				settings.SexPerYear,
+				settings.MinSexableFromLifestage,
+				settings.MinSexablePercent,
+				settings.VirginRatio,
+				settings.SlavesBeenRapedExp,
+				settings.EnableSexHistory,
+				settings.HideGizmoWhenDrafted,
+				settings.HideGizmoWithRJW
+				}
+			);
+	}
+}

Source/RJWSexperience/Settings/SettingsTab.cs

@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace RJWSexperience.Settings
+{
+	public abstract class SettingsTab : ITab, IResettable
+	{
+		protected readonly List<ISettingHandle> tabSettings;
+		protected readonly Configurations settings;
+
+		public string Label { get; protected set; }
+
+		protected SettingsTab(Configurations settings, string label, List<ISettingHandle> tabSettings)
+		{
+			this.settings = settings;
+			Label = label;
+			this.tabSettings = tabSettings;
+		}
+
+		public void Reset()
+		{
+			foreach (ISettingHandle setting in tabSettings)
+			{
+				setting.Reset();
+			}
+		}
+
+		public abstract void DoTabContents(Rect inRect);
+	}
+}

Source/RJWSexperience/Settings/SettingsTabDebug.cs

@@ -1,36 +1,18 @@
-using UnityEngine;
+using System.Collections.Generic;
+using UnityEngine;
 using Verse;
 
 namespace RJWSexperience.Settings
 {
-	public class SettingsTabDebug : IExposable, IResettable, ITab
+	public class SettingsTabDebug : SettingsTab
 	{
-		public string Label => Keyed.TabLabelDebug;
+		public SettingsTabDebug(Configurations settings) : base(settings, Keyed.TabLabelDebug, new List<ISettingHandle> { settings.DevMode }) { }
 
-		// Defaults
-		public const bool DevModeDefault = false;
-
-		// Private attributes
-		private bool devMode;
-
-		//Public read-only properties
-		public bool DevMode => devMode;
-
-		public void Reset()
-		{
-			devMode = DevModeDefault;
-		}
-
-		public void ExposeData()
-		{
-			Scribe_Values.Look(ref devMode, "DevMode", DevModeDefault);
-		}
-
-		public void DoTabContents(Rect inRect)
+		public override void DoTabContents(Rect inRect)
 		{
 			Listing_Standard listmain = new Listing_Standard();
 			listmain.Begin(inRect);
-			listmain.CheckboxLabeled(Keyed.Option_Debug_Label, ref devMode, Keyed.Option_Debug_Desc);
+			listmain.CheckboxLabeled(Keyed.Option_Debug_Label, settings.DevMode, Keyed.Option_Debug_Desc);
 
 			if (listmain.ButtonText(Keyed.Button_ResetToDefault))
 			{

Source/RJWSexperience/Settings/SettingsTabHistory.cs

@@ -1,132 +1,69 @@
 using RimWorld;
+using System.Collections.Generic;
 using UnityEngine;
 using Verse;
 
 namespace RJWSexperience.Settings
 {
-	public class SettingsTabHistory : IExposable, IResettable, ITab
+	public class SettingsTabHistory : SettingsTab
 	{
-		public string Label => Keyed.TabLabelHistory;
+		public SettingsTabHistory(Configurations settings) : base(
+			settings,
+			Keyed.TabLabelHistory,
+			new List<ISettingHandle> {
+				settings.EnableRecordRandomizer,
+				settings.MaxLustDeviation,
+				settings.AvgLust,
+				settings.MaxSexCountDeviation,
+				settings.SexPerYear,
+				settings.MinSexableFromLifestage,
+				settings.MinSexablePercent,
+				settings.VirginRatio,
+				settings.SlavesBeenRapedExp,
+				settings.EnableSexHistory,
+				settings.HideGizmoWhenDrafted,
+				settings.HideGizmoWithRJW
+			}
+		) { }
 
-		// Defaults
-		public const bool EnableStatRandomizerDefault = true;
-		public const float MaxLustDeviationDefault = 400f;
-		public const float AvgLustDefault = 0f;
-		public const float MaxSexCountDeviationDefault = 90f;
-		public const float SexPerYearDefault = 30f;
-		public const bool MinSexableFromLifestageDefault = true;
-		public const float MinSexablePercentDefault = 0.2f;
-		public const float VirginRatioDefault = 0.01f;
-		public const bool SlavesBeenRapedExpDefault = true;
-		public const bool EnableSexHistoryDefault = true;
-		public const bool HideGizmoWhenDraftedDefault = true;
-		public const bool HideGizmoWithRJWDefault = true;
-
-		// Private attributes
-		private bool enableRecordRandomizer = EnableStatRandomizerDefault;
-		private float maxLustDeviation = MaxLustDeviationDefault;
-		private float avgLust = AvgLustDefault;
-		private float maxSexCountDeviation = MaxSexCountDeviationDefault;
-		private float sexPerYear = SexPerYearDefault;
-		private bool minSexableFromLifestage = MinSexableFromLifestageDefault;
-		private float minSexablePercent = MinSexablePercentDefault;
-		private float virginRatio = VirginRatioDefault;
-		private bool slavesBeenRapedExp = SlavesBeenRapedExpDefault;
-		private bool enableSexHistory = EnableSexHistoryDefault;
-		private bool hideGizmoWhenDrafted = HideGizmoWhenDraftedDefault;
-		private bool hideGizmoWithRJW = HideGizmoWithRJWDefault;
-
-		//Public read-only properties
-		public bool EnableRecordRandomizer => enableRecordRandomizer;
-		public float MaxLustDeviation => maxLustDeviation;
-		public float AvgLust => avgLust;
-		public float MaxSexCountDeviation => maxSexCountDeviation;
-		public float SexPerYear => sexPerYear;
-		public bool MinSexableFromLifestage => minSexableFromLifestage;
-		public float MinSexablePercent => minSexablePercent;
-		public float VirginRatio => virginRatio;
-		public bool SlavesBeenRapedExp => slavesBeenRapedExp;
-		public bool EnableSexHistory => enableSexHistory;
-		public bool HideGizmoWhenDrafted => hideGizmoWhenDrafted;
-		public bool HideGizmoWithRJW => hideGizmoWithRJW;
-
-		public static SettingsTabHistory CreateDefault()
-		{
-			SettingsTabHistory history = new SettingsTabHistory();
-			history.Reset();
-			return history;
-		}
-
-		public void Reset()
-		{
-			enableRecordRandomizer = EnableStatRandomizerDefault;
-			maxLustDeviation = MaxLustDeviationDefault;
-			avgLust = AvgLustDefault;
-			maxSexCountDeviation = MaxSexCountDeviationDefault;
-			sexPerYear = SexPerYearDefault;
-			minSexableFromLifestage = MinSexableFromLifestageDefault;
-			minSexablePercent = MinSexablePercentDefault;
-			virginRatio = VirginRatioDefault;
-			slavesBeenRapedExp = SlavesBeenRapedExpDefault;
-			enableSexHistory = EnableSexHistoryDefault;
-			hideGizmoWhenDrafted = HideGizmoWhenDraftedDefault;
-			hideGizmoWithRJW = HideGizmoWithRJWDefault;
-		}
-
-		public void ExposeData()
-		{
-			Scribe_Values.Look(ref enableRecordRandomizer, "EnableRecordRandomizer", EnableStatRandomizerDefault);
-			Scribe_Values.Look(ref maxLustDeviation, "MaxLustDeviation", MaxLustDeviationDefault);
-			Scribe_Values.Look(ref avgLust, "AvgLust", AvgLustDefault);
-			Scribe_Values.Look(ref maxSexCountDeviation, "MaxSexCountDeviation", MaxSexCountDeviationDefault);
-			Scribe_Values.Look(ref sexPerYear, "SexPerYear", SexPerYearDefault);
-			Scribe_Values.Look(ref minSexableFromLifestage, "MinSexableFromLifestage", MinSexableFromLifestageDefault);
-			Scribe_Values.Look(ref minSexablePercent, "MinSexablePercent", MinSexablePercentDefault);
-			Scribe_Values.Look(ref virginRatio, "VirginRatio", VirginRatioDefault);
-			Scribe_Values.Look(ref slavesBeenRapedExp, "SlavesBeenRapedExp", SlavesBeenRapedExpDefault);
-			Scribe_Values.Look(ref enableSexHistory, "EnableSexHistory", EnableSexHistoryDefault);
-			Scribe_Values.Look(ref hideGizmoWhenDrafted, "HideGizmoWhenDrafted", HideGizmoWhenDraftedDefault);
-			Scribe_Values.Look(ref hideGizmoWithRJW, "HideGizmoWithRJW", HideGizmoWithRJWDefault);
-		}
-
-		public void DoTabContents(Rect inRect)
+		public override void DoTabContents(Rect inRect)
 		{
 			const float lineHeight = SettingsWidgets.lineHeight;
 
 			Listing_Standard listmain = new Listing_Standard();
 			listmain.Begin(inRect);
 
-			listmain.CheckboxLabeled(Keyed.Option_1_Label, ref enableRecordRandomizer, Keyed.Option_1_Desc);
-			if (enableRecordRandomizer)
+			listmain.CheckboxLabeled(Keyed.Option_1_Label, settings.EnableRecordRandomizer, Keyed.Option_1_Desc);
+			if (settings.EnableRecordRandomizer)
 			{
 				float sectionHeight = 12f;
-				if (!minSexableFromLifestage)
+				if (!settings.MinSexableFromLifestage)
 					sectionHeight += 2f;
 
 				Listing_Standard section = listmain.BeginSection(lineHeight * sectionHeight);
 
-				SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), Keyed.Option_3_Label + " " + maxLustDeviation, Keyed.Option_3_Desc, ref maxLustDeviation, 0f, 2000f, 1f);
-				SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), Keyed.Option_4_Label + " " + avgLust, Keyed.Option_4_Desc, ref avgLust, -1000f, 1000f, 1f);
-				SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), Keyed.Option_5_Label + " " + maxSexCountDeviation, Keyed.Option_5_Desc, ref maxSexCountDeviation, 0f, 2000f, 1f);
-				SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), Keyed.Option_6_Label + " " + sexPerYear, Keyed.Option_6_Desc, ref sexPerYear, 0f, 2000f, 1f);
+				section.SliderOption(Keyed.Option_3_Label + " {0}", Keyed.Option_3_Desc, settings.MaxLustDeviation, new FloatRange(0f, 1000f), 1f);
+				section.SliderOption(Keyed.Option_4_Label + " {0}", Keyed.Option_4_Desc, settings.AvgLust, new FloatRange(-200f, 200f), 1f);
+				section.SliderOption(Keyed.Option_5_Label + " {0}", Keyed.Option_5_Desc, settings.MaxSexCountDeviation, new FloatRange(0f, 1000f), 1f);
+				section.SliderOption(Keyed.Option_6_Label + " {0}", Keyed.Option_6_Desc, settings.SexPerYear, new FloatRange(0f, 2000f), 1f);
 
-				section.CheckboxLabeled(Keyed.Option_MinSexableFromLifestage_Label, ref minSexableFromLifestage, Keyed.Option_MinSexableFromLifestage_Desc);
+				section.CheckboxLabeled(Keyed.Option_MinSexableFromLifestage_Label, settings.MinSexableFromLifestage, Keyed.Option_MinSexableFromLifestage_Desc);
 
-				if (!minSexableFromLifestage)
-					SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), $"{Keyed.Option_9_Label} {minSexablePercent:P1}   {ThingDefOf.Human.race.lifeExpectancy * minSexablePercent} human years", Keyed.Option_9_Desc, ref minSexablePercent, 0, 1, 0.001f);
+				if (!settings.MinSexableFromLifestage)
+					section.SliderOption($"{Keyed.Option_9_Label} {{0:P1}}  {ThingDefOf.Human.race.lifeExpectancy * settings.MinSexablePercent} human years", Keyed.Option_9_Desc, settings.MinSexablePercent, FloatRange.ZeroToOne, 0.001f);
 
-				SettingsWidgets.SliderOption(section.GetRect(lineHeight * 2f), $"{Keyed.Option_10_Label} {virginRatio:P1}", Keyed.Option_10_Desc, ref virginRatio, 0f, 1f, 0.001f);
-				section.CheckboxLabeled(Keyed.Option_7_Label, ref slavesBeenRapedExp, Keyed.Option_7_Desc);
+				section.SliderOption(Keyed.Option_10_Label + " {0:P1}", Keyed.Option_10_Desc, settings.VirginRatio, FloatRange.ZeroToOne, 0.001f);
+				section.CheckboxLabeled(Keyed.Option_7_Label, settings.SlavesBeenRapedExp, Keyed.Option_7_Desc);
 
 				listmain.EndSection(section);
 			}
 
-			listmain.CheckboxLabeled(Keyed.Option_EnableSexHistory_Label, ref enableSexHistory, Keyed.Option_EnableSexHistory_Desc);
+			listmain.CheckboxLabeled(Keyed.Option_EnableSexHistory_Label, settings.EnableSexHistory, Keyed.Option_EnableSexHistory_Desc);
 
-			if (enableSexHistory)
+			if (settings.EnableSexHistory)
 			{
-				listmain.CheckboxLabeled(Keyed.Option_HideGizmoWhenDrafted_Label, ref hideGizmoWhenDrafted, Keyed.Option_HideGizmoWhenDrafted_Desc);
-				listmain.CheckboxLabeled(Keyed.Option_HideGizmoWithRJW_Label, ref hideGizmoWithRJW, Keyed.Option_HideGizmoWithRJW_Desc);
+				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))

Source/RJWSexperience/Settings/SettingsTabMain.cs

@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using UnityEngine;
+using Verse;
+
+namespace RJWSexperience.Settings
+{
+	public class SettingsTabMain : SettingsTab
+	{
+		public SettingsTabMain(Configurations settings) : base(
+			settings,
+			Keyed.TabLabelMain,
+			new List<ISettingHandle> {
+				settings.LustEffectPower,
+				settings.EnableBastardRelation,
+				settings.LustLimit,
+				settings.MaxSingleLustChange,
+				settings.SexCanFillBuckets,
+				}
+			) { }
+
+		public override void DoTabContents(Rect inRect)
+		{
+			Listing_Standard listmain = new Listing_Standard { maxOneColumn = true };
+			listmain.Begin(inRect);
+			listmain.SliderOption(Keyed.Option_2_Label + " x{0}", Keyed.Option_2_Desc, settings.LustEffectPower, new FloatRange(0f, 2f), 0.01f);
+			listmain.SliderOption(Keyed.Option_8_Label + " {0}", Keyed.Option_8_Desc, settings.LustLimit, new FloatRange(0f, 500f), 1f);
+			listmain.SliderOption(Keyed.Option_MaxSingleLustChange_Label + " {0}", Keyed.Option_MaxSingleLustChange_Desc, settings.MaxSingleLustChange, new FloatRange(0f, 10f), 0.05f);
+			listmain.CheckboxLabeled(Keyed.Option_EnableBastardRelation_Label, settings.EnableBastardRelation, Keyed.Option_EnableBastardRelation_Desc);
+			listmain.CheckboxLabeled(Keyed.Option_SexCanFillBuckets_Label, settings.SexCanFillBuckets, Keyed.Option_SexCanFillBuckets_Desc);
+
+			if (settings.DevMode)
+				LustUtility.DrawGraph(listmain.GetRect(300f));
+
+			if (listmain.ButtonText(Keyed.Button_ResetToDefault))
+			{
+				Reset();
+			}
+			listmain.End();
+		}
+	}
+}

Source/RJWSexperience/Settings/SettingsWidgets.cs

@@ -7,30 +7,39 @@ namespace RJWSexperience.Settings
 	{
 		public const float lineHeight = 24f;
 
-		public static void LabelwithTextfield(Rect rect, string label, string tooltip, ref float value, float min, float max)
+		public static void LabelwithTextfield(Rect rect, string label, string tooltip, ref float value, FloatRange range)
 		{
 			Rect textfieldRect = new Rect(rect.xMax - 100f, rect.y, 100f, rect.height);
 			string valuestr = value.ToString();
 			Widgets.Label(rect, label);
-			Widgets.TextFieldNumeric(textfieldRect, ref value, ref valuestr, min, max);
+			Widgets.TextFieldNumeric(textfieldRect, ref value, ref valuestr, range.TrueMin, range.TrueMax);
 			Widgets.DrawHighlightIfMouseover(rect);
 			TooltipHandler.TipRegion(rect, tooltip);
 		}
 
-		public static void SliderOption(Rect doublerect, string label, string tooltip, ref float value, float min, float max, float roundTo)
+		public static void SliderOption(this Listing_Standard outList, string label, string tooltip, SettingHandle<float> handle, FloatRange range, float roundTo)
 		{
 			// Slider was fighting with textfield for "correct" decimals. Causes a repeating slider move sound
-			float fieldValue = value;
-			float sliderValue = value;
+			float fieldValue = handle.Value;
+			float sliderValue = handle.Value;
 			float minChange = roundTo / 10f;
 
-			LabelwithTextfield(doublerect.TopHalf(), label, tooltip, ref fieldValue, min, max);
-			sliderValue = Widgets.HorizontalSlider(doublerect.BottomHalf(), sliderValue, min, max, roundTo: roundTo);
+			string formattedLabel = string.Format(label, handle.Value);
 
-			if (Mathf.Abs(fieldValue - value) > minChange)
-				value = fieldValue;
+			LabelwithTextfield(outList.GetRect(lineHeight), formattedLabel, tooltip, ref fieldValue, range);
+			sliderValue = Widgets.HorizontalSlider_NewTemp(outList.GetRect(lineHeight), sliderValue, range.TrueMin, range.TrueMax, roundTo: roundTo);
+
+			if (Mathf.Abs(fieldValue - handle.Value) > minChange)
+				handle.Value = fieldValue;
 			else
-				value = sliderValue;
+				handle.Value = sliderValue;
+		}
+
+		public static void CheckboxLabeled(this Listing_Standard outList, string label, SettingHandle<bool> handle, string tooltip)
+		{
+			bool value = handle.Value;
+			outList.CheckboxLabeled(label, ref value, tooltip);
+			handle.Value = value;
 		}
 	}
 }