diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index f3c80a6..443fe23 100644 Binary files a/1.4/Assemblies/RJW_Menstruation.dll and b/1.4/Assemblies/RJW_Menstruation.dll differ diff --git a/1.4/MilkModule/Assemblies/MilkModule.dll b/1.4/MilkModule/Assemblies/MilkModule.dll index 7337849..0adf6be 100644 Binary files a/1.4/MilkModule/Assemblies/MilkModule.dll and b/1.4/MilkModule/Assemblies/MilkModule.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 9cbb425..1e7e50c 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Compatibility/AnimalGeneticsCompatibility.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Compatibility/AnimalGeneticsCompatibility.cs @@ -1,4 +1,5 @@ -using AnimalGenetics; +#if false +using AnimalGenetics; using RimWorld; using System.Collections.Generic; using Verse; @@ -38,3 +39,4 @@ 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 9ecada1..e7c91dc 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs @@ -378,10 +378,31 @@ namespace RJW_Menstruation public bool AddNewBaby(Pawn mother, Pawn father) { + //float melanin; string lastname; - if (xxx.is_human(mother)) lastname = NameTriple.FromString(mother.Name.ToStringFull).Last; - else if (xxx.is_human(father)) lastname = NameTriple.FromString(father.Name.ToStringFull).Last; - else lastname = ""; + if (xxx.is_human(mother)) + { + if (xxx.is_human(father)) + { + //melanin = ChildRelationUtility.GetRandomChildSkinColor(father.story?.melanin ?? 0f, mother.story?.melanin ?? 0f); + //melanin = (mother.story?.melanin ?? 0f + father.story?.melanin ?? 0f) / 2; + } + else + { + //melanin = mother.story?.melanin ?? 0f; + } + lastname = NameTriple.FromString(mother.Name.ToStringFull).Last; + } + else if (xxx.is_human(father)) + { + //melanin = father.story?.melanin ?? 0f; + lastname = NameTriple.FromString(father.Name.ToStringFull).Last; + } + else + { + //melanin = Rand.Range(0, 1.0f); + lastname = ""; + } PawnGenerationRequest request = new PawnGenerationRequest( developmentalStages: DevelopmentalStage.Newborn, @@ -403,6 +424,7 @@ namespace RJW_Menstruation int division = 1; Pawn firstbaby = null; + //string firstheadpath = null; int traitSeed = Rand.Int; List parentTraits = GetInheritableTraits(mother, father); while (Rand.Chance(Configurations.EnzygoticTwinsChance) && division < Configurations.MaxEnzygoticTwins) division++; @@ -454,8 +476,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 +489,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/Patch/Gizmo_Patch.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/GetGizmos.cs similarity index 100% rename from 1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs rename to 1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/GetGizmos.cs 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 2de20d8..22ab246 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/RJW_Menstruation.csproj @@ -72,7 +72,6 @@ - @@ -81,6 +80,7 @@ + @@ -98,10 +98,6 @@ ..\..\..\..\..\..\..\..\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 84c2a83..c88dc12 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW Menstruation - 1.0.8.3 + 1.0.8.2 @@ -11,7 +11,6 @@
  • rim.job.world
  • Abraxas.RJW.RaceSupport
  • rjw.milk.humanoid
  • -
  • Mlie.AnimalGenetics
  • diff --git a/changelogs.txt b/changelogs.txt index e0b4847..91640aa 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -1,6 +1,3 @@ -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 - Requires RJW 5.3.0.7