diff --git a/1.4/Assemblies/Rimworld-Animations-Patch.dll b/1.4/Assemblies/Rimworld-Animations-Patch.dll index c48695c..56f4dad 100644 Binary files a/1.4/Assemblies/Rimworld-Animations-Patch.dll and b/1.4/Assemblies/Rimworld-Animations-Patch.dll differ diff --git a/About/Changelog_v2.0.7.txt b/About/Changelog_v2.0.8.txt similarity index 90% rename from About/Changelog_v2.0.7.txt rename to About/Changelog_v2.0.8.txt index 8cb1441..9a6943d 100644 --- a/About/Changelog_v2.0.7.txt +++ b/About/Changelog_v2.0.8.txt @@ -1,3 +1,6 @@ +Change log v 2.0.8 +- Implemented potential fix for users experiencing a 'null pawn reference' when pawns masturbate + Change log v 2.0.7 - Fixed issue where apparel settings were not being saved between sessions - Using the 'set all true / false' buttons in the apparel settings now only applies to the apparel that are currently displayed in the configuration table diff --git a/About/Manifest.xml b/About/Manifest.xml index 0dc380b..cdb75ec 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,5 +1,5 @@ - 2.0.7 + 2.0.8 https://gitgud.io/AbstractConcept/rimworld-animations-patch \ No newline at end of file diff --git a/Defs/AnimationDefs/Animations_solo.xml b/Defs/AnimationDefs/Animations_solo.xml index 0a9cd23..30a10d0 100644 --- a/Defs/AnimationDefs/Animations_solo.xml +++ b/Defs/AnimationDefs/Animations_solo.xml @@ -1,7 +1,6 @@  - MasturbationWithPenis_Standing @@ -2123,7 +2122,7 @@ MasturbationHumping_InBed - +
  • masturbatin'.
  • diff --git a/Source/.vs/Rimworld-Animations-Patch/v16/.suo b/Source/.vs/Rimworld-Animations-Patch/v16/.suo index 54aac9a..69d8ec3 100644 Binary files a/Source/.vs/Rimworld-Animations-Patch/v16/.suo and b/Source/.vs/Rimworld-Animations-Patch/v16/.suo differ diff --git a/Source/Scripts/Patches/HarmonyPatch_RJW.cs b/Source/Scripts/Patches/HarmonyPatch_RJW.cs index 2a74454..326e568 100644 --- a/Source/Scripts/Patches/HarmonyPatch_RJW.cs +++ b/Source/Scripts/Patches/HarmonyPatch_RJW.cs @@ -76,7 +76,7 @@ namespace Rimworld_Animations_Patch SexProps sexProps = new SexProps(); sexProps.pawn = __instance.pawn; - sexProps.partner = null; + sexProps.partner = __instance.pawn; sexProps.sexType = xxx.rjwSextype.Masturbation; IEnumerable interactionDefs = DefDatabase.AllDefs.Where(x => x.HasModExtension()); diff --git a/Source/obj/Debug/Rimworld-Animations-Patch.csprojAssemblyReference.cache b/Source/obj/Debug/Rimworld-Animations-Patch.csprojAssemblyReference.cache index 7dde8a4..5144e7f 100644 Binary files a/Source/obj/Debug/Rimworld-Animations-Patch.csprojAssemblyReference.cache and b/Source/obj/Debug/Rimworld-Animations-Patch.csprojAssemblyReference.cache differ diff --git a/Source/obj/Debug/Rimworld-Animations-Patch.dll b/Source/obj/Debug/Rimworld-Animations-Patch.dll index c48695c..56f4dad 100644 Binary files a/Source/obj/Debug/Rimworld-Animations-Patch.dll and b/Source/obj/Debug/Rimworld-Animations-Patch.dll differ diff --git a/Source/obj/Debug/Rimworld-Animations-Patch.pdb b/Source/obj/Debug/Rimworld-Animations-Patch.pdb index 4f4a606..99bd26f 100644 Binary files a/Source/obj/Debug/Rimworld-Animations-Patch.pdb and b/Source/obj/Debug/Rimworld-Animations-Patch.pdb differ