Common/Defs/GeneDefs_Breeding.xml

@@ -19,7 +19,7 @@
     <displayOrderInCategory>52</displayOrderInCategory>
 	<displayCategory>rjw_genes_breeding</displayCategory>
   </GeneDef>
-
+  
   <GeneDef>
     <defName>rjw_genes_insectbreeder</defName>
     <label>InsectBreeder</label>	
@@ -28,5 +28,5 @@
     <displayOrderInCategory>53</displayOrderInCategory>
 	<displayCategory>rjw_genes_breeding</displayCategory>
   </GeneDef>
-  
+
 </Defs>

Common/Defs/Genes/GeneCategories.xml

@@ -24,10 +24,4 @@
     <displayPriorityInXenotype>15</displayPriorityInXenotype>
   </GeneCategoryDef>
 
-  <GeneCategoryDef>
-    <defName>rjw_genes_cum</defName>
-    <label>Cum</label>
-    <displayPriorityInXenotype>14</displayPriorityInXenotype>
-  </GeneCategoryDef>
-
 </Defs>

Common/Defs/Genes/GeneDefs_Cum.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-    <GeneDef Name="GeneCumAmount" Abstract="True">
-        <displayCategory>rjw_genes_cum</displayCategory>
-        <exclusionTags>
-            <li>CumAmount</li>
-        </exclusionTags>  
-    </GeneDef>
-
-  <!-- Penis -->
-  <GeneDef ParentName="GeneCumAmount">
-    <defName>rjw_genes_no_cum</defName>
-    <label>No Cum</label>
-    <description>Males of these species have no fluid.</description>
-    <iconPath>Genes/Icons/Placeholder</iconPath>
-    <geneClass>RJW_Genes.Gene_NoCum</geneClass>
-    <displayOrderInCategory>533</displayOrderInCategory>
-    <biostatCpx>0</biostatCpx>
-    <biostatMet>1</biostatMet>
-  </GeneDef>
-
-  <GeneDef ParentName="GeneCumAmount">
-    <defName>rjw_genes_much_cum</defName>
-    <label>Much Cum</label>
-    <description>Males of this species produce a lot of fluid.</description>
-    <iconPath>Genes/Icons/Placeholder</iconPath>
-    <geneClass>RJW_Genes.Gene_MuchCum</geneClass>
-    <displayOrderInCategory>534</displayOrderInCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-1</biostatMet>
-  </GeneDef>
-
-  <GeneDef ParentName="GeneCumAmount">
-    <defName>rjw_genes_very_much_cum</defName>
-    <label>Very Much Cum</label>
-    <description>Males of this species produce a whole lot of fluid. They are like fountains basically.</description>
-    <iconPath>Genes/Icons/Placeholder</iconPath>
-    <geneClass>RJW_Genes.Gene_VeryMuchCum</geneClass>
-    <displayOrderInCategory>535</displayOrderInCategory>
-    <biostatCpx>1</biostatCpx>
-    <biostatMet>-2</biostatMet>
-  </GeneDef>
-
-  <GeneDef MayRequire="LustLicentia.RJWLabs">
-    <defName>rjw_genes_likes_cumflation</defName>
-    <label>Likes Cumflation</label>
-    <displayCategory>rjw_genes_cum</displayCategory>
-    <description>This Xenotype loves being cumflated.</description>
-    <iconPath>Genes/Icons/Placeholder</iconPath>
-    <displayOrderInCategory>536</displayOrderInCategory>
-    <forcedTraits>
-      <li>
-        <def>LikesCumflation</def>
-      </li>
-    </forcedTraits>
-    <exclusionTags>
-        <li>NotCumflatable</li>
-    </exclusionTags>  
-  </GeneDef>
-
-<!-- Does not Work like this (yet)-->
-<!--
-  <GeneDef MayRequire="LustLicentia.RJWLabs">
-    <defName>rjw_genes_cumflation_immunity</defName>
-    <label>Cumflation Immunity</label>
-    <displayCategory>rjw_genes_cum</displayCategory>
-    <description>This Xenotype cannot get cumflated.</description>
-    <iconPath>Genes/Icons/Placeholder</iconPath>
-    <displayOrderInCategory>537</displayOrderInCategory>
-    <hediffGiversCannotGive>
-      <li>Cumflation</li>
-    </hediffGiversCannotGive>
-    <exclusionTags>
-        <li>NotCumflatable</li>
-    </exclusionTags>  
-  </GeneDef>
--->
-
-</Defs>

