mirror of
https://gitgud.io/lutepickle/rjw_menstruation.git
synced 2024-08-14 22:46:52 +00:00
Give animal children the standard mother/father relations instead of the old RJW_Sire/RJW_Pup ones
This commit is contained in:
parent
b7a911000e
commit
75fe253911
4 changed files with 6 additions and 12 deletions
Binary file not shown.
|
@ -423,7 +423,7 @@ namespace RJW_Menstruation
|
|||
Pawn baby = PawnGenerator.GeneratePawn(request);
|
||||
if (baby != null)
|
||||
{
|
||||
if (xxx.is_human(baby))
|
||||
if (xxx.is_human(baby) || (baby.relations != null && !RJWSettings.Disable_bestiality_pregnancy_relations))
|
||||
{
|
||||
baby.SetMother(mother);
|
||||
if (mother != father)
|
||||
|
@ -434,23 +434,15 @@ namespace RJW_Menstruation
|
|||
baby.relations.AddDirectRelation(PawnRelationDefOf.Parent, father);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (xxx.is_human(baby))
|
||||
{
|
||||
// Ensure the same inherited traits are chosen each run
|
||||
// Has to happen right here so GeneratePawn up there still gets unique results
|
||||
Rand.PushState(traitSeed); // With a seed just to make sure that fraternal twins *don't* get trait-duped
|
||||
UpdateTraits(baby, parentTraits);
|
||||
Rand.PopState();
|
||||
}
|
||||
else if (baby.relations != null && !RJWSettings.Disable_bestiality_pregnancy_relations)
|
||||
{
|
||||
baby.relations.AddDirectRelation(VariousDefOf.Relation_birthgiver, mother);
|
||||
mother.relations.AddDirectRelation(VariousDefOf.Relation_spawn, baby);
|
||||
if (mother != father)
|
||||
{
|
||||
baby.relations.AddDirectRelation(VariousDefOf.Relation_birthgiver, father);
|
||||
father.relations.AddDirectRelation(VariousDefOf.Relation_spawn, baby);
|
||||
}
|
||||
}
|
||||
}
|
||||
else Log.Error("Baby not generated. Request: " + request.ToString());
|
||||
return baby;
|
||||
|
|
|
@ -22,6 +22,7 @@ namespace RJW_Menstruation
|
|||
public static readonly HediffDef Hediff_Estrus_Concealed = DefDatabase<HediffDef>.GetNamed("Hediff_Estrus_Concealed");
|
||||
public static readonly HediffDef Hediff_ASA = DefDatabase<HediffDef>.GetNamed("Hediff_ASA");
|
||||
public static readonly StatDef MaxAbsorbable = DefDatabase<StatDef>.GetNamed("MaxAbsorbable");
|
||||
// Obsolete, kept for compatibility for now
|
||||
public static readonly PawnRelationDef Relation_birthgiver = DefDatabase<PawnRelationDef>.AllDefs.FirstOrDefault(d => d.defName == "RJW_Sire");
|
||||
public static readonly PawnRelationDef Relation_spawn = DefDatabase<PawnRelationDef>.AllDefs.FirstOrDefault(d => d.defName == "RJW_Pup");
|
||||
public static readonly NeedDef SexNeed = DefDatabase<NeedDef>.GetNamed("Sex");
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
Version 1.0.6.6
|
||||
- Ovipostors add on average 1.5x as much cum to a womb than before.
|
||||
- The womb tick timing is now more consistent across a save and load, and also spread out across pawns.
|
||||
- Babies of bestial relations get a mother/father relationship to their parents instead of the old sire one.
|
||||
- Fix error when an egg fertilized by a nonexistent/garbage collected pawn (e.g. in an NPC's womb) tries to implant.
|
||||
- Another hybrid fix for invalid races.
|
||||
- Fix an implanted egg icon showing for mechanoid pregnancies.
|
||||
|
|
Loading…
Reference in a new issue