AblativeAbsolute
/
rjw_menstruation
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove availableWomb from CanFertilize. It's only used for fetishes, and it won't be DangerDay if they're all pregnant

This commit is contained in:
lutepickle 2022-07-11 18:30:59 -07:00
parent c0043d2936
commit 70346a0901
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
1.3/Assemblies/RJW_Menstruation.dll
View File

Binary file not shown.

4
1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs
View File

@ -90,7 +90,7 @@ namespace RJW_Menstruation
}
// A looser CanImpregnate
public static bool CanFertilize(Pawn fucker, Pawn fucked, xxx.rjwSextype sexType = xxx.rjwSextype.Vaginal, bool availableWomb = false)
public static bool CanFertilize(Pawn fucker, Pawn fucked, xxx.rjwSextype sexType = xxx.rjwSextype.Vaginal)
{
if (fucker == null || fucked == null) return false;
@ -114,8 +114,6 @@ namespace RJW_Menstruation
if (fucker.def.defName != fucked.def.defName && RJWPregnancySettings.interspecies_impregnation_modifier <= 0.0f && !RJWPregnancySettings.complex_interspecies) return false;
if (availableWomb && fucked.GetMenstruationComps().All(comp => comp.Pregnancy != null)) return false;
return true;
}

8
1.3/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs
View File

@ -144,9 +144,9 @@ namespace RJW_Menstruation
// This is stricter than can_impregnate, so quickly filter out scenarios that are negative anyways.
if (__result == false || __instance != Quirk.ImpregnationFetish) return;
__result =
(MenstruationUtility.CanFertilize(pawn, partner, availableWomb: true) && (partner.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true))
(MenstruationUtility.CanFertilize(pawn, partner) && (partner.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true))
||
(MenstruationUtility.CanFertilize(partner, pawn, availableWomb: true) && (pawn.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true));
(MenstruationUtility.CanFertilize(partner, pawn) && (pawn.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true));
}
}
@ -165,9 +165,9 @@ namespace RJW_Menstruation
else __result--;
if (
(MenstruationUtility.CanFertilize(pawn, partner, props.sexType, true) && (partner.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true))
(MenstruationUtility.CanFertilize(pawn, partner, props.sexType) && (partner.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true))
||
(MenstruationUtility.CanFertilize(partner, pawn, props.sexType, true) && (pawn.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true)))
(MenstruationUtility.CanFertilize(partner, pawn, props.sexType) && (pawn.GetMenstruationComps()?.Any(comp => comp.IsDangerDay) ?? true)))
__result++;
}
}