AblativeAbsolute/rjw_menstruation
1
0
Fork 0
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git synced 2024-08-14 22:46:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Null check in GetMenstruationComps, probably unnecessary. Also simplify HasMenstruationComp

Browse source
This commit is contained in:
lutepickle 2022-07-16 07:30:34 -07:00
parent 5a64a081c2
commit 6383823e34
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs
View file

@ -19,6 +19,7 @@ namespace RJW_Menstruation
public static IEnumerable<HediffComp_Menstruation> GetMenstruationComps(this Pawn pawn) public static IEnumerable<HediffComp_Menstruation> GetMenstruationComps(this Pawn pawn)
{ {
List<Hediff> hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll((Hediff h) => h.def.defName.ToLower().Contains("vagina")); List<Hediff> hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll((Hediff h) => h.def.defName.ToLower().Contains("vagina"));
if (hedifflist == null) yield break;
foreach (Hediff hediff in hedifflist) foreach (Hediff hediff in hedifflist)
{ {
HediffComp_Menstruation result = hediff.TryGetComp<HediffComp_Menstruation>(); HediffComp_Menstruation result = hediff.TryGetComp<HediffComp_Menstruation>();

10
1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
View file

@ -120,15 +120,7 @@ namespace RJW_Menstruation
public static bool HasMenstruationComp(this Pawn pawn) public static bool HasMenstruationComp(this Pawn pawn)
{ {
List<Hediff> hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll((Hediff h) => h.def.defName.ToLower().Contains("vagina")); return pawn.GetMenstruationComps().Any();
HediffComp_Menstruation result;
if (hedifflist.NullOrEmpty()) return false;
foreach (Hediff h in hedifflist)
{
result = h.TryGetComp<HediffComp_Menstruation>();
if (result != null) return true;
}
return false;
} }
public static bool HasMenstruationComp(this Hediff hediff) public static bool HasMenstruationComp(this Hediff hediff)