diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index 2bed4c0..7678f93 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 new file mode 100644 index 0000000..d7d4895 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Cowgirl/AnimationPropDef_Cowgirl_Xray.xml @@ -0,0 +1,25 @@ + + + + + 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 new file mode 100644 index 0000000..6d49621 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage1.xml @@ -0,0 +1,172 @@ + + + + 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 new file mode 100644 index 0000000..44b5ca9 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml @@ -0,0 +1,140 @@ + + + + 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 new file mode 100644 index 0000000..0b1d919 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml @@ -0,0 +1,140 @@ + + + + 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 new file mode 100644 index 0000000..c70e4fe --- /dev/null +++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml @@ -0,0 +1,156 @@ + + + + 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 new file mode 100644 index 0000000..9474a0e --- /dev/null +++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml @@ -0,0 +1,216 @@ + + + + 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 new file mode 100644 index 0000000..72dba98 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage4.xml @@ -0,0 +1,270 @@ + + + + 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 new file mode 100644 index 0000000..471f674 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml @@ -0,0 +1,140 @@ + + + + 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 new file mode 100644 index 0000000..8d7a8e6 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Cowgirl/GroupAnimation_Cowgirl.xml @@ -0,0 +1,191 @@ + + + + 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
    • + + + + + +     + +
  • GroinToAppropriateHeight
    • +
  • GroinToAppropriateHeight
    • +     + +     + + + GroupAnimation_Cowgirl_Stage2_Branch1 + 2 + +
  • + 3 + +
  • + 1 + +
  • Male_Cowgirl_Stage2_1
    • +
  • Female_Cowgirl_Stage2_1
    • + + + + + +     + + +
  • GroinToAppropriateHeight
    • + +
  • GroinToAppropriateHeight
    • + +     + +     + + + GroupAnimation_Cowgirl_Stage2_Branch2 + 2 + +
  • + 3 + +
  • + 1 + +
  • Male_Cowgirl_Stage2_2
    • +
  • Female_Cowgirl_Stage2_2
    • + + + + + +     + + +
  • GroinToAppropriateHeight
    • + +
  • GroinToAppropriateHeight
    • + +     + +     + + + GroupAnimation_Cowgirl_Stage2_Branch3 + 2 + +
  • + 3 + +
  • + 1 + +
  • Male_Cowgirl_Stage2_3
    • +
  • Female_Cowgirl_Stage2_3
    • + + + + + +     + + +
  • GroinToAppropriateHeight
    • + +
  • GroinToAppropriateHeight
    • + +     + +     +     diff --git a/1.5/Defs/AnimationDefs/Cowgirl/TexPathVariants_Cowgirl.xml b/1.5/Defs/AnimationDefs/Cowgirl/TexPathVariants_Cowgirl.xml new file mode 100644 index 0000000..354317e --- /dev/null +++ b/1.5/Defs/AnimationDefs/Cowgirl/TexPathVariants_Cowgirl.xml @@ -0,0 +1,14 @@ + + + + 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 new file mode 100644 index 0000000..f4b7d50 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Missionary/GroupAnimation_Missionary.xml @@ -0,0 +1,206 @@ + + + + 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
    • + + + + + +     + +
  • GroinToAppropriateHeight
    • +
  • GroinToAppropriateHeight
    • +     + +     + + + Missionary_Stage2_Branch1 + 2 + +
  • + 3 + +
  • + 1 + +
  • MalePawn_Missionary_Stage2a
    • +
  • FemalePawn_Missionary_Stage2a
    • + + + + + +     + + +
  • GroinToAppropriateHeight
    • + +
  • GroinToAppropriateHeight
    • + +     + +     + + + Missionary_Stage2_Branch2 + 2 + +
  • + 3 + +
  • + 1 + +
  • MalePawn_Missionary_Stage2b
    • +
  • FemalePawn_Missionary_Stage2b
    • + + + + + +     + + +
  • GroinToAppropriateHeight
    • + +
  • GroinToAppropriateHeight
    • + +     + +     + + + Missionary_Stage2_Branch3 + 2 + +
  • + 3 + +
  • + 1 + +
  • MalePawn_Missionary_Stage2c
    • +
  • FemalePawn_Missionary_Stage2c
    • + + + + + +     + + +
  • GroinToAppropriateHeight
    • + +
  • GroinToAppropriateHeight
    • + +     + +     +     diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage1.xml b/1.5/Defs/AnimationDefs/Missionary/Stage1.xml new file mode 100644 index 0000000..e526acf --- /dev/null +++ b/1.5/Defs/AnimationDefs/Missionary/Stage1.xml @@ -0,0 +1,200 @@ + + + + MalePawn_Missionary_Stage1 + 100 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 0 + true + (-0.85, 4, 0.5) + (1, 1, 1) + East +
    • +
  • + 30 + 0 + true + (-0.79, 4, 0.44) + (1, 1, 1) + East +
    • +
  • + 60 + 20 + true + (-0.75, 4, 0.38) + (1, 1, 1) + East +
    • +
  • + 66 + -10 + true + (-0.6, 4, 0.38) + (1, 1, 1) + East +
    • +
  • + 100 + 10 + true + (-0.75, 4, 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, -6, 0) + (1, 1, 1) + East +
    • +
  • + 20 + 0 + true + (0, -6, 0) + (1, 1, 1) + East +
    • +
  • + 60 + 30 + true + (0, -6, 0) + (1, 1, 1) + East +
    • + + + +     +     + + FemalePawn_Missionary_Stage1 + 100 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 90 + true + (0, 2, 0) + (1, 1, 1) + West +
    • +
  • + 60 + 90 + true + (0.03, 2, 0) + (1, 1, 1) + West +
    • +
  • + 66 + 90 + true + (0.1, 2, 0) + (1, 1, 1) + West +
    • +
  • + 100 + 90 + true + (0.03, 2, 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 new file mode 100644 index 0000000..4be7c39 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Missionary/Stage2.xml @@ -0,0 +1,177 @@ + + + + MalePawn_Missionary_Stage2a + 35 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 10 + true + (-0.75, 4, 0.38) + (1, 1, 1) + East +
    • +
  • + 5 + -25 + true + (-0.6, 4, 0.38) + (1, 1, 1) + East +
    • +
  • + 35 + 10 + true + (-0.75, 4, 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, -6, 0) + (1, 1, 1) + East +
    • +
  • + 5 + 60 + true + (0, -6, 0) + (1, 1, 1) + East +
    • +
  • + 35 + 30 + true + (0, -6, 0) + (1, 1, 1) + East +
    • + + + +     +     + + FemalePawn_Missionary_Stage2a + 35 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 90 + true + (0.03, 2, 0) + (1, 1, 1) + West +
    • +
  • + 3 + 90 + true + (0.03, 2, 0) + (1, 1, 1) + West +
    • +
  • + 10 + 88 + true + (0.12, 2, 0.03) + (1, 1, 1) + West +
    • +
  • + 35 + 90 + true + (0.03, 2, 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 new file mode 100644 index 0000000..f2a8ed5 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Missionary/Stage2b.xml @@ -0,0 +1,177 @@ + + + + MalePawn_Missionary_Stage2b + 35 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 10 + true + (-0.75, 4, 0.38) + (1, 1, 1) + East +
    • +
  • + 5 + -25 + true + (-0.6, 4, 0.38) + (1, 1, 1) + East +
    • +
  • + 35 + 10 + true + (-0.75, 4, 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, -6, 0) + East +
    • +
  • + 5 + 60 + true + (1, 1, 1) + (0, -6, 0) + East +
    • +
  • + 35 + 30 + true + (1, 1, 1) + (0, -6, 0) + East +
    • + + + +     +     + + FemalePawn_Missionary_Stage2b + 35 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 90 + true + (0.03, 2, 0) + (1, 1, 1) + West +
    • +
  • + 3 + 90 + true + (0.03, 2, 0) + (1, 1, 1) + West +
    • +
  • + 10 + 88 + true + (0.12, 2, 0.03) + (1, 1, 1) + West +
    • +
  • + 35 + 90 + true + (0.03, 2, 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 new file mode 100644 index 0000000..faa7a16 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Missionary/Stage2c.xml @@ -0,0 +1,177 @@ + + + + MalePawn_Missionary_Stage2c + 35 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 10 + true + (-0.75, 4, 0.38) + (1, 1, 1) + East +
    • +
  • + 5 + -25 + true + (-0.6, 4, 0.38) + (1, 1, 1) + East +
    • +
  • + 35 + 10 + true + (-0.75, 4, 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, -6, 0) + East +
    • +
  • + 5 + 60 + true + (1, 1, 1) + (0, -6, 0) + East +
    • +
  • + 35 + 30 + true + (1, 1, 1) + (0, -6, 0) + East +
    • + + + +     +     + + FemalePawn_Missionary_Stage2c + 35 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 90 + true + (0.03, 2, 0) + (1, 1, 1) + West +
    • +
  • + 3 + 90 + true + (0.03, 2, 0) + (1, 1, 1) + West +
    • +
  • + 10 + 88 + true + (0.12, 2, 0.03) + (1, 1, 1) + West +
    • +
  • + 35 + 90 + true + (0.03, 2, 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 new file mode 100644 index 0000000..808c018 --- /dev/null +++ b/1.5/Defs/AnimationDefs/Missionary/Stage3_DontLoop.xml @@ -0,0 +1,131 @@ + + + + MalePawn_Missionary_Stage3 + 35 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 10 + true + (-0.75, 4, 0.38) + (1, 1, 1) + East +
    • +
  • + 35 + 15 + true + (-0.65, 4, 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, -6, 0) + East +
    • +
  • + 35 + 30 + true + (1, 1, 1) + (0, -6, 0) + East +
    • + + + +     +     + + FemalePawn_Missionary_Stage3 + 35 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 90 + true + (0.03, 2, 0) + (1, 1, 1) + West +
    • +
  • + 35 + 95 + true + (0.07, 2, 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 new file mode 100644 index 0000000..3a377cd --- /dev/null +++ b/1.5/Defs/AnimationDefs/Missionary/Stage4.xml @@ -0,0 +1,153 @@ + + + + MalePawn_Missionary_Stage4 + 20 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 15 + true + (-0.65, 4, 0.42) + (1, 1, 1) + East +
    • +
  • + 5 + 0 + true + (-0.42, 4, 0.42) + (1, 1, 1) + East +
    • +
  • + 20 + 15 + true + (-0.65, 4, 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, -6, 0) + East +
    • + + + +     +     + + FemalePawn_Missionary_Stage4 + 20 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 95 + true + (0.07, 2, 0) + (1, 1, 1) + West +
    • +
  • + 5 + 100 + true + (0.2, 2, 0) + (1, 1, 1) + West +
    • +
  • + 20 + 95 + true + (0.07, 2, 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 new file mode 100644 index 0000000..021ed2d --- /dev/null +++ b/1.5/Defs/AnimationDefs/Missionary/Stage5.xml @@ -0,0 +1,153 @@ + + + + MalePawn_Missionary_Stage5 + 13 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 15 + true + (-0.65, 4, 0.42) + (1, 1, 1) + East +
    • +
  • + 5 + 0 + true + (-0.45, 4, 0.42) + (1, 1, 1) + East +
    • +
  • + 13 + 15 + true + (-0.65, 4, 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, -6, 0) + East +
    • + + + +     +     + + FemalePawn_Missionary_Stage5 + 13 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 95 + true + (0.07, 2, 0) + (1, 1, 1) + West +
    • +
  • + 3 + 100 + true + (0.16, 2, 0) + (1, 1, 1) + West +
    • +
  • + 13 + 95 + true + (0.07, 2, 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 new file mode 100644 index 0000000..458717b --- /dev/null +++ b/1.5/Defs/AnimationDefs/Missionary/Stage6.xml @@ -0,0 +1,225 @@ + + + + MalePawn_Missionary_Stage6 + 200 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 15 + true + (-0.65, 4, 0.42) + (1, 1, 1) + East +
    • +
  • + 13 + -20 + true + (-0.43, 4, 0.42) + (1, 1, 1) + East +
    • +
  • + 80 + -15 + true + (-0.49, 4, 0.42) + (1, 1, 1) + East +
    • +
  • + 85 + -20 + true + (-0.43, 4, 0.42) + (1, 1, 1) + East +
    • +
  • + 150 + -15 + true + (-0.49, 4, 0.42) + (1, 1, 1) + East +
    • +
  • + 155 + -20 + true + (-0.43, 4, 0.42) + (1, 1, 1) + East +
    • +
  • + 200 + -15 + true + (-0.49, 4, 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, -6, 0) + East +
    • +
  • + 13 + 60 + true + (1, 1, 1) + (0, -6, 0) + East +
    • + + + +     +     + + FemalePawn_Missionary_Stage6 + 200 + +
  • + Root + + Rimworld_Animations.AnimationWorker_KeyframesExtended + +
  • + 0 + 95 + true + (0.07, 2, 0) + (1, 1, 1) + West +
    • +
  • + 13 + 100 + true + (0.23, 2, 0) + (1, 1, 1) + West +
    • +
  • + 80 + 100 + true + (0.2, 2, 0) + (1, 1, 1) + West +
    • +
  • + 85 + 100 + true + (0.23, 2, 0) + (1, 1, 1) + West +
    • +
  • + 150 + 100 + true + (0.2, 2, 0) + (1, 1, 1) + West +
    • +
  • + 155 + 100 + true + (0.23, 2, 0) + (1, 1, 1) + West +
    • +
  • + 200 + 100 + true + (0.2, 2, 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 2aa9ae3..a9cd0b5 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 544eb4d..60f7a54 100644 --- a/1.5/Defs/OffsetDefs/OffsetDef_GroinToAppropriateHeight.xml +++ b/1.5/Defs/OffsetDefs/OffsetDef_GroinToAppropriateHeight.xml @@ -3,6 +3,7 @@ GroinToAppropriateHeight + diff --git a/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs b/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs index affee1b..965eb8e 100644 --- a/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs +++ b/1.5/Source/Animations/GroupAnimations/GroupAnimationDef.cs @@ -24,16 +24,19 @@ namespace Rimworld_Animations Log.Message("[anims] Checking if " + defName + " is valid animation"); } - - foreach (BaseGroupAnimationContext context in contexts) + if (!contexts.NullOrEmpty()) { - if (context.CanAnimationBeUsed(actors)) + foreach (BaseGroupAnimationContext context in contexts) { - //find all where context matches actors - return true; + 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 b212183..1597681 100644 --- a/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage.cs +++ b/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage.cs @@ -11,6 +11,7 @@ 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 abee2e7..414879f 100644 --- a/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_Branch.cs +++ b/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_Branch.cs @@ -14,10 +14,14 @@ namespace Rimworld_Animations { List animationDefs = new List(); - //loop thru the selected groupanimationdef path - foreach (AnimationStage stage in paths[(seed * 59) % paths.Count].animationStages) + for (int i = 0; i < loops; i++) { - animationDefs.AddRange(stage.GetAnimations(actorNumber, seed)); + //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)); + } + } 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 09cbc9c..1ee90e6 100644 --- a/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_LoopRandomSelectChance.cs +++ b/1.5/Source/Animations/GroupAnimations/GroupAnimationStages/AnimationStage_LoopRandomSelectChance.cs @@ -9,7 +9,6 @@ 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 2a6dfd2..bed2411 100644 --- a/1.5/Source/Comps/CompExtendedAnimator.cs +++ b/1.5/Source/Comps/CompExtendedAnimator.cs @@ -186,11 +186,13 @@ 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)) { @@ -267,16 +269,22 @@ namespace Rimworld_Animations { // never true if not animating; anim props shouldn't be attached if (!IsAnimating) return false; - //for ONLY THE CURRENT animation, - foreach (PawnRenderNodeTagDef propTag in animationQueue[0].animationParts.Keys) + //for all anims in queue (because it's only recached at start) + foreach (AnimationDef animation in animationQueue) { - // if that proptag is the same as the one for animationProp, - if (propTag == animationProp.animPropProperties.tagDef) + foreach (PawnRenderNodeTagDef propTag in animation.animationParts.Keys) { - //that prop is being used in the animation - return true; + // 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; + } } + } + //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 0612d8b..4e8b0f0 100644 --- a/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNodeWorker.cs +++ b/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNodeWorker.cs @@ -26,6 +26,16 @@ 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 b28a3b0..035da95 100644 --- a/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_ChangeOffset.cs +++ b/1.5/Source/RenderSubWorkers/PawnRenderSubWorker_ChangeOffset.cs @@ -14,8 +14,7 @@ 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) - && extendedAnimator.IsAnimating) + && node.tree.pawn.TryGetComp(out CompExtendedAnimator extendedAnimator)) { Vector3? pawnOffset = extendedAnimator.Offset; if (pawnOffset != null) @@ -30,8 +29,7 @@ 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) - && extendedAnimator.IsAnimating) + && node.tree.pawn.TryGetComp(out CompExtendedAnimator extendedAnimator)) { int? pawnRotation = extendedAnimator.Rotation; if (pawnRotation != null) diff --git a/1.5/Source/Utilities/AnimationUtility.cs b/1.5/Source/Utilities/AnimationUtility.cs index d691314..61e3d1f 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 - GroupAnimationDef result = DefDatabase.AllDefsListForReading + DefDatabase.AllDefsListForReading .FindAll((GroupAnimationDef x) => x.canAnimationBeUsed(participants)) .OrderBy(_ => Rand.Int) - .MaxBy((GroupAnimationDef x) => x.Priority(participants, out reorder2)); + .TryMaxBy((GroupAnimationDef x) => x.Priority(participants, out reorder2), out GroupAnimationDef result); reorder = reorder2; diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-1.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-1.png new file mode 100644 index 0000000..2a848c6 Binary files /dev/null and b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-1.png differ diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-2.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-2.png new file mode 100644 index 0000000..d5cccf2 Binary files /dev/null and b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-2.png differ diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-3.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-3.png new file mode 100644 index 0000000..9dffa7c Binary files /dev/null and b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-3.png differ diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-4.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-4.png new file mode 100644 index 0000000..af3af31 Binary files /dev/null and b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-4.png differ diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-5.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-5.png new file mode 100644 index 0000000..bfd3ef5 Binary files /dev/null and b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-5.png differ diff --git a/1.5/Textures/AnimationProps/CowgirlXray/XRay2-6.png b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-6.png new file mode 100644 index 0000000..95a1397 Binary files /dev/null and b/1.5/Textures/AnimationProps/CowgirlXray/XRay2-6.png differ diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index 1fad458..84d0aef 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -140,6 +140,25 @@ + + + + + + + + + + + + + + + + + + + @@ -156,7 +175,7 @@ - + @@ -204,6 +223,12 @@ + + + + + +