This commit is contained in:
moreoreganostodump 2021-02-19 15:42:08 +09:00
parent 3fa9d46256
commit 0c86674b41
10 changed files with 17 additions and 16 deletions

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<Manifest>
<identifier>RJW Menstruation</identifier>
<version>1.0.1.5</version>
<version>1.0.1.6</version>
<dependencies>
</dependencies>
<incompatibleWith />

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View file

@ -1,3 +1,6 @@
Version 1.0.1.6
- fixed bugs when display fetus image
- fixed futa female was not set as parent
Version 1.0.1.5
- DNADef is obsoleted and replaced to ModExtention
Version 1.0.1.4

View file

@ -15,8 +15,6 @@ namespace RJW_Menstruation
{
public Pawn pawn;
//public bool failedFertilization = false;
//public bool dead = false;
public float volume; // ml
public float fertvolume;
public float fertFactor = 1.0f;

View file

@ -304,7 +304,14 @@ namespace RJW_Menstruation
{
List<Trait> traitpool = new List<Trait>();
baby.SetMother(mother);
if (mother != father) baby.SetFather(father);
if (mother != father)
{
if (father.gender != Gender.Female) baby.SetFather(father);
else
{
baby.relations.AddDirectRelation(PawnRelationDefOf.Parent, father);
}
}
if (xxx.has_traits(pawn) && pawn.RaceProps.Humanlike)
{

View file

@ -38,6 +38,7 @@ namespace RJW_Menstruation
foreach (LocalTargetInfo t in selftargets)
{
opts.AddDistinct(MakeSelfMenu(pawn, t));
break;
}

View file

@ -76,8 +76,7 @@ namespace RJW_Menstruation
{
if (wearhours > MinHrstoDirtyEffect && Rand.Chance(0.02f))
{
Hediff hediff = HediffMaker.MakeHediff(HediffDefOf.WoundInfection, Wearer, Genital_Helper.get_genitalsBPR(Wearer));
Wearer.health.AddHediff(hediff, Genital_Helper.get_genitalsBPR(Wearer));
Wearer.health.AddHediff(HediffDefOf.WoundInfection, Genital_Helper.get_genitalsBPR(Wearer));
}
}

View file

@ -149,7 +149,7 @@ namespace RJW_Menstruation
else if (hediff is Hediff_BasePregnancy)
{
Hediff_BasePregnancy h = (Hediff_BasePregnancy)hediff;
string fetustex = h.babies.First().def.GetModExtension<PawnDNAModExtention>().fetusTexPath ?? "Fetus/Fetus_Default";
string fetustex = h.babies?.First()?.def.GetModExtension<PawnDNAModExtention>()?.fetusTexPath ?? "Fetus/Fetus_Default";
if (h.GestationProgress < 0.2f) icon = comp.wombTex + "_Implanted";
else if (h.GestationProgress < 0.3f) icon += "Fetus/Fetus_Early00";
else if (h.GestationProgress < 0.4f) icon += fetustex + "00";

View file

@ -11,12 +11,6 @@ namespace RJW_Menstruation
{
public static class VariousDefOf
{
//public static readonly DNADef defaultDNA = new DNADef
//{
// fetusTexPath = "Fetus/Fetus_Default",
// cumColor = new ColorInt(255, 255, 255, 255),
// cumThickness = 0
//};
public static readonly ThingDef CumFilth = DefDatabase<ThingDef>.GetNamed("FilthCum");
public static readonly ThingDef Tampon = DefDatabase<ThingDef>.GetNamed("Absorber_Tampon");
@ -26,7 +20,6 @@ namespace RJW_Menstruation
public static readonly HediffDef Hediff_MenstrualCramp = DefDatabase<HediffDef>.GetNamed("Hediff_MenstrualCramp");
public static readonly HediffDef Hediff_Climacteric = DefDatabase<HediffDef>.GetNamed("Hediff_Climacteric");
public static readonly HediffDef Hediff_Menopause = DefDatabase<HediffDef>.GetNamed("Hediff_Menopause");
//public static readonly DNADef HumanDNA = DefDatabase<DNADef>.GetNamed("Human");
public static readonly StatDef MaxAbsorbable = DefDatabase<StatDef>.GetNamed("MaxAbsorbable");
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");