diff --git a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml index 77cdcd7..1eab617 100644 --- a/Common/Defs/GeneDefs/GeneDefs_Breeding.xml +++ b/Common/Defs/GeneDefs/GeneDefs_Breeding.xml @@ -82,13 +82,13 @@ rjw_genes_mating_call This gene allows to call nearby animals and invite them for mating. - Genes/Icons/Animal_Mating_Call + Genes/Icons/RJW_Genes_Mating_Call 65
  • rjw_genes_ability_mating_call
  • - RJW_Genes_Mating_Call + rjw_genes_ability_mating_call 2 -1 diff --git a/Source/Common/patches/Patch_ParentRelationUtility_GetParents.cs b/Source/Common/patches/Patch_ParentRelationUtility_GetParents.cs index c153bf5..d6f2d94 100644 --- a/Source/Common/patches/Patch_ParentRelationUtility_GetParents.cs +++ b/Source/Common/patches/Patch_ParentRelationUtility_GetParents.cs @@ -12,6 +12,8 @@ namespace RJW_Genes { /// /// This Patch handles the changes to Fathers / Mothers when dealing with Femboys and Male/Male Pregnancies. + /// + /// This is related to /// [HarmonyPatch(typeof(ParentRelationUtility))] public class Patch_ParentRelationUtility_GetParents diff --git a/Source/Genes/Special/Patches/Patch_AgeDrain.cs b/Source/Genes/Special/Patches/Patch_AgeDrain.cs index 060c20d..ab159b1 100644 --- a/Source/Genes/Special/Patches/Patch_AgeDrain.cs +++ b/Source/Genes/Special/Patches/Patch_AgeDrain.cs @@ -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; diff --git a/Source/Genes/Special/Patches/Patch_Youth_Fountain.cs b/Source/Genes/Special/Patches/Patch_Youth_Fountain.cs index b64ca83..d810bc6 100644 --- a/Source/Genes/Special/Patches/Patch_Youth_Fountain.cs +++ b/Source/Genes/Special/Patches/Patch_Youth_Fountain.cs @@ -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); diff --git a/Source/Rjw-Genes.csproj b/Source/Rjw-Genes.csproj index 500f87e..0e0c0a0 100644 --- a/Source/Rjw-Genes.csproj +++ b/Source/Rjw-Genes.csproj @@ -218,8 +218,7 @@ False - ..\..\rjw-sexperience-master\1.5\Assemblies\RJWSexperience.dll - False + ..\..\rjw-sexperience\1.5\Assemblies\RJWSexperience.dll