Added a check for masturbation, fixes #99

This commit is contained in:
Vegapnk 2024-06-26 17:49:08 +02:00
parent daee7c747f
commit 0c139f2eff
5 changed files with 17 additions and 4 deletions

View file

@ -82,13 +82,13 @@
<defName>rjw_genes_mating_call</defName>
<label>Mating Call</label>
<description>This gene allows to call nearby animals and invite them for mating.</description>
<iconPath>Genes/Icons/Animal_Mating_Call</iconPath>
<iconPath>Genes/Icons/RJW_Genes_Mating_Call</iconPath>
<displayOrderInCategory>65</displayOrderInCategory>
<abilities>
<li>rjw_genes_ability_mating_call</li>
</abilities>
<descriptionHyperlinks>
<AbilityDef>RJW_Genes_Mating_Call</AbilityDef>
<AbilityDef>rjw_genes_ability_mating_call</AbilityDef>
</descriptionHyperlinks>
<biostatCpx>2</biostatCpx>
<biostatMet>-1</biostatMet>

View file

@ -12,6 +12,8 @@ namespace RJW_Genes
{
/// <summary>
/// This Patch handles the changes to Fathers / Mothers when dealing with Femboys and Male/Male Pregnancies.
///
/// This is related to
/// </summary>
[HarmonyPatch(typeof(ParentRelationUtility))]
public class Patch_ParentRelationUtility_GetParents

View file

@ -31,6 +31,12 @@ namespace RJW_Genes.Genes.Special
return;
}
if (props.pawn == props.partner || props.sexType == xxx.rjwSextype.Masturbation || props.sexType == xxx.rjwSextype.None)
{
// This case was reported but is a bit strange, I hardened it after reports in #99
return;
}
Pawn pawn = props.pawn;
Pawn partner = props.partner;

View file

@ -30,6 +30,12 @@ namespace RJW_Genes.Genes.Special
return;
}
if (props.pawn == props.partner || props.sexType == xxx.rjwSextype.Masturbation || props.sexType == xxx.rjwSextype.None)
{
// This case was reported but is a bit strange, I hardened it after reports in #99
return;
}
if (GeneUtility.IsYouthFountain(props.pawn))
{
ChangeAgeForPawn(props.partner, props.pawn);

View file

@ -218,8 +218,7 @@
<Private>False</Private>
</Reference>
<Reference Include="RJWSexperience">
<HintPath>..\..\rjw-sexperience-master\1.5\Assemblies\RJWSexperience.dll</HintPath>
<Private>False</Private>
<HintPath>..\..\rjw-sexperience\1.5\Assemblies\RJWSexperience.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="UnityEngine">