diff --git a/1.4/Assemblies/RJW_Menstruation.dll b/1.4/Assemblies/RJW_Menstruation.dll
index 721b3a7..d1b0f25 100644
Binary files a/1.4/Assemblies/RJW_Menstruation.dll and b/1.4/Assemblies/RJW_Menstruation.dll differ
diff --git a/1.4/Languages/English/Keyed/RJW_Menstruation.xml b/1.4/Languages/English/Keyed/RJW_Menstruation.xml
index 8ff0f64..5be5d11 100644
--- a/1.4/Languages/English/Keyed/RJW_Menstruation.xml
+++ b/1.4/Languages/English/Keyed/RJW_Menstruation.xml
@@ -124,6 +124,8 @@
Use basic RJW pregnancy
Use menstruation multiple pregnancy
Use Biotech pregnancy
+ Show womb status when drafted
+ Draw womb icon for drafted pawns
Reset to default
Gather cum
diff --git a/1.4/MilkModule/Assemblies/MilkModule.dll b/1.4/MilkModule/Assemblies/MilkModule.dll
index 20c9007..9431e9d 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/Configurations.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs
index 94daadc..6a843bb 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Configurations.cs
@@ -42,6 +42,7 @@ 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;
@@ -72,13 +73,14 @@ 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;
@@ -185,6 +187,7 @@ 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);
@@ -290,7 +293,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(350);
+ Listing_Standard wombsection = listmain.BeginSection(380);
wombsection.CheckboxLabeled(Translations.Option9_Label, ref Configurations.DrawWombStatus, Translations.Option9_Desc);
if (Configurations.DrawWombStatus)
{
@@ -299,6 +302,7 @@ 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;
@@ -478,7 +482,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();
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/IngestionOutcomeDoers.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/IngestionOutcomeDoers.cs
index 0ebf299..a413f42 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/IngestionOutcomeDoers.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/IngestionOutcomeDoers.cs
@@ -9,11 +9,9 @@ namespace RJW_Menstruation
{
Hediff hediff = HediffMaker.MakeHediff(hediffDef, pawn);
float effect = ((!(severity > 0f)) ? hediffDef.initialSeverity : severity) * ingested.stackCount;
- AddictionUtility.ModifyChemicalEffectForToleranceAndBodySize(pawn, toleranceChemical, ref effect);
+ AddictionUtility.ModifyChemicalEffectForToleranceAndBodySize_NewTemp(pawn, toleranceChemical, ref effect, multiplyByGeneToleranceFactors);
hediff.Severity = effect;
pawn.health.AddHediff(hediff);
}
-
-
}
}
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Translations.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Translations.cs
index 35d95c8..426991d 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Translations.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Translations.cs
@@ -125,6 +125,8 @@ 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();
diff --git a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
index aefa4c2..73cdf7e 100644
--- a/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
+++ b/1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
@@ -449,7 +449,10 @@ namespace RJW_Menstruation
public static bool ShouldShowWombGizmo(this Pawn pawn)
{
- return Configurations.EnableWombIcon && (!pawn.IsAnimal() || Configurations.EnableAnimalCycle);
+ if (!Configurations.EnableWombIcon) return false;
+ if (pawn.Drafted && !Configurations.EnableDraftedIcon) return false;
+ if (pawn.IsAnimal() && !Configurations.EnableAnimalCycle) return false;
+ return true;
}
}
}
diff --git a/changelogs.txt b/changelogs.txt
index 965c2a1..ddd0654 100644
--- a/changelogs.txt
+++ b/changelogs.txt
@@ -1,6 +1,7 @@
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.