diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index d60cc47..5f73187 100644 Binary files a/1.4/Assemblies/RJW_Menstruation.dll and b/1.4/Assemblies/RJW_Menstruation.dll differ diff --git a/1.4/MilkModule/Assemblies/MilkModule.dll b/1.4/MilkModule/Assemblies/MilkModule.dll index a0d00f9..5c953b2 100644 Binary files a/1.4/MilkModule/Assemblies/MilkModule.dll and b/1.4/MilkModule/Assemblies/MilkModule.dll differ diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs index 907b36a..2a6d7b8 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs @@ -466,12 +466,6 @@ namespace RJW_Menstruation pawn.story.traits.allTraits = selectedTraits; } - public string DueDate() - { - if (pawn.Tile == -1) return ""; - return GenDate.DateFullStringWithHourAt(GenDate.TickGameToAbs((int)p_end_tick), Find.WorldGrid.LongLatOf(pawn.Tile)); - } - public override bool TryMergeWith(Hediff other) { return false; diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs index e640659..7185ccf 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/Gizmo_Patch.cs @@ -48,8 +48,10 @@ namespace RJW_Menstruation { description .AppendFormat("{0}: {1}\n", comp.curStage, comp.curStageHrs); - if (comp.Pregnancy is Hediff_MultiplePregnancy preg) description - .AppendFormat("due: {0}\n", preg.DueDate()); + if (comp.Pregnancy is Hediff_BasePregnancy rjwpreg) description + .AppendFormat("due: {0}\n", rjwpreg.DueDate()); + else if (comp.Pregnancy is Hediff_Pregnant biopreg) description + .AppendFormat("due: {0}\n", biopreg.DueDate()); description .AppendFormat("fertcums: {0}\n" + "ovarypower: {1}\n" + diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/PregnancyCommon.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/PregnancyCommon.cs index 2429736..7cbf28c 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/PregnancyCommon.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/PregnancyCommon.cs @@ -304,5 +304,19 @@ namespace RJW_Menstruation CopyBodyPartRecord(baby, original, Genital_Helper.get_uddersBPR(baby), Genital_Helper.get_uddersBPR(original)); CopyBodyPartRecord(baby, original, Genital_Helper.get_anusBPR(baby), Genital_Helper.get_anusBPR(original)); } + + public static string DueDate(this Hediff_BasePregnancy preg) + { + if (preg.pawn.Tile == -1) return ""; + return GenDate.DateFullStringWithHourAt(GenDate.TickGameToAbs((int)preg.p_end_tick), Find.WorldGrid.LongLatOf(preg.pawn.Tile)); + } + + public static string DueDate(this Hediff_Pregnant preg) + { + if (preg.pawn.Tile == -1) return ""; + int ticksRemaining = (int)((1f - preg.GestationProgress) * preg.pawn.RaceProps.gestationPeriodDays * GenDate.TicksPerDay); + int dueTickAbs = GenTicks.TicksAbs + ticksRemaining; + return GenDate.DateFullStringWithHourAt(dueTickAbs, Find.WorldGrid.LongLatOf(preg.pawn.Tile)); + } } }