diff --git a/1.4/Source/Comps/CompBodyAnimator.cs b/1.4/Source/Comps/CompBodyAnimator.cs
index 5d355a6..326b652 100644
--- a/1.4/Source/Comps/CompBodyAnimator.cs
+++ b/1.4/Source/Comps/CompBodyAnimator.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
using RimWorld;
using rjw;
using UnityEngine;
@@ -13,6 +9,15 @@ using Verse.Sound;
namespace Rimworld_Animations {
public class CompBodyAnimator : ThingComp
{
+ ///
+ /// Cache of the currently animated pawns for the very fast isAnimating checks
+ ///
+ private static readonly HashSet animatingPawns = new HashSet();
+ ///
+ /// Check if the is currently animated by this comp
+ ///
+ public static bool IsAnimating(Pawn pawn) => animatingPawns.Contains(pawn);
+
public Pawn pawn => base.parent as Pawn;
public PawnGraphicSet Graphics;
@@ -27,9 +32,11 @@ namespace Rimworld_Animations {
if (value == true) {
SexUtility.DrawNude(pawn);
+ animatingPawns.Add(pawn);
} else {
pawn.Drawer.renderer.graphics.ResolveAllGraphics();
actorsInCurrentAnimation = null;
+ animatingPawns.Remove(pawn);
}
PortraitsCache.SetDirty(pawn);
diff --git a/1.4/Source/Extensions/PawnWoundDrawerExtension.cs b/1.4/Source/Extensions/PawnWoundDrawerExtension.cs
index 417f8ed..77594e6 100644
--- a/1.4/Source/Extensions/PawnWoundDrawerExtension.cs
+++ b/1.4/Source/Extensions/PawnWoundDrawerExtension.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using RimWorld;
+using RimWorld;
using UnityEngine;
using Verse;
-using Rimworld_Animations;
namespace Rimworld_Animations {
@@ -17,9 +14,9 @@ namespace Rimworld_Animations {
if (!flags.FlagSet(PawnRenderFlags.Portrait) && layer == PawnOverlayDrawer.OverlayLayer.Head)
{
- CompBodyAnimator pawnAnimator = pawn.TryGetComp();
- if (pawnAnimator != null && pawnAnimator.isAnimating && pawn.Drawer.renderer.graphics.headGraphic != null)
+ if (CompBodyAnimator.IsAnimating(pawn) && pawn.Drawer.renderer.graphics.headGraphic != null)
{
+ CompBodyAnimator pawnAnimator = pawn.TryGetComp();
pawnRot = pawnAnimator.headFacing;
quat = Quaternion.AngleAxis(angle: pawnAnimator.headAngle, axis: Vector3.up);
float y = drawLoc.y;
diff --git a/1.4/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs b/1.4/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs
index a800a55..1cbc26d 100644
--- a/1.4/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs
+++ b/1.4/Source/MainTabWindows/MainTabWindow_OffsetConfigure.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
using Verse;
using RimWorld;
using UnityEngine;
@@ -25,14 +21,13 @@ namespace Rimworld_Animations {
listingStandard.GapLine();
- if (Find.Selector.SingleSelectedThing is Pawn) {
+ if (Find.Selector.SingleSelectedThing is Pawn curPawn) {
- Pawn curPawn = Find.Selector.SingleSelectedThing as Pawn;
+ if (CompBodyAnimator.IsAnimating(curPawn)) {
- if (curPawn.TryGetComp().isAnimating) {
-
- AnimationDef def = curPawn.TryGetComp().CurrentAnimation;
- int ActorIndex = curPawn.TryGetComp().ActorIndex;
+ CompBodyAnimator compBodyAnimator = curPawn.TryGetComp();
+ AnimationDef def = compBodyAnimator.CurrentAnimation;
+ int ActorIndex = compBodyAnimator.ActorIndex;
float offsetX = 0, offsetZ = 0, rotation = 0;
string bodyTypeDef = (curPawn.story?.bodyType != null) ? curPawn.story.bodyType.ToString() : "";
@@ -57,8 +52,6 @@ namespace Rimworld_Animations {
listingStandard.Label("Warning--You generally don't want to change human offsets, only alien offsets");
}
- bool mirrored = curPawn.TryGetComp().Mirror;
-
float.TryParse(listingStandard.TextEntryLabeled("X Offset: ", offsetX.ToString()), out offsetX);
offsetX = listingStandard.Slider(offsetX, -2, 2);
diff --git a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs
index 83ffd5b..59631b8 100644
--- a/1.4/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs
+++ b/1.4/Source/Patches/OtherModPatches/HarmonyPatch_FacialAnimation.cs
@@ -23,17 +23,16 @@ namespace Rimworld_Animations {
}
}))();
}
- catch (TypeLoadException ex) {
+ catch (TypeLoadException) {
}
}
- public static bool Prefix(ref Pawn ___pawn, ref Rot4 headFacing, ref Vector3 headOrigin, ref Quaternion quaternion, ref bool portrait) {
+ public static bool Prefix(Pawn ___pawn, ref Rot4 headFacing, ref Vector3 headOrigin, ref Quaternion quaternion, bool portrait) {
- CompBodyAnimator bodyAnim = ___pawn.TryGetComp();
-
- if (bodyAnim != null && bodyAnim.isAnimating && !portrait) {
+ if (!portrait && CompBodyAnimator.IsAnimating(___pawn)) {
+ CompBodyAnimator bodyAnim = ___pawn.TryGetComp();
headFacing = bodyAnim.headFacing;
headOrigin = new Vector3(bodyAnim.getPawnHeadPosition().x, headOrigin.y, bodyAnim.getPawnHeadPosition().z);
quaternion = Quaternion.AngleAxis(bodyAnim.headAngle, Vector3.up);
diff --git a/1.4/Source/Patches/RJWPatches/HarmonyPatch_PlaySexSounds.cs b/1.4/Source/Patches/RJWPatches/HarmonyPatch_PlaySexSounds.cs
index 6544f13..25d93b9 100644
--- a/1.4/Source/Patches/RJWPatches/HarmonyPatch_PlaySexSounds.cs
+++ b/1.4/Source/Patches/RJWPatches/HarmonyPatch_PlaySexSounds.cs
@@ -1,11 +1,5 @@
using HarmonyLib;
using rjw;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Verse;
namespace Rimworld_Animations
{
@@ -14,7 +8,7 @@ namespace Rimworld_Animations
{
public static bool Prefix(JobDriver_Sex __instance)
{
- if (__instance.pawn.TryGetComp().isAnimating)
+ if (CompBodyAnimator.IsAnimating(__instance.pawn))
{
return false;
}
diff --git a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_JoinInBed.cs b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_JoinInBed.cs
index 18c955e..bbbb0b8 100644
--- a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_JoinInBed.cs
+++ b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_JoinInBed.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using HarmonyLib;
using RimWorld;
using Verse;
using rjw;
-using System.Reflection.Emit;
using Verse.AI;
namespace Rimworld_Animations
@@ -27,11 +23,7 @@ namespace Rimworld_Animations
}
return true;
-
}
-
-
-
}
[HarmonyPatch(typeof(JobDriver_JoinInBed), "MakeNewToils")]
@@ -66,19 +58,13 @@ namespace Rimworld_Animations
toils[3].AddPreTickAction(() =>
{
- if (!__instance.Partner.TryGetComp().isAnimating)
+ if (!CompBodyAnimator.IsAnimating(__instance.Partner))
{
__instance.pawn.TryGetComp().isAnimating = false;
}
});
-
__result = toils.AsEnumerable();
-
-
}
-
-
-
}
}
diff --git a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs
index 00227c4..530600b 100644
--- a/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs
+++ b/1.4/Source/Patches/RJWPatches/JobDrivers/HarmonyPatch_JobDriver_SexBaseInitiator.cs
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using HarmonyLib;
using RimWorld;
using Verse;
@@ -158,10 +156,12 @@ namespace Rimworld_Animations {
public static void Postfix(ref JobDriver_SexBaseInitiator __instance) {
- if ((__instance.Target as Pawn)?.jobs?.curDriver is JobDriver_SexBaseReciever) {
- if (__instance.pawn.TryGetComp().isAnimating) {
+ Pawn reciever = __instance.Target as Pawn;
- List parteners = ((__instance.Target as Pawn)?.jobs.curDriver as JobDriver_SexBaseReciever).parteners;
+ if (reciever?.jobs?.curDriver is JobDriver_SexBaseReciever recieverJobDriver) {
+ if (CompBodyAnimator.IsAnimating(__instance.pawn)) {
+
+ List parteners = recieverJobDriver.parteners;
for (int i = 0; i < parteners.Count; i++) {
@@ -173,13 +173,13 @@ namespace Rimworld_Animations {
__instance.Target.TryGetComp().isAnimating = false;
- if (xxx.is_human((__instance.Target as Pawn))) {
- (__instance.Target as Pawn)?.Drawer.renderer.graphics.ResolveApparelGraphics();
- PortraitsCache.SetDirty((__instance.Target as Pawn));
+ if (xxx.is_human(reciever)) {
+ reciever?.Drawer.renderer.graphics.ResolveApparelGraphics();
+ PortraitsCache.SetDirty(reciever);
}
}
- ((__instance.Target as Pawn)?.jobs.curDriver as JobDriver_SexBaseReciever).parteners.Remove(__instance.pawn);
+ recieverJobDriver?.parteners.Remove(__instance.pawn);
}
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_HeadHair.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_HeadHair.cs
index 37ba6ce..401f1b5 100644
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_HeadHair.cs
+++ b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_HeadHair.cs
@@ -1,4 +1,4 @@
-using HarmonyLib;
+/*using HarmonyLib;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -19,4 +19,4 @@ namespace Rimworld_Animations
}
}
-}
+}*/
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderer.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderer.cs
index b7ff70d..518f24c 100644
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderer.cs
+++ b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderer.cs
@@ -5,7 +5,6 @@ using HarmonyLib;
using RimWorld;
using Verse;
using UnityEngine;
-using System.Reflection;
using System.Reflection.Emit;
namespace Rimworld_Animations {
@@ -31,12 +30,10 @@ namespace Rimworld_Animations {
PawnGraphicSet graphics = __instance.graphics;
Pawn pawn = graphics.pawn;
- CompBodyAnimator bodyAnim = pawn.TryGetComp();
-
- if (bodyAnim != null && bodyAnim.isAnimating && pawn.Map == Find.CurrentMap)
+ if (CompBodyAnimator.IsAnimating(pawn) && pawn.Map == Find.CurrentMap)
{
- bodyAnim.animatePawnBody(ref rootLoc, ref angle, ref bodyFacing);
+ pawn.TryGetComp().animatePawnBody(ref rootLoc, ref angle, ref bodyFacing);
}
@@ -75,7 +72,7 @@ namespace Rimworld_Animations {
else
{
yield return ins[i];
- }
+ }
}
}
}
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRotation.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRotation.cs
index 7ec75a1..cf2a7d9 100644
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRotation.cs
+++ b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_PawnRotation.cs
@@ -1,29 +1,23 @@
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(Thing), "Rotation", MethodType.Getter)]
+ [HarmonyPatch(typeof(Thing), nameof(Thing.Rotation), MethodType.Getter)]
public static class HarmonyPatch_PawnRotation {
public static bool Prefix(Thing __instance, ref Rot4 __result) {
- if(!(__instance is Pawn) || (__instance as Pawn)?.TryGetComp() == null || !(__instance as Pawn).TryGetComp().isAnimating) {
+ if (!(__instance is Pawn pawn)) {
+ return true;
+ }
+
+ if (!CompBodyAnimator.IsAnimating(pawn)) {
return true;
}
- Pawn pawn = (__instance as Pawn);
__result = pawn.TryGetComp().bodyFacing;
return false;
-
-
}
-
}
-
}
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_Pawn_DrawTracker.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_Pawn_DrawTracker.cs
index 5cdcfce..fdd3e07 100644
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_Pawn_DrawTracker.cs
+++ b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_Pawn_DrawTracker.cs
@@ -1,9 +1,4 @@
using HarmonyLib;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using UnityEngine;
using Verse;
@@ -13,10 +8,9 @@ namespace Rimworld_Animations {
public static class HarmonyPatch_Pawn_DrawTracker {
public static bool Prefix(ref Pawn ___pawn, ref Vector3 __result) {
- CompBodyAnimator bodyAnim = ___pawn.TryGetComp();
-
- if (bodyAnim != null && bodyAnim.isAnimating) {
- __result = ___pawn.TryGetComp().anchor + ___pawn.TryGetComp().deltaPos;
+ if (CompBodyAnimator.IsAnimating(___pawn)) {
+ CompBodyAnimator bodyAnim = ___pawn.TryGetComp();
+ __result = bodyAnim.anchor + bodyAnim.deltaPos;
return false;
}
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_ResolveApparelGraphics.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_ResolveApparelGraphics.cs
index 0f5d978..379f85e 100644
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_ResolveApparelGraphics.cs
+++ b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_ResolveApparelGraphics.cs
@@ -1,9 +1,4 @@
using HarmonyLib;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using Verse;
namespace Rimworld_Animations
@@ -13,8 +8,7 @@ namespace Rimworld_Animations
{
public static bool Prefix(ref Pawn ___pawn)
{
-
- if (___pawn.TryGetComp() != null && ___pawn.TryGetComp().isAnimating)
+ if (CompBodyAnimator.IsAnimating(___pawn))
{
return false;
}
diff --git a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_SetPawnAnimatable.cs b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_SetPawnAnimatable.cs
index b8c66b8..f495bff 100644
--- a/1.4/Source/Patches/RimworldPatches/HarmonyPatch_SetPawnAnimatable.cs
+++ b/1.4/Source/Patches/RimworldPatches/HarmonyPatch_SetPawnAnimatable.cs
@@ -1,12 +1,6 @@
using HarmonyLib;
using RimWorld;
-using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Reflection.Emit;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
using Verse;
namespace Rimworld_Animations
@@ -16,18 +10,16 @@ namespace Rimworld_Animations
{
static bool ClearCache(Pawn pawn)
{
- return pawn.IsInvisible() || (pawn.TryGetComp() != null && pawn.TryGetComp().isAnimating);
+ return pawn.IsInvisible() || CompBodyAnimator.IsAnimating(pawn);
}
public static IEnumerable Transpiler(IEnumerable instructions)
{
- var list = instructions.ToList();
-
foreach (CodeInstruction i in instructions)
{
- if (i.OperandIs(AccessTools.Method(typeof(PawnUtility), "IsInvisible")))
+ if (i.Calls(AccessTools.Method(typeof(PawnUtility), nameof(PawnUtility.IsInvisible))))
{
- yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(PawnRenderer_RenderPawnAt_Patch), "ClearCache"));
+ yield return CodeInstruction.Call(typeof(PawnRenderer_RenderPawnAt_Patch), nameof(ClearCache));
}
else
{
diff --git a/1.4/Source/Utilities/AnimationUtility.cs b/1.4/Source/Utilities/AnimationUtility.cs
index 1ae89be..396eab3 100644
--- a/1.4/Source/Utilities/AnimationUtility.cs
+++ b/1.4/Source/Utilities/AnimationUtility.cs
@@ -169,11 +169,10 @@ namespace Rimworld_Animations {
return;
}
- CompBodyAnimator pawnAnimator = pawn.TryGetComp();
-
- if (pawnAnimator == null || !pawnAnimator.isAnimating) {
+ if (!CompBodyAnimator.IsAnimating(pawn)) {
GenDraw.DrawMeshNowOrLater(mesh, loc, quaternion, material, drawNow);
} else {
+ CompBodyAnimator pawnAnimator = pawn.TryGetComp();
Vector3 pawnHeadPosition = pawnAnimator.getPawnHeadPosition();
pawnHeadPosition.y = loc.y;
GenDraw.DrawMeshNowOrLater(MeshPool.humanlikeHeadSet.MeshAt(pawnAnimator.headFacing), pawnHeadPosition, Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up), material, true);
@@ -184,14 +183,13 @@ namespace Rimworld_Animations {
{
if (flags.FlagSet(PawnRenderFlags.Portrait)) return;
- CompBodyAnimator anim = pawn.TryGetComp();
- if (anim.isAnimating)
+ if (CompBodyAnimator.IsAnimating(pawn))
{
+ CompBodyAnimator anim = pawn.TryGetComp();
bodyFacing = anim.headFacing;
angle = anim.headAngle;
quat = Quaternion.AngleAxis(anim.headAngle, Vector3.up);
pos = anim.getPawnHeadOffset();
-
}
}
@@ -202,12 +200,12 @@ namespace Rimworld_Animations {
return;
}
- CompBodyAnimator pawnAnimator = pawn.TryGetComp();
- if (pawnAnimator == null || !pawnAnimator.isAnimating || portrait) {
+ if (!CompBodyAnimator.IsAnimating(pawn) || portrait) {
GenDraw.DrawMeshNowOrLater(mesh, loc, quaternion, material, portrait);
}
else {
+ CompBodyAnimator pawnAnimator = pawn.TryGetComp();
Vector3 pawnHeadPosition = pawnAnimator.getPawnHeadPosition();
pawnHeadPosition.x *= bodySizeFactor;
pawnHeadPosition.x *= bodySizeFactor;
diff --git a/Patch_HumanoidAlienRaces/Source/HarmonyPatch_AlienRace.cs b/Patch_HumanoidAlienRaces/Source/HarmonyPatch_AlienRace.cs
index 8ab0255..f06e987 100644
--- a/Patch_HumanoidAlienRaces/Source/HarmonyPatch_AlienRace.cs
+++ b/Patch_HumanoidAlienRaces/Source/HarmonyPatch_AlienRace.cs
@@ -51,7 +51,7 @@ namespace Rimworld_Animations {
public static bool Prefix_AnimateHeadAddons(PawnRenderFlags renderFlags, Vector3 vector, Vector3 headOffset, Pawn pawn, Quaternion quat, Rot4 rotation)
{
- if (renderFlags.FlagSet(PawnRenderFlags.Portrait) || pawn.TryGetComp() == null || !pawn.TryGetComp().isAnimating) return true;
+ if (renderFlags.FlagSet(PawnRenderFlags.Portrait) || !CompBodyAnimator.IsAnimating(pawn)) return true;
if (!(pawn.def is ThingDef_AlienRace alienProps) || renderFlags.FlagSet(PawnRenderFlags.Invisible)) return false;
List addons = alienProps.alienRace.generalSettings.alienPartGenerator.bodyAddons;