Merge pull request #7 from Shabakur/main

Fixed and improved prioritization of racegenedefs

Common/Defs/RaceGeneDefs/RaceGeneDefs_template.xml

@@ -18,6 +18,9 @@
 		</pawnKindNames>
 		For even more direct control you can use pawnKindNames. 
 		
+		<priority>0</priority> 
+		You can use priority incase you have multiple racegenedefs with the same animal under the same list (racegroup, racenames or pawnKindNames). If not assigned the value is 0. Higher priority is chosen.
+		
 		The RaceGeneDef for an animal will first be decided by if it is in the pawnkindNames, after that racenames and lastly racegroup,
 		so if there is for a wolf a RaceGeneDef with the canine group and a second which has wolf under raceNames it will always use the second one to determine
 		which genes can be inherited

KNOWN_BUGS.md

@@ -48,7 +48,7 @@ RimWorld.GeneMaker:MakeGene (Verse.GeneDef,Verse.Pawn)
 
 Reason: 
 
-RJW covers some corner cases when the pawn is changed before creation. 
+RJW covers some corner cases when the pawn is changed before creation. This seems a bit legacy and related to Royalty-Content.
 
 Current Solution: 
 
@@ -56,10 +56,25 @@ Ignore this. The pawns seem to have the right sex and genitalia, I cannot "catch
 
 Aimed Solution: 
 
-Patch ChangeSex to skip for pawns with the two genes producing this.
+Patch RJW ChangeSex upstream to skip for pawns with the two genes producing this.
+
+## Error on Game Load:  Verse.GeneDef named rjw_genes_human_genitalia (wanter=genes)
+
+Error: Issue #4, Game throws a warning on load that some Genes were not found. 
+
+Reason: (Likely) because I removed some genes from Pre-Release to 1.0.0. Now some players have unknown definitions in their safe-files and Xenotype Defs. 
+The removed Genes were the ones that performed default behaviour (e.g. normal breast size, normal penis size, ...)
+
+Solution: Should be safe to ignore, when you get this on safe-load make a quick new safe. new safe should not throw the error. For Self-Made Xenotypes remove the Genes. 
+
+Sorry about this one, I know removal can break things but hey you were playing with the Prerelease! 
 
 ## Insect Breeder does not fertilize
 
+Update:
+
+We changed behaviour in [1.0.1](https://github.com/vegapnk/RJW-Genes/releases/tag/1.0.1) and it seems to work now. Please tell us if you still encounter this. 
+
 Error: 
 
 A pawn with insect breeder fucks a pawn with unfertilized insect eggs, but the eggs stay unfertilized. 

Source/Animal_Inheritance/InheritanceUtility.cs

@@ -42,7 +42,7 @@ namespace RJW_BGS
         public static List<GeneDef> SelectGenes(Pawn pawn)
         {
             List<GeneDef> genelist = new List<GeneDef>();
-            RaceGeneDef raceGeneDef = RJWcopy.GetRaceGeneDefInternal(pawn);
+            RaceGeneDef raceGeneDef = RaceGeneDef_Helper.GetRaceGeneDefInternal(pawn);
             if (raceGeneDef != null)
             {
                 foreach (BestialityGeneInheritanceDef gene in raceGeneDef.genes)

Source/Animal_Inheritance/RaceGeneDef.cs

@@ -10,7 +10,7 @@ namespace RJW_BGS
 {
     public class RaceGeneDef : Def
     {
-
+        public int priority;
         public String raceGroup;
         public List<string> raceNames;
         public List<string> pawnKindNames;

Source/Animal_Inheritance/RaceGeneDef_Helper.cs

@@ -9,10 +9,22 @@ using RimWorld;
 
 namespace RJW_BGS
 {
-    internal class RJWcopy
+    public class RaceGeneDef_Helper
     {
       	//code based on racegroupdefinternal which has a similar function
 		public static RaceGeneDef GetRaceGeneDefInternal(Pawn pawn)
+        {
+			List<RaceGeneDef> Valids = ValidRaceGeneDefs(pawn);
+			if (Valids.Count > 0)
+            {
+				RaceGeneDef result = Valids.MaxBy(r => r.priority);
+				return result;
+			}			
+			return null;
+			//First check if there is a matching pawnkinddef then race, then racegroup
+
+		}
+		public static List<RaceGeneDef> ValidRaceGeneDefs(Pawn pawn)
 		{
 			PawnKindDef kindDef = pawn.kindDef;
 			if (kindDef == null)
@@ -21,19 +33,24 @@ namespace RJW_BGS
 			}
 			string raceName = kindDef.race.defName;
 			string pawnKindName = kindDef.defName;
-			IEnumerable<RaceGeneDef> allDefs = DefDatabase<RaceGeneDef>.AllDefs;
 			PawnData pawnData = SaveStorage.DataStore.GetPawnData(pawn);
 			RaceGroupDef raceGroupDef = pawnData.RaceSupportDef;
+
+			IEnumerable<RaceGeneDef> allDefs = DefDatabase<RaceGeneDef>.AllDefs;
 			List<RaceGeneDef> pawnKindDefs = allDefs.Where(delegate (RaceGeneDef group)
 			{
 				List<string> pawnKindNames = group.pawnKindNames;
 				return pawnKindNames != null && pawnKindNames.Contains(pawnKindName);
 			}).ToList<RaceGeneDef>();
+			if (pawnKindDefs.Count() > 0)
+				return pawnKindDefs;
 			List<RaceGeneDef> raceKindDefs = allDefs.Where(delegate (RaceGeneDef group)
 			{
 				List<string> raceNames = group.raceNames;
 				return raceNames != null && raceNames.Contains(raceName);
 			}).ToList<RaceGeneDef>();
+			if (raceKindDefs.Count() > 0)
+				return raceKindDefs;
 			List<RaceGeneDef> raceGroupDefs = new List<RaceGeneDef>();
 			if (raceGroupDef != null)
 			{
@@ -43,27 +60,9 @@ namespace RJW_BGS
 					return raceGroupDefName != null && raceGroupDefName == raceGroupDef.defName;
 				}).ToList<RaceGeneDef>();
 			}
-			RaceGeneDef result = null;
+			if (raceGroupDefs.Count() > 0)
-			//First check if there is a matching pawnkinddef then race, then racegroup
+				return raceGroupDefs;
-			if (pawnKindDefs.Any())
+			return new List<RaceGeneDef>();
-			{
-				result = pawnKindDefs.RandomElement();
-			}
-			else if (raceKindDefs.Any() && result == null)
-			{
-				result = raceKindDefs.RandomElement();
-			}
-			else if (raceGroupDefs.Any() && result == null)
-			{
-				result = raceGroupDefs.RandomElement();
-			}
-			else
-            {
-				result = null;
-            }
-			return result;
-
-
 		}
     } 
 }

Source/Genes/GenitaliaSize/SizeAdjuster.cs

@@ -58,7 +58,7 @@ namespace RJW_Genes
         public static void AdjustAllBreastSizes(Pawn pawn, float lowerLimit = 0.0f, float upperLimit = 1.0f)
         {
 
-            List<Hediff> AllBreasts = Genital_Helper.get_AllPartsHediffList(pawn).FindAll(x => x.def.defName.Contains("breasts"));
+            List<Hediff> AllBreasts = Genital_Helper.get_AllPartsHediffList(pawn).FindAll(x => x.def.defName.ToLower().Contains("breasts"));
             ResizeAll(AllBreasts,lowerLimit,upperLimit);
         }