AblativeAbsolute/rjw_menstruation
1
0
Fork 0
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git synced 2024-08-14 22:46:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Have AddNewBaby use the vanilla xenotype inheritance functions

Browse source
This commit is contained in:
lutepickle 2022-12-28 09:03:39 -08:00
parent ba3f24cba3
commit 190173d87d
3 changed files with 13 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
1.4/Assemblies/RJW_Menstruation.dll
View file

Binary file not shown.

49
1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs
View file

@ -1,9 +1,10 @@
using RimWorld; using RimWorld;
using rjw; using rjw;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text; using System.Text;
using UnityEngine;
using Verse; using Verse;
namespace RJW_Menstruation namespace RJW_Menstruation
@ -12,6 +13,9 @@ namespace RJW_Menstruation
{ {
protected Dictionary<Pawn, Pawn> enzygoticSiblings = new Dictionary<Pawn, Pawn>(); // Each pawn and who they split from protected Dictionary<Pawn, Pawn> enzygoticSiblings = new Dictionary<Pawn, Pawn>(); // Each pawn and who they split from
protected readonly MethodInfo TryGetInheritedXenotype = typeof(PregnancyUtility).GetMethod("TryGetInheritedXenotype", BindingFlags.Static | BindingFlags.NonPublic, null, new Type[] { typeof(Pawn), typeof(Pawn), typeof(XenotypeDef).MakeByRefType() }, null );
protected readonly MethodInfo ShouldByHybrid = typeof(PregnancyUtility).GetMethod("ShouldByHybrid", BindingFlags.Static | BindingFlags.NonPublic, null, new Type[] { typeof(Pawn), typeof(Pawn) }, null);
public override void DiscoverPregnancy() public override void DiscoverPregnancy()
{ {
PregnancyThought(); PregnancyThought();
@ -431,9 +435,13 @@ namespace RJW_Menstruation
baby.genes.xenotypeName = mother.genes.xenotypeName; baby.genes.xenotypeName = mother.genes.xenotypeName;
baby.genes.iconDef = mother.genes.iconDef; baby.genes.iconDef = mother.genes.iconDef;
} }
XenotypeDef xenoTypeDef = BabyXenoTypeDecider(mother, father, out bool hybridBaby);
if (xenoTypeDef != null) baby.genes.SetXenotypeDirect(xenoTypeDef); object[] args = new object[] { mother, father, null };
if (hybridBaby) if ((bool)TryGetInheritedXenotype.Invoke(null, args))
{
baby.genes.SetXenotypeDirect((XenotypeDef)args[2]);
}
else if((bool)ShouldByHybrid.Invoke(null, new object[] { mother, father }))
{ {
baby.genes.hybrid = true; baby.genes.hybrid = true;
baby.genes.xenotypeName = "Hybrid".Translate(); baby.genes.xenotypeName = "Hybrid".Translate();
@ -638,39 +646,6 @@ namespace RJW_Menstruation
} }
public XenotypeDef BabyXenoTypeDecider(Pawn mother, Pawn father, out bool hybrid)
{
hybrid = false;
bool hybridMother = mother?.genes?.hybrid ?? false;
bool hybridFather = father?.genes?.hybrid ?? false;
if (hybridMother && hybridFather)
{
hybrid = true;
return null;
}
XenotypeDef motherInheritableXenotype = mother?.genes?.Xenotype;
XenotypeDef fatherInheritableXenotype = father?.genes?.Xenotype;
if (!(motherInheritableXenotype?.inheritable ?? false)) motherInheritableXenotype = null;
if (!(fatherInheritableXenotype?.inheritable ?? false)) fatherInheritableXenotype = null;
// If they're the same (or both null)
if (motherInheritableXenotype == fatherInheritableXenotype)
{
// Both null, but one's a hybrid
if (motherInheritableXenotype == null && (hybridMother || hybridFather))
hybrid = true;
return motherInheritableXenotype;
}
// If one is null and the other isn't
if ((motherInheritableXenotype == null) != (fatherInheritableXenotype == null)) return motherInheritableXenotype ?? fatherInheritableXenotype;
// So two different inheritable ones
hybrid = true;
return null;
}
public PawnKindDef GetHybrid(Pawn first, Pawn second) public PawnKindDef GetHybrid(Pawn first, Pawn second)
{ {
PawnKindDef res = null; PawnKindDef res = null;

1
changelogs.txt
View file

@ -4,6 +4,7 @@ Version 1.0.8.5
- Impregnation fetishists are significantly less likely to pull out. - Impregnation fetishists are significantly less likely to pull out.
- Some males will release small amounts of semen into a womb during vaginal sex before their actual ejaculation. - Some males will release small amounts of semen into a womb during vaginal sex before their actual ejaculation.
- Babies born from multiple pregnancy will properly produce the prompt to name them. - Babies born from multiple pregnancy will properly produce the prompt to name them.
- Hopefully improve compatibility with xenotype inhertiance-altering mods for multiple pregnancy.
- Experimental "periodic ovulator" cycle type, currently not used. See Patches/Hediffs_Private_Parts_Animal.xml. - Experimental "periodic ovulator" cycle type, currently not used. See Patches/Hediffs_Private_Parts_Animal.xml.
Version 1.0.8.4 Version 1.0.8.4