diff --git a/1.6/Assemblies/Rjw-Genes.dll b/1.6/Assemblies/Rjw-Genes.dll index 86881f1..bb86a3a 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/GeneCategories.xml b/1.6/Defs/GeneDefs/GeneCategories.xml index 66b76fd..4aabd12 100644 --- a/1.6/Defs/GeneDefs/GeneCategories.xml +++ b/1.6/Defs/GeneDefs/GeneCategories.xml @@ -16,61 +16,61 @@ rjw_genes_gender - 395 + 21 rjw_genes_genitalia_type - 390 + 19 rjw_genes_genitalia_extras - 385 + 17 rjw_genes_genitalia_size - 380 + 15 + + + + rjw_genes_fertilin + + 14 rjw_genes_breeding - 375 + 13 rjw_genes_fluids - 370 + 12 rjw_genes_damage - 365 + 11 rjw_genes_special - 360 + 8 - - rjw_genes_fertilin - - 355 - - rjw_genes_diseases - 350 + 22 diff --git a/1.6/Defs/GeneDefs/GeneDefs_SexSpecial.xml b/1.6/Defs/GeneDefs/GeneDefs_SexSpecial.xml index 5662ecb..efc64cc 100644 --- a/1.6/Defs/GeneDefs/GeneDefs_SexSpecial.xml +++ b/1.6/Defs/GeneDefs/GeneDefs_SexSpecial.xml @@ -188,7 +188,7 @@
  • rjw_genes_feminization_progress true - 0.05 + 0.01 1.00 false true @@ -229,7 +229,7 @@
  • rjw_genes_twinkification_progress true - 0.05 + 0.01 1.00 false true diff --git a/1.6/Mods/Cumpilation/Assemblies/CumpilationPatcher.dll b/1.6/Mods/Cumpilation/Assemblies/CumpilationPatcher.dll index 26f94c9..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/Source/Common/patches/Patch_RJWSexualizer.cs b/1.6/Source/Common/patches/Patch_RJWSexualizer.cs index 441153b..3deabc1 100644 --- a/1.6/Source/Common/patches/Patch_RJWSexualizer.cs +++ b/1.6/Source/Common/patches/Patch_RJWSexualizer.cs @@ -42,10 +42,7 @@ namespace RJW_Genes { foreach (var curGene in geneDict[key]) { - //TODO: Replace this with `Notify_OnPawnSexualization()` Call? - - (curGene as RJW_Gene).Notify_OnPawnSexualization(); - //curGene.PostAdd(); + curGene.PostAdd(); } } } diff --git a/1.6/Source/CumpilationLoader/CumpilationLoader.cs b/1.6/Source/CumpilationLoader/CumpilationLoader.cs index ffc880f..64fe9f8 100644 --- a/1.6/Source/CumpilationLoader/CumpilationLoader.cs +++ b/1.6/Source/CumpilationLoader/CumpilationLoader.cs @@ -1,4 +1,9 @@ -using HarmonyLib; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using HarmonyLib; using rjw; using RJW_Genes; using Verse; diff --git a/1.6/Source/CumpilationLoader/CumpilationPatcher.csproj b/1.6/Source/CumpilationLoader/CumpilationPatcher.csproj index bde892b..025c5d6 100644 --- a/1.6/Source/CumpilationLoader/CumpilationPatcher.csproj +++ b/1.6/Source/CumpilationLoader/CumpilationPatcher.csproj @@ -24,22 +24,21 @@ 4 - none + pdbonly true ..\..\Mods\Cumpilation\Assemblies\ prompt 4 - false - ..\..\..\..\..\..\..\Steam\steamapps\workshop\content\294100\2009463077\1.6\Assemblies\0Harmony.dll + ..\..\..\..\..\..\..\Steam\steamapps\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll False - ..\..\..\..\..\Rimworld_Clients\RimWorld-1.6-Debug\RimWorldWin64_Data\Managed\Assembly-CSharp.dll + ..\..\..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False diff --git a/1.6/Source/Genes/Genitalia/GenitaliaUtility.cs b/1.6/Source/Genes/Genitalia/GenitaliaUtility.cs index d13d7a8..19942a8 100644 --- a/1.6/Source/Genes/Genitalia/GenitaliaUtility.cs +++ b/1.6/Source/Genes/Genitalia/GenitaliaUtility.cs @@ -1,5 +1,7 @@ -using Verse; +using RimWorld; +using Verse; using rjw; +using System; namespace RJW_Genes { diff --git a/1.6/Source/Genes/RJW_Gene.cs b/1.6/Source/Genes/RJW_Gene.cs index 816615f..a036554 100644 --- a/1.6/Source/Genes/RJW_Gene.cs +++ b/1.6/Source/Genes/RJW_Gene.cs @@ -34,9 +34,6 @@ namespace RJW_Genes } - public virtual void Notify_OnPawnSexualization() - { - PostAdd(); - } + public virtual void Notify_OnPawnSexualization() { } } } diff --git a/1.6/Source/Rjw-Genes.csproj b/1.6/Source/Rjw-Genes.csproj index dea2739..2404ae3 100644 --- a/1.6/Source/Rjw-Genes.csproj +++ b/1.6/Source/Rjw-Genes.csproj @@ -213,12 +213,12 @@ - ..\..\..\..\..\..\Steam\steamapps\workshop\content\294100\2009463077\1.6\Assemblies\0Harmony.dll + ..\..\..\..\..\..\Steam\steamapps\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll False False - ..\..\..\..\Rimworld_Clients\RimWorld-1.6-Debug\RimWorldWin64_Data\Managed\Assembly-CSharp.dll + ..\..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False @@ -235,17 +235,17 @@ - ..\..\..\..\Rimworld_Clients\RimWorld-1.6-Debug\RimWorldWin64_Data\Managed\UnityEngine.dll + ..\..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.dll False False - ..\..\..\..\Rimworld_Clients\RimWorld-1.6-Debug\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + ..\..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll False False - ..\..\..\..\Rimworld_Clients\RimWorld-1.6-Debug\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll + ..\..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll False diff --git a/About/About.xml b/About/About.xml index 6ccd694..c6f0f05 100644 --- a/About/About.xml +++ b/About/About.xml @@ -10,7 +10,6 @@
  • 1.4
  • 1.5
  • 1.6
    • -
  • 1.7
    • Adds Genes for RJW Content. Adds: diff --git a/CHANGELOG.md b/CHANGELOG.md index b635fb2..671b325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,3 @@ -# 2.7.1 (14-10-2026) - -### Experimental Update. -- Added Rimworld v1.7 to about.xml - -### Balance Changes. -- Altered base infection rate for Feminizer and Twinkifier from 0.01 to 0.05 (20 Sex events to max instead of 100) - - - # 2.7.0 (23-07-2026) (Commit by @Telanda-DDS) @@ -56,7 +46,6 @@ I've done a Check over the included xenotype patches, A few Xenotypes that hadn' ### Known Issues. - Fertile Anus gene is Unreliable, and does not work with Biotech Pregnancies Enabled in RJW. (Waiting for large Upstream patch to RJW Core to be accepted.) ------------- # 2.6.2 (15-02-2026) (Commit by @Telanda-DDS) @@ -66,6 +55,8 @@ I've done a Check over the included xenotype patches, A few Xenotypes that hadn' - Fixed missing translation text field `RJW_Genes_GenitalsNotAlterable` +------------ + # 2.6.1 (16-10-2025) (Commit by @Telanda-DDS) diff --git a/LoadFolders.xml b/LoadFolders.xml index 4344ae2..0a70b1f 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -29,6 +29,7 @@
  • 1.6
  • Common
    • +
  • 1.6/Mods/Cumpilation
  • 1.6/Mods/Sanguophage
  • 1.6/Mods/Saurid
    • @@ -42,21 +43,4 @@
  • 1.6/Mods/VE_Genetics
  • 1.6/Mods/RaceSupport
    • - -
  • 1.6
    • -
  • Common
    • - -
  • 1.6/Mods/Cumpilation
    • -
  • 1.6/Mods/Sanguophage
    • -
  • 1.6/Mods/Saurid
    • -
  • 1.6/Mods/Phytokin
    • -
  • 1.6/Mods/Lycanthrope
    • -
  • 1.6/Mods/Highmate
    • -
  • 1.6/Mods/Genie
    • -
  • 1.6/Mods/Fungoid
    • -
  • 1.6/Mods/Archon
    • -
  • 1.6/Mods/Android
    • -
  • 1.6/Mods/VE_Genetics
    • -
  • 1.6/Mods/RaceSupport
    • -     \ No newline at end of file