1.0.3.0

Languages/English/Keyed/RJW_Menstruation.xml

@@ -87,7 +87,7 @@
   <Option26_Label>Maximum transition</Option26_Label>
   <Option26_Desc>Nipples/areolas won't be darker/wider than this value.</Option26_Desc>
   <Option27_Label>Transition speed of nipples</Option27_Label>
-  <Option27_Desc>Set how fast transition of nipples/areolas.</Option27_Desc>
+  <Option27_Desc>Set speed of transition of nipples/areolas.&#10;1 = instant transition</Option27_Desc>
   <Option28_Label></Option28_Label>
   <Option28_Desc></Option28_Desc>
   

changelogs.txt

@@ -1,5 +1,5 @@
 Version 1.0.3.0
- - added various fetus images
+ - added various fetus images (thanks to GluxDesigns)
  - added twin fetus image
  - male insects can impregnate female
  - now insects egg display on womb icon
@@ -7,7 +7,7 @@ Version 1.0.3.0
    - added milk status bar(milkable colonists compatible)
    - added self lactating button
      - self lactating enlarges nipple
-   - initial nipple size is determined by breast size
+   - pawns will get different size of nipple tips, areolas and colors
  - added status bars
    - you can check when the pawn get breeder/incubator quirk with this
  - fixed problems when cycle acceleration is too high

source/RJW_Menstruation/MilkModule/JobDriver_MilkSelf.cs

@@ -36,8 +36,8 @@ namespace MilkModule
             {
                 if (breastcomp != null)
                 {
-                    breastcomp.AdjustAreolaSize(Rand.Range(0.0f,0.001f * Configurations.NipplePermanentTransitionVariance));
-                    breastcomp.AdjustNippleSize(Rand.Range(0.0f,0.001f * Configurations.NipplePermanentTransitionVariance));
+                    breastcomp.AdjustAreolaSize(Rand.Range(0.0f,0.0001f * Configurations.NipplePermanentTransitionVariance));
+                    breastcomp.AdjustNippleSize(Rand.Range(0.0f,0.0001f * Configurations.NipplePermanentTransitionVariance));
                 }
 
             };

source/RJW_Menstruation/RJW_Menstruation/Configurations.cs

@@ -22,7 +22,7 @@ namespace RJW_Menstruation
         public const float NippleTransitionVarianceDefault = 0.2f;
         public const float NipplePermanentTransitionVarianceDefault = 0.02f;
         public const float NippleMaximumTransitionDefault = 0.4f;
-        public const float NippleTransitionSpeedDefault = 0.1f;
+        public const float NippleTransitionSpeedDefault = 0.035f;
 
         public static float ImplantationChance = ImplantationChanceDefault;
         public static int ImplantationChanceAdjust = ImplantationChanceAdjustDefault;

source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs

@@ -38,7 +38,7 @@ namespace RJW_Menstruation
         public const float defaultareola = -1;
         public const float defaultnipple = -1;
         public const float variation = 0.2f;
-        public const int tickinterval = 1250;
+        public const int tickinterval = 3750;
 
         public CompProperties_Breast Props;
 
@@ -167,7 +167,7 @@ namespace RJW_Menstruation
         {
             alphaCurrent = Mathf.Lerp(alphaCurrent, alpha, Configurations.NippleTransitionRatio);
             areolaSizeCurrent = Mathf.Lerp(areolaSizeCurrent, areolaSize, Configurations.NippleTransitionRatio);
-            nippleSizeCurrent = Mathf.Lerp(nippleSizeCurrent, NippleSize, Configurations.NippleTransitionRatio);
+            nippleSizeCurrent = Mathf.Lerp(nippleSizeCurrent, nippleSize, Configurations.NippleTransitionRatio);
             UpdateColor();
             HugsLibController.Instance.TickDelayScheduler.ScheduleCallback(action, tickinterval, parent.pawn);
         }
