AblativeAbsolute/rjw_menstruation
1
0
Fork 0
mirror of https://gitgud.io/lutepickle/rjw_menstruation.git synced 2024-08-14 22:46:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Split animal cycle check into generic ShouldCycle function, exclude egglaying races from cycling

Browse source
This commit is contained in:
lutepickle 2023-10-11 08:06:31 -07:00
parent ebf0db8ae6
commit f08ff58b64
8 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
1.4/Assemblies/RJW_Menstruation.dll
View file

Binary file not shown.

BIN
1.4/MilkModule/Assemblies/MilkModule.dll
View file

Binary file not shown.

2
1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs
View file

@ -150,7 +150,7 @@ namespace RJW_Menstruation
public bool ShouldSimulate()
{
if (!Configurations.EnableAnimalCycle && Pawn.IsAnimal()) return false;
if (!Pawn.ShouldCycle()) return false;
if (Pawn.SpawnedOrAnyParentSpawned || Pawn.IsCaravanMember() || PawnUtility.IsTravelingInTransportPodWorldObject(Pawn)) return true;
return false;

2
1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
View file

@ -714,7 +714,7 @@ namespace RJW_Menstruation
public bool ShouldSimulate()
{
if (!Configurations.EnableAnimalCycle && Pawn.IsAnimal()) return false;
if (!Pawn.ShouldCycle()) return false;
if (Pawn.SpawnedOrAnyParentSpawned || Pawn.IsCaravanMember() || PawnUtility.IsTravelingInTransportPodWorldObject(Pawn)) return true;
return false;

8
1.4/source/RJW_Menstruation/RJW_Menstruation/HediffComps/MenstruationUtility.cs
View file

@ -403,6 +403,14 @@ namespace RJW_Menstruation
else return variability;
}
public static bool ShouldCycle(this Pawn pawn)
{
if (!Configurations.EnableAnimalCycle && pawn.IsAnimal()) return false;
if (pawn.RaceHasOviPregnancy()) return false;
// TODO: Exclude egglaying genes
return true;
}
public static bool IsInEstrus(this Pawn pawn, bool visible = true)
{
if (pawn.Dead) return false;

8
1.4/source/RJW_Menstruation/RJW_Menstruation/Patch/RJW_Patch.cs
View file

@ -24,7 +24,7 @@ namespace RJW_Menstruation
if (sextype != xxx.rjwSextype.Vaginal && sextype != xxx.rjwSextype.DoublePenetration) return true;
if (partner.IsAnimal() && !Configurations.EnableAnimalCycle) return true;
if (!partner.ShouldCycle()) return true;
if (!InteractionCanCausePregnancy(props)) return false;
@ -100,7 +100,7 @@ namespace RJW_Menstruation
{
public static bool Prefix(Pawn pawn, Pawn partner) // partner has vagina
{
if (partner.IsAnimal() && !Configurations.EnableAnimalCycle) return true;
if (!partner.ShouldCycle()) return true;
HediffComp_Menstruation comp;
if (pawn.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish) || partner.HasQuirk(QuirkUtility.Quirks.ImpregnationFetish) || partner.IsInEstrus())
comp = partner.GetFertileMenstruationComp();
@ -125,7 +125,7 @@ namespace RJW_Menstruation
{
private static bool PregnancyBlocksImpregnation(this Pawn pawn, bool _)
{
if (!Configurations.EnableAnimalCycle && pawn.IsAnimal()) return pawn.IsPregnant();
if (!pawn.ShouldCycle()) return pawn.IsPregnant();
else if (pawn.GetMenstruationComps().Any()) return false;
else return pawn.IsPregnant();
}
@ -347,7 +347,7 @@ namespace RJW_Menstruation
if (__instance.Sexprops.usedCondom) return;
if (AndroidsCompatibility.IsAndroid(pawn)) return;
if (!Impregnate_Patch.InteractionCanCausePregnancy(__instance.Sexprops)) return;
if (!Configurations.EnableAnimalCycle && xxx.is_animal(partner)) return;
if (!partner.ShouldCycle()) return;
// Archotech penises have more control. Or something.
CompHediffBodyPart penisComp = pawn.GetGenitalsList()?.Find(genital => (genital as Hediff_PartBaseNatural)?.def.defName.ToLower().Contains("penis") ?? false)?.TryGetComp<CompHediffBodyPart>();

2
1.4/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
View file

@ -448,7 +448,7 @@ namespace RJW_Menstruation
{
if (!Configurations.EnableWombIcon) return false;
if (pawn.Drafted && !Configurations.EnableDraftedIcon) return false;
if (pawn.IsAnimal() && !Configurations.EnableAnimalCycle) return false;
if (!pawn.ShouldCycle()) return false;
return true;
}

1
changelogs.txt
View file

@ -2,6 +2,7 @@ Version 1.0.9.2
- Fixed the no bleeding gene having positive metabolic efficiency instead of negative.
- Removed status button in health tab for non-genitals to avoid errors.
- Handle errors more gracefully when starting a pregnancy.
- Egglaying races no longer have a menstrual cycle, regardless of vagina type.
Version 1.0.9.1
- Japanese translation for most text by Lokuzt.