diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index efcf504..2bed4c0 100644 Binary files a/1.5/Assemblies/Rimworld-Animations.dll and b/1.5/Assemblies/Rimworld-Animations.dll differ diff --git a/1.5/Defs/AnimationDefs/Cowgirl/AnimationPropDef_Cowgirl_Xray.xml b/1.5/Defs/AnimationDefs/Cowgirl/AnimationPropDef_Cowgirl_Xray.xml deleted file mode 100644 index d7d4895..0000000 --- a/1.5/Defs/AnimationDefs/Cowgirl/AnimationPropDef_Cowgirl_Xray.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - RenderNodeTag_Cowgirl_Xray - - - - AnimProp_Cowgirl_Xray - - Cowgirl Xray - Rimworld_Animations.PawnRenderNode_GraphicVariants - Rimworld_Animations.PawnRenderNodeWorker_GraphicVariants - RenderNodeTag_Cowgirl_Xray - True - Body - - AnimationProps/CowgirlXray/XRay2-1 - Head - 95 - TexPathVariants_Cowgirl_Xray - - - - diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage1.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage1.xml deleted file mode 100644 index 6d49621..0000000 --- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage1.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - - Male_Cowgirl_Stage1 - 150 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 55 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 110 - 180 - true - (0, 0, -0.75) - (1, 1, 1) - South -
    • -
  • - 150 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 190 - true - (0, 1, 0) - (1, 1, 1) - South -
    • -
  • - 70 - 170 - true - (0, 1, 0) - (1, 1, 1) - South -
    • -
  • - 150 - 180 - true - (0, 1, 0) - (1, 1, 1) - South -
    • - - - -     -     - - Female_Cowgirl_Stage1 - 150 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 15 - true - (0.2, 2, 0.5) - (1, 1, 1) - South -
    • -
  • - 30 - 15 - true - (0.1, 2, 0.5) - (1, 1, 1) - South -
    • -
  • - 110 - 0 - true - (0, 2, 0.2) - (1, 1, 1) - South -
    • -
  • - 150 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - -15 - true - (1, 1, 1) - South -
    • -
  • - 55 - -15 - true - (0, 0, -0.05) - (1, 1, 1) - South -
    • -
  • - 110 - 0 - true - (1, 1, 1) - South -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml deleted file mode 100644 index 44b5ca9..0000000 --- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - Male_Cowgirl_Stage2_1 - 30 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 20 - 180 - true - (0, 0, -0.65) - (1, 1, 1) - South -
    • -
  • - 30 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 1, 0) - (1, 1, 1) - South -
    • - - - -     -     - - Female_Cowgirl_Stage2_1 - 30 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • -
  • - 10 - 0 - true - (0, 2, 0.43) - (1, 1, 1) - South -
    • -
  • - 30 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • -
  • - 15 - 0 - true - (0, 0, -0.04) - (1, 1, 1) - South -
    • -
  • - 30 - 0 - true - (1, 1, 1) - South -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml deleted file mode 100644 index 0b1d919..0000000 --- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - Male_Cowgirl_Stage2_2 - 30 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 20 - 180 - true - (0, 0, -0.65) - (1, 1, 1) - South -
    • -
  • - 30 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 1, 0) - (1, 1, 1) - South -
    • - - - -     -     - - Female_Cowgirl_Stage2_2 - 30 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • -
  • - 10 - 7 - true - (0, 2, 0.43) - (1, 1, 1) - South -
    • -
  • - 30 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • -
  • - 15 - -7 - true - (0, 0, -0.04) - (1, 1, 1) - South -
    • -
  • - 30 - 0 - true - (1, 1, 1) - South -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml deleted file mode 100644 index c70e4fe..0000000 --- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml +++ /dev/null @@ -1,156 +0,0 @@ - - - - Male_Cowgirl_Stage2_3 - 30 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 20 - 180 - true - (0, 0, -0.65) - (1, 1, 1) - South -
    • -
  • - 30 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 1, 0) - (1, 1, 1) - South -
    • - - - -     -     - - Female_Cowgirl_Stage2_3 - 30 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • -
  • - 10 - 7 - true - (0, 2, 0.43) - (1, 1, 1) - South -
    • -
  • - 15 - -7 - true - (0.03, 2, 0.43) - (1, 1, 1) - South -
    • -
  • - 30 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • -
  • - 10 - -7 - true - (0, 0, -0.07) - (1, 1, 1) - South -
    • -
  • - 15 - 7 - true - (0, 0, -0.07) - (1, 1, 1) - South -
    • -
  • - 30 - 0 - true - (1, 1, 1) - South -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml deleted file mode 100644 index 9474a0e..0000000 --- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml +++ /dev/null @@ -1,216 +0,0 @@ - - - - Male_Cowgirl_Stage3 - 25 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 20 - 180 - true - (0, 0, -0.6) - (1, 1, 1) - South -
    • -
  • - 25 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • -
  • - 10 - 0 - true - (0, 0, 0.03) - (1, 1, 1) - South -
    • -
  • - 25 - 0 - true - (1, 1, 1) - South -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 1, 0) - (1, 1, 1) - South -
    • - - - -     -     - - Female_Cowgirl_Stage3 - 25 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • -
  • - 7 - 3 - true - (0, 2, 0.43) - (1, 1, 1) - South -
    • -
  • - 25 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • -
  • - 20 - 0 - true - (0, 0, 0.03) - (1, 1, 1) - South -
    • -
  • - 25 - 0 - true - (1, 1, 1) - South -
    • - - - -
  • - RenderNodeTag_Cowgirl_Xray - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 0, 0.3) - (0.5, 1, 0.5) - North -
    • -
  • - 5 - 0 - true - (1, 0, 0.3) - (0.5, 1, 0.5) - North - 1 -
    • -
  • - 10 - 0 - true - (1, 0, 0.3) - (0.52, 1, 0.52) - North - 2 -
    • -
  • - 15 - 1 - true - (1, 0, 0.3) - (0.52, 1, 0.52) - North - 3 -
    • -
  • - 20 - 2 - true - (1, 0, 0.3) - (0.5, 1, 0.5) - North - 2 -
    • -
  • - 25 - 1 - true - (1, 0, 0.3) - (0.5, 1, 0.5) - North - 1 -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage4.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage4.xml deleted file mode 100644 index 72dba98..0000000 --- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage4.xml +++ /dev/null @@ -1,270 +0,0 @@ - - - - Male_Cowgirl_Stage4 - 200 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 60 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 70 - 180 - true - (0, 0, -0.67) - (1, 1, 1) - South -
    • -
  • - 75 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 125 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 135 - 180 - true - (0, 0, -0.67) - (1, 1, 1) - South -
    • -
  • - 150 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 200 - 180 - true - (0, 0, -0.72) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • -
  • - 75 - 0 - true - (0, 0, -0.02) - (1, 1, 1) - South -
    • -
  • - 200 - 0 - true - (1, 1, 1) - South -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 1, 0) - (1, 1, 1) - South -
    • - - - -     -     - - Female_Cowgirl_Stage4 - 200 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • -
  • - 75 - 0 - true - (0, 2, 0.26) - (1, 1, 1) - South -
    • -
  • - 85 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • -
  • - 135 - 0 - true - (0, 2, 0.26) - (1, 1, 1) - South -
    • -
  • - 200 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • -
  • - 50 - 0 - true - (0, 0, 0.02) - (1, 1, 1) - South -
    • -
  • - 100 - 0 - true - (1, 1, 1) - South -
    • -
  • - 150 - 0 - true - (0, 0, 0.025) - (1, 1, 1) - South -
    • -
  • - 200 - 0 - true - (1, 1, 1) - South -
    • - - - -
  • - RenderNodeTag_Cowgirl_Xray - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 1 - true - (1, 0, 0.3) - (0.5, 1, 0.5) - North - 3 -
    • -
  • - 40 - 1 - true - (1, 0, 0.3) - (0.5, 1, 0.5) - North - 4 -
    • -
  • - 105 - 1 - true - (1, 0, 0.3) - (0.5, 1, 0.5) - North - 5 -
    • -
  • - 150 - 1 - true - (1, 0, 0.3) - (0.5, 1, 0.5) - North - 5 -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml deleted file mode 100644 index 471f674..0000000 --- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - Male_Cowgirl_Stage1_5 - 55 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • -
  • - 30 - 180 - true - (0, 0, -0.65) - (1, 1, 1) - South -
    • -
  • - 55 - 180 - true - (0, 0, -0.7) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 180 - true - (0, 1, 0) - (1, 1, 1) - South -
    • - - - -     -     - - Female_Cowgirl_Stage1_5 - 55 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • -
  • - 25 - 0 - true - (0, 2, 0.43) - (1, 1, 1) - South -
    • -
  • - 55 - 0 - true - (0, 2, 0.23) - (1, 1, 1) - South -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - South -
    • -
  • - 30 - 0 - true - (0, 0, -0.04) - (1, 1, 1) - South -
    • -
  • - 55 - 0 - true - (1, 1, 1) - South -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Cowgirl/GroupAnimation_Cowgirl.xml b/1.5/Defs/AnimationDefs/Cowgirl/GroupAnimation_Cowgirl.xml deleted file mode 100644 index a4d5f1c..0000000 --- a/1.5/Defs/AnimationDefs/Cowgirl/GroupAnimation_Cowgirl.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - - GroupAnimation_Cowgirl - 2 - -
  • - 1 - -
  • - 1 - -
  • Male_Cowgirl_Stage1
    • -
  • Female_Cowgirl_Stage1
    • - - - - - - -
  • - 10 - -
  • - 1 - -
  • Male_Cowgirl_Stage1_5
    • -
  • Female_Cowgirl_Stage1_5
    • - - - - - - -
  • - 10 - -
  • GroupAnimation_Cowgirl_Stage2_Branch1
    • -
  • GroupAnimation_Cowgirl_Stage2_Branch2
    • -
  • GroupAnimation_Cowgirl_Stage2_Branch3
    • - - - -
  • - 20 - -
  • - 1 - -
  • Male_Cowgirl_Stage3
    • -
  • Female_Cowgirl_Stage3
    • - - - - - - -
  • - 1 - -
  • - 1 - -
  • Male_Cowgirl_Stage4
    • -
  • Female_Cowgirl_Stage4
    • - - - - - - -     - - -
  • - 1 - -
  • Sex_Anal
    • -
  • Sex_Vaginal
    • - - -
  • - 1 - 1 - -
  • Sex_Reverse_Anal
    • -
  • Sex_Reverse_Vaginal
    • - - - - - -     - -
  • Offset_Placeholder
    • -
  • Offset_Cowgirl_Top
    • -     - -     - - - GroupAnimation_Cowgirl_Stage2_Branch1 - 2 - -
  • - 3 - -
  • - 1 - -
  • Male_Cowgirl_Stage2_1
    • -
  • Female_Cowgirl_Stage2_1
    • - - - - - -     - - -
  • Offset_Placeholder
    • -
  • Offset_Cowgirl_Top
    • -     - -     - - - GroupAnimation_Cowgirl_Stage2_Branch2 - 2 - -
  • - 3 - -
  • - 1 - -
  • Male_Cowgirl_Stage2_2
    • -
  • Female_Cowgirl_Stage2_2
    • - - - - - -     - - -
  • Offset_Placeholder
    • -
  • Offset_Cowgirl_Top
    • -     - -     - - - GroupAnimation_Cowgirl_Stage2_Branch3 - 2 - -
  • - 3 - -
  • - 1 - -
  • Male_Cowgirl_Stage2_3
    • -
  • Female_Cowgirl_Stage2_3
    • - - - - - -     - - -
  • Offset_Placeholder
    • -
  • Offset_Cowgirl_Top
    • -     - -     -     diff --git a/1.5/Defs/AnimationDefs/Cowgirl/OffsetDef_Cowgirl.xml b/1.5/Defs/AnimationDefs/Cowgirl/OffsetDef_Cowgirl.xml deleted file mode 100644 index 9c7e6c5..0000000 --- a/1.5/Defs/AnimationDefs/Cowgirl/OffsetDef_Cowgirl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - Offset_Cowgirl_Top - -
  • - -
  • Human
    • - - -
  • Thin(0, 0, -0.05)
    • -
  • Female(0, 0, 0)
    • -
  • Hulk(0, 0, 0.15)
    • -     - -     -     -     diff --git a/1.5/Defs/AnimationDefs/Cowgirl/TexPathVariants_Cowgirl.xml b/1.5/Defs/AnimationDefs/Cowgirl/TexPathVariants_Cowgirl.xml deleted file mode 100644 index 354317e..0000000 --- a/1.5/Defs/AnimationDefs/Cowgirl/TexPathVariants_Cowgirl.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - TexPathVariants_Cowgirl_Xray - -
  • AnimationProps/CowgirlXray/XRay2-2
    • -
  • AnimationProps/CowgirlXray/XRay2-3
    • -
  • AnimationProps/CowgirlXray/XRay2-4
    • -
  • AnimationProps/CowgirlXray/XRay2-5
    • -
  • AnimationProps/CowgirlXray/XRay2-6
    • -     -     - -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Missionary/GroupAnimation_Missionary.xml b/1.5/Defs/AnimationDefs/Missionary/GroupAnimation_Missionary.xml deleted file mode 100644 index a496f85..0000000 --- a/1.5/Defs/AnimationDefs/Missionary/GroupAnimation_Missionary.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - - GroupAnimation_Missionary - 2 - -
  • - 1 - -
  • - 1 - -
  • MalePawn_Missionary_Stage1
    • -
  • FemalePawn_Missionary_Stage1
    • - - - - - - -
  • - 5 - -
  • Missionary_Stage2_Branch1
    • -
  • Missionary_Stage2_Branch2
    • -
  • Missionary_Stage2_Branch3
    • - - - - -
  • - 1 - -
  • - 1 - -
  • MalePawn_Missionary_Stage3
    • -
  • FemalePawn_Missionary_Stage3
    • - - - - - - -
  • - 20 - -
  • - 1 - -
  • MalePawn_Missionary_Stage4
    • -
  • FemalePawn_Missionary_Stage4
    • - - - - - - -
  • - 35 - -
  • - 1 - -
  • MalePawn_Missionary_Stage5
    • -
  • FemalePawn_Missionary_Stage5
    • - - - - - - -
  • - 1 - -
  • - 1 - -
  • MalePawn_Missionary_Stage6
    • -
  • FemalePawn_Missionary_Stage6
    • - - - - - - -     - - -
  • - 1 - -
  • Sex_Anal
    • -
  • Sex_Vaginal
    • - - -
  • - 1 - 1 - -
  • Sex_Reverse_Anal
    • -
  • Sex_Reverse_Vaginal
    • - - - - - -     - -
  • Offset_Placeholder
    • -
  • Offset_Missionary_Female
    • -     - -     - - - Missionary_Stage2_Branch1 - 2 - -
  • - 3 - -
  • - 1 - -
  • MalePawn_Missionary_Stage2a
    • -
  • FemalePawn_Missionary_Stage2a
    • - - - - - -     - - -
  • Offset_Placeholder
    • -
  • Offset_Missionary_Female
    • -     - -     - - - Missionary_Stage2_Branch2 - 2 - -
  • - 3 - -
  • - 1 - -
  • MalePawn_Missionary_Stage2b
    • -
  • FemalePawn_Missionary_Stage2b
    • - - - - - -     - - -
  • Offset_Placeholder
    • -
  • Offset_Missionary_Female
    • -     - -     - - - Missionary_Stage2_Branch3 - 2 - -
  • - 3 - -
  • - 1 - -
  • MalePawn_Missionary_Stage2c
    • -
  • FemalePawn_Missionary_Stage2c
    • - - - - - -     - - -
  • Offset_Placeholder
    • -
  • Offset_Missionary_Female
    • -     - -     -     diff --git a/1.5/Defs/AnimationDefs/Missionary/OffsetDef_Missionary.xml b/1.5/Defs/AnimationDefs/Missionary/OffsetDef_Missionary.xml deleted file mode 100644 index d20c782..0000000 --- a/1.5/Defs/AnimationDefs/Missionary/OffsetDef_Missionary.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - Offset_Missionary_Female - -
  • - -
  • Human
    • - - -
  • Thin(-0.1, 0, 0.05)
    • -
  • Female(0, 0, 0)
    • -
  • Hulk(0.1, 0, 0.1)
    • -     - -     -     -     diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage1.xml b/1.5/Defs/AnimationDefs/Missionary/Stage1.xml deleted file mode 100644 index 830521a..0000000 --- a/1.5/Defs/AnimationDefs/Missionary/Stage1.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - - MalePawn_Missionary_Stage1 - 100 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (-0.85, 0, 0.5) - (1, 1, 1) - East -
    • -
  • - 30 - 0 - true - (-0.79, 0, 0.44) - (1, 1, 1) - East -
    • -
  • - 60 - 20 - true - (-0.75, 0, 0.38) - (1, 1, 1) - East -
    • -
  • - 66 - -10 - true - (-0.6, 0, 0.38) - (1, 1, 1) - East -
    • -
  • - 100 - 10 - true - (-0.75, 0, 0.38) - (1, 1, 1) - East -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (1, 1, 1) - East -
    • -
  • - 40 - 13 - true - (1, 1, 1) - East -
    • -
  • - 100 - 3 - true - (1, 1, 1) - East -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 0 - true - (0, -3, 0) - (1, 1, 1) - East -
    • -
  • - 20 - 0 - true - (0, -3, 0) - (1, 1, 1) - East -
    • -
  • - 60 - 30 - true - (0, -3, 0) - (1, 1, 1) - East -
    • - - - -     -     - - FemalePawn_Missionary_Stage1 - 100 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 90 - true - (0, -1, 0) - (1, 1, 1) - West -
    • -
  • - 60 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • -
  • - 66 - 90 - true - (0.1, -1, 0) - (1, 1, 1) - West -
    • -
  • - 100 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - -15 - true - (1, 1, 1) - West -
    • -
  • - 60 - -20 - true - (1, 1, 1) - West -
    • -
  • - 66 - 0 - true - (1, 1, 1) - West -
    • -
  • - 100 - -20 - true - (1, 1, 1) - West -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage2.xml b/1.5/Defs/AnimationDefs/Missionary/Stage2.xml deleted file mode 100644 index 5bb92b4..0000000 --- a/1.5/Defs/AnimationDefs/Missionary/Stage2.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - MalePawn_Missionary_Stage2a - 35 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 10 - true - (-0.75, 0, 0.38) - (1, 1, 1) - East -
    • -
  • - 5 - -25 - true - (-0.6, 0, 0.38) - (1, 1, 1) - East -
    • -
  • - 35 - 10 - true - (-0.75, 0, 0.38) - (1, 1, 1) - East -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 3 - true - (1, 1, 1) - East -
    • -
  • - 5 - 20 - true - (1, 1, 1) - East -
    • -
  • - 35 - 3 - true - (1, 1, 1) - East -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 30 - true - (0, -3, 0) - (1, 1, 1) - East -
    • -
  • - 5 - 60 - true - (0, -3, 0) - (1, 1, 1) - East -
    • -
  • - 35 - 30 - true - (0, -3, 0) - (1, 1, 1) - East -
    • - - - -     -     - - FemalePawn_Missionary_Stage2a - 35 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • -
  • - 3 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • -
  • - 10 - 88 - true - (0.12, -1, 0.03) - (1, 1, 1) - West -
    • -
  • - 35 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - -20 - true - (1, 1, 1) - West -
    • -
  • - 10 - -10 - true - (1, 1, 1) - West -
    • -
  • - 35 - -20 - true - (1, 1, 1) - West -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage2b.xml b/1.5/Defs/AnimationDefs/Missionary/Stage2b.xml deleted file mode 100644 index eab8093..0000000 --- a/1.5/Defs/AnimationDefs/Missionary/Stage2b.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - MalePawn_Missionary_Stage2b - 35 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 10 - true - (-0.75, 0, 0.38) - (1, 1, 1) - East -
    • -
  • - 5 - -25 - true - (-0.6, 0, 0.38) - (1, 1, 1) - East -
    • -
  • - 35 - 10 - true - (-0.75, 0, 0.38) - (1, 1, 1) - East -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 3 - true - (1, 1, 1) - East -
    • -
  • - 5 - 20 - true - (1, 1, 1) - East -
    • -
  • - 35 - 3 - true - (1, 1, 1) - East -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 30 - true - (1, 1, 1) - (0, -3, 0) - East -
    • -
  • - 5 - 60 - true - (1, 1, 1) - (0, -3, 0) - East -
    • -
  • - 35 - 30 - true - (1, 1, 1) - (0, -3, 0) - East -
    • - - - -     -     - - FemalePawn_Missionary_Stage2b - 35 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • -
  • - 3 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • -
  • - 10 - 88 - true - (0.12, -1, 0.03) - (1, 1, 1) - West -
    • -
  • - 35 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - -20 - true - (1, 1, 1) - South -
    • -
  • - 10 - -17 - true - (1, 1, 1) - South -
    • -
  • - 35 - -20 - true - (1, 1, 1) - South -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage2c.xml b/1.5/Defs/AnimationDefs/Missionary/Stage2c.xml deleted file mode 100644 index 574bbc5..0000000 --- a/1.5/Defs/AnimationDefs/Missionary/Stage2c.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - MalePawn_Missionary_Stage2c - 35 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 10 - true - (-0.75, 0, 0.38) - (1, 1, 1) - East -
    • -
  • - 5 - -25 - true - (-0.6, 0, 0.38) - (1, 1, 1) - East -
    • -
  • - 35 - 10 - true - (-0.75, 0, 0.38) - (1, 1, 1) - East -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 3 - true - (1, 1, 1) - East -
    • -
  • - 5 - 20 - true - (1, 1, 1) - East -
    • -
  • - 35 - 3 - true - (1, 1, 1) - East -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 30 - true - (1, 1, 1) - (0, -3, 0) - East -
    • -
  • - 5 - 60 - true - (1, 1, 1) - (0, -3, 0) - East -
    • -
  • - 35 - 30 - true - (1, 1, 1) - (0, -3, 0) - East -
    • - - - -     -     - - FemalePawn_Missionary_Stage2c - 35 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • -
  • - 3 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • -
  • - 10 - 88 - true - (0.12, -1, 0.03) - (1, 1, 1) - West -
    • -
  • - 35 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - -20 - true - (1, 1, 1) - North -
    • -
  • - 10 - -17 - true - (1, 1, 1) - North -
    • -
  • - 35 - -20 - true - (1, 1, 1) - North -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage3_DontLoop.xml b/1.5/Defs/AnimationDefs/Missionary/Stage3_DontLoop.xml deleted file mode 100644 index 7e23d5c..0000000 --- a/1.5/Defs/AnimationDefs/Missionary/Stage3_DontLoop.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - - MalePawn_Missionary_Stage3 - 35 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 10 - true - (-0.75, 0, 0.38) - (1, 1, 1) - East -
    • -
  • - 35 - 15 - true - (-0.65, 0, 0.42) - (1, 1, 1) - East -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 3 - true - (1, 1, 1) - East -
    • -
  • - 35 - 20 - true - (1, 1, 1) - East -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 30 - true - (1, 1, 1) - (0, -3, 0) - East -
    • -
  • - 35 - 30 - true - (1, 1, 1) - (0, -3, 0) - East -
    • - - - -     -     - - FemalePawn_Missionary_Stage3 - 35 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 90 - true - (0.03, -1, 0) - (1, 1, 1) - West -
    • -
  • - 35 - 95 - true - (0.07, -1, 0) - (1, 1, 1) - West -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - -20 - true - (1, 1, 1) - West -
    • -
  • - 35 - -20 - true - (1, 1, 1) - West -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage4.xml b/1.5/Defs/AnimationDefs/Missionary/Stage4.xml deleted file mode 100644 index 931d915..0000000 --- a/1.5/Defs/AnimationDefs/Missionary/Stage4.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - MalePawn_Missionary_Stage4 - 20 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 15 - true - (-0.65, 0, 0.42) - (1, 1, 1) - East -
    • -
  • - 5 - 0 - true - (-0.42, 0, 0.42) - (1, 1, 1) - East -
    • -
  • - 20 - 15 - true - (-0.65, 0, 0.42) - (1, 1, 1) - East -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 20 - true - (1, 1, 1) - East -
    • -
  • - 5 - 30 - true - (1, 1, 1) - East -
    • -
  • - 20 - 20 - true - (1, 1, 1) - East -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 35 - 30 - true - (1, 1, 1) - (0, -3, 0) - East -
    • - - - -     -     - - FemalePawn_Missionary_Stage4 - 20 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 95 - true - (0.07, -1, 0) - (1, 1, 1) - West -
    • -
  • - 5 - 100 - true - (0.2, -1, 0) - (1, 1, 1) - West -
    • -
  • - 20 - 95 - true - (0.07, -1, 0) - (1, 1, 1) - West -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - -20 - true - (1, 1, 1) - West -
    • -
  • - 13 - -26 - true - (1, 1, 1) - West -
    • -
  • - 20 - -20 - true - (1, 1, 1) - West -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage5.xml b/1.5/Defs/AnimationDefs/Missionary/Stage5.xml deleted file mode 100644 index 8f1e8b7..0000000 --- a/1.5/Defs/AnimationDefs/Missionary/Stage5.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - MalePawn_Missionary_Stage5 - 13 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 15 - true - (-0.65, 0, 0.42) - (1, 1, 1) - East -
    • -
  • - 5 - 0 - true - (-0.45, 0, 0.42) - (1, 1, 1) - East -
    • -
  • - 13 - 15 - true - (-0.65, 0, 0.42) - (1, 1, 1) - East -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 20 - true - (1, 1, 1) - East -
    • -
  • - 5 - 40 - true - (1, 1, 1) - East -
    • -
  • - 20 - 20 - true - (1, 1, 1) - East -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 35 - 30 - true - (1, 1, 1) - (0, -3, 0) - East -
    • - - - -     -     - - FemalePawn_Missionary_Stage5 - 13 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 95 - true - (0.07, -1, 0) - (1, 1, 1) - West -
    • -
  • - 3 - 100 - true - (0.16, -1, 0) - (1, 1, 1) - West -
    • -
  • - 13 - 95 - true - (0.07, -1, 0) - (1, 1, 1) - West -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - -20 - true - (1, 1, 1) - West -
    • -
  • - 3 - -34 - true - (1, 1, 1) - West -
    • -
  • - 13 - -20 - true - (1, 1, 1) - West -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage6.xml b/1.5/Defs/AnimationDefs/Missionary/Stage6.xml deleted file mode 100644 index bf4d03a..0000000 --- a/1.5/Defs/AnimationDefs/Missionary/Stage6.xml +++ /dev/null @@ -1,225 +0,0 @@ - - - - MalePawn_Missionary_Stage6 - 200 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 15 - true - (-0.65, 0, 0.42) - (1, 1, 1) - East -
    • -
  • - 13 - -20 - true - (-0.43, 0, 0.42) - (1, 1, 1) - East -
    • -
  • - 80 - -15 - true - (-0.49, 0, 0.42) - (1, 1, 1) - East -
    • -
  • - 85 - -20 - true - (-0.43, 0, 0.42) - (1, 1, 1) - East -
    • -
  • - 150 - -15 - true - (-0.49, 0, 0.42) - (1, 1, 1) - East -
    • -
  • - 155 - -20 - true - (-0.43, 0, 0.42) - (1, 1, 1) - East -
    • -
  • - 200 - -15 - true - (-0.49, 0, 0.42) - (1, 1, 1) - East -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 20 - true - (1, 1, 1) - East -
    • -
  • - 40 - 25 - true - (1, 1, 1) - East -
    • -
  • - 200 - 30 - true - (1, 1, 1) - East -
    • - - - -
  • - RimNude_Penis - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 30 - true - (1, 1, 1) - (0, -3, 0) - East -
    • -
  • - 13 - 60 - true - (1, 1, 1) - (0, -3, 0) - East -
    • - - - -     -     - - FemalePawn_Missionary_Stage6 - 200 - -
  • - Root - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - 95 - true - (0.07, -1, 0) - (1, 1, 1) - West -
    • -
  • - 13 - 100 - true - (0.23, -1, 0) - (1, 1, 1) - West -
    • -
  • - 80 - 100 - true - (0.2, -1, 0) - (1, 1, 1) - West -
    • -
  • - 85 - 100 - true - (0.23, -1, 0) - (1, 1, 1) - West -
    • -
  • - 150 - 100 - true - (0.2, -1, 0) - (1, 1, 1) - West -
    • -
  • - 155 - 100 - true - (0.23, -1, 0) - (1, 1, 1) - West -
    • -
  • - 200 - 100 - true - (0.2, -1, 0) - (1, 1, 1) - West -
    • - - - -
  • - Head - - Rimworld_Animations.AnimationWorker_KeyframesExtended - -
  • - 0 - -20 - true - (1, 1, 1) - West -
    • -
  • - 100 - -10 - true - (1, 1, 1) - West -
    • -
  • - 200 - -23 - true - (1, 1, 1) - West -
    • - - - -     -     -     \ No newline at end of file diff --git a/1.5/Defs/GroupAnimationDefs/TestGroupAnimation1.xml b/1.5/Defs/GroupAnimationDefs/TestGroupAnimation1.xml index a9cd0b5..2aa9ae3 100644 --- a/1.5/Defs/GroupAnimationDefs/TestGroupAnimation1.xml +++ b/1.5/Defs/GroupAnimationDefs/TestGroupAnimation1.xml @@ -35,7 +35,7 @@ --> - + - -->
  • GroinToAppropriateHeight
    • diff --git a/1.5/Defs/OffsetDefs/OffsetDef_GroinToAppropriateHeight.xml b/1.5/Defs/OffsetDefs/OffsetDef_GroinToAppropriateHeight.xml index 60f7a54..544eb4d 100644 --- a/1.5/Defs/OffsetDefs/OffsetDef_GroinToAppropriateHeight.xml +++ b/1.5/Defs/OffsetDefs/OffsetDef_GroinToAppropriateHeight.xml @@ -3,7 +3,6 @@ GroinToAppropriateHeight - diff --git a/1.5/Defs/OffsetDefs/OffsetDef_Placeholder.xml b/1.5/Defs/OffsetDefs/OffsetDef_Placeholder.xml deleted file mode 100644 index 4e88661..0000000 --- a/1.5/Defs/OffsetDefs/OffsetDef_Placeholder.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - Offset_Placeholder - - - - diff --git a/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs b/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs index 965eb8e..affee1b 100644 --- a/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs +++ b/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs @@ -24,19 +24,16 @@ namespace Rimworld_Animations Log.Message("[anims] Checking if " + defName + " is valid animation"); } - if (!contexts.NullOrEmpty()) - { - foreach (BaseGroupAnimationContext context in contexts) - { - if (context.CanAnimationBeUsed(actors)) - { - //find all where context matches actors - return true; - } + foreach (BaseGroupAnimationContext context in contexts) + { + if (context.CanAnimationBeUsed(actors)) + { + //find all where context matches actors + return true; + } } - return false; } diff --git a/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage.cs b/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage.cs index 1597681..b212183 100644 --- a/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage.cs +++ b/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage.cs @@ -11,7 +11,6 @@ namespace Rimworld_Animations { //Return a list containing a tuple; int for how long the animation should play for - public int loops; public abstract List GetAnimations(int actorNumber, int seed); } diff --git a/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_Branch.cs b/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_Branch.cs index 414879f..abee2e7 100644 --- a/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_Branch.cs +++ b/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_Branch.cs @@ -14,14 +14,10 @@ namespace Rimworld_Animations { List animationDefs = new List(); - for (int i = 0; i < loops; i++) + //loop thru the selected groupanimationdef path + foreach (AnimationStage stage in paths[(seed * 59) % paths.Count].animationStages) { - //loop thru the selected groupanimationdef path - foreach (AnimationStage stage in paths[((seed * 30 + 12 * i) % 59) % paths.Count].animationStages) - { - animationDefs.AddRange(stage.GetAnimations(actorNumber, seed)); - } - + animationDefs.AddRange(stage.GetAnimations(actorNumber, seed)); } return animationDefs; diff --git a/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_LoopRandomSelectChance.cs b/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_LoopRandomSelectChance.cs index 1ee90e6..09cbc9c 100644 --- a/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_LoopRandomSelectChance.cs +++ b/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_LoopRandomSelectChance.cs @@ -9,6 +9,7 @@ namespace Rimworld_Animations { public class AnimationStage_LoopRandomSelectChance : AnimationStage { + public int loops; public List loopOptions; public override List GetAnimations(int actorNumber, int seed) diff --git a/1.5/Source/Comps/CompExtendedAnimator.cs b/1.5/Source/Comps/CompExtendedAnimator.cs index bed2411..2a6dfd2 100644 --- a/1.5/Source/Comps/CompExtendedAnimator.cs +++ b/1.5/Source/Comps/CompExtendedAnimator.cs @@ -186,13 +186,11 @@ namespace Rimworld_Animations { //only if pawn is animating for performance if (IsAnimating) { - List animRenderNodes = new List(); // for all animationpropdefs, foreach (AnimationPropDef animationProp in DefDatabase.AllDefsListForReading) { - //if animation makes use of prop, if (AnimationMakesUseOfProp(animationProp)) { @@ -269,22 +267,16 @@ namespace Rimworld_Animations { // never true if not animating; anim props shouldn't be attached if (!IsAnimating) return false; - //for all anims in queue (because it's only recached at start) - foreach (AnimationDef animation in animationQueue) + //for ONLY THE CURRENT animation, + foreach (PawnRenderNodeTagDef propTag in animationQueue[0].animationParts.Keys) { - foreach (PawnRenderNodeTagDef propTag in animation.animationParts.Keys) + // if that proptag is the same as the one for animationProp, + if (propTag == animationProp.animPropProperties.tagDef) { - // if that proptag is the same as the one for animationProp, - if (propTag == animationProp.animPropProperties.tagDef) - { - //that prop is being used in the animation - return true; - } + //that prop is being used in the animation + return true; } - } - //for ALL animations (only recaches at start of rjw job), - return false; } diff --git a/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNodeWorker.cs b/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNodeWorker.cs index 4e8b0f0..0612d8b 100644 --- a/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNodeWorker.cs +++ b/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNodeWorker.cs @@ -26,16 +26,6 @@ namespace Rimworld_Animations __result = false; return false; } - - //visible when animating - return true; - } - - //set graphic variant nodes to invisible when not animating - if (node is PawnRenderNode_GraphicVariants) - { - __result = false; - return false; } return true; diff --git a/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_ChangeOffset.cs b/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_ChangeOffset.cs index 035da95..b28a3b0 100644 --- a/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_ChangeOffset.cs +++ b/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_ChangeOffset.cs @@ -14,7 +14,8 @@ namespace Rimworld_Animations public override void TransformOffset(PawnRenderNode node, PawnDrawParms parms, ref Vector3 offset, ref Vector3 pivot) { if (node.AnimationWorker is AnimationWorker_KeyframesExtended - && node.tree.pawn.TryGetComp(out CompExtendedAnimator extendedAnimator)) + && node.tree.pawn.TryGetComp(out CompExtendedAnimator extendedAnimator) + && extendedAnimator.IsAnimating) { Vector3? pawnOffset = extendedAnimator.Offset; if (pawnOffset != null) @@ -29,7 +30,8 @@ namespace Rimworld_Animations public override void TransformRotation(PawnRenderNode node, PawnDrawParms parms, ref Quaternion rotation) { if (node.AnimationWorker is AnimationWorker_KeyframesExtended - && node.tree.pawn.TryGetComp(out CompExtendedAnimator extendedAnimator)) + && node.tree.pawn.TryGetComp(out CompExtendedAnimator extendedAnimator) + && extendedAnimator.IsAnimating) { int? pawnRotation = extendedAnimator.Rotation; if (pawnRotation != null) diff --git a/1.5/Source/Utilities/AnimationUtility.cs b/1.5/Source/Utilities/AnimationUtility.cs index 61e3d1f..d691314 100644 --- a/1.5/Source/Utilities/AnimationUtility.cs +++ b/1.5/Source/Utilities/AnimationUtility.cs @@ -85,10 +85,10 @@ namespace Rimworld_Animations { int reorder2 = 0; //find all, reorder randomly, then find max priority context - DefDatabase.AllDefsListForReading + GroupAnimationDef result = DefDatabase.AllDefsListForReading .FindAll((GroupAnimationDef x) => x.canAnimationBeUsed(participants)) .OrderBy(_ => Rand.Int) - .TryMaxBy((GroupAnimationDef x) => x.Priority(participants, out reorder2), out GroupAnimationDef result); + .MaxBy((GroupAnimationDef x) => x.Priority(participants, out reorder2)); reorder = reorder2; diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-1.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-1.png deleted file mode 100644 index 2a848c6..0000000 Binary files a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-1.png and /dev/null differ diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-2.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-2.png deleted file mode 100644 index d5cccf2..0000000 Binary files a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-2.png and /dev/null differ diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-3.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-3.png deleted file mode 100644 index 9dffa7c..0000000 Binary files a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-3.png and /dev/null differ diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-4.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-4.png deleted file mode 100644 index af3af31..0000000 Binary files a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-4.png and /dev/null differ diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-5.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-5.png deleted file mode 100644 index bfd3ef5..0000000 Binary files a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-5.png and /dev/null differ diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-6.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-6.png deleted file mode 100644 index 95a1397..0000000 Binary files a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-6.png and /dev/null differ diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index 6410462..1fad458 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -140,28 +140,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -178,7 +156,7 @@ - + @@ -226,12 +204,6 @@ - - - - - -