From 5130c70655b305d8b077eadaed56a39534e93fcc Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 22 May 2022 22:33:34 +0500 Subject: [PATCH] Rename SexPartnerHistory to SexHistoryComp --- .../ExtensionMethods/PawnExtensions.cs | 2 +- .../RJWSexperience/Patches/DefInjection.cs | 2 +- RJWSexperience/RJWSexperience/Patches/GetGizmos.cs | 2 +- .../RJWSexperience/RJWSexperience.csproj | 2 +- RJWSexperience/RJWSexperience/RJWUtility.cs | 4 ++-- .../{SexPartnerHistory.cs => SexHistoryComp.cs} | 8 +++----- RJWSexperience/RJWSexperience/UI/SexStatus.cs | 14 +++++++------- 7 files changed, 16 insertions(+), 18 deletions(-) rename RJWSexperience/RJWSexperience/SexHistory/{SexPartnerHistory.cs => SexHistoryComp.cs} (98%) diff --git a/RJWSexperience/RJWSexperience/ExtensionMethods/PawnExtensions.cs b/RJWSexperience/RJWSexperience/ExtensionMethods/PawnExtensions.cs index 5c6fe42..1106519 100644 --- a/RJWSexperience/RJWSexperience/ExtensionMethods/PawnExtensions.cs +++ b/RJWSexperience/RJWSexperience/ExtensionMethods/PawnExtensions.cs @@ -85,7 +85,7 @@ namespace RJWSexperience { if (pawn.IsVirgin()) { - SexPartnerHistory history = pawn.TryGetComp(); + SexHistoryComp history = pawn.TryGetComp(); history?.RecordFirst(partner, props); if (RJWUtility.RemoveVirginTrait(pawn, partner, props)) { diff --git a/RJWSexperience/RJWSexperience/Patches/DefInjection.cs b/RJWSexperience/RJWSexperience/Patches/DefInjection.cs index 67a0fc0..6562ddc 100644 --- a/RJWSexperience/RJWSexperience/Patches/DefInjection.cs +++ b/RJWSexperience/RJWSexperience/Patches/DefInjection.cs @@ -25,7 +25,7 @@ namespace RJWSexperience private static void InjectComp(List PawnDefs) { - CompProperties comp = new CompProperties(typeof(SexPartnerHistory)); + CompProperties comp = new CompProperties(typeof(SexHistoryComp)); if (!PawnDefs.NullOrEmpty()) foreach(ThingDef def in PawnDefs) { def.comps.Add(comp); diff --git a/RJWSexperience/RJWSexperience/Patches/GetGizmos.cs b/RJWSexperience/RJWSexperience/Patches/GetGizmos.cs index 65b3fd4..6c975ac 100644 --- a/RJWSexperience/RJWSexperience/Patches/GetGizmos.cs +++ b/RJWSexperience/RJWSexperience/Patches/GetGizmos.cs @@ -20,7 +20,7 @@ namespace RJWSexperience foreach (Gizmo gizmo in gizmos) yield return gizmo; - SexPartnerHistory history = pawn.TryGetComp(); + SexHistoryComp history = pawn.TryGetComp(); if (history != null) yield return history.Gizmo; } diff --git a/RJWSexperience/RJWSexperience/RJWSexperience.csproj b/RJWSexperience/RJWSexperience/RJWSexperience.csproj index dc5df92..f498e11 100644 --- a/RJWSexperience/RJWSexperience/RJWSexperience.csproj +++ b/RJWSexperience/RJWSexperience/RJWSexperience.csproj @@ -71,7 +71,7 @@ - + diff --git a/RJWSexperience/RJWSexperience/RJWUtility.cs b/RJWSexperience/RJWSexperience/RJWUtility.cs index 6388384..b77b9ce 100644 --- a/RJWSexperience/RJWSexperience/RJWUtility.cs +++ b/RJWSexperience/RJWSexperience/RJWUtility.cs @@ -159,7 +159,7 @@ namespace RJWSexperience { if (partner != null) { - SexPartnerHistory pawnshistory = pawn.TryGetComp(); + SexHistoryComp pawnshistory = pawn.TryGetComp(); pawnshistory?.RecordSex(partner, props); } } @@ -168,7 +168,7 @@ namespace RJWSexperience { if (partner != null) { - SexPartnerHistory pawnshistory = pawn.TryGetComp(); + SexHistoryComp pawnshistory = pawn.TryGetComp(); pawnshistory?.RecordSatisfaction(partner, props, satisfaction); } } diff --git a/RJWSexperience/RJWSexperience/SexHistory/SexPartnerHistory.cs b/RJWSexperience/RJWSexperience/SexHistory/SexHistoryComp.cs similarity index 98% rename from RJWSexperience/RJWSexperience/SexHistory/SexPartnerHistory.cs rename to RJWSexperience/RJWSexperience/SexHistory/SexHistoryComp.cs index c8b0eeb..73918f4 100644 --- a/RJWSexperience/RJWSexperience/SexHistory/SexPartnerHistory.cs +++ b/RJWSexperience/RJWSexperience/SexHistory/SexHistoryComp.cs @@ -1,14 +1,12 @@ -using RimWorld; -using rjw; +using rjw; using RJWSexperience.ExtensionMethods; using System.Collections.Generic; using System.Linq; -using UnityEngine; using Verse; namespace RJWSexperience { - public class SexPartnerHistory : ThingComp + public class SexHistoryComp : ThingComp { public const int ARRLEN = 20; @@ -275,7 +273,7 @@ namespace RJWSexperience if (VirginCheck() && props.sexType == xxx.rjwSextype.Vaginal) { first = partner.ThingID; - SexPartnerHistory history = partner.TryGetComp(); + SexHistoryComp history = partner.TryGetComp(); firstSexTickAbs = GenTicks.TicksAbs; history?.TakeSomeonesVirgin(parent as Pawn); } diff --git a/RJWSexperience/RJWSexperience/UI/SexStatus.cs b/RJWSexperience/RJWSexperience/UI/SexStatus.cs index 032e7bb..179235d 100644 --- a/RJWSexperience/RJWSexperience/UI/SexStatus.cs +++ b/RJWSexperience/RJWSexperience/UI/SexStatus.cs @@ -56,7 +56,7 @@ namespace RJWSexperience.UI protected Pawn pawn; protected SexPartnerHistoryRecord selectedPawn; - protected SexPartnerHistory history; + protected SexHistoryComp history; protected CompRJW rjwcomp; protected List partnerList; protected PartnerOrderMode orderMode; @@ -73,7 +73,7 @@ namespace RJWSexperience.UI private static Vector2 LastWindowPosition { get; set; } private Vector2 scroll; - public SexStatusWindow(Pawn pawn, SexPartnerHistory history) + public SexStatusWindow(Pawn pawn, SexHistoryComp history) { this.pawn = pawn; this.history = history; @@ -120,7 +120,7 @@ namespace RJWSexperience.UI Pawn p = selected.First(); if (p != pawn) { - SexPartnerHistory h = p.TryGetComp(); + SexHistoryComp h = p.TryGetComp(); if (h != null) ChangePawn(p, h); } } @@ -129,7 +129,7 @@ namespace RJWSexperience.UI DrawSexStatus(inRect, history); } - public static void ToggleWindow(Pawn pawn, SexPartnerHistory history) + public static void ToggleWindow(Pawn pawn, SexHistoryComp history) { SexStatusWindow window = (SexStatusWindow)Find.WindowStack.Windows.FirstOrDefault(x => x.GetType() == typeof(SexStatusWindow)); if (window != null) @@ -146,7 +146,7 @@ namespace RJWSexperience.UI } } - public void ChangePawn(Pawn pawn, SexPartnerHistory history) + public void ChangePawn(Pawn pawn, SexHistoryComp history) { List selected = Find.Selector.SelectedPawns; if (!selected.NullOrEmpty()) @@ -189,7 +189,7 @@ namespace RJWSexperience.UI /// /// Main contents /// - protected void DrawSexStatus(Rect mainrect, SexPartnerHistory history) + protected void DrawSexStatus(Rect mainrect, SexHistoryComp history) { float sectionwidth = mainrect.width / 3; @@ -228,7 +228,7 @@ namespace RJWSexperience.UI Widgets.DrawHighlightIfMouseover(portraitRect); if (Widgets.ButtonInvisible(portraitRect)) { - SexPartnerHistory pawnhistory = partner?.TryGetComp(); + SexHistoryComp pawnhistory = partner?.TryGetComp(); if (pawnhistory != null) { ChangePawn(partner, pawnhistory);