1.0.4.2

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW Menstruation</identifier>
-	<version>1.0.4.0</version>
+	<version>1.0.4.2</version>
 	<dependencies>
 	</dependencies>
 	<incompatibleWith />

changelogs.txt

@@ -1,10 +1,14 @@
+Version 1.0.4.2
+ - fixed errors on hybrid custom
+ - fixed errors on pregnancy 
+
 Version 1.0.4.1
  - fixed errors when the race mods are uninstalled
  - minor bug fixes
  - removed mechanoids from hybrid table
  - increased probability weight range of custom hybrid
  - breasts size increase gradually after pregnancy about one cup 
- 
+
 Version 1.0.4.0
  - minor bug fixes
  - cums will get maximum thickness initially and become thinner gradually

source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs

@@ -490,10 +490,10 @@ namespace RJW_Menstruation
         {
             PawnKindDef res = null;
             Pawn opposite = second;
-            HybridInformations info = Configurations.HybridOverride.FirstOrDefault(x => x.defName == first.def.defName && x.hybridExtension.Exists(y => y.defName == second.def.defName));
+            HybridInformations info = Configurations.HybridOverride.FirstOrDefault(x => x.defName == first.def?.defName && (x.hybridExtension?.Exists(y => y.defName == second.def?.defName) ?? false));
             if (info == null)
             {
-                info = Configurations.HybridOverride.FirstOrDefault(x => x.defName == second.def.defName && x.hybridExtension.Exists(y => y.defName == first.def.defName));
+                info = Configurations.HybridOverride.FirstOrDefault(x => x.defName == second.def?.defName && (x.hybridExtension?.Exists(y => y.defName == first.def?.defName) ?? false));
                 opposite = first;
             }
 

source/RJW_Menstruation/RJW_Menstruation/Things.cs

@@ -34,7 +34,7 @@ namespace RJW_Menstruation
     public class HybridExtension
     {
 
-        public Dictionary<string, float> hybridInfo;
+        public Dictionary<string, float> hybridInfo = new Dictionary<string, float>();
         public ThingDef thingDef;
 
         public HybridExtension() { }
@@ -60,7 +60,6 @@ namespace RJW_Menstruation
 
         public void LoadDataFromXmlCustom(XmlNode xmlRoot)
         {
-            hybridInfo = new Dictionary<string, float>();
             DirectXmlCrossRefLoader.RegisterObjectWantsCrossRef(this, "thingDef", xmlRoot.Name);
             XmlNodeList childNodes = xmlRoot.ChildNodes;
             

source/RJW_Menstruation/RJW_Menstruation/UI/Dialog_HybridCustom.cs

@@ -140,7 +140,7 @@ namespace RJW_Menstruation
 
             
             Rect outRect = new Rect(inRect.x, inRect.y + 30f, inRect.width, inRect.height - 30f);
-            Rect mainRect = new Rect(inRect.x, inRect.y + 30f, inRect.width - 30f, Math.Max(24f*Configurations.HybridOverride.Count(),10f));
+            Rect mainRect = new Rect(inRect.x, inRect.y + 30f, inRect.width - 30f, Math.Max(24f*Configurations.HybridOverride?.Count() ?? 1,10f));
             Listing_Standard listmain = new Listing_Standard();
             
             listmain.BeginScrollView(outRect, ref scroll, ref mainRect);
@@ -336,12 +336,12 @@ namespace RJW_Menstruation
             float additionalHeight = 0f;
             if (!info.hybridExtension.NullOrEmpty()) foreach(HybridExtensionExposable e in info.hybridExtension)
                 {
-                    additionalHeight += e.hybridInfo.Count() * rowH;
+                    additionalHeight += e.hybridInfo?.Count() ?? 1 * rowH;
                 }
 
 
             Rect outRect = new Rect(inRect.x, inRect.y + 30f, inRect.width, inRect.height - 30f);
-            Rect mainRect = new Rect(inRect.x, inRect.y + 30f, inRect.width - 30f, rowH * info.hybridExtension.Count() + additionalHeight);
+            Rect mainRect = new Rect(inRect.x, inRect.y + 30f, inRect.width - 30f, rowH * info.hybridExtension?.Count() ?? 1 + additionalHeight);
             Listing_Standard listmain = new Listing_Standard();
 
             listmain.BeginScrollView(outRect, ref scroll, ref mainRect);
@@ -351,7 +351,7 @@ namespace RJW_Menstruation
             {
                 foreach (HybridExtensionExposable extension in info.hybridExtension)
                 {
-                    DoRow(listmain.GetRect(rowH + rowH * extension.hybridInfo.Count()), extension);
+                    DoRow(listmain.GetRect(rowH + rowH * extension.hybridInfo?.Count() ?? 1), extension);
                 }
 
             }

source/RJW_Menstruation/RJW_Menstruation/Utility.cs

@@ -184,7 +184,8 @@ namespace RJW_Menstruation
                 if (!h.babies.NullOrEmpty()) return h.babies.First();
                 else
                 {
-                    Log.Error("Baby not exist: baby was not created or removed");
+                    Log.Error("Baby not exist: baby was not created or removed. Remove pregnancy.");
+                    pawn.health.RemoveHediff(hediff);
                     return null;
                 }
             }