Add state to hediff tooltip, and time to next state in debug tooltip

1.4/Patches/Hediffs_PrivateParts_Animal.xml

@@ -11,27 +11,6 @@
 
 <Patch>
 	<Operation Class="PatchOperationAdd">
-		<xpath>/Defs/rjw.HediffDef_PartBase[defName="DogVagina"]</xpath>
-		<value>
-			<comps>
-				<li Class="RJW_Menstruation.CompProperties_Menstruation">
-					<maxCumCapacity>8</maxCumCapacity>
-					<baseImplantationChanceFactor>1.0</baseImplantationChanceFactor>
-					<basefertilizationChanceFactor>1.0</basefertilizationChanceFactor>
-					<follicularIntervalDays>14</follicularIntervalDays>
-					<lutealIntervalDays>166</lutealIntervalDays>
-					<bleedingIntervalDays>8</bleedingIntervalDays>
-					<recoveryIntervalDays>15</recoveryIntervalDays>
-					<eggLifespanDays>4</eggLifespanDays>
-					<wombTex>Womb/Womb</wombTex>
-					<vagTex>Genitals/Vagina</vagTex>
-					<estrusDaysBeforeOvulation>9</estrusDaysBeforeOvulation>
-				</li>
-			</comps>
-		</value>
-	</Operation>
-
-	<!--<Operation Class="PatchOperationAdd">
 		<xpath>/Defs/rjw.HediffDef_PartBase[defName="DogVagina"]</xpath>
 		<value>
 			<comps>
@@ -51,7 +30,7 @@
 				</li>
 			</comps>
 		</value>
-	</Operation>-->
+	</Operation>
 	
 	<Operation Class="PatchOperationAdd">
 		<xpath>/Defs/rjw.HediffDef_PartBase[defName="CatVagina"]</xpath>

1.4/Patches/MilkPatch.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-	<Operation Class="PatchOperationConditional">
-		<xpath>/Defs/ThingDef[defName="HumanMilk" or defName="HumanoidMilk"]/graphicData</xpath>
-		<match Class="PatchOperationReplace">
-			<xpath>/Defs/ThingDef[defName="HumanMilk" or defName="HumanoidMilk"]/graphicData</xpath>
-			<value>
-				<graphicData>
-					<texPath>Things/Item/Milkbottle</texPath>
-					<graphicClass>Graphic_StackCount</graphicClass>
-				</graphicData>
-			</value>
-		</match>
-	</Operation>
-	
-	
-</Patch>

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();
+        }
+
         /// <summary>
         /// Get fluid in womb that not a cum
         /// </summary>

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)

About/Manifest.xml

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

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.