Compare commits

..

No commits in common. "d6818b9834d36da579a44fe103f17cdc8b69acdd" and "5da2b69fd5b3e5853bdd6f57d259b9960213b84c" have entirely different histories.

3 changed files with 6 additions and 6 deletions

View file

@ -301,10 +301,10 @@ namespace RJW_Menstruation
// So make it always consider the mother to have one baby // So make it always consider the mother to have one baby
public static class HAR_LitterSize_Undo public static class HAR_LitterSize_Undo
{ {
public static void Postfix(ref int __result) public static void Postfix(ref int __result, Pawn mother)
{ {
if (Configurations.PregnancySource == Configurations.PregnancyType.Biotech && Configurations.EnableBiotechTwins) if (Configurations.PregnancySource != Configurations.PregnancyType.Biotech || !Configurations.EnableBiotechTwins) return;
__result = 0; __result = 0;
return; return;
} }
} }

View file

@ -8,7 +8,7 @@ namespace RJW_Menstruation
protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested, int ingestedcount) protected override void DoIngestionOutcomeSpecial(Pawn pawn, Thing ingested, int ingestedcount)
{ {
Hediff hediff = HediffMaker.MakeHediff(hediffDef, pawn); Hediff hediff = HediffMaker.MakeHediff(hediffDef, pawn);
float effect = ((!(severity > 0f)) ? hediffDef.initialSeverity : severity) * ingestedcount; float effect = ((!(severity > 0f)) ? hediffDef.initialSeverity : severity) * ingested.stackCount;
AddictionUtility.ModifyChemicalEffectForToleranceAndBodySize_NewTemp(pawn, toleranceChemical, ref effect, multiplyByGeneToleranceFactors); AddictionUtility.ModifyChemicalEffectForToleranceAndBodySize_NewTemp(pawn, toleranceChemical, ref effect, multiplyByGeneToleranceFactors);
hediff.Severity = effect; hediff.Severity = effect;
pawn.health.AddHediff(hediff); pawn.health.AddHediff(hediff);

View file

@ -55,7 +55,7 @@ namespace RJW_Menstruation
public const float buttonWidth = 50f; public const float buttonWidth = 50f;
public const float buttonHeight = 20f; public const float buttonHeight = 20f;
public static void Prefix(Rect rect, Pawn pawn, float curY) public static void Prefix(Rect leftRect, Pawn pawn, float curY)
{ {
if (Configurations.EnableButtonInHT && pawn.ShowStatus() && pawn.ShouldCycle()) if (Configurations.EnableButtonInHT && pawn.ShowStatus() && pawn.ShouldCycle())
{ {
@ -63,7 +63,7 @@ namespace RJW_Menstruation
if (comp != null) if (comp != null)
{ {
Text.Font = GameFont.Tiny; Text.Font = GameFont.Tiny;
Rect buttonRect = new Rect(rect.xMax - buttonWidth - 8f, curY + 4f, buttonWidth, buttonHeight); Rect buttonRect = new Rect(leftRect.xMax - buttonWidth - 8f, curY + 4f, buttonWidth, buttonHeight);
if (Widgets.ButtonText(buttonRect, Translations.Button_HealthTab)) if (Widgets.ButtonText(buttonRect, Translations.Button_HealthTab))
{ {
Dialog_WombStatus.ToggleWindow(pawn, comp); Dialog_WombStatus.ToggleWindow(pawn, comp);