Compare commits

..

2 commits

Author SHA1 Message Date
Telanda-DDS
fd1bee6f84 Squashed Dev-Fix Commit 2026-10-14 13:40:05 +11:00
Telanda
59e8e2ab7e
Dev 2.7.0 Merge (#237)
* - 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.

* - Seperation of Animal Gene code from base RJW_Genes

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

* Rework of Gene Application order for New pawns.

* Migrated Genital Genes to new Post-Sexualizeing system, removing likelyhood of Duplicates.

* Gender Fluid no longer allows sex change while pregnant.

* Fixed changes to Big & Small Lamia & Sneks Xenotype Names. (Thank you RHS0 on discord for the report!)

* Update Load order & Xenotype cleanup.

* Fix to Littered Births.
Fix to Gender Genes to make sure they only fire if active.
Version increment to 2.7

* Hormonal Saliva Gene Fixes.

* Updates to Changelog.

* DLL Commit
Fluid Production Rebalance

* Typo's fixed in CHangelog

* More Changelog Fixes
2026-07-23 16:30:18 +10:00
13 changed files with 65 additions and 39 deletions

Binary file not shown.

View file

@ -16,61 +16,61 @@
<GeneCategoryDef>
<defName>rjw_genes_gender</defName>
<label>gender</label>
<displayPriorityInXenotype>21</displayPriorityInXenotype>
<displayPriorityInXenotype>395</displayPriorityInXenotype>
</GeneCategoryDef>
<GeneCategoryDef>
<defName>rjw_genes_genitalia_type</defName>
<label>cosmetic - genitalia type</label>
<displayPriorityInXenotype>19</displayPriorityInXenotype>
<displayPriorityInXenotype>390</displayPriorityInXenotype>
</GeneCategoryDef>
<GeneCategoryDef>
<defName>rjw_genes_genitalia_extras</defName>
<label>genitalia count</label>
<displayPriorityInXenotype>17</displayPriorityInXenotype>
<displayPriorityInXenotype>385</displayPriorityInXenotype>
</GeneCategoryDef>
<GeneCategoryDef>
<defName>rjw_genes_genitalia_size</defName>
<label>genitalia size / attributes</label>
<displayPriorityInXenotype>15</displayPriorityInXenotype>
</GeneCategoryDef>
<GeneCategoryDef>
<defName>rjw_genes_fertilin</defName>
<label>fertilin</label>
<displayPriorityInXenotype>14</displayPriorityInXenotype>
<displayPriorityInXenotype>380</displayPriorityInXenotype>
</GeneCategoryDef>
<GeneCategoryDef>
<defName>rjw_genes_breeding</defName>
<label>breeding</label>
<displayPriorityInXenotype>13</displayPriorityInXenotype>
<displayPriorityInXenotype>375</displayPriorityInXenotype>
</GeneCategoryDef>
<GeneCategoryDef>
<defName>rjw_genes_fluids</defName>
<label>fluids</label>
<displayPriorityInXenotype>12</displayPriorityInXenotype>
<displayPriorityInXenotype>370</displayPriorityInXenotype>
</GeneCategoryDef>
<GeneCategoryDef>
<defName>rjw_genes_damage</defName>
<label>genital-related damage</label>
<displayPriorityInXenotype>11</displayPriorityInXenotype>
<displayPriorityInXenotype>365</displayPriorityInXenotype>
</GeneCategoryDef>
<GeneCategoryDef>
<defName>rjw_genes_special</defName>
<label>genital-based special abilities</label>
<displayPriorityInXenotype>8</displayPriorityInXenotype>
<displayPriorityInXenotype>360</displayPriorityInXenotype>
</GeneCategoryDef>
<GeneCategoryDef>
<defName>rjw_genes_fertilin</defName>
<label>fertilin</label>
<displayPriorityInXenotype>355</displayPriorityInXenotype>
</GeneCategoryDef>
<GeneCategoryDef>
<defName>rjw_genes_diseases</defName>
<label>genetic STDs</label>
<displayPriorityInXenotype>22</displayPriorityInXenotype>
<displayPriorityInXenotype>350</displayPriorityInXenotype>
</GeneCategoryDef>

View file

@ -188,7 +188,7 @@
<li Class="RJW_Genes.HediffIncreaseOnSexExtension">
<hediffDef>rjw_genes_feminization_progress</hediffDef>
<canCreateHediff>true</canCreateHediff>
<severityIncrease>0.01</severityIncrease>
<severityIncrease>0.05</severityIncrease>
<applicationChance>1.00</applicationChance>
<applicableForWomen>false</applicableForWomen>
<applicableForMen>true</applicableForMen>
@ -229,7 +229,7 @@
<li Class="RJW_Genes.HediffIncreaseOnSexExtension">
<hediffDef>rjw_genes_twinkification_progress</hediffDef>
<canCreateHediff>true</canCreateHediff>
<severityIncrease>0.01</severityIncrease>
<severityIncrease>0.05</severityIncrease>
<applicationChance>1.00</applicationChance>
<applicableForWomen>false</applicableForWomen>
<applicableForMen>true</applicableForMen>

View file

@ -42,7 +42,10 @@ namespace RJW_Genes
{
foreach (var curGene in geneDict[key])
{
curGene.PostAdd();
//TODO: Replace this with `Notify_OnPawnSexualization()` Call?
(curGene as RJW_Gene).Notify_OnPawnSexualization();
//curGene.PostAdd();
}
}
}

