diff --git a/1.1/Assemblies/Rimworld-Animations.dll b/1.1/Assemblies/Rimworld-Animations.dll index 9b2a820..488169a 100644 Binary files a/1.1/Assemblies/Rimworld-Animations.dll and b/1.1/Assemblies/Rimworld-Animations.dll differ diff --git a/Defs/AnimationDefs/Animations_Vanilla2.xml b/Defs/AnimationDefs/Animations_Vanilla2.xml new file mode 100644 index 0000000..ae7dc9b --- /dev/null +++ b/Defs/AnimationDefs/Animations_Vanilla2.xml @@ -0,0 +1,142 @@ + + + + + + diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index a63d0aa..f14d4bf 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -114,6 +114,7 @@ + diff --git a/Source/AnimationUtility.cs b/Source/AnimationUtility.cs index 1c758de..a89c310 100644 --- a/Source/AnimationUtility.cs +++ b/Source/AnimationUtility.cs @@ -78,10 +78,10 @@ namespace Rimworld_Animations { //TESTING ANIMATIONS ONLY REMEMBER TO COMMENT OUT BEFORE PUSH /* - if (x.defName != "Doggystyle") + if (x.defName != "Missionary") return false; - */ + */ if (x.actors[i].isFucking && !rjw.xxx.can_fuck(localParticipants[i])) { Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " can't fuck"); diff --git a/Source/Comps/CompBodyAnimator.cs b/Source/Comps/CompBodyAnimator.cs index fb84d77..3de585c 100644 --- a/Source/Comps/CompBodyAnimator.cs +++ b/Source/Comps/CompBodyAnimator.cs @@ -102,8 +102,6 @@ namespace Rimworld_Animations { } public void StartAnimation(AnimationDef anim, int actor, bool mirror = false, bool shiver = false, bool fastAnimForQuickie = false) { - isAnimating = true; - AlienRaceOffset raceOffset = anim?.actors[actor]?.raceOffsets?.Find(x => x.defName == pawn.def.defName); if (raceOffset != null) { @@ -154,6 +152,8 @@ namespace Rimworld_Animations { //tick once for initialization tickAnim(); + isAnimating = true; + } public override void CompTick() {