diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index cb05a16..c209de4 100644 Binary files a/1.2/Assemblies/Rimworld-Animations.dll and b/1.2/Assemblies/Rimworld-Animations.dll differ diff --git a/Defs/SoundDefs/Sounds_Sex.xml b/Defs/SoundDefs/Sounds_Sex.xml index 7d3500c..4cce5d0 100644 --- a/Defs/SoundDefs/Sounds_Sex.xml +++ b/Defs/SoundDefs/Sounds_Sex.xml @@ -6,6 +6,7 @@ MapOnly 1 + 1
  • @@ -34,6 +35,7 @@ MapOnly 1 + 1
  • @@ -62,6 +64,7 @@ MapOnly 1 + 1
  • @@ -118,6 +121,7 @@ MapOnly 1 + 1
  • @@ -168,6 +172,7 @@ MapOnly 1 + 1
  • diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index e7e6ab0..9b564e6 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -45,7 +45,7 @@ False - ..\RJW\1.1\Assemblies\RJW.dll + ..\rjw-master\1.1\Assemblies\RJW.dll False diff --git a/Source/Patches/HarmonyPatch_FacialAnimation.cs b/Source/Patches/HarmonyPatch_FacialAnimation.cs index 6d561de..9de25d8 100644 --- a/Source/Patches/HarmonyPatch_FacialAnimation.cs +++ b/Source/Patches/HarmonyPatch_FacialAnimation.cs @@ -72,6 +72,12 @@ namespace Rimworld_Animations { "UseFM" }; + public static List rjwRapeDefNames = new List { + "RapeComfortPawn", + "RandomRape", + "RapeEnemy" + }; + public static bool Prefix_IsSameA(JobDef job, string ___jobDef, ref bool __result) { @@ -79,6 +85,11 @@ namespace Rimworld_Animations { __result = true; return false; } + else if (___jobDef != null && ___jobDef == "WaitCombat" && job?.defName != null && rjwRapeDefNames.Contains(job?.defName)) { + __result = true; + return false; + } + return true; } @@ -89,6 +100,10 @@ namespace Rimworld_Animations { __result = true; return false; } + if (___jobDef != null && ___jobDef == "WaitCombat" && jobName != null && rjwRapeDefNames.Contains(jobName)) { + __result = true; + return false; + } return true; }