From c9dacad8a1cd30ef739032e369785f0eed99e19d Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 14 May 2021 19:07:30 -0700 Subject: [PATCH] Better rotation of RimNudeWorld genitals changed Animating to false on PostExposeData to stop errors from trying to start animation on save load --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 59904 -> 59904 bytes About/Manifest.xml | 2 +- Defs/AnimationDefs/Animations_Multi.xml | 14 ++ Defs/AnimationDefs/Animations_vanilla.xml | 198 ++++++++++++++++++++-- Source/Comps/CompBodyAnimator.cs | 2 +- 5 files changed, 200 insertions(+), 16 deletions(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index 57d6c2f9b0f3980e1d1b9300365df3414b090c95..b303ce4ab23874c81118e457acadd327cf6e2def 100644 GIT binary patch delta 3471 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 m Rimworld-Animations - 1.1.3 + 1.1.4 \ No newline at end of file diff --git a/Defs/AnimationDefs/Animations_Multi.xml b/Defs/AnimationDefs/Animations_Multi.xml index a5c2ba5..ce4e595 100644 --- a/Defs/AnimationDefs/Animations_Multi.xml +++ b/Defs/AnimationDefs/Animations_Multi.xml @@ -18,6 +18,7 @@
  • Human
    •  + true true true @@ -25,6 +26,7 @@
  • Human
    •  + true true true @@ -78,6 +80,7 @@ LayingPawn
  • + -10 30 12 -14.1 @@ -98,6 +101,7 @@ 0
  • + -10 1 12 -14.1 @@ -114,6 +118,7 @@ LayingPawn
  • + 43 27 8.7 15.1 @@ -135,6 +140,7 @@ 0
  • + 43 1 8.7 15.1 @@ -205,6 +211,7 @@ LayingPawn
  • + -10 13 12 -14.1 @@ -225,6 +232,7 @@ 0
  • + -10 1 12 -14.1 @@ -241,6 +249,7 @@ LayingPawn
  • + 43 13 8.7 15.1 @@ -262,6 +271,7 @@ 0
  • + 43 1 8.7 15.1 @@ -417,6 +427,7 @@ LayingPawn
  • + -10 9 9 -14.1 @@ -518,6 +529,7 @@ 3 3 0 + -10
    • @@ -527,6 +539,7 @@ LayingPawn
  • + 43 9 8.7 15.1 @@ -622,6 +635,7 @@ 0
  • + 43 1 8.7 15.1 diff --git a/Defs/AnimationDefs/Animations_vanilla.xml b/Defs/AnimationDefs/Animations_vanilla.xml index bc8d032..079753a 100644 --- a/Defs/AnimationDefs/Animations_vanilla.xml +++ b/Defs/AnimationDefs/Animations_vanilla.xml @@ -31,6 +31,7 @@
  • Human
    • + true true true @@ -257,6 +258,7 @@ LayingPawn
  • + 27 0 10 16.6 @@ -286,6 +288,7 @@ 1 1 0 + 27
    • @@ -334,6 +337,7 @@ LayingPawn
  • + 27 8 11 -0.217 @@ -363,6 +367,7 @@ 1 1 0 + 27
    • @@ -422,6 +427,7 @@ LayingPawn
  • + 27 8 11 -0.217 @@ -458,6 +464,7 @@ 1 1 0 + 27
    • @@ -940,6 +947,7 @@ true true + true (0, 0.2) @@ -991,6 +999,7 @@ LayingPawn
  • + 6 30 -3.18 -0.41 @@ -1001,6 +1010,7 @@ 0
  • + 40 Fuck 29 17.11 @@ -1020,6 +1030,7 @@ 3 3 0 + 6
    • @@ -1657,6 +1668,7 @@ LayingPawn
  • + 6 13 -3.18 -0.41 @@ -1667,6 +1679,7 @@ 0
  • + 40 Fuck 12 17.11 @@ -1686,6 +1699,7 @@ 3 3 0 + 6
    • @@ -1880,6 +1894,7 @@ LayingPawn
  • + 6 7 -3.18 -0.41 @@ -1890,6 +1905,7 @@ 0
  • + 40 Fuck 7 17.11 @@ -1901,6 +1917,7 @@ 0
  • + 6 1 -3.18 -0.41 @@ -1912,6 +1929,7 @@
  • + 6 7 -3.18 -0.41 @@ -1922,6 +1940,7 @@ 0
  • + 40 Fuck 7 17.11 @@ -1933,6 +1952,7 @@ 0
  • + 6 1 -3.18 -0.41 @@ -1944,6 +1964,7 @@
  • + 6 7 -3.18 -0.41 @@ -1954,6 +1975,7 @@ 0
  • + 40 Fuck 7 17.11 @@ -1965,6 +1987,7 @@ 0
  • + 6 1 -3.18 -0.41 @@ -1976,16 +1999,18 @@
  • - 7 - -3.18 - -0.41 - 0.122 - 0.356 - 3 - 3 - 0 -
    • -
  • + 6 + 7 + -3.18 + -0.41 + 0.122 + 0.356 + 3 + 3 + 0 +
    • +
  • + 40 Cum 75 17.11 @@ -1997,6 +2022,7 @@ 0
  • + 40 27 17.11 -2.87 @@ -2007,6 +2033,7 @@ 0
  • + 6 1 -3.18 -0.41 @@ -2252,7 +2279,7 @@ LayingPawn
  • - 33 + 16 180 180 0 @@ -2262,17 +2289,39 @@ 0 0
    • +
  • + 17 + 180 + 180 + 0 + -0.347 + 2 + 2 + 0.015 + -15 +
  • - 33 + 16 180 180 0 - -0.313 + -0.331 2 2 - 0.045 + 0.03 0
    • +
  • + 17 + 180 + 180 + 0 + -0.315 + 2 + 2 + 0.045 + 15 +
  • 1 180 @@ -2284,6 +2333,127 @@ 0 0
    • +
  • + 16 + 180 + 180 + 0 + -0.363 + 2 + 2 + 0 + 0 +
    • +
  • + 17 + 180 + 180 + 0 + -0.347 + 2 + 2 + 0.015 + -15 +
    • +
  • + 16 + 180 + 180 + 0 + -0.331 + 2 + 2 + 0.03 + 0 +
    • +
  • + 17 + 180 + 180 + 0 + -0.315 + 2 + 2 + 0.045 + 15 +
    • +
  • + 1 + 180 + 180 + 0 + -0.363 + 2 + 2 + 0 + 0 +
    • +
  • + 33 + 180 + 180 + 0 + -0.363 + 2 + 2 + 0 + 0 +
    • +
  • + 33 + 180 + 180 + 0 + -0.315 + 2 + 2 + 0.045 + 0 +
    • +
  • + 1 + 180 + 180 + 0 + -0.363 + 2 + 2 + 0 + 0 +
    • +
  • + 33 + 180 + 180 + 0 + -0.363 + 2 + 2 + 0 + 0 +
    • +
  • + 33 + 180 + 180 + 0 + -0.315 + 2 + 2 + 0.045 + 0 +
    • +
  • + 1 + 180 + 180 + 0 + -0.363 + 2 + 2 + 0 + 0 +
    • diff --git a/Source/Comps/CompBodyAnimator.cs b/Source/Comps/CompBodyAnimator.cs index b5fcfc9..5eb446e 100644 --- a/Source/Comps/CompBodyAnimator.cs +++ b/Source/Comps/CompBodyAnimator.cs @@ -428,7 +428,7 @@ namespace Rimworld_Animations { Scribe_Values.Look(ref curStage, "RJWAnimations-curStage", 0); Scribe_Values.Look(ref actor, "RJWAnimations-actor"); - Scribe_Values.Look(ref Animating, "RJWAnimations-Animating"); + Animating = false; Scribe_Values.Look(ref anchor, "RJWAnimations-anchor"); Scribe_Values.Look(ref deltaPos, "RJWAnimations-deltaPos"); Scribe_Values.Look(ref headBob, "RJWAnimations-headBob");