Merge 2.6.2 Update (#228)

* - Seperation of Animal Gene code from base RJW_Genes

* - Clean-up of leftover XML Files
- Minor update to README.md

* Fixed missing translation text
Fixed Missing B&S Undead Patch
Fixed Anal Fertility Errors, might be broken again.

DLL Included for Merge.

1.6/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml

@@ -189,6 +189,8 @@
     <modExtensions>
       <li Class="RJW_Genes.GenitaliaTypeExtension">
         <penis>HemiPenis</penis>
+		<vagina>CloacalVagina</vagina>
+		<anus>CloacalAnus</anus>
       </li>
       <li Class="RJW_Genes.QirkExtension">
         <Satisfiedquirk>ScaleLoverQuirk</Satisfiedquirk>
@@ -233,4 +235,31 @@
     </exclusionTags>
   </GeneDef>
 
+  <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_rodent_genitalia</defName>
+    <label>rodent genitalia</label>
+    <description>Carriers of this gene develop rodent genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_croc_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>RodentPenis</penis>
+        <vagina>RodentVagina</vagina>
+      </li>
+    </modExtensions>
+  </GeneDef>
+  
+    <GeneDef ParentName="GeneGenitalTypeBase">
+    <defName>rjw_genes_cloacal_genitalia</defName>
+    <label>cloacal genitalia</label>
+    <description>Carriers of this gene develop cloacal genitalia.</description>
+    <iconPath>Genes/Icons/Genitalia_croc_icon</iconPath>
+    <modExtensions>
+      <li Class="RJW_Genes.GenitaliaTypeExtension">
+        <penis>CloacalPenis</penis>
+        <vagina>CloacalVagina</vagina>
+		<anus>CloacalAnus</anus>
+      </li>
+    </modExtensions>
+  </GeneDef>
+
 </Defs>

1.6/Languages/English/Keyed/StatsReports.xml

@@ -4,5 +4,6 @@
 	<StatsReport_NoChildren>Pawn doesn't have any children.</StatsReport_NoChildren>
 	<StatsReport_ManyChildren>Pawn has a decent amount of children.</StatsReport_ManyChildren>
 	<StatsReport_VeryManyChildren>Pawn has a lot of children.</StatsReport_VeryManyChildren>
+	<RJW_Genes_GenitalsNotAlterable>Unable to geneticaly adapt or alter {PAWN_nameDef}'s genitals.</RJW_Genes_GenitalsNotAlterable>
 
 </LanguageData>

1.6/Patches/Xenotypes/PatchBSUndead.xml

@@ -9,16 +9,9 @@
         <li Class="PatchOperationAdd">
           <xpath>Defs/XenotypeDef[defName="VU_Returned" or defName="VU_Ghoul" or defName="VU_Frankenstein"]/genes</xpath>
           <value>
-            <li>rjw_genes_Necro_genitalia</li>
             <li>rjw_genes_no_sex_need</li>
           </value>
         </li>
-        <li Class="PatchOperationAdd">
-          <xpath>Defs/XenotypeDef[defName="VU_Revenant"]/genes</xpath>
-          <value>
-            <li>rjw_genes_Necro_genitalia</li>
-          </value>
-        </li>
         <li Class="PatchOperationAdd">
           <xpath>Defs/XenotypeDef[defName="VU_Lycantrope"]/genes</xpath> <!-- sic -->
           <value>

1.6/Source/Common/Helpers/LaborState.cs

@@ -18,7 +18,7 @@ namespace RJW_Genes
             this.birthTotal = birthTotal;
             this.birthCount = 0;
             this.hasOvaryAgitator = pawn.health.hediffSet.HasHediff(HediffDef.Named("OvaryAgitator"));
-            this.hasBioscaffold = pawn.health.hediffSet.HasHediff(HediffDef.Named("OvaryAgitator"));
+            this.hasBioscaffold = pawn.health.hediffSet.HasHediff(HediffDef.Named("Bioscaffold"));
         }
     }
 }

1.6/Source/Common/patches/PatchPregnancyHelper.cs

@@ -5,9 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 using HarmonyLib;
 using RimWorld;
-using Verse;
 using rjw;
 using rjw.Modules.Interactions;
+using Verse;
+using static rjw.RJWPregnancySettings;
 //using rjw.Modules.Interactions.Enums;
 
 namespace RJW_Genes
