Build for rjw 4.4.0; last build is good for 4.3.3

This commit is contained in:
Platinum 2020-07-31 10:48:24 -07:00
parent 4d8151959d
commit cbf4766c5d
5 changed files with 2909 additions and 8 deletions

BIN
1.1/Assemblies/0Harmony.dll Normal file

Binary file not shown.

2900
1.1/Assemblies/0Harmony.xml Normal file

File diff suppressed because it is too large Load diff

View file

@ -31,10 +31,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="0Harmony, Version=2.0.0.8, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\workshop\content\294100\2009463077\v1.1\Assemblies\0Harmony.dll</HintPath>
<Private>False</Private>
<Reference Include="0Harmony">
<HintPath>..\..\..\..\workshop\content\294100\2009463077\Current\Assemblies\0Harmony.dll</HintPath>
</Reference>
<Reference Include="AlienRace">
<HintPath>..\..\..\..\workshop\content\294100\839005762\1.1\Assemblies\AlienRace.dll</HintPath>
@ -46,7 +44,7 @@
<Private>False</Private>
</Reference>
<Reference Include="RJW">
<HintPath>..\rjw-master\1.1\Assemblies\RJW.dll</HintPath>
<HintPath>..\RJW\1.1\Assemblies\RJW.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />

View file

@ -18,7 +18,7 @@ namespace Rimworld_Animations {
These particular jobs need special code
don't play anim for now
*/
if(__instance is JobDriver_Masturbate_Bed || __instance is JobDriver_Masturbate_Quick || __instance is JobDriver_ViolateCorpse) {
if(__instance is JobDriver_Masturbate || __instance is JobDriver_ViolateCorpse) {
return;
}
@ -26,6 +26,7 @@ namespace Rimworld_Animations {
Building_Bed bed = __instance.Bed;
/*
if (__instance is JobDriver_BestialityForFemale)
bed = (__instance as JobDriver_BestialityForFemale).Bed;
else if (__instance is JobDriver_WhoreIsServingVisitors) {
@ -34,10 +35,12 @@ namespace Rimworld_Animations {
else if (__instance is JobDriver_SexCasualForAnimation) {
bed = (__instance as JobDriver_SexCasualForAnimation).Bed;
}
else if (__instance is JobDriver_Masturbate_Bed)
bed = (__instance as JobDriver_Masturbate_Bed).Bed;
else if (__instance is JobDriver_Masturbate)
bed = (__instance as JobDriver_Masturbate).Bed;
else if (__instance is JobDriver_Rape)
bed = (__instance?.Partner?.jobs?.curDriver as JobDriver_Sex)?.Bed;
*/
if ((__instance.Target as Pawn)?.jobs?.curDriver is JobDriver_SexBaseReciever) {