1.4/Languages/English/Keyed/RJW_Menstruation.xml

@@ -124,8 +124,6 @@
   <Option_PregnancyFromBaseRJW_Label>Use basic RJW pregnancy</Option_PregnancyFromBaseRJW_Label>
   <Option_PregnancyFromMultiplePregnancy_Label>Use menstruation multiple pregnancy</Option_PregnancyFromMultiplePregnancy_Label>
   <Option_PregnancyFromBiotech_Label>Use Biotech pregnancy</Option_PregnancyFromBiotech_Label>
-  <Option_EnableDraftedIcon_Label>Show womb status when drafted</Option_EnableDraftedIcon_Label>
-  <Option_EnableDraftedIcon_Desc>Draw womb icon for drafted pawns</Option_EnableDraftedIcon_Desc>
   <Button_ResetToDefault>Reset to default</Button_ResetToDefault>
 
   <Gizmo_GatherCum>Gather cum</Gizmo_GatherCum>

1.4/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs

@@ -42,7 +42,6 @@ namespace RJW_Menstruation
         public static int CumFertilityDecayRatioAdjust = CumFertilityDecayRatioAdjustDefault;
         public static int CycleAcceleration = CycleAccelerationDefault;
         public static bool EnableWombIcon = true;
-        public static bool EnableDraftedIcon = true;
         public static bool EnableAnimalCycle = false;
         public static bool DrawWombStatus = true;
         public static bool DrawVaginaStatus = true;
@@ -73,14 +72,13 @@ namespace RJW_Menstruation
         public static float MaxBreastIncrementFactor = MaxBreastIncrementFactorDefault;
         public static float MaxNippleIncrementFactor = MaxNippleIncrementFactorDefault;
         public static float PermanentNippleChange = PermanentNippleChangeDefault;
