Merge branch 'nre-partner' into 'master'

Fix NRE when jobdriver partner is null

See merge request c0ffeeeeeeee/rimworld-animations!5

1.3/Source/Comps/CompBodyAnimator.cs

@@ -504,14 +504,29 @@ namespace Rimworld_Animations {
 
         public bool LoopNeverending()
         {
-            if(pawn?.jobs?.curDriver != null && 
+            return IsNeverEndingSex(pawn) || IsNeverEndingSexPartner(pawn);
-                (pawn.jobs.curDriver is JobDriver_Sex) && (pawn.jobs.curDriver as JobDriver_Sex).neverendingsex ||
-                (pawn.jobs.curDriver is JobDriver_SexBaseReciever) && (pawn.jobs.curDriver as JobDriver_Sex).Partner?.jobs?.curDriver != null && ((pawn.jobs.curDriver as JobDriver_Sex).Partner.jobs.curDriver as JobDriver_Sex).neverendingsex)
-            {
-                return true;
         }
 
+        public static bool IsNeverEndingSex(Pawn pawn)
+        {
+            bool hasDriver = pawn?.jobs?.curDriver != null;
+            if (!hasDriver)
                 return false;
+
+            return (pawn.jobs.curDriver is JobDriver_Sex jds) && jds.neverendingsex;
+        }
+
+        public static bool IsNeverEndingSexPartner(Pawn pawn)
+        {
+            bool hasDriver = pawn?.jobs?.curDriver != null;
+            if (!hasDriver)
+                return false;
+
+            var partner = (pawn.jobs.curDriver is JobDriver_SexBaseReciever jds) ? jds.Partner : null;
+            if (partner == null)
+                return false;
+
+            return IsNeverEndingSex(partner);
         }
 
         public void ResetOnLoop()

1.4/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs

@@ -60,7 +60,7 @@ namespace Rimworld_Animations {
                     bool mirrored = curPawn.TryGetComp<CompBodyAnimator>().Mirror;
 
                     float.TryParse(listingStandard.TextEntryLabeled("X Offset: ", offsetX.ToString()), out offsetX);
-                    offsetX = listingStandard.Slider(offsetX, -2 * (mirrored ? -1 : 1), 2 * (mirrored ? -1 : 1));
+                    offsetX = listingStandard.Slider(offsetX, -2, 2);
 
                     float.TryParse(listingStandard.TextEntryLabeled("Z Offset: ", offsetZ.ToString()), out offsetZ);
                     offsetZ = listingStandard.Slider(offsetZ, -2, 2);

1.4/Source/Patches/RimworldPatches/HarmonyPatch_ResolveApparelGraphics.cs

@@ -0,0 +1,24 @@
+using HarmonyLib;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace Rimworld_Animations
+{
+	[HarmonyPatch(typeof(PawnGraphicSet), "ResolveApparelGraphics")]
+	public static class HarmonyPatch_ResolveApparelGraphics
+	{
+		public static bool Prefix(ref Pawn ___pawn)
+		{
+
+			if (___pawn.TryGetComp<CompBodyAnimator>() != null && ___pawn.TryGetComp<CompBodyAnimator>().isAnimating)
+			{
+				return false;
+			}
+			return true;
+		}
+	}
+}

Patch_HumanoidAlienRaces/Source/HarmonyPatch_AlienRace.cs

@@ -139,19 +139,7 @@ namespace Rimworld_Animations {
 		}
 	}
 
-	[HarmonyPatch(typeof(PawnGraphicSet), "ResolveApparelGraphics")]
-	public static class HarmonyPatch_ResolveApparelGraphics
-	{
-		public static bool Prefix(ref Pawn ___pawn)
-		{
 
-			if (___pawn.TryGetComp<CompBodyAnimator>() != null && ___pawn.TryGetComp<CompBodyAnimator>().isAnimating)
-			{
-				return false;
-			}
-			return true;
-		}
-	}
 
 	/*
 

Rimworld-Animations.csproj

@@ -99,6 +99,7 @@
     <Compile Include="1.4\Source\Patches\RimworldPatches\HarmonyPatch_PawnRenderer.cs" />
     <Compile Include="1.4\Source\Patches\RimworldPatches\HarmonyPatch_PawnRotation.cs" />
     <Compile Include="1.4\Source\Patches\RimworldPatches\HarmonyPatch_Pawn_DrawTracker.cs" />
+    <Compile Include="1.4\Source\Patches\RimworldPatches\HarmonyPatch_ResolveApparelGraphics.cs" />
     <Compile Include="1.4\Source\Patches\RimworldPatches\HarmonyPatch_SetPawnAnimatable.cs" />
     <Compile Include="1.4\Source\Patches\RimworldPatches\HarmonyPatch_Thing.cs" />
     <Compile Include="1.4\Source\Patches\RJWPatches\HarmonyPatch_PlaySexSounds.cs" />