diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll index 0215954..72bd75a 100644 Binary files a/1.4/Assemblies/RJW_Menstruation.dll and b/1.4/Assemblies/RJW_Menstruation.dll differ diff --git a/1.4/Patches/Hediffs_PrivateParts_Animal.xml b/1.4/Patches/Hediffs_PrivateParts_Animal.xml index fc60760..63b12b5 100644 --- a/1.4/Patches/Hediffs_PrivateParts_Animal.xml +++ b/1.4/Patches/Hediffs_PrivateParts_Animal.xml @@ -11,27 +11,6 @@ - /Defs/rjw.HediffDef_PartBase[defName="DogVagina"] - - -
  • - 8 - 1.0 - 1.0 - 14 - 166 - 8 - 15 - 4 - Womb/Womb - Genitals/Vagina - 9 -
  • -
    -
    -
    - - + /Defs/rjw.HediffDef_PartBase[defName="CatVagina"] diff --git a/1.4/Patches/MilkPatch.xml b/1.4/Patches/MilkPatch.xml deleted file mode 100644 index 5097577..0000000 --- a/1.4/Patches/MilkPatch.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - /Defs/ThingDef[defName="HumanMilk" or defName="HumanoidMilk"]/graphicData - - /Defs/ThingDef[defName="HumanMilk" or defName="HumanoidMilk"]/graphicData - - - Things/Item/Milkbottle - Graphic_StackCount - - - - - - - diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs index 070c6ef..d72090b 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs @@ -744,6 +744,38 @@ namespace RJW_Menstruation base.CompPostPostRemoved(); } + public override string CompTipStringExtra + { + get + { + StringBuilder tip = new StringBuilder(); + tip.Append(Translations.Dialog_WombInfo01); + tip.Append(": "); + tip.Append(GetCurStageLabel); + string fertInfo = GetFertilizingInfo; + if(CurrentVisibleStage == Stage.Luteal && fertInfo.Length > 0) + { + tip.AppendLine(); + tip.Append(fertInfo); + } + return tip.ToString(); + } + } + + protected virtual int HoursToNextStage() + { + return Math.Max(0,(currentIntervalHours - curStageHrs) / Configurations.CycleAcceleration); + } + + public override string CompDebugString() + { + if (curStage == Stage.None || curStage == Stage.Infertile || curStage == Stage.Pregnant) return base.CompDebugString(); + StringBuilder debugString = new StringBuilder(); + debugString.Append($"Time to next state: "); + debugString.Append(GenDate.ToStringTicksToPeriod(HoursToNextStage() * GenDate.TicksPerHour)); + return debugString.ToString(); + } + /// /// Get fluid in womb that not a cum /// diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs index b3fa2ac..6611547 100644 --- a/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs +++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_PeriodicOvulator.cs @@ -57,6 +57,12 @@ namespace RJW_Menstruation Scribe_Values.Look(ref averageCycleIntervalHours, "averageCycleIntervalHours", averageCycleIntervalHours, true); } + protected override int HoursToNextStage() + { + if (curStage == Stage.Anestrus && hoursToNextCycle > 0) return hoursToNextCycle / Configurations.CycleAcceleration; + else return base.HoursToNextStage(); + } + protected override void BleedingAction() { if (curStageHrs >= currentIntervalHours) diff --git a/About/Manifest.xml b/About/Manifest.xml index 015d8cc..5477ddb 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJW Menstruation - 1.0.8.6 + 1.0.8.7 diff --git a/changelogs.txt b/changelogs.txt index 78e5725..c22902c 100644 --- a/changelogs.txt +++ b/changelogs.txt @@ -1,3 +1,8 @@ +Version 1.0.8.7 + - Fix missing texture when using Milkable Colonists. + - Canine vaginas now use the new periodic ovulator cycle. + - Hovering over a vagina hediff will show the current state in the tooltip. + Version 1.0.8.6 - Updated Traditional Chinese translation by Hydrogen. - Fix error when trying to terminate a non-Biotech pregnancy.