diff --git a/1.6/Assemblies/Rjw-Genes.dll b/1.6/Assemblies/Rjw-Genes.dll index f649db6..4778bf2 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 3d8c82b..543c542 100644 --- a/1.6/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml +++ b/1.6/Defs/GeneDefs/GeneDefs_GenitaliaTypes.xml @@ -189,6 +189,8 @@
  • HemiPenis + CloacalVagina + CloacalAnus
  • ScaleLoverQuirk @@ -233,4 +235,31 @@ + + 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 715bccb..63085f9 100644 --- a/1.6/Languages/English/Keyed/StatsReports.xml +++ b/1.6/Languages/English/Keyed/StatsReports.xml @@ -4,5 +4,6 @@ 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 d902457..586660a 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 0c2e592..c0a9632 100644 --- a/1.6/Patches/Xenotypes/PatchBSUndead.xml +++ b/1.6/Patches/Xenotypes/PatchBSUndead.xml @@ -9,16 +9,9 @@
  • 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 8a0e59d..abb00a1 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("OvaryAgitator")); + this.hasBioscaffold = pawn.health.hediffSet.HasHediff(HediffDef.Named("Bioscaffold")); } } } diff --git a/1.6/Source/Common/patches/PatchPregnancyHelper.cs b/1.6/Source/Common/patches/PatchPregnancyHelper.cs index a01897c..a040924 100644 --- a/1.6/Source/Common/patches/PatchPregnancyHelper.cs +++ b/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.GetNamed("Vasectomy", true); // Token: 0x0600000F RID: 15 - [HarmonyPostfix] - [HarmonyPatch("impregnate")] + //[HarmonyPostfix] + //[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) @@ -103,7 +106,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; @@ -196,7 +199,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) @@ -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) { diff --git a/1.6/Source/Properties/AssemblyInfo.cs b/1.6/Source/Properties/AssemblyInfo.cs index c3ac3ce..5dbde35 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 © 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")] diff --git a/About/About.xml b/About/About.xml index a35fb09..41240b4 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.0 + 2.6.2
  • 1.4
  • 1.5
    • diff --git a/About/Manifest.xml b/About/Manifest.xml index cf7dd84..0cd2bf9 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW-Genes - 2.6.0 + 2.6.2
  • RimJobWorld
    •  diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b4bc3d..e044bfc 100644 --- a/CHANGELOG.md +++ b/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** diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a41147f..c27c658 100644 --- a/CONTRIBUTING.md +++ b/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) diff --git a/README.md b/README.md index f95644a..3663b7c 100644 --- a/README.md +++ b/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.