Common/Defs/Genes/GeneDefs_Reproduction.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-    <GeneDef>
-        <defName>rjw_genes_hypersexual</defName>
-        <label>Hypersexuality</label>
-        <displayCategory>Reproduction</displayCategory>
-        <description>Xenotypes with this Gene are Hypersexual (Nymphs).</description>
-        <iconPath>Genes/Icons/Placeholder</iconPath>
-        <displayOrderInCategory>1</displayOrderInCategory>    
-        <forcedTraits>
-            <li>
-                <def>Nymphomaniac</def>
-            </li>
-        </forcedTraits>
-    </GeneDef>
-    
-</Defs>

Source/GeneDefOf.cs

@@ -6,61 +6,51 @@ namespace RJW_Genes
 	[DefOf]
 	public static class GeneDefOf
 	{
-		public static readonly GeneCategoryDef rjw_genes_genitalia;
+		[MayRequireBiotech] public static readonly GeneCategoryDef rjw_genes_genitalia;
-		public static readonly GeneCategoryDef rjw_genes_gender;
+		[MayRequireBiotech] public static readonly GeneCategoryDef rjw_genes_gender;
 
 		// Base Genitalia Types
-		public static readonly GeneDef rjw_genes_human_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_human_genitalia;
-		public static readonly GeneDef rjw_genes_equine_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_equine_genitalia;
-		public static readonly GeneDef rjw_genes_demonic_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_demonic_genitalia;
-		public static readonly GeneDef rjw_genes_dragon_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_dragon_genitalia;
-		public static readonly GeneDef rjw_genes_slime_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_slime_genitalia;
-		public static readonly GeneDef rjw_genes_ovipositor_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_ovipositor_genitalia;
-		public static readonly GeneDef rjw_genes_feline_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_feline_genitalia;
-		public static readonly GeneDef rjw_genes_canine_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_canine_genitalia;
 
 		// Extra Genitalia 
-		public static readonly GeneDef rjw_genes_extra_penis;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_extra_penis;
-		public static readonly GeneDef rjw_genes_no_penis;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_no_penis;
-		public static readonly GeneDef rjw_genes_extra_vagina;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_extra_vagina;
-		public static readonly GeneDef rjw_genes_no_vagina;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_no_vagina;
-		public static readonly GeneDef rjw_genes_extra_breasts;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_extra_breasts;
-		public static readonly GeneDef rjw_genes_no_breasts;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_no_breasts;
-		public static readonly GeneDef rjw_genes_extra_anus;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_extra_anus;
-		public static readonly GeneDef rjw_genes_no_anus;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_no_anus;
-		public static readonly GeneDef rjw_genes_futa;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_futa;
 
 		// Genitalia Sizes
-		public static readonly GeneDef rjw_genes_big_male_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_big_male_genitalia;
-		public static readonly GeneDef rjw_genes_normal_male_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_normal_male_genitalia;
-		public static readonly GeneDef rjw_genes_small_male_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_small_male_genitalia;
-		public static readonly GeneDef rjw_genes_loose_female_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_loose_female_genitalia;
-		public static readonly GeneDef rjw_genes_normal_female_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_normal_female_genitalia;
-		public static readonly GeneDef rjw_genes_tight_female_genitalia;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_tight_female_genitalia;
-		public static readonly GeneDef rjw_genes_big_breasts;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_big_breasts;
-		public static readonly GeneDef rjw_genes_normal_breasts;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_normal_breasts;
-		public static readonly GeneDef rjw_genes_small_breasts;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_small_breasts;
-		public static readonly GeneDef rjw_genes_loose_anus;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_loose_anus;
-		public static readonly GeneDef rjw_genes_normal_anus;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_normal_anus;
-		public static readonly GeneDef rjw_genes_tight_anus;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_tight_anus;
 
 		// Gender 
-		public static readonly GeneDef rjw_genes_female_only;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_female_only;
-		public static readonly GeneDef rjw_genes_male_only;
+		[MayRequireBiotech] public static readonly GeneDef rjw_genes_male_only;
 
 		// Breeding
 		public static readonly GeneDef rjw_genes_mechbreeder;
 		public static readonly GeneDef rjw_genes_insectincubator;
 		public static readonly GeneDef rjw_genes_insectbreeder;
-
-		//Cum 
-		public static readonly GeneDef rjw_genes_no_cum;
-		public static readonly GeneDef rjw_genes_much_cum;
-		public static readonly GeneDef rjw_genes_very_much_cum;
-		[MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_likes_cumflation;
-		//[MayRequire("LustLicentia.RJWLabs")] public static readonly GeneDef rjw_genes_cumflation_immunity; //Does currently not work like this
-
-		//Reproduction 
-		public static readonly GeneDef rjw_genes_hypersexual;
 	}
 }

Source/Genes/Breeding/Gene_MechBreeder.cs

