diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 443fe23..f3c80a6 100644 Binary files a/1.4/Assemblies/RJW_Menstruation.dll and b/1.4/Assemblies/RJW_Menstruation.dll differ diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Compatibility/AnimalGeneticsCompatibility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Compatibility/AnimalGeneticsCompatibility.cs index 1e7e50c..9cbb425 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Compatibility/AnimalGeneticsCompatibility.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Compatibility/AnimalGeneticsCompatibility.cs @@ -1,5 +1,4 @@ -#if false -using AnimalGenetics; +using AnimalGenetics; using RimWorld; using System.Collections.Generic; using Verse; @@ -39,4 +38,3 @@ namespace RJW_Menstruation } } } -#endif diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs index 32c0fb4..9ecada1 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs @@ -454,8 +454,8 @@ namespace RJW_Menstruation if (baby.IsHAR()) HARCompatibility.CopyHARProperties(baby, firstbaby); - //if (Configurations.AnimalGeneticsActivated) - //AnimalGeneticsCompatibility.CopyGenes(baby, firstbaby); + if (Configurations.AnimalGeneticsActivated) + AnimalGeneticsCompatibility.CopyGenes(baby, firstbaby); } } babies.Add(baby); @@ -467,9 +467,9 @@ namespace RJW_Menstruation public Pawn GenerateBaby(PawnGenerationRequest request, Pawn mother, Pawn father, List parentTraits, int traitSeed) { - //if (Configurations.AnimalGeneticsActivated) AnimalGeneticsCompatibility.PreConception(mother, father); + if (Configurations.AnimalGeneticsActivated) AnimalGeneticsCompatibility.PreConception(mother, father); Pawn baby = PawnGenerator.GeneratePawn(request); - //if (Configurations.AnimalGeneticsActivated) AnimalGeneticsCompatibility.PostConception(); + if (Configurations.AnimalGeneticsActivated) AnimalGeneticsCompatibility.PostConception(); if (baby == null) { Log.Error("Baby not generated. Request: " + request.ToString()); diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj b/1.4/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj index 782af0b..2de20d8 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj @@ -98,6 +98,10 @@ ..\..\..\..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\AlienRace.dll False + + ..\..\..\..\..\..\..\..\workshop\content\294100\2830943477\1.4\Assemblies\AnimalGenetics.dll + False + ..\..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll False diff --git a/About/Manifest.xml b/About/Manifest.xml index 88eafc4..84c2a83 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -11,6 +11,7 @@
  • rim.job.world
  • Abraxas.RJW.RaceSupport
  • rjw.milk.humanoid
  • +
  • Mlie.AnimalGenetics
  • diff --git a/changelogs.txt b/changelogs.txt index 5162a54..e0b4847 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -1,4 +1,5 @@ Version 1.0.8.3 + - Re-added support for Animal Genetics (Continued). Version 1.0.8.2 - Compatibility update for RJW 5.3.0.7