diff --git a/1.6/Assemblies/Rjw-Genes.dll b/1.6/Assemblies/Rjw-Genes.dll index 4778bf2..f649db6 100644 Binary files a/1.6/Assemblies/Rjw-Genes.dll and b/1.6/Assemblies/Rjw-Genes.dll differ diff --git a/1.6/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml b/1.6/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml index 543c542..3d8c82b 100644 --- a/1.6/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml +++ b/1.6/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml @@ -189,8 +189,6 @@
  • HemiPenis - CloacalVagina - CloacalAnus
  • ScaleLoverQuirk @@ -235,31 +233,4 @@ - - rjw_genes_rodent_genitalia - - Carriers of this gene develop rodent genitalia. - Genes/Icons/Genitalia_croc_icon - -
  • - RodentPenis - RodentVagina -
    • -     - - - - rjw_genes_cloacal_genitalia - - Carriers of this gene develop cloacal genitalia. - Genes/Icons/Genitalia_croc_icon - -
  • - CloacalPenis - CloacalVagina - CloacalAnus -
    • -     -     - \ No newline at end of file diff --git a/1.6/Languages/English/Keyed/StatsReports.xml b/1.6/Languages/English/Keyed/StatsReports.xml index 63085f9..715bccb 100644 --- a/1.6/Languages/English/Keyed/StatsReports.xml +++ b/1.6/Languages/English/Keyed/StatsReports.xml @@ -4,6 +4,5 @@ Pawn doesn't have any children. Pawn has a decent amount of children. Pawn has a lot of children. - Unable to geneticaly adapt or alter {PAWN_nameDef}'s genitals. diff --git a/1.6/Mods/Cumpilation/Assemblies/CumpilationPatcher.dll b/1.6/Mods/Cumpilation/Assemblies/CumpilationPatcher.dll index 586660a..d902457 100644 Binary files a/1.6/Mods/Cumpilation/Assemblies/CumpilationPatcher.dll and b/1.6/Mods/Cumpilation/Assemblies/CumpilationPatcher.dll differ diff --git a/1.6/Patches/Xenotypes/PatchBSUndead.xml b/1.6/Patches/Xenotypes/PatchBSUndead.xml index c0a9632..0c2e592 100644 --- a/1.6/Patches/Xenotypes/PatchBSUndead.xml +++ b/1.6/Patches/Xenotypes/PatchBSUndead.xml @@ -9,9 +9,16 @@
  • Defs/XenotypeDef[defName="VU_Returned" or defName="VU_Ghoul" or defName="VU_Frankenstein"]/genes +
  • rjw_genes_Necro_genitalia
  • rjw_genes_no_sex_need
    • +
  • + Defs/XenotypeDef[defName="VU_Revenant"]/genes + +
  • rjw_genes_Necro_genitalia
    • + +
  • Defs/XenotypeDef[defName="VU_Lycantrope"]/genes diff --git a/1.6/Source/Common/Helpers/LaborState.cs b/1.6/Source/Common/Helpers/LaborState.cs index abb00a1..8a0e59d 100644 --- a/1.6/Source/Common/Helpers/LaborState.cs +++ b/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("Bioscaffold")); + this.hasBioscaffold = pawn.health.hediffSet.HasHediff(HediffDef.Named("OvaryAgitator")); } } } diff --git a/1.6/Source/Common/patches/PatchPregnancyHelper.cs b/1.6/Source/Common/patches/PatchPregnancyHelper.cs index a040924..a01897c 100644 --- a/1.6/Source/Common/patches/PatchPregnancyHelper.cs +++ b/1.6/Source/Common/patches/PatchPregnancyHelper.cs @@ -5,10 +5,9 @@ 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 @@ -18,8 +17,8 @@ namespace RJW_Genes { public static HediffDef vasectomydef = DefDatabase.GetNamed("Vasectomy", true); // Token: 0x0600000F RID: 15 - //[HarmonyPostfix] - //[HarmonyPatch("impregnate")] + [HarmonyPostfix] + [HarmonyPatch("impregnate")] private static void ImpregnatePostfix(ref SexProps props) { @@ -82,18 +81,16 @@ 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)); - //DOES NOT EXIST - //PregnancyHelper.DoImpregnate(giver, receiver); + PregnancyHelper.DoImpregnate(giver, receiver); } if (vasectomy != null) @@ -106,7 +103,7 @@ namespace RJW_Genes private static bool CanImpregnate2(Pawn fucker, Pawn fucked, xxx.rjwSextype sexType) { - if (fucker == null || fucked == null) + if (fucker == null || fucked == null) { return false; @@ -199,7 +196,7 @@ namespace RJW_Genes } List genitalsList = fucker.GetGenitalsList(); - List genitalsList2 = fucked.GetGenitalsList(); + List genitalsList2 = fucked.GetGenitalsList(); if (!Genital_Helper.has_penis_fertile(fucker, genitalsList) && !Genital_Helper.has_penis_fertile(fucked, genitalsList2)) { if (RJWSettings.DevMode) @@ -226,7 +223,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 == BestialPregnancy.None) + if (((xxx.is_animal(fucker) && xxx.is_human(fucked)) || (xxx.is_human(fucker) && xxx.is_animal(fucked))) && !RJWPregnancySettings.bestial_pregnancy_enabled) { if (RJWSettings.DevMode) { diff --git a/1.6/Source/Properties/AssemblyInfo.cs b/1.6/Source/Properties/AssemblyInfo.cs index 5dbde35..c3ac3ce 100644 --- a/1.6/Source/Properties/AssemblyInfo.cs +++ b/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 © 2026")] +[assembly: AssemblyCopyright("Copyright © 2025")] [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.2")] +[assembly: AssemblyVersion("2.6.0")] diff --git a/About/About.xml b/About/About.xml index 41240b4..a35fb09 100644 --- a/About/About.xml +++ b/About/About.xml @@ -2,7 +2,7 @@ RJW Genes Vegapnk - 1.6 Rewrite by Telanda Vegapnk.rjw.genes - 2.6.2 + 2.6.0
  • 1.4
  • 1.5
    • diff --git a/About/Manifest.xml b/About/Manifest.xml index 0cd2bf9..cf7dd84 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW-Genes - 2.6.2 + 2.6.0
  • RimJobWorld
    •  diff --git a/CHANGELOG.md b/CHANGELOG.md index e044bfc..2b4bc3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,22 +1,4 @@ -#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) +# 2.6.0 (18-08-2025) (Commit by @Telanda-DDS) **Changes** diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c27c658..a41147f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ But please consider also the following: ## Contributors -- Shabalox (MechBreeding, InsectBreeding) +- Shabalox (MechBreeding, InsectBreeding, Animal Gene Inheritance) - WasMachenDennSachen (Various Icons) - Jaaldabaoth (1.5 Migration, MPreg, Femboys, Initial VE-Genetic Hybrids) - Flock-of-Birds (Cosmetic Genitalia per XML) diff --git a/README.md b/README.md index 3663b7c..f95644a 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ 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.