merge

Defs/AnimationDefs/Animations_Multi.xml

@@ -20,6 +20,9 @@
         </defNames>
         <isFucking>true</isFucking>
         <initiator>true</initiator>
+        <bodyTypeOffset>
+          <Hulk>(0, 0.2)</Hulk>
+        </bodyTypeOffset>
       </li>
       <li>
         <defNames>
@@ -27,6 +30,9 @@
         </defNames>
         <isFucking>true</isFucking>
         <initiator>true</initiator>
+        <bodyTypeOffset>
+          <Hulk>(0, 0.2)</Hulk>
+        </bodyTypeOffset>
       </li>
     </actors>
 

Rimworld-Animations.csproj

@@ -34,10 +34,6 @@
     <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>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Assembly-CSharp, Version=1.1.7397.36407, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>

Source/AnimationUtility.cs

@@ -288,5 +288,9 @@ namespace Rimworld_Animations {
                 GenDraw.DrawMeshNowOrLater(mesh, pawnHeadPosition, Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up), material, portrait);
             }
         }
+
+        public static readonly JobDef JoinInBedAnimation = DefDatabase<JobDef>.GetNamed("JoinInBedAnimation", true);
+        public static readonly JobDef GettinLovedAnimation = DefDatabase<JobDef>.GetNamed("GettinLovedAnimation", true);
+
     }
 }

Source/JobDrivers/JobDriver_SexBaseRecieverLovedForAnimation.cs

@@ -47,7 +47,7 @@ namespace Rimworld_Animations {
 			yield return Toils_Reserve.Reserve(ibed, Bed.SleepingSlotsCount, 0);
 
 			Toil get_loved = new Toil();
-			get_loved.FailOn(() => Partner.CurJobDef != DefDatabase<JobDef>.GetNamed("JoinInBedAnimation", true));
+			get_loved.FailOn(() => Partner.CurJobDef != AnimationUtility.JoinInBedAnimation);
 			get_loved.defaultCompleteMode = ToilCompleteMode.Never;
 			get_loved.socialMode = RandomSocialMode.Off;
 			get_loved.handlingFacing = true;

Source/JobDrivers/JobDriver_SexCasualForAnimation.cs

@@ -27,7 +27,7 @@ namespace Rimworld_Animations {
             yield return Toils_Reserve.Reserve(ipartner, xxx.max_rapists_per_prisoner, 0, null);
 
             Toil goToPawnInBed = Toils_Goto.GotoThing(ipartner, PathEndMode.OnCell);
-            goToPawnInBed.FailOn(() => !RestUtility.InBed(Partner) && !xxx.in_same_bed(Partner, pawn));
+            goToPawnInBed.FailOn(() => !(RestUtility.InBed(Partner) || Partner.CurJobDef == AnimationUtility.GettinLovedAnimation));
 
             yield return goToPawnInBed;
 
@@ -35,15 +35,17 @@ namespace Rimworld_Animations {
             Toil startPartnerSex = new Toil();
             startPartnerSex.initAction = delegate {
 
-                Job gettinLovedJob = JobMaker.MakeJob(DefDatabase<JobDef>.GetNamed("GettinLovedAnimation"), pawn, Bed); // new gettin loved toil that wakes up the pawn goes here
+                if(Partner.CurJobDef != AnimationUtility.GettinLovedAnimation) {
+                    Job gettinLovedJob = JobMaker.MakeJob(AnimationUtility.GettinLovedAnimation, pawn, Bed); // new gettin loved toil that wakes up the pawn goes here
+                    Partner.jobs.jobQueue.EnqueueFirst(gettinLovedJob);
+                    Partner.jobs.EndCurrentJob(JobCondition.InterruptForced);
+                }
                 
-                Partner.jobs.jobQueue.EnqueueFirst(gettinLovedJob);
-                Partner.jobs.EndCurrentJob(JobCondition.InterruptForced);
             };
             yield return startPartnerSex;
 
             Toil sexToil = new Toil();
-            sexToil.FailOn(() => (Partner.CurJobDef == null) || Partner.CurJobDef != DefDatabase<JobDef>.GetNamed("GettinLovedAnimation", true)); //partner jobdriver is not sexbaserecieverlovedforanim
+            sexToil.FailOn(() => (Partner.CurJobDef == null) || Partner.CurJobDef != AnimationUtility.GettinLovedAnimation); //partner jobdriver is not sexbaserecieverlovedforanim
             sexToil.socialMode = RandomSocialMode.Off;
             sexToil.defaultCompleteMode = ToilCompleteMode.Never;
             sexToil.handlingFacing = true;

Source/Patches/HarmonyPatch_AlienRace.cs

@@ -1,4 +1,5 @@
-using HarmonyLib;
+/*
+using HarmonyLib;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -144,4 +145,4 @@ namespace Rimworld_Animations {
 			return false;
 		}
 	}
-}
+}*/

Source/Patches/rjwPatches/HarmonyPatch_DoLovinAnimationPatch.cs

@@ -19,7 +19,7 @@ namespace Rimworld_Animations {
             if(__result != null) {
                 Pawn partnerInMyBed = LovePartnerRelationUtility.GetPartnerInMyBed(pawn);
                 RestUtility.WakeUp(pawn);
-                __result = JobMaker.MakeJob(DefDatabase<JobDef>.GetNamed("JoinInBedAnimation", true), partnerInMyBed, partnerInMyBed.CurrentBed());
+                __result = JobMaker.MakeJob(AnimationUtility.JoinInBedAnimation, partnerInMyBed, partnerInMyBed.CurrentBed());
             }
         }
     }