From d6c813af2f494bc805b00944439621480763375e Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 7 May 2024 11:34:59 -0700 Subject: [PATCH 1/3] Tweaked probabilities + added offsets for different pawn types --- .../Blowjob/GroupAnimation_Blowjob.xml | 18 +++++++++--------- .../Blowjob/OffsetDef_Blowjob.xml | 14 ++++++++++++++ .../Cowgirl/OffsetDef_Cowgirl.xml | 13 +++++++++++++ .../Missionary/GroupAnimation_Missionary.xml | 8 ++++---- .../Missionary/OffsetDef_Missionary.xml | 14 ++++++++++++++ 1.5/Defs/VoiceDefs/VoiceTagDef.xml | 4 ++-- 6 files changed, 56 insertions(+), 15 deletions(-) diff --git a/1.5/Defs/AnimationDefs/Blowjob/GroupAnimation_Blowjob.xml b/1.5/Defs/AnimationDefs/Blowjob/GroupAnimation_Blowjob.xml index 31d17c9..6eaa94b 100644 --- a/1.5/Defs/AnimationDefs/Blowjob/GroupAnimation_Blowjob.xml +++ b/1.5/Defs/AnimationDefs/Blowjob/GroupAnimation_Blowjob.xml @@ -129,7 +129,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Blowjob_Male
  • Offset_Blowjob_Female
    •  @@ -155,7 +155,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Blowjob_Male
  • Offset_Blowjob_Female
    •  @@ -181,7 +181,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Blowjob_Male
  • Offset_Blowjob_Female
    •  @@ -207,7 +207,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Blowjob_Male
  • Offset_Blowjob_Female
    •  @@ -233,7 +233,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Blowjob_Male
  • Offset_Blowjob_Female
    •  @@ -259,7 +259,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Blowjob_Male
  • Offset_Blowjob_Female
    •  @@ -311,7 +311,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Blowjob_Male
  • Offset_Blowjob_Female
    •  @@ -337,7 +337,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Blowjob_Male
  • Offset_Blowjob_Female
    •  @@ -363,7 +363,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Blowjob_Male
  • Offset_Blowjob_Female
    •  diff --git a/1.5/Defs/AnimationDefs/Blowjob/OffsetDef_Blowjob.xml b/1.5/Defs/AnimationDefs/Blowjob/OffsetDef_Blowjob.xml index e019088..e80ff93 100644 --- a/1.5/Defs/AnimationDefs/Blowjob/OffsetDef_Blowjob.xml +++ b/1.5/Defs/AnimationDefs/Blowjob/OffsetDef_Blowjob.xml @@ -12,4 +12,18 @@ + + + Offset_Blowjob_Male + +
  • + +
  • Human
    • + + +
  • Hulk(0, 0, 0.223)
    • +     + +     +     diff --git a/1.5/Defs/AnimationDefs/Cowgirl/OffsetDef_Cowgirl.xml b/1.5/Defs/AnimationDefs/Cowgirl/OffsetDef_Cowgirl.xml index 9c7e6c5..5a3099b 100644 --- a/1.5/Defs/AnimationDefs/Cowgirl/OffsetDef_Cowgirl.xml +++ b/1.5/Defs/AnimationDefs/Cowgirl/OffsetDef_Cowgirl.xml @@ -15,4 +15,17 @@ + + Offset_Cowgirl_Bottom + +
  • + +
  • Human
    • + + +
  • Hulk(0, 0, -0.17)
    • +     + +     +     diff --git a/1.5/Defs/AnimationDefs/Missionary/GroupAnimation_Missionary.xml b/1.5/Defs/AnimationDefs/Missionary/GroupAnimation_Missionary.xml index 02fe7e4..b6cefd8 100644 --- a/1.5/Defs/AnimationDefs/Missionary/GroupAnimation_Missionary.xml +++ b/1.5/Defs/AnimationDefs/Missionary/GroupAnimation_Missionary.xml @@ -129,7 +129,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Missionary_Male
  • Offset_Missionary_Female
    •  @@ -155,7 +155,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Missionary_Male
  • Offset_Missionary_Female
    •  @@ -181,7 +181,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Missionary_Male
  • Offset_Missionary_Female
    •  @@ -207,7 +207,7 @@ -
  • Offset_Placeholder
    • +
  • Offset_Missionary_Male
  • Offset_Missionary_Female
    •  diff --git a/1.5/Defs/AnimationDefs/Missionary/OffsetDef_Missionary.xml b/1.5/Defs/AnimationDefs/Missionary/OffsetDef_Missionary.xml index d20c782..a0ce10c 100644 --- a/1.5/Defs/AnimationDefs/Missionary/OffsetDef_Missionary.xml +++ b/1.5/Defs/AnimationDefs/Missionary/OffsetDef_Missionary.xml @@ -15,4 +15,18 @@ + + + Offset_Missionary_Male + +
  • + +
  • Human
    • + + +
  • Hulk(0, 0, 0.179)
    • +     + +     +     diff --git a/1.5/Defs/VoiceDefs/VoiceTagDef.xml b/1.5/Defs/VoiceDefs/VoiceTagDef.xml index 955b26d..1bbc6f2 100644 --- a/1.5/Defs/VoiceDefs/VoiceTagDef.xml +++ b/1.5/Defs/VoiceDefs/VoiceTagDef.xml @@ -7,12 +7,12 @@ MoanShort - 0.4 + 0.1 Grunt - 0.4 + 0.1 From 3488352676b33f8e3850f3ca6053c95aa52a72f6 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 7 May 2024 12:04:38 -0700 Subject: [PATCH 2/3] Moved some stuff around for tidiness --- .../Backup2.rar | Bin .../Blowjob/AnimationPropDef_Cum.xml | 0 .../Blowjob/GroupAnimation_Blowjob.xml | 0 .../Blowjob/OffsetDef_Blowjob.xml | 0 .../Blowjob/Stage1.xml | 0 .../Blowjob/Stage2a.xml | 0 .../Blowjob/Stage2b.xml | 0 .../Blowjob/Stage2c.xml | 0 .../Blowjob/Stage3.xml | 0 .../Blowjob/Stage4a.xml | 0 .../Blowjob/Stage4b.xml | 0 .../Blowjob/Stage4c.xml | 0 .../Blowjob/Stage5.xml | 0 .../Blowjob/Stage6a.xml | 0 .../Blowjob/Stage6b.xml | 0 .../Cowgirl/AnimationPropDef_Cowgirl_Xray.xml | 0 .../Cowgirl/Cowgirl_Stage1.xml | 0 .../Cowgirl/Cowgirl_Stage2_1.xml | 0 .../Cowgirl/Cowgirl_Stage2_2.xml | 0 .../Cowgirl/Cowgirl_Stage2_3.xml | 0 .../Cowgirl/Cowgirl_Stage3_XRay.xml | 0 .../Cowgirl/Cowgirl_Stage4.xml | 0 .../Cowgirl/Cowgirl_Stage_1_5.xml | 0 .../Cowgirl/GroupAnimation_Cowgirl.xml | 0 .../Cowgirl/OffsetDef_Cowgirl.xml | 0 .../Cowgirl/TexPathVariants_Cowgirl.xml | 0 .../Cunnilingus/AnimationPropDef_Saliva.xml | 0 .../GroupAnimation_Cunnilingus.xml | 0 .../Cunnilingus/OffsetDef_Cunnilingus.xml | 0 .../Cunnilingus/Stage1.xml | 0 .../Cunnilingus/Stage2a.xml | 0 .../Cunnilingus/Stage2b.xml | 0 .../Cunnilingus/Stage2c.xml | 0 .../Cunnilingus/Stage3_LoopOnce.xml | 0 .../Cunnilingus/Stage4a.xml | 0 .../Cunnilingus/Stage4b.xml | 0 .../Cunnilingus/Stage4c.xml | 0 .../Cunnilingus/Stage5.xml | 0 .../Cunnilingus/Stage6.xml | 0 .../DoublePenetration/GroupAnimation_DP.xml | 0 .../DoublePenetration/OffsetDef_DP.xml | 0 .../DoublePenetration/Stage1.xml | 0 .../DoublePenetration/Stage2a.xml | 0 .../DoublePenetration/Stage2b.xml | 0 .../DoublePenetration/Stage2c.xml | 0 .../DoublePenetration/Stage2d.xml | 0 .../DoublePenetration/Stage3.xml | 0 .../DoublePenetration/Stage4.xml | 0 .../DoublePenetration/Stage5_Base.xml | 0 .../DoublePenetration/Stage5a.xml | 0 .../DoublePenetration/Stage5b.xml | 0 .../DoublePenetration/Stage5c.xml | 0 .../Missionary/GroupAnimation_Missionary.xml | 0 .../Missionary/OffsetDef_Missionary.xml | 0 .../Missionary/Stage1.xml | 0 .../Missionary/Stage2.xml | 0 .../Missionary/Stage2b.xml | 0 .../Missionary/Stage2c.xml | 0 .../Missionary/Stage3_DontLoop.xml | 0 .../Missionary/Stage4.xml | 0 .../Missionary/Stage5.xml | 0 .../Missionary/Stage6.xml | 0 .../TestAnimation}/TestAnimation1.xml | 0 .../TestAnimation}/TestAnimation2.xml | 0 .../TestAnimation}/TestAnimation3.xml | 0 .../TestGroupAnimation1.xml | 0 Rimworld-Animations.csproj | 140 +++++++++--------- 67 files changed, 69 insertions(+), 71 deletions(-) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Backup2.rar (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/AnimationPropDef_Cum.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/GroupAnimation_Blowjob.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/OffsetDef_Blowjob.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/Stage1.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/Stage2a.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/Stage2b.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/Stage2c.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/Stage3.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/Stage4a.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/Stage4b.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/Stage4c.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/Stage5.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/Stage6a.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Blowjob/Stage6b.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cowgirl/AnimationPropDef_Cowgirl_Xray.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cowgirl/Cowgirl_Stage1.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cowgirl/Cowgirl_Stage2_1.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cowgirl/Cowgirl_Stage2_2.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cowgirl/Cowgirl_Stage2_3.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cowgirl/Cowgirl_Stage3_XRay.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cowgirl/Cowgirl_Stage4.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cowgirl/Cowgirl_Stage_1_5.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cowgirl/GroupAnimation_Cowgirl.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cowgirl/OffsetDef_Cowgirl.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cowgirl/TexPathVariants_Cowgirl.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/AnimationPropDef_Saliva.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/GroupAnimation_Cunnilingus.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/OffsetDef_Cunnilingus.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/Stage1.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/Stage2a.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/Stage2b.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/Stage2c.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/Stage3_LoopOnce.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/Stage4a.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/Stage4b.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/Stage4c.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/Stage5.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Cunnilingus/Stage6.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/GroupAnimation_DP.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/OffsetDef_DP.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/Stage1.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/Stage2a.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/Stage2b.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/Stage2c.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/Stage2d.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/Stage3.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/Stage4.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/Stage5_Base.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/Stage5a.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/Stage5b.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/DoublePenetration/Stage5c.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Missionary/GroupAnimation_Missionary.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Missionary/OffsetDef_Missionary.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Missionary/Stage1.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Missionary/Stage2.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Missionary/Stage2b.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Missionary/Stage2c.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Missionary/Stage3_DontLoop.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Missionary/Stage4.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Missionary/Stage5.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs}/Missionary/Stage6.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs/TestAnimation}/TestAnimation1.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs/TestAnimation}/TestAnimation2.xml (100%) rename 1.5/Defs/{AnimationDefs => GroupAnimationDefs/TestAnimation}/TestAnimation3.xml (100%) rename 1.5/Defs/GroupAnimationDefs/{ => TestAnimation}/TestGroupAnimation1.xml (100%) diff --git a/1.5/Defs/AnimationDefs/Backup2.rar b/1.5/Defs/GroupAnimationDefs/Backup2.rar similarity index 100% rename from 1.5/Defs/AnimationDefs/Backup2.rar rename to 1.5/Defs/GroupAnimationDefs/Backup2.rar diff --git a/1.5/Defs/AnimationDefs/Blowjob/AnimationPropDef_Cum.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/AnimationPropDef_Cum.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/AnimationPropDef_Cum.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/AnimationPropDef_Cum.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/GroupAnimation_Blowjob.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/GroupAnimation_Blowjob.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/GroupAnimation_Blowjob.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/GroupAnimation_Blowjob.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/OffsetDef_Blowjob.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/OffsetDef_Blowjob.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/OffsetDef_Blowjob.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/OffsetDef_Blowjob.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/Stage1.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/Stage1.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/Stage1.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/Stage1.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/Stage2a.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/Stage2a.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/Stage2a.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/Stage2a.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/Stage2b.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/Stage2b.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/Stage2b.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/Stage2b.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/Stage2c.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/Stage2c.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/Stage2c.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/Stage2c.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/Stage3.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/Stage3.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/Stage3.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/Stage3.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/Stage4a.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/Stage4a.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/Stage4a.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/Stage4a.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/Stage4b.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/Stage4b.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/Stage4b.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/Stage4b.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/Stage4c.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/Stage4c.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/Stage4c.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/Stage4c.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/Stage5.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/Stage5.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/Stage5.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/Stage5.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/Stage6a.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/Stage6a.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/Stage6a.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/Stage6a.xml diff --git a/1.5/Defs/AnimationDefs/Blowjob/Stage6b.xml b/1.5/Defs/GroupAnimationDefs/Blowjob/Stage6b.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Blowjob/Stage6b.xml rename to 1.5/Defs/GroupAnimationDefs/Blowjob/Stage6b.xml diff --git a/1.5/Defs/AnimationDefs/Cowgirl/AnimationPropDef_Cowgirl_Xray.xml b/1.5/Defs/GroupAnimationDefs/Cowgirl/AnimationPropDef_Cowgirl_Xray.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cowgirl/AnimationPropDef_Cowgirl_Xray.xml rename to 1.5/Defs/GroupAnimationDefs/Cowgirl/AnimationPropDef_Cowgirl_Xray.xml diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage1.xml b/1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage1.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage1.xml rename to 1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage1.xml diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml b/1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml rename to 1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml b/1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml rename to 1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml b/1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml rename to 1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml b/1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml rename to 1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage4.xml b/1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage4.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage4.xml rename to 1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage4.xml diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml b/1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml rename to 1.5/Defs/GroupAnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml diff --git a/1.5/Defs/AnimationDefs/Cowgirl/GroupAnimation_Cowgirl.xml b/1.5/Defs/GroupAnimationDefs/Cowgirl/GroupAnimation_Cowgirl.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cowgirl/GroupAnimation_Cowgirl.xml rename to 1.5/Defs/GroupAnimationDefs/Cowgirl/GroupAnimation_Cowgirl.xml diff --git a/1.5/Defs/AnimationDefs/Cowgirl/OffsetDef_Cowgirl.xml b/1.5/Defs/GroupAnimationDefs/Cowgirl/OffsetDef_Cowgirl.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cowgirl/OffsetDef_Cowgirl.xml rename to 1.5/Defs/GroupAnimationDefs/Cowgirl/OffsetDef_Cowgirl.xml diff --git a/1.5/Defs/AnimationDefs/Cowgirl/TexPathVariants_Cowgirl.xml b/1.5/Defs/GroupAnimationDefs/Cowgirl/TexPathVariants_Cowgirl.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cowgirl/TexPathVariants_Cowgirl.xml rename to 1.5/Defs/GroupAnimationDefs/Cowgirl/TexPathVariants_Cowgirl.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/AnimationPropDef_Saliva.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/AnimationPropDef_Saliva.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/AnimationPropDef_Saliva.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/AnimationPropDef_Saliva.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/GroupAnimation_Cunnilingus.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/GroupAnimation_Cunnilingus.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/GroupAnimation_Cunnilingus.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/GroupAnimation_Cunnilingus.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/OffsetDef_Cunnilingus.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/OffsetDef_Cunnilingus.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/OffsetDef_Cunnilingus.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/OffsetDef_Cunnilingus.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage1.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage1.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/Stage1.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage1.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage2a.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage2a.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/Stage2a.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage2a.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage2b.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage2b.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/Stage2b.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage2b.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage2c.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage2c.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/Stage2c.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage2c.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage3_LoopOnce.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage3_LoopOnce.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/Stage3_LoopOnce.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage3_LoopOnce.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage4a.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage4a.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/Stage4a.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage4a.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage4b.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage4b.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/Stage4b.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage4b.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage4c.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage4c.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/Stage4c.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage4c.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage5.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage5.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/Stage5.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage5.xml diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage6.xml b/1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage6.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Cunnilingus/Stage6.xml rename to 1.5/Defs/GroupAnimationDefs/Cunnilingus/Stage6.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/GroupAnimation_DP.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/GroupAnimation_DP.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/GroupAnimation_DP.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/GroupAnimation_DP.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/OffsetDef_DP.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/OffsetDef_DP.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/OffsetDef_DP.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/OffsetDef_DP.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage1.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage1.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/Stage1.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage1.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2a.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage2a.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/Stage2a.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage2a.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2b.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage2b.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/Stage2b.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage2b.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2c.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage2c.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/Stage2c.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage2c.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2d.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage2d.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/Stage2d.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage2d.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage3.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage3.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/Stage3.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage3.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage4.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage4.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/Stage4.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage4.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage5_Base.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage5_Base.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/Stage5_Base.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage5_Base.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage5a.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage5a.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/Stage5a.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage5a.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage5b.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage5b.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/Stage5b.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage5b.xml diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage5c.xml b/1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage5c.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/DoublePenetration/Stage5c.xml rename to 1.5/Defs/GroupAnimationDefs/DoublePenetration/Stage5c.xml diff --git a/1.5/Defs/AnimationDefs/Missionary/GroupAnimation_Missionary.xml b/1.5/Defs/GroupAnimationDefs/Missionary/GroupAnimation_Missionary.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Missionary/GroupAnimation_Missionary.xml rename to 1.5/Defs/GroupAnimationDefs/Missionary/GroupAnimation_Missionary.xml diff --git a/1.5/Defs/AnimationDefs/Missionary/OffsetDef_Missionary.xml b/1.5/Defs/GroupAnimationDefs/Missionary/OffsetDef_Missionary.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Missionary/OffsetDef_Missionary.xml rename to 1.5/Defs/GroupAnimationDefs/Missionary/OffsetDef_Missionary.xml diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage1.xml b/1.5/Defs/GroupAnimationDefs/Missionary/Stage1.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Missionary/Stage1.xml rename to 1.5/Defs/GroupAnimationDefs/Missionary/Stage1.xml diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage2.xml b/1.5/Defs/GroupAnimationDefs/Missionary/Stage2.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Missionary/Stage2.xml rename to 1.5/Defs/GroupAnimationDefs/Missionary/Stage2.xml diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage2b.xml b/1.5/Defs/GroupAnimationDefs/Missionary/Stage2b.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Missionary/Stage2b.xml rename to 1.5/Defs/GroupAnimationDefs/Missionary/Stage2b.xml diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage2c.xml b/1.5/Defs/GroupAnimationDefs/Missionary/Stage2c.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Missionary/Stage2c.xml rename to 1.5/Defs/GroupAnimationDefs/Missionary/Stage2c.xml diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage3_DontLoop.xml b/1.5/Defs/GroupAnimationDefs/Missionary/Stage3_DontLoop.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Missionary/Stage3_DontLoop.xml rename to 1.5/Defs/GroupAnimationDefs/Missionary/Stage3_DontLoop.xml diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage4.xml b/1.5/Defs/GroupAnimationDefs/Missionary/Stage4.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Missionary/Stage4.xml rename to 1.5/Defs/GroupAnimationDefs/Missionary/Stage4.xml diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage5.xml b/1.5/Defs/GroupAnimationDefs/Missionary/Stage5.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Missionary/Stage5.xml rename to 1.5/Defs/GroupAnimationDefs/Missionary/Stage5.xml diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage6.xml b/1.5/Defs/GroupAnimationDefs/Missionary/Stage6.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/Missionary/Stage6.xml rename to 1.5/Defs/GroupAnimationDefs/Missionary/Stage6.xml diff --git a/1.5/Defs/AnimationDefs/TestAnimation1.xml b/1.5/Defs/GroupAnimationDefs/TestAnimation/TestAnimation1.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/TestAnimation1.xml rename to 1.5/Defs/GroupAnimationDefs/TestAnimation/TestAnimation1.xml diff --git a/1.5/Defs/AnimationDefs/TestAnimation2.xml b/1.5/Defs/GroupAnimationDefs/TestAnimation/TestAnimation2.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/TestAnimation2.xml rename to 1.5/Defs/GroupAnimationDefs/TestAnimation/TestAnimation2.xml diff --git a/1.5/Defs/AnimationDefs/TestAnimation3.xml b/1.5/Defs/GroupAnimationDefs/TestAnimation/TestAnimation3.xml similarity index 100% rename from 1.5/Defs/AnimationDefs/TestAnimation3.xml rename to 1.5/Defs/GroupAnimationDefs/TestAnimation/TestAnimation3.xml diff --git a/1.5/Defs/GroupAnimationDefs/TestGroupAnimation1.xml b/1.5/Defs/GroupAnimationDefs/TestAnimation/TestGroupAnimation1.xml similarity index 100% rename from 1.5/Defs/GroupAnimationDefs/TestGroupAnimation1.xml rename to 1.5/Defs/GroupAnimationDefs/TestAnimation/TestGroupAnimation1.xml diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index fb6aa88..e20555d 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -151,72 +151,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -241,14 +235,14 @@ - - - + + + - + @@ -257,7 +251,7 @@ - + @@ -340,6 +334,9 @@ + + + @@ -353,6 +350,7 @@ + From 87c10cacffdd453d077f6ccfb1ef90751cebd550 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Tue, 7 May 2024 12:05:56 -0700 Subject: [PATCH 3/3] Updated Chinese Simplified and Chinese Traditional languages by Talos --- .../ChineseSimplified/Keyed/RJWAnimations-LanguageData.xml | 5 +++-- .../ChineseTraditional/Keyed/RJWAnimations-LanguageData.xml | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Languages/ChineseSimplified/Keyed/RJWAnimations-LanguageData.xml b/Languages/ChineseSimplified/Keyed/RJWAnimations-LanguageData.xml index f72918a..1d72019 100644 --- a/Languages/ChineseSimplified/Keyed/RJWAnimations-LanguageData.xml +++ b/Languages/ChineseSimplified/Keyed/RJWAnimations-LanguageData.xml @@ -11,10 +11,11 @@ 播放非性行为的动画 (牵手、亲热) 启用动画管理器选项卡 颤抖/颤动强度 (默认为 2): - - 默认情况下播放类似人类的声音 + 在动画期间播放语音 + 如果没有找到外星种族的声音，则默认播放人类的声音 调试模式 调整渲染树偏移表单的浮动范围: + Animation Manager diff --git a/Languages/ChineseTraditional/Keyed/RJWAnimations-LanguageData.xml b/Languages/ChineseTraditional/Keyed/RJWAnimations-LanguageData.xml index 735e081..c014f16 100644 --- a/Languages/ChineseTraditional/Keyed/RJWAnimations-LanguageData.xml +++ b/Languages/ChineseTraditional/Keyed/RJWAnimations-LanguageData.xml @@ -11,10 +11,11 @@ 播放非性行為的動畫 (牽手、親熱) 啟用動畫管理器選項卡 顫抖/顫動強度 (預設為 2): - - 默認情況下播放類似人類的聲音 + 在動畫期間播放語音 + 如果沒有找到外星種族的聲音，則默認播放人類的聲音 除錯模式 調整渲染樹偏移表單的浮動範圍: + Animation Manager