Set up the xenotype inheritance for all babies, not just enzygotic ones

This commit is contained in:
lutepickle 2022-11-25 07:52:16 -08:00
parent 9891f72fc6
commit 82440db26b
4 changed files with 18 additions and 17 deletions

Binary file not shown.

View file

@ -409,15 +409,6 @@ namespace RJW_Menstruation
{ {
Pawn baby = GenerateBaby(request, mother, father, parentTraits, traitSeed); Pawn baby = GenerateBaby(request, mother, father, parentTraits, traitSeed);
if (baby == null) break; if (baby == null) break;
if (division > 1)
{
if (baby.IsHAR()) // necessary for HAR to decide on graphical properties pre-birth
baby.Drawer.renderer.graphics.ResolveAllGraphics();
if (i == 0)
{
firstbaby = baby;
request.FixedGender = baby.gender;
request.ForcedEndogenes = baby.genes?.Endogenes.Select(gene => gene.def).ToList();
if (baby.genes != null && ModsConfig.BiotechActive) if (baby.genes != null && ModsConfig.BiotechActive)
{ {
if (GeneUtility.SameHeritableXenotype(mother, father) && mother.genes.UniqueXenotype) if (GeneUtility.SameHeritableXenotype(mother, father) && mother.genes.UniqueXenotype)
@ -433,6 +424,15 @@ namespace RJW_Menstruation
baby.genes.xenotypeName = "Hybrid".Translate(); baby.genes.xenotypeName = "Hybrid".Translate();
} }
} }
if (division > 1)
{
if (baby.IsHAR()) // necessary for HAR to decide on graphical properties pre-birth
baby.Drawer.renderer.graphics.ResolveAllGraphics();
if (i == 0)
{
firstbaby = baby;
request.FixedGender = baby.gender;
request.ForcedEndogenes = baby.genes?.Endogenes.Select(gene => gene.def).ToList();
} }
else else
{ {

View file

@ -1,4 +1,5 @@
Version 1.0.8.4 Version 1.0.8.4
- Fix Biotech xenotype inheritance for single-child pregnancies.
- Newborns should now be baseliners if there are no xenotypes to inherit. - Newborns should now be baseliners if there are no xenotypes to inherit.
- The Biotech terminate pregnancy recipe can now terminate a menstruation pregnancy, too. - The Biotech terminate pregnancy recipe can now terminate a menstruation pregnancy, too.
@ -17,7 +18,7 @@ Version 1.0.8.2
Version 1.0.8.1 Version 1.0.8.1
- Added the option for humans to start Biotech pregnancies if the DLC is enabled. If set, non-humans will use the old multiple pregnancy instead. - Added the option for humans to start Biotech pregnancies if the DLC is enabled. If set, non-humans will use the old multiple pregnancy instead.
- Babies conceived through the multiple pregnancy option will now properly inherit xenotypes. - Babies conceived through the multiple pregnancy option will now properly inherit xenotypes.
- Properly track biotech pregnancy through labor. - Properly track Biotech pregnancy through labor.
- Pawns that are genetically sterile will no longer produce fertile cum, nor have a menstrual cycle. - Pawns that are genetically sterile will no longer produce fertile cum, nor have a menstrual cycle.
- Biotech IUDs will now reduce pregnancy chances the same as an RJW IUD. Using both will not stack. - Biotech IUDs will now reduce pregnancy chances the same as an RJW IUD. Using both will not stack.
- A biotech pregnancy will pause before going into labor if another womb already is in labor. - A biotech pregnancy will pause before going into labor if another womb already is in labor.