-        public static void SetToDefault()
+        public static void SettoDefault()
         {
             ImplantationChanceAdjust = ImplantationChanceAdjustDefault;
             FertilizeChanceAdjust = FertilizeChanceAdjustDefault;
             CumDecayRatioAdjust = CumDecayRatioAdjustDefault;
             CumFertilityDecayRatioAdjust = CumFertilityDecayRatioAdjustDefault;
             EnableWombIcon = true;
-            EnableDraftedIcon = true;
             EnableGatherCumGizmo = true;
             EnableAnimalCycle = false;
             CycleAcceleration = CycleAccelerationDefault;
@@ -187,7 +185,6 @@ namespace RJW_Menstruation
             Scribe_Values.Look(ref CumFertilityDecayRatio, "CumFertilityDecayRatio", CumFertilityDecayRatio, true);
             Scribe_Values.Look(ref CycleAcceleration, "CycleAcceleration", CycleAcceleration, true);
             Scribe_Values.Look(ref EnableWombIcon, "EnableWombIcon", EnableWombIcon, true);
-            Scribe_Values.Look(ref EnableDraftedIcon, "EnableDraftedIcon", EnableDraftedIcon, true);
             Scribe_Values.Look(ref EnableAnimalCycle, "EnableAnimalCycle", EnableAnimalCycle, true);
             Scribe_Values.Look(ref DrawWombStatus, "DrawWombStatus", DrawWombStatus, true);
             Scribe_Values.Look(ref DrawVaginaStatus, "DrawVaginaStatus", DrawVaginaStatus, true);
@@ -293,7 +290,7 @@ namespace RJW_Menstruation
             Widgets.CheckboxLabeled(middleAndRightCells.RightHalf(), Translations.Option_EnableGatherCumGizmo_Label, ref Configurations.EnableGatherCumGizmo, false, null, null, true);
             if (Configurations.EnableWombIcon || Configurations.EnableButtonInHT)
             {
-                Listing_Standard wombsection = listmain.BeginSection(380);
+                Listing_Standard wombsection = listmain.BeginSection(350);
                 wombsection.CheckboxLabeled(Translations.Option9_Label, ref Configurations.DrawWombStatus, Translations.Option9_Desc);
                 if (Configurations.DrawWombStatus)
                 {
@@ -302,7 +299,6 @@ namespace RJW_Menstruation
 
                 wombsection.CheckboxLabeled(Translations.Option10_Label, ref Configurations.DrawVaginaStatus, Translations.Option10_Desc);
                 wombsection.CheckboxLabeled(Translations.Option29_Label, ref Configurations.AllowShrinkIcon, Translations.Option29_Desc);
-                wombsection.CheckboxLabeled(Translations.Option_EnableDraftedIcon_Label, ref Configurations.EnableDraftedIcon, Translations.Option_EnableDraftedIcon_Desc);
                 if (wombsection.ButtonText(Translations.Option11_Label + ": " + Configurations.LevelString(Configurations.infoDetail)))
                 {
                     if (Configurations.infoDetail == Configurations.DetailLevel.Hide) Configurations.infoDetail = Configurations.DetailLevel.All;
@@ -482,7 +478,7 @@ namespace RJW_Menstruation
             listmain.CheckboxLabeled(Translations.Option8_Label, ref Configurations.Debug, Translations.Option8_Desc);
             if (listmain.ButtonText(Translations.Button_ResetToDefault))
             {
-                Configurations.SetToDefault();
+                Configurations.SettoDefault();
             }
 
             listmain.End();

1.4/source/RJW_Menstruation/RJW_Menstruation/IngestionOutcomeDoers.cs

@@ -9,9 +9,11 @@ namespace RJW_Menstruation
         {
             Hediff hediff = HediffMaker.MakeHediff(hediffDef, pawn);
             float effect = ((!(severity > 0f)) ? hediffDef.initialSeverity : severity) * ingested.stackCount;
-            AddictionUtility.ModifyChemicalEffectForToleranceAndBodySize_NewTemp(pawn, toleranceChemical, ref effect, multiplyByGeneToleranceFactors);
+            AddictionUtility.ModifyChemicalEffectForToleranceAndBodySize(pawn, toleranceChemical, ref effect);
             hediff.Severity = effect;
             pawn.health.AddHediff(hediff);
         }
+
+
     }
 }

1.4/source/RJW_Menstruation/RJW_Menstruation/Translations.cs

@@ -125,8 +125,6 @@ namespace RJW_Menstruation
         public static readonly string Option_PregnancyFromBaseRJW_Label = "Option_PregnancyFromBaseRJW_Label".Translate();
         public static readonly string Option_PregnancyFromMultiplePregnancy_Label = "Option_PregnancyFromMultiplePregnancy_Label".Translate();
         public static readonly string Option_PregnancyFromBiotech_Label = "Option_PregnancyFromBiotech_Label".Translate();
-        public static readonly string Option_EnableDraftedIcon_Label = "Option_EnableDraftedIcon_Label".Translate();
-        public static readonly string Option_EnableDraftedIcon_Desc = "Option_EnableDraftedIcon_Desc".Translate();
 
         public static readonly string Button_ResetToDefault = "Button_ResetToDefault".Translate();
 

1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs

@@ -449,10 +449,7 @@ namespace RJW_Menstruation
 
         public static bool ShouldShowWombGizmo(this Pawn pawn)
         {
-            if (!Configurations.EnableWombIcon) return false;
+            return Configurations.EnableWombIcon && (!pawn.IsAnimal() || Configurations.EnableAnimalCycle);
-            if (pawn.Drafted && !Configurations.EnableDraftedIcon) return false;
-            if (pawn.IsAnimal() && !Configurations.EnableAnimalCycle) return false;
-            return true;
         }
     }
 }

changelogs.txt

@@ -1,7 +1,6 @@
 Version 1.0.8.4
  - Fix Biotech xenotype inheritance for single-child pregnancies.
  - Fix error in Traditional Chinese translation.
- - New option in the mod settings to hide the womb icon for drafted pawns.
  - Newborns should now be baseliners if there are no xenotypes to inherit.
  - The Biotech terminate pregnancy recipe can now terminate a menstruation pregnancy, too.