From ba7b72b42668e2c0f467df6d85bd1f5dfb85427d Mon Sep 17 00:00:00 2001 From: Vegapnk Date: Sun, 15 Jan 2023 09:50:29 +0100 Subject: [PATCH] Minor Cleanups --- Source/Animal_Inheritance/RaceGeneDef_Helper.cs | 11 ++++++----- Source/Genes/GeneUtility.cs | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Source/Animal_Inheritance/RaceGeneDef_Helper.cs b/Source/Animal_Inheritance/RaceGeneDef_Helper.cs index 680b155..3db664c 100644 --- a/Source/Animal_Inheritance/RaceGeneDef_Helper.cs +++ b/Source/Animal_Inheritance/RaceGeneDef_Helper.cs @@ -1,11 +1,8 @@ -using System; +using rjw; +using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using rjw; using Verse; -using RimWorld; namespace RJW_BGS { @@ -44,6 +41,7 @@ namespace RJW_BGS }).ToList(); if (pawnKindDefs.Count() > 0) return pawnKindDefs; + List raceKindDefs = allDefs.Where(delegate (RaceGeneDef group) { List raceNames = group.raceNames; @@ -51,6 +49,7 @@ namespace RJW_BGS }).ToList(); if (raceKindDefs.Count() > 0) return raceKindDefs; + List raceGroupDefs = new List(); if (raceGroupDef != null) { @@ -60,8 +59,10 @@ namespace RJW_BGS return raceGroupDefName != null && raceGroupDefName == raceGroupDef.defName; }).ToList(); } + if (raceGroupDefs.Count() > 0) return raceGroupDefs; + return new List(); } } diff --git a/Source/Genes/GeneUtility.cs b/Source/Genes/GeneUtility.cs index d9251d3..284aab2 100644 --- a/Source/Genes/GeneUtility.cs +++ b/Source/Genes/GeneUtility.cs @@ -102,17 +102,17 @@ namespace RJW_Genes return !GetGenitaliaResizingGenes(pawn).NullOrEmpty(); } - public static List GetGenitaliaResizingGenes(Pawn pawn) + public static List GetGenitaliaResizingGenes(Pawn pawn) { - var ResizingGenes = new List(); + var ResizingGenes = new List(); // Error Handling: Issue with Pawn or Genes return empty. if (pawn == null || pawn.genes == null) return ResizingGenes; - foreach (Gene g in pawn.genes.GenesListForReading) - if (g is Gene_GenitaliaResizingGene) - ResizingGenes.Add(g); + foreach (Gene gene in pawn.genes.GenesListForReading) + if (gene is Gene_GenitaliaResizingGene resizing_gene) + ResizingGenes.Add(resizing_gene); return ResizingGenes; }