AblativeAbsolute
/
rimworld-animations
mirror of https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

facial animation tweaks

This commit is contained in:
Platinum 2020-08-21 17:29:28 -07:00
parent 8cbb5ef03b
commit 401c2c3866
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
1.2/Assemblies/Rimworld-Animations.dll
View File

Binary file not shown.

5
Defs/SoundDefs/Sounds_Sex.xml
View File

@ -6,6 +6,7 @@
<context>MapOnly</context> <context>MapOnly</context>
<eventNames /> <eventNames />
<maxSimultaneous>1</maxSimultaneous> <maxSimultaneous>1</maxSimultaneous>
<maxVoices>1</maxVoices>
<subSounds> <subSounds>
<li> <li>
<grains> <grains>
@ -34,6 +35,7 @@
<context>MapOnly</context> <context>MapOnly</context>
<eventNames /> <eventNames />
<maxSimultaneous>1</maxSimultaneous> <maxSimultaneous>1</maxSimultaneous>
<maxVoices>1</maxVoices>
<subSounds> <subSounds>
<li> <li>
<grains> <grains>
@ -62,6 +64,7 @@
<context>MapOnly</context> <context>MapOnly</context>
<eventNames /> <eventNames />
<maxSimultaneous>1</maxSimultaneous> <maxSimultaneous>1</maxSimultaneous>
<maxVoices>1</maxVoices>
<subSounds> <subSounds>
<li> <li>
<grains> <grains>
@ -118,6 +121,7 @@
<context>MapOnly</context> <context>MapOnly</context>
<eventNames /> <eventNames />
<maxSimultaneous>1</maxSimultaneous> <maxSimultaneous>1</maxSimultaneous>
<maxVoices>1</maxVoices>
<subSounds> <subSounds>
<li> <li>
<grains> <grains>
@ -168,6 +172,7 @@
<context>MapOnly</context> <context>MapOnly</context>
<eventNames /> <eventNames />
<maxSimultaneous>1</maxSimultaneous> <maxSimultaneous>1</maxSimultaneous>
<maxVoices>1</maxVoices>
<subSounds> <subSounds>
<li> <li>
<grains> <grains>

2
Rimworld-Animations.csproj
View File

@ -45,7 +45,7 @@
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="RJW"> <Reference Include="RJW">
<HintPath>..\RJW\1.1\Assemblies\RJW.dll</HintPath> <HintPath>..\rjw-master\1.1\Assemblies\RJW.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />

15
Source/Patches/HarmonyPatch_FacialAnimation.cs
View File

@ -72,6 +72,12 @@ namespace Rimworld_Animations {
"UseFM" "UseFM"
}; };
public static List<string> rjwRapeDefNames = new List<string> {
"RapeComfortPawn",
"RandomRape",
"RapeEnemy"
};
public static bool Prefix_IsSameA(JobDef job, string ___jobDef, ref bool __result) { public static bool Prefix_IsSameA(JobDef job, string ___jobDef, ref bool __result) {
@ -79,6 +85,11 @@ namespace Rimworld_Animations {
__result = true; __result = true;
return false; return false;
} }
else if (___jobDef != null && ___jobDef == "WaitCombat" && job?.defName != null && rjwRapeDefNames.Contains(job?.defName)) {
__result = true;
return false;
}
return true; return true;
} }
@ -89,6 +100,10 @@ namespace Rimworld_Animations {
__result = true; __result = true;
return false; return false;
} }
if (___jobDef != null && ___jobDef == "WaitCombat" && jobName != null && rjwRapeDefNames.Contains(jobName)) {
__result = true;
return false;
}
return true; return true;
} }