diff --git a/Assemblies/RJWSexperience.dll b/Assemblies/RJWSexperience.dll index da358c9..5623c5a 100644 Binary files a/Assemblies/RJWSexperience.dll and b/Assemblies/RJWSexperience.dll differ diff --git a/RJWSexperience/RJWSexperience/ExtensionMethods/SexPropsExtensions.cs b/RJWSexperience/RJWSexperience/ExtensionMethods/SexPropsExtensions.cs new file mode 100644 index 0000000..cf07b63 --- /dev/null +++ b/RJWSexperience/RJWSexperience/ExtensionMethods/SexPropsExtensions.cs @@ -0,0 +1,32 @@ +using Verse; +using rjw; + +namespace RJWSexperience.ExtensionMethods +{ + public static class SexPropsExtensions + { + public static Pawn GetInteractionInitiator(this SexProps props) + { + if (props.isReceiver) + { + return props.partner; + } + else + { + return props.pawn; + } + } + + public static Pawn GetInteractionRecipient(this SexProps props) + { + if (props.isReceiver) + { + return props.pawn; + } + else + { + return props.partner; + } + } + } +} diff --git a/RJWSexperience/RJWSexperience/Patches/RJW_Patch.cs b/RJWSexperience/RJWSexperience/Patches/RJW_Patch.cs index 3805c59..958dd4c 100644 --- a/RJWSexperience/RJWSexperience/Patches/RJW_Patch.cs +++ b/RJWSexperience/RJWSexperience/Patches/RJW_Patch.cs @@ -10,7 +10,7 @@ using RimWorld; using Verse; using Verse.AI; using UnityEngine; - +using RJWSexperience.ExtensionMethods; namespace RJWSexperience { @@ -119,7 +119,7 @@ namespace RJWSexperience { var interaction = rjw.Modules.Interactions.Helpers.InteractionHelper.GetWithExtension(props.dictionaryKey); - if (props.pawn == props.interactionInitiator) + if (props.pawn == props.GetInteractionInitiator()) { if (!interaction.DominantHasTag(GenitalTag.CanPenetrate) && !interaction.DominantHasFamily(GenitalFamily.Penis)) return false; diff --git a/RJWSexperience/RJWSexperience/RJWSexperience.csproj b/RJWSexperience/RJWSexperience/RJWSexperience.csproj index 113f6ea..9a58f05 100644 --- a/RJWSexperience/RJWSexperience/RJWSexperience.csproj +++ b/RJWSexperience/RJWSexperience/RJWSexperience.csproj @@ -68,6 +68,7 @@ + diff --git a/RJWSexperience/RJWSexperience/SexHistory/SexHistory.cs b/RJWSexperience/RJWSexperience/SexHistory/SexHistory.cs index e80d13f..b91ce12 100644 --- a/RJWSexperience/RJWSexperience/SexHistory/SexHistory.cs +++ b/RJWSexperience/RJWSexperience/SexHistory/SexHistory.cs @@ -7,7 +7,7 @@ using RimWorld; using Verse; using rjw; using UnityEngine; -using System.Collections; +using RJWSexperience.ExtensionMethods; namespace RJWSexperience { @@ -758,11 +758,11 @@ namespace RJWSexperience totalsexhad++; if (props.isRape) { - if (partner == props.interactionInitiator) + if (partner == props.GetInteractionInitiator()) { rapedme++; } - else if (partner == props.interactionRecipient) + else if (partner == props.GetInteractionRecipient()) { raped++; } diff --git a/RJWSexperience_Ideology/Assemblies/RJWSexperience.Ideology.dll b/RJWSexperience_Ideology/Assemblies/RJWSexperience.Ideology.dll index fab9674..ac4eb26 100644 Binary files a/RJWSexperience_Ideology/Assemblies/RJWSexperience.Ideology.dll and b/RJWSexperience_Ideology/Assemblies/RJWSexperience.Ideology.dll differ