From a51d0214a2d7360907448c320972225242ab0f2a Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sat, 4 May 2024 18:29:21 -0700 Subject: [PATCH 1/4] Remove a message that would be noisy for pawns without a menstrual cycle --- 1.5/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs index d4a6f94..e580ccf 100644 --- a/1.5/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs +++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs @@ -108,7 +108,6 @@ namespace RJW_Menstruation else comp = partner.GetRandomMenstruationComp(); if (comp == null) { - if (Configurations.Debug) ModLog.Message("used original rjw method: Comp missing"); return true; } else if (AndroidsCompatibility.IsAndroid(pawn) && !AndroidsCompatibility.AndroidPenisFertility(pawn)) From 81544451ffa5c32afaf8892ff4a39cc1fe9a2e40 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sat, 4 May 2024 18:33:42 -0700 Subject: [PATCH 2/4] Update changelog --- changelogs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/changelogs.txt b/changelogs.txt index fc2e2f7..beb35b2 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -2,6 +2,7 @@ Version 1.5.0.0 - Support for RimWorld 1.5. All future changes to Menstruation will only be for RimWorld 1.5. - Updated Traditional Chinese translation by Hydrogen. - Inactive genes will no longer be applied to wombs. + - Fix babies becoming the wrong pawnkind in some scenarios. Version 1.0.9.4 - Added graphics for the menstruation genes with thanks to Alpenglow. From 1e803d52c6367d104d78682cbd748ffbdddeb520 Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sun, 5 May 2024 10:54:46 -0700 Subject: [PATCH 3/4] Remove comment about random last name that doesn't apply anymore --- .../HediffComps/HediffComp_PregeneratedBabies.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs index 6732a92..fa64afb 100644 --- a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs +++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs @@ -78,7 +78,6 @@ namespace RJW_Menstruation kind: babyPawnKind, faction: mother.Faction, allowDowned: true, - // fixedLastName seems not to actually do anything, as we eventually end up in PawnBioAndNameGenerator.NameResolvedFrom, which ignores its forcedLastName argument fixedLastName: (string)RandomLastName.Invoke(null, new object[] { mother, mother, xxx.is_human(father) ? father : null }), forceNoIdeo: true, forcedEndogenes: PregnancyUtility.GetInheritedGenes(father, mother), From 8f497764cb64610bcda193fcd4983f098bc7212f Mon Sep 17 00:00:00 2001 From: lutepickle <28810-lutepickle@users.noreply.gitgud.io> Date: Sun, 5 May 2024 11:01:48 -0700 Subject: [PATCH 4/4] Little change in the baby generators to call EnsureGraphicsInitialized instead --- .../HediffComps/HediffComp_PregeneratedBabies.cs | 2 +- .../RJW_Menstruation/Hediff_MultiplePregnancy.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs index fa64afb..802d92d 100644 --- a/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs +++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PregeneratedBabies.cs @@ -95,7 +95,7 @@ namespace RJW_Menstruation PregnancyCommon.SetupBabyXenotype(mother, father, baby); // Probably redundant with Biotech post-birth xenotyping // HAR and some xenotype mods don't randomize graphics until it's rendered // So poke it early - baby.Drawer.renderer.renderTree.EnsureInitialized(PawnRenderFlags.DrawNow); + baby.Drawer.renderer.EnsureGraphicsInitialized(); if (division > 1) { diff --git a/1.5/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs b/1.5/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs index cf3fbbb..531a911 100644 --- a/1.5/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs +++ b/1.5/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs @@ -332,7 +332,7 @@ namespace RJW_Menstruation PregnancyCommon.SetupBabyXenotype(mother, father, baby); // HAR and some xenotype mods don't randomize graphics until it's rendered // So poke it early - baby.Drawer.renderer.renderTree.EnsureInitialized(PawnRenderFlags.DrawNow); + baby.Drawer.renderer.EnsureGraphicsInitialized(); if (division > 1) {