@@ -2,7 +2,7 @@
 
 namespace Genes.Breeding
 {
-    public class Gene_MechBreeder : Gene
+    internal class Gene_MechBreeder : Gene
     {
         // This one does not do anything, the patch is some where else checking for the pawn to have this Gene!
     }

Source/Genes/Breeding/PatchPawnExtensions.cs

@@ -6,8 +6,6 @@ namespace RJW_Genes
 {
     /// <summary>
     /// Kindly provided by 'shabalox' https://github.com/Shabalox/RJW_Genes_Addons/
-    /// 
-    /// Note on the logic: the result mentioned below is changing the result of fertilization (true or false) to true if the pawn has the insect-breeder gene.
     /// </summary>
     [HarmonyPatch(typeof(PawnExtensions), "RaceImplantEggs")]
     public static class PatchPawnExtensions

Source/Genes/Cum/CumUtility.cs

@@ -1,37 +0,0 @@
-using Verse;
-using rjw;
-
-namespace RJW_Genes
-{
-    public class CumUtility
-    {
-
-        public static void MultiplyFluidAmountBy(Pawn pawn, float multiplier)
-        {
-			var partBPR = Genital_Helper.get_genitalsBPR(pawn);
-			var parts = Genital_Helper.get_PartsHediffList(pawn, partBPR);
-
-			if (!parts.NullOrEmpty())
-			{
-				CompHediffBodyPart CompHediff;
-
-				foreach (Hediff part in parts)
-				{
-					if (GenitaliaChanger.IsArtificial(part))
-						continue;
-
-					if (rjw.Genital_Helper.is_penis(part))
-					{
-						CompHediff = part.TryGetComp<rjw.CompHediffBodyPart>();
-						if (CompHediff != null)
-						{
-							CompHediff.FluidAmmount *= multiplier;
-						}
-					}
-				}
-
-			}
-
-		}
-	}
-}

Source/Genes/Cum/Gene_MuchCum.cs

@@ -1,39 +0,0 @@
-namespace RJW_Genes
-{
-    public class Gene_MuchCum : RJW_Gene
-    {
-        bool has_been_fired = false;
-
-        float multiplier_much_cum = 3f;
-
-        public override void PostMake()
-        {
-            base.PostMake();
-
-            CumUtility.MultiplyFluidAmountBy(pawn, multiplier_much_cum);
-            has_been_fired = true;
-        }
-
-        public override void PostAdd()
-        {
-            base.PostAdd();
-            if (!has_been_fired) { 
-                CumUtility.MultiplyFluidAmountBy(pawn, multiplier_much_cum); 
-                has_been_fired = true;
-            }
-        }
-
-
-        public override void PostRemove()
-        {
-            base.PostAdd();
-
-            if (has_been_fired)
-            {
-                CumUtility.MultiplyFluidAmountBy(pawn, 1/multiplier_much_cum);
-                has_been_fired = false;
-            }
-        }
-
-    }
-}

Source/Genes/Cum/Gene_NoCum.cs

@@ -1,34 +0,0 @@
-namespace RJW_Genes
-{
-    public class Gene_NoCum : RJW_Gene
-    {
-        bool has_been_fired = false;
-
-
-        public override void PostMake()
-        {
-            base.PostMake();
-
-            CumUtility.MultiplyFluidAmountBy(pawn, 0f);
-            has_been_fired = true;
-        }
-
-        public override void PostAdd()
-        {
-            base.PostAdd();
-            if (!has_been_fired) { 
-                CumUtility.MultiplyFluidAmountBy(pawn, 0f); 
-                has_been_fired = true;
-            }
-        }
-
-
-        public override void PostRemove()
-        {
-            // Cum Removal does not do at the moment :/ I would need to safe the old cum amount but I don't want to at the moment
-            base.PostAdd();
-
-        }
-
-    }
-}

Source/Genes/Cum/Gene_VeryMuchCum.cs

@@ -1,39 +0,0 @@
-namespace RJW_Genes
-{
-    public class Gene_VeryMuchCum : RJW_Gene
-    {
-        bool has_been_fired = false;
-
-        float multiplier_much_cum = 10f;
-
-        public override void PostMake()
-        {
-            base.PostMake();
-
-            CumUtility.MultiplyFluidAmountBy(pawn, multiplier_much_cum);
-            has_been_fired = true;
-        }
-
-        public override void PostAdd()
-        {
-            base.PostAdd();
-            if (!has_been_fired) { 
-                CumUtility.MultiplyFluidAmountBy(pawn, multiplier_much_cum); 
-                has_been_fired = true;
-            }
-        }
-
-
-        public override void PostRemove()
-        {
-            base.PostAdd();
-
-            if (has_been_fired)
-            {
-                CumUtility.MultiplyFluidAmountBy(pawn, 1/multiplier_much_cum);
-                has_been_fired = false;
-            }
-        }
-
-    }
-}

Source/Genes/Genitalia/Gene_CanineGenitalia.cs

@@ -14,7 +14,7 @@ namespace RJW_Genes
 
         public override void PostAdd()
         {
-            base.PostAdd();
+            base.PostMake();
             GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.canine_penis, Genital_Helper.canine_vagina, Genital_Helper.generic_anus);
         }
     }