View file

@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using HarmonyLib;
using HarmonyLib;
using rjw;
using RJW_Genes;
using Verse;

View file

@ -24,21 +24,22 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\Mods\Cumpilation\Assemblies\</OutputPath>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>..\..\..\..\..\..\..\Steam\steamapps\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll</HintPath>
<HintPath>..\..\..\..\..\..\..\Steam\steamapps\workshop\content\294100\2009463077\1.6\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\..\..\..\Rimworld_Clients\RimWorld-1.6-Debug\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Cumpilation">

View file

@ -1,7 +1,5 @@
using RimWorld;
using Verse;
using Verse;
using rjw;
using System;
namespace RJW_Genes
{

View file

@ -34,6 +34,9 @@ namespace RJW_Genes
}
public virtual void Notify_OnPawnSexualization() { }
public virtual void Notify_OnPawnSexualization()
{
PostAdd();
}
}
}

View file

@ -213,12 +213,12 @@
</ItemGroup>
<ItemGroup>
<Reference Include="0Harmony">
<HintPath>..\..\..\..\..\..\Steam\steamapps\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll</HintPath>
<HintPath>..\..\..\..\..\..\Steam\steamapps\workshop\content\294100\2009463077\1.6\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp, Version=1.4.8385.39127, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\..\..\Rimworld_Clients\RimWorld-1.6-Debug\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="LLStretcher">
@ -235,17 +235,17 @@
</Reference>
<Reference Include="System" />
<Reference Include="UnityEngine">
<HintPath>..\..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.dll</HintPath>
<HintPath>..\..\..\..\Rimworld_Clients\RimWorld-1.6-Debug\RimWorldWin64_Data\Managed\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<HintPath>..\..\..\..\Rimworld_Clients\RimWorld-1.6-Debug\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
<HintPath>..\..\..\..\Rimworld_Clients\RimWorld-1.6-Debug\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>

View file

@ -10,6 +10,7 @@
<li>1.4</li>
<li>1.5</li>
<li>1.6</li>
<li>1.7</li>
</supportedVersions>
<description>Adds Genes for RJW Content.
Adds:

View file

@ -1,3 +1,13 @@
# 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)
@ -46,6 +56,7 @@ 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)
@ -55,8 +66,6 @@ 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)

View file

@ -29,7 +29,6 @@
<li>1.6</li>
<li>Common</li>
<!-- Mods -->
<li IfModActive="vegapnk.cumpilation">1.6/Mods/Cumpilation</li>
<li IfModActive="vanillaracesexpanded.sanguophage">1.6/Mods/Sanguophage</li>
<li IfModActive="vanillaracesexpanded.saurid">1.6/Mods/Saurid</li>
@ -43,4 +42,21 @@
<li IfModActive="VanillaExpanded.VGeneticsE">1.6/Mods/VE_Genetics</li>
<li IfModActive="ASMR.RJW.RaceSupport">1.6/Mods/RaceSupport</li>
</v1.6>
<v1.7>
<li>1.6</li>
<li>Common</li>
<!-- Mods -->
<li IfModActive="vegapnk.cumpilation">1.6/Mods/Cumpilation</li>
<li IfModActive="vanillaracesexpanded.sanguophage">1.6/Mods/Sanguophage</li>
<li IfModActive="vanillaracesexpanded.saurid">1.6/Mods/Saurid</li>
<li IfModActive="vanillaracesexpanded.phytokin">1.6/Mods/Phytokin</li>
<li IfModActive="vanillaracesexpanded.lycanthrope">1.6/Mods/Lycanthrope</li>
<li IfModActive="vanillaracesexpanded.highmate">1.6/Mods/Highmate</li>
<li IfModActive="vanillaracesexpanded.genie">1.6/Mods/Genie</li>
<li IfModActive="vanillaracesexpanded.fungoid">1.6/Mods/Fungoid</li>
<li IfModActive="vanillaracesexpanded.archon">1.6/Mods/Archon</li>
<li IfModActive="vanillaracesexpanded.android">1.6/Mods/Android</li>
<li IfModActive="VanillaExpanded.VGeneticsE">1.6/Mods/VE_Genetics</li>
<li IfModActive="ASMR.RJW.RaceSupport">1.6/Mods/RaceSupport</li>
</v1.7>
</loadFolders>