@@ -185,11 +185,11 @@ namespace RJW_Menstruation
         public void PregnancyTransition()
         {
             alphaPermanent = Math.Min(MaxAlpha, alphaPermanent + Configurations.NipplePermanentTransitionVariance.VariationRange(variation));
-            areolaSizePermanent = Math.Min(MaxAreola, (areolaSizePermanent + Configurations.NipplePermanentTransitionVariance.VariationRange(variation))/10);
-            nippleSizePermanent = Math.Min(MaxNipple, (nippleSizePermanent + Configurations.NipplePermanentTransitionVariance.VariationRange(variation))/20);
+            areolaSizePermanent = Math.Min(MaxAreola, areolaSizePermanent + Configurations.NipplePermanentTransitionVariance.VariationRange(variation));
+            nippleSizePermanent = Math.Min(MaxNipple, nippleSizePermanent + Configurations.NipplePermanentTransitionVariance.VariationRange(variation));
             alpha = Math.Min(MaxAlpha, alpha + Configurations.NippleTransitionVariance.VariationRange(variation));
-            areolaSize = Math.Min(MaxAreola, (areolaSize + Configurations.NippleTransitionVariance.VariationRange(variation))/10);
-            nippleSize = Math.Min(MaxNipple, (nippleSize + Configurations.NippleTransitionVariance.VariationRange(variation))/20);
+            areolaSize = Math.Min(MaxAreola, areolaSize + Configurations.NippleTransitionVariance.VariationRange(variation));
+            nippleSize = Math.Min(MaxNipple, nippleSize + Configurations.NippleTransitionVariance.VariationRange(variation));
         }
 
         public void BirthTransition()

source/RJW_Menstruation/RJW_Menstruation/Utility.cs

@@ -51,6 +51,7 @@ namespace RJW_Menstruation
     {
         public static System.Random random = new System.Random(Environment.TickCount);
 
+
         public static float GetCumVolume(this Pawn pawn)
         {
             CompHediffBodyPart part = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_genitalsBPR(pawn))?.FindAll((Hediff hed) => hed.def.defName.ToLower().Contains("penis")).InRandomOrder().FirstOrDefault()?.TryGetComp<CompHediffBodyPart>();
@@ -346,8 +347,7 @@ namespace RJW_Menstruation
                 string nippleicon, areolaicon;
 
                 nippleicon = icon + "_Nipple0" + GetNippleIndex(comp.NippleSize);
-                //areolaicon = icon + "_Areola0" + GetNippleIndex(comp.AreolaSize);
-                areolaicon = "Womb/Empty";
+                areolaicon = icon + "_Areola0" + GetAreolaIndex(comp.AreolaSize);
                 
 
                 breast = ContentFinder<Texture2D>.Get(icon, false);
@@ -355,8 +355,13 @@ namespace RJW_Menstruation
                 nipple = ContentFinder<Texture2D>.Get(nippleicon, false);
                 GUI.color = pawn.story.SkinColor;
                 GUI.DrawTexture(rect, breast, ScaleMode.ScaleToFit);
+
                 GUI.color = comp.NippleColor;
+                GUI.DrawTexture(rect, areola, ScaleMode.ScaleToFit);
+
                 GUI.DrawTexture(rect, nipple, ScaleMode.ScaleToFit);
+
+
                 if (Configurations.Debug) TooltipHandler.TipRegion(rect, comp.DebugInfo());
             }
             else
@@ -381,6 +386,14 @@ namespace RJW_Menstruation
             else return 3;
         }
 
+        public static int GetAreolaIndex(float nipplesize)
+        {
+            if (nipplesize < 0.15f) return 0;
+            else if (nipplesize < 0.30f) return 1;
+            else if (nipplesize < 0.45f) return 2;
+            else if (nipplesize < 0.70f) return 3;
+            else return 4;
+        }
 
         public static void DrawMilkBars(this Pawn pawn, Rect rect)
         {
@@ -434,7 +447,9 @@ namespace RJW_Menstruation
                 TooltipHandler.TipRegion(buttonrect, tooltip);
                 if (GUI.Button(buttonrect, icon, style))
                 {
-                    if (fullness < 0.1f) SoundDefOf.ClickReject.PlayOneShotOnCamera();
+                    if (fullness < 0.1f 
+                        || !pawn.IsColonistPlayerControlled 
+                        || pawn.Downed) SoundDefOf.ClickReject.PlayOneShotOnCamera();
                     else
                     {
                         SoundDefOf.Click.PlayOneShotOnCamera();