Source/Genes/Genitalia/Gene_DemonicGenitalia.cs

@@ -15,7 +15,7 @@ namespace RJW_Genes
 
         public override void PostAdd()
         {
-            base.PostAdd();
+            base.PostMake();
             GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.demon_penis, Genital_Helper.demon_vagina, Genital_Helper.demon_anus);
         }
     }

Source/Genes/Genitalia/Gene_DragonGenitalia.cs

@@ -14,7 +14,7 @@ namespace RJW_Genes
 
         public override void PostAdd()
         {
-            base.PostAdd();
+            base.PostMake();
             GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.dragon_penis, Genital_Helper.dragon_vagina, Genital_Helper.generic_anus);
         }
     }

Source/Genes/Genitalia/Gene_EquineGenitalia.cs

@@ -14,7 +14,7 @@ namespace RJW_Genes
 
         public override void PostAdd()
         {
-            base.PostAdd();
+            base.PostMake();
             GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.equine_penis, Genital_Helper.equine_vagina, Genital_Helper.generic_anus);
         }
     }

Source/Genes/Genitalia/Gene_FelineGenitalia.cs

@@ -14,7 +14,7 @@ namespace RJW_Genes
 
         public override void PostAdd()
         {
-            base.PostAdd();
+            base.PostMake();
             GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.feline_penis, Genital_Helper.feline_vagina, Genital_Helper.generic_anus);
         }
     }

Source/Genes/Genitalia/Gene_OvipositorGenitalia.cs

@@ -14,7 +14,7 @@ namespace RJW_Genes
 
         public override void PostAdd()
         {
-            base.PostAdd();
+            base.PostMake();
             GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.ovipositorM, Genital_Helper.ovipositorF, Genital_Helper.insect_anus);
         }
     }

Source/Genes/Genitalia/Gene_SlimeGenitalia.cs

@@ -14,7 +14,7 @@ namespace RJW_Genes
 
         public override void PostAdd()
         {
-            base.PostAdd();
+            base.PostMake();
             GenitaliaChanger.ChangeGenitalia(this.pawn, Genital_Helper.slime_penis, Genital_Helper.slime_vagina, Genital_Helper.slime_anus);
         }
     }

Source/Rjw-Genes.csproj

@@ -56,10 +56,6 @@
     <Compile Include="Genes\Breeding\PatchMechBirth.cs" />
     <Compile Include="Genes\Breeding\PatchPawnExtensions.cs" />
     <Compile Include="Genes\Breeding\PatchPregnancyHelper.cs" />
-    <Compile Include="Genes\Cum\CumUtility.cs" />
-    <Compile Include="Genes\Cum\Gene_VeryMuchCum.cs" />
-    <Compile Include="Genes\Cum\Gene_MuchCum.cs" />
-    <Compile Include="Genes\Cum\Gene_NoCum.cs" />
     <Compile Include="Genes\ExtraGenitalia\Gene_ExtraBreasts.cs" />
     <Compile Include="Genes\ExtraGenitalia\Gene_ExtraAnus.cs" />
     <Compile Include="Genes\ExtraGenitalia\Gene_Futa.cs" />

TODOS.md

@@ -8,6 +8,15 @@ So any help is very appreciated, even if it is just pointing me to existing simi
 **Sanguophage like Cumwhores** adding Hemogen and refilling it by getting semen. 
 Showstopper here is the amount of code required, and that I need to understand a bit better of harmony to run the AfterSexUtility and modulate SexChances. 
 
+**MechBreeder** hetch mechanoids without harm. 
+Showstopper: The damage to the pawn is hardcoded in MechBirth, so I might want to do a Deathstasis like Hediff after
+
+**InsectBreeder** pawn fertilizes the insect eggs in his partner
+
+**InsectIncubator** increase amount of eggs that fit inside pawn. 
+Issue is that the MaxEggSize and Eggsize have hardcoded criteria, mostly around pawn size.
+This might need a small change in RJW base code to split the function up with parameters (e.g. MaxEggSize)
+
 **Traits** such as Hypersexual and LikesCumflation, Sexuality Genes?
 
 **Modulation of FluidAmount** for Cocks and Tiddies