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 && 
-                (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;
-            }
+            return IsNeverEndingSex(pawn) || IsNeverEndingSexPartner(pawn);
+        }
 
-            return false;
+        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/Patches/OtherModPatches/HarmonyPatch_AlienRace.cs

@@ -78,7 +78,7 @@ namespace Rimworld_Animations {
 				Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, pawn.story.headType) : Vector3.zero);
 				vector2.y = (ba.inFrontOfBody ? (0.3f + vector2.y) : (-0.3f - vector2.y));
 				float num = ba.angle;
-				if (rotation == Rot4.North)
+				if (((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing) == Rot4.North)
 				{
 					if (ba.layerInvert)
 					{
@@ -86,7 +86,7 @@ namespace Rimworld_Animations {
 					}
 					num = 0f;
 				}
-				if (rotation == Rot4.East)
+				if (((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing) == Rot4.East)
 				{
 					num = 0f - num;
 					vector2.x = 0f - vector2.x;
@@ -95,71 +95,12 @@ namespace Rimworld_Animations {
 
 				addonGraphic.drawSize = ((flag && ba.drawSizePortrait != Vector2.zero) ? ba.drawSizePortrait : ba.drawSize) * (ba.scaleWithPawnDrawsize ? (ba.alignWithHead ? ((flag ? comp.customPortraitHeadDrawSize : comp.customHeadDrawSize) * (ModsConfig.BiotechActive ? (pawn.ageTracker.CurLifeStage.headSizeFactor ?? 1.5f) : 1.5f)) : ((flag ? comp.customPortraitDrawSize : comp.customDrawSize) * (ModsConfig.BiotechActive ? pawn.ageTracker.CurLifeStage.bodySizeFactor : 1f) * 1.5f)) : (Vector2.one * 1.5f));
 
-				Vector3 orassanv = Vector3.zero;
-				bool orassan = false;
-				if ((pawn.def as ThingDef_AlienRace).defName == "Alien_Orassan")
-				{
-					orassan = true;
-
-					if (ba.path.Contains("closed"))
-					{
-						continue;
-					}
-
-					if (ba.bodyPart.defName.Contains("ear"))
-
-					{
-						orassan = true;
-
-						orassanv = new Vector3(0, 0, 0.23f);
-						if (pawnAnimator.headFacing == Rot4.North)
-						{
-							orassanv.z -= 0.1f;
-							orassanv.y += 1f;
-
-							if (ba.bodyPart.defName.Contains("left"))
-							{
-								orassanv.x += 0.03f;
-							}
-							else
-							{
-								orassanv.x -= 0.03f;
-							}
-
-						}
-						else if (pawnAnimator.headFacing == Rot4.East)
-						{
-							orassanv.x -= 0.1f;
-						}
-						else if (pawnAnimator.headFacing == Rot4.West)
-						{
-							orassanv.x = 0.1f;
-						}
-						else
-						{
-							orassanv.z -= 0.1f;
-							orassanv.y += 1f;
-
-							if (ba.bodyPart.defName.Contains("right"))
-							{
-								//orassanv.x += 0.3f;
-							}
-							else
-							{
-								//orassanv.x -= 0.3f;
-							}
-						}
-						orassanv = orassanv.RotatedBy(pawnAnimator.headAngle);
-					}
-				}
-
-
 				if ((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead)
 				{
 					
 					Quaternion addonRotation = Quaternion.AngleAxis(pawnAnimator.headAngle < 0 ? 360 - (360 % pawnAnimator.headAngle) : pawnAnimator.headAngle, Vector3.up);
 
-					GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: pawnAnimator.headFacing), loc: vector + orassanv + (ba.alignWithHead && !orassan ? headOffset : headOffset - addonRotation * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.headFacing)) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f),
+					GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: pawnAnimator.headFacing), loc: vector + (ba.alignWithHead ? headOffset : headOffset - addonRotation * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.headFacing)) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f),
 					quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * addonRotation, mat: addonGraphic.MatAt(rot: pawnAnimator.headFacing), renderFlags.FlagSet(PawnRenderFlags.DrawNow));