@@ -17,8 +18,8 @@ namespace RJW_Genes
     {
         public static HediffDef vasectomydef = DefDatabase<HediffDef>.GetNamed("Vasectomy", true);
         // Token: 0x0600000F RID: 15
-        [HarmonyPostfix]
+        //[HarmonyPostfix]
-        [HarmonyPatch("impregnate")]
+        //[HarmonyPatch("impregnate")]
         private static void ImpregnatePostfix(ref SexProps props)
         {
             
@@ -81,16 +82,18 @@ namespace RJW_Genes
                 if (RJWSettings.DevMode) ModLog.Message(xxx.get_pawnname(giver) + " has no parts to Fertilize with");
                 return;
             }
+
+            //If recieving pawn has a Vasectomy,temporarily remove it to prevent fertility Malice, replace it after DoImpregnate.
             if (vasectomy != null)
             {
-                //Temporarily remove Vasectomy from Receiver to prevent fertility Malice, replace it after DoImpregnate.
                 if (RJWSettings.DevMode) ModLog.Message("vasectomy check");
                 receiver.health.RemoveHediff(vasectomy);
             }
             if (CanImpregnate2(giver, receiver, props.sexType))
             {
                 if (RJWSettings.DevMode) ModLog.Message(xxx.get_pawnname(giver)+" is analy impregnating "+ xxx.get_pawnname(receiver));
-                PregnancyHelper.DoImpregnate(giver, receiver);
+                //DOES NOT EXIST
+                //PregnancyHelper.DoImpregnate(giver, receiver);
                
             }
             if (vasectomy != null)
@@ -223,7 +226,7 @@ namespace RJW_Genes
                 return false;
 
             }
-            if (((xxx.is_animal(fucker) && xxx.is_human(fucked)) || (xxx.is_human(fucker) && xxx.is_animal(fucked))) && !RJWPregnancySettings.bestial_pregnancy_enabled)
+            if (((xxx.is_animal(fucker) && xxx.is_human(fucked)) || (xxx.is_human(fucker) && xxx.is_animal(fucked))) && RJWPregnancySettings.bestial_pregnancy == BestialPregnancy.None)
                 {
                     if (RJWSettings.DevMode)
                     {

1.6/Source/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Rjw-Genes")]
-[assembly: AssemblyCopyright("Copyright ©  2025")]
+[assembly: AssemblyCopyright("Copyright ©  2026")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.0")]
+[assembly: AssemblyVersion("2.6.2")]

About/About.xml

@@ -2,7 +2,7 @@
 	<name>RJW Genes</name>
 	<author>Vegapnk - 1.6 Rewrite by Telanda</author>
 	<packageId>Vegapnk.rjw.genes</packageId>
-	<modVersion>2.6.0</modVersion>
+	<modVersion>2.6.2</modVersion>
 	<supportedVersions>
 		<li>1.4</li>
 		<li>1.5</li>

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW-Genes</identifier>
-	<version>2.6.0</version>
+	<version>2.6.2</version>
 	<dependencies>
         <li>RimJobWorld</li>
 	</dependencies>

CHANGELOG.md

@@ -1,4 +1,22 @@
-# 2.6.0 (18-08-2025)
+#INPROG
+
+# 2.6.2 (15-02-2026)
+(Commit by @Telanda-DDS)
+
+**Fixes**
+- Fixed incorrect gene Definition for Big and Small - Vampires and the Undead.
+- Fixed missing translation text field `RJW_Genes_GenitalsNotAlterable`
+
+
+------------
+
+# 2.6.1 (16-10-2025)
+(Commit by @Telanda-DDS)
+
+**Fixes**
+- Updated RJW Patches to reference changed setting variable.
+
+# 2.6.0 (05-09-2025)
 (Commit by @Telanda-DDS)
 
 **Changes**

CONTRIBUTING.md

@@ -17,7 +17,7 @@ But please consider also the following:
 
 ## Contributors 
 
-- Shabalox (MechBreeding, InsectBreeding, Animal Gene Inheritance)
+- Shabalox (MechBreeding, InsectBreeding)
 - WasMachenDennSachen (Various Icons)
 - Jaaldabaoth (1.5 Migration, MPreg, Femboys, Initial VE-Genetic Hybrids)
 - Flock-of-Birds (Cosmetic Genitalia per XML)

README.md

@@ -14,7 +14,6 @@ This mod adds genes related and based on RJW to Rimworld.
 - Cum-Amount Changes, Transfer Nutrition Boosts
 - Sexual Vampires that need Cum, Cocks or some other sources.
 - Mech Breeding Additions & Orgasmic Mytosis
-- Human-Animal Gene Inheritance merged from [Shabakur](https://github.com/Shabakur/RJW_Animal_Gene_Inheritance)
 - Genetic Diseases that spread on Intercourse
 - Patches for some popular / common Xenotypes from other Mods.