Merge branch '1.5_solo_anims' into '1.5'

Patch to allow solo anims

See merge request c0ffeeeeeeee/rimworld-animations!22

1.5/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs

@@ -6,22 +6,22 @@ using RimWorld;
 using Verse;
 using rjw;
 
-namespace Rimworld_Animations {
+namespace Rimworld_Animations
+{
 
     [HarmonyPatch(typeof(JobDriver_SexBaseInitiator), "Start")]
-    static class HarmonyPatch_JobDriver_SexBaseInitiator_Start {
+    static class HarmonyPatch_JobDriver_SexBaseInitiator_Start
-        public static void Postfix(ref JobDriver_SexBaseInitiator __instance) {
+    {
+        public static void Postfix(ref JobDriver_SexBaseInitiator __instance)
+        {
 
             Pawn pawn = __instance.pawn;
             Pawn partner = __instance.Target as Pawn;
 
+            if (partner == null)
+                partner = pawn;
 
-			if (partner?.jobs?.curDriver is JobDriver_SexBaseReciever partnerSexBaseReceiver) {
+            List<Pawn> participants = GetAllSexParticipants(pawn);
-
-				Pawn Target = __instance.Target as Pawn;
-
-				List<Pawn> participants = partnerSexBaseReceiver.parteners.Append(partner).ToList();
-
             GroupAnimationDef groupAnimation = AnimationUtility.FindGroupAnimation(participants, out int reorder);
 
             if (groupAnimation != null)
@@ -37,7 +37,6 @@ namespace Rimworld_Animations {
                     {
                         Log.Message("Participant: " + participant.Name);
                         Log.Message("JobDriver: " + participant.CurJobDef.defName);
-
                     }
 
                     //null ref check for pawns that might have lost their jobs or become null for some reason
@@ -51,6 +50,47 @@ namespace Rimworld_Animations {
                 }
             }
         }
+
+        public static List<Pawn> GetAllSexParticipants(this Pawn pawn)
+        {
+            List<Pawn> participants = new List<Pawn>();
+
+            if (pawn?.jobs?.curDriver == null ||
+                (pawn.jobs.curDriver is JobDriver_Sex) == false)
+                return participants;
+
+            var receiver = pawn.GetSexReceiver();
+
+            if (receiver != null)
+            {
+                participants = (receiver.jobs.curDriver as JobDriver_SexBaseReciever).parteners;
+                participants.AddDistinct(receiver);
+
+                return participants;
+            }
+
+            participants.AddDistinct(pawn);
+
+            return participants;
+        }
+
+        public static Pawn GetSexReceiver(this Pawn pawn)
+        {
+            if (pawn?.jobs?.curDriver == null)
+                return null;
+
+            if (pawn.jobs.curDriver is JobDriver_SexBaseReciever)
+                return pawn;
+
+            JobDriver_SexBaseInitiator jobDriver = pawn.jobs.curDriver as JobDriver_SexBaseInitiator;
+
+            if (jobDriver?.Partner?.jobs?.curDriver == null)
+                return null;
+
+            if (jobDriver.Partner.jobs.curDriver is JobDriver_SexBaseReciever)
+                return jobDriver.Partner;
+
+            return null;
         }
 
         static IEnumerable<String> NonSexActRulePackDefNames = new String[]
@@ -71,7 +111,8 @@ namespace Rimworld_Animations {
 
 
     [HarmonyPatch(typeof(JobDriver_SexBaseInitiator), "End")]
-	static class HarmonyPatch_JobDriver_SexBaseInitiator_End {
+    static class HarmonyPatch_JobDriver_SexBaseInitiator_End
+    {
 
         public static void Prefix(ref JobDriver_SexBaseInitiator __instance)
         {