diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll
index f2f3749..0b2fedc 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/Backup.rar b/1.5/Defs/AnimationDefs/Backup.rar
new file mode 100644
index 0000000..756fe55
Binary files /dev/null and b/1.5/Defs/AnimationDefs/Backup.rar differ
diff --git a/1.5/Defs/AnimationDefs/Backup2.rar b/1.5/Defs/AnimationDefs/Backup2.rar
deleted file mode 100644
index bffdd7b..0000000
Binary files a/1.5/Defs/AnimationDefs/Backup2.rar and /dev/null differ
diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage1.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage1.xml
index eb93073..0955fd5 100644
--- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage1.xml
+++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage1.xml
@@ -30,7 +30,6 @@
true
(0, 0, -0.75)
South
- Moan
150
diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml
index 54b7fdf..0d8fac2 100644
--- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml
+++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_1.xml
@@ -23,7 +23,6 @@
(0, 0, -0.65)
South
Fuck
- Moan
30
@@ -88,7 +87,6 @@
true
(0, 2, 0.43)
South
- Moan
30
diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml
index ad3c424..536e518 100644
--- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml
+++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_2.xml
@@ -23,7 +23,6 @@
(0, 0, -0.65)
South
Fuck
- Moan
30
@@ -88,7 +87,6 @@
true
(0, 2, 0.43)
South
- Moan
30
diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml
index 373be15..72d68ea 100644
--- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml
+++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage2_3.xml
@@ -23,7 +23,6 @@
(0, 0, -0.65)
South
Fuck
- Moan
30
@@ -95,7 +94,6 @@
true
(0.03, 2, 0.43)
South
- Moan
30
diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml
index d91c9b0..52b6170 100644
--- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml
+++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage3_XRay.xml
@@ -15,7 +15,6 @@
true
(0, 0, -0.7)
South
- MoanShort
20
@@ -108,7 +107,6 @@
true
(0, 2, 0.23)
South
- Grunt
diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage4.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage4.xml
index 392239a..1536330 100644
--- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage4.xml
+++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage4.xml
@@ -37,7 +37,6 @@
(0, 0, -0.7)
South
Cum
- Scream
125
@@ -138,7 +137,6 @@
true
(0, 2, 0.26)
South
- Scream
85
@@ -153,7 +151,6 @@
true
(0, 2, 0.26)
South
- Scream
200
diff --git a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml
index d3d7883..95591e5 100644
--- a/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml
+++ b/1.5/Defs/AnimationDefs/Cowgirl/Cowgirl_Stage_1_5.xml
@@ -23,7 +23,6 @@
(0, 0, -0.65)
South
Slimy
- Moan
55
@@ -89,7 +88,6 @@
true
(0, 2, 0.43)
South
- Moan
55
diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage2a.xml b/1.5/Defs/AnimationDefs/Cunnilingus/Stage2a.xml
index 708a6e8..6e3be48 100644
--- a/1.5/Defs/AnimationDefs/Cunnilingus/Stage2a.xml
+++ b/1.5/Defs/AnimationDefs/Cunnilingus/Stage2a.xml
@@ -90,7 +90,7 @@
true
(0.578171, 0, 0.06489658)
West
- Slimy
+ Slimy
15
@@ -112,7 +112,6 @@
true
(0.578171, 0, 0.06489658)
West
- Moan
60
diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage2b.xml b/1.5/Defs/AnimationDefs/Cunnilingus/Stage2b.xml
index 32d87b0..f48b9ba 100644
--- a/1.5/Defs/AnimationDefs/Cunnilingus/Stage2b.xml
+++ b/1.5/Defs/AnimationDefs/Cunnilingus/Stage2b.xml
@@ -90,7 +90,7 @@
true
(0.578171, 0, 0.06489658)
West
- Slimy
+ Slimy
15
@@ -98,7 +98,6 @@
true
(0.578171, 0, 0.06489658)
West
- Moan
28
@@ -120,6 +119,7 @@
true
(0.578171, 0, 0.06489658)
West
+ Slimy
diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage2c.xml b/1.5/Defs/AnimationDefs/Cunnilingus/Stage2c.xml
index cf34694..30c9b68 100644
--- a/1.5/Defs/AnimationDefs/Cunnilingus/Stage2c.xml
+++ b/1.5/Defs/AnimationDefs/Cunnilingus/Stage2c.xml
@@ -22,7 +22,6 @@
true
(-0.2359883, -1, 0.3185842)
East
- Moan
60
@@ -85,7 +84,7 @@
true
(0.578171, 0, 0.06489658)
West
- Slimy
+ Slimy
15
@@ -94,7 +93,6 @@
(0.5309734, 0, 0.1120945)
(1, 1, 0.97)
West
- MoanShort
60
diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage3_LoopOnce.xml b/1.5/Defs/AnimationDefs/Cunnilingus/Stage3_LoopOnce.xml
index d8abf81..7169a61 100644
--- a/1.5/Defs/AnimationDefs/Cunnilingus/Stage3_LoopOnce.xml
+++ b/1.5/Defs/AnimationDefs/Cunnilingus/Stage3_LoopOnce.xml
@@ -97,7 +97,7 @@
- RenderNodeTag_Hand
+ Hand
Rimworld_Animations.AnimationWorker_KeyframesExtended
diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage4a.xml b/1.5/Defs/AnimationDefs/Cunnilingus/Stage4a.xml
index b129a6a..b166c6a 100644
--- a/1.5/Defs/AnimationDefs/Cunnilingus/Stage4a.xml
+++ b/1.5/Defs/AnimationDefs/Cunnilingus/Stage4a.xml
@@ -100,7 +100,6 @@
(0.5073743, 0, 0.07669616)
West
Slimy
- MoanShort
25
@@ -150,6 +149,7 @@
true
(0.2713863, -0.5, 0.6135693)
North
+
10
@@ -157,6 +157,7 @@
true
(0.2064899, -0.5, 0.60177)
North
+
20
@@ -164,6 +165,7 @@
true
(0.2477879, -0.5, 0.5545721)
North
+
25
@@ -171,6 +173,7 @@
true
(0.2713863, -0.5, 0.6135693)
North
+
diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage4b.xml b/1.5/Defs/AnimationDefs/Cunnilingus/Stage4b.xml
index 4d8d003..3deacfc 100644
--- a/1.5/Defs/AnimationDefs/Cunnilingus/Stage4b.xml
+++ b/1.5/Defs/AnimationDefs/Cunnilingus/Stage4b.xml
@@ -93,7 +93,6 @@
(0.5073743, 0, 0.07669616)
West
Slimy
- Grunt
25
@@ -143,6 +142,7 @@
true
(0.2713863, -0.5, 0.6135693)
North
+
10
@@ -150,6 +150,7 @@
true
(0.2064899, -0.5, 0.60177)
North
+
20
@@ -157,6 +158,7 @@
true
(0.2477879, -0.5, 0.5545721)
North
+
25
@@ -164,6 +166,7 @@
true
(0.2713863, -0.5, 0.6135693)
North
+
diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage4c.xml b/1.5/Defs/AnimationDefs/Cunnilingus/Stage4c.xml
index 8575f60..1d48c3b 100644
--- a/1.5/Defs/AnimationDefs/Cunnilingus/Stage4c.xml
+++ b/1.5/Defs/AnimationDefs/Cunnilingus/Stage4c.xml
@@ -100,7 +100,6 @@
(0.5073743, 0, 0.07669616)
West
Slimy
- MoanShort
25
@@ -150,6 +149,7 @@
true
(0.2713863, -0.5, 0.6135693)
North
+
10
@@ -157,6 +157,7 @@
true
(0.2064899, -0.5, 0.60177)
North
+
20
@@ -164,6 +165,7 @@
true
(0.2477879, -0.5, 0.5545721)
North
+
25
@@ -171,6 +173,7 @@
true
(0.2713863, -0.5, 0.6135693)
North
+
diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage5.xml b/1.5/Defs/AnimationDefs/Cunnilingus/Stage5.xml
index 06a941f..331b925 100644
--- a/1.5/Defs/AnimationDefs/Cunnilingus/Stage5.xml
+++ b/1.5/Defs/AnimationDefs/Cunnilingus/Stage5.xml
@@ -91,7 +91,7 @@
true
(0.5073743, 0, 0.06489658)
West
- Slimy
+ Slimy
10
@@ -100,7 +100,6 @@
(0.4896755, 0, 0.04129779)
West
Slimy
- Grunt
20
@@ -149,6 +148,7 @@
true
(0.2713863, -0.5, 0.6135693)
North
+
8
@@ -156,6 +156,7 @@
true
(0.2477879, -0.5, 0.6548674)
North
+
15
@@ -163,6 +164,7 @@
true
(0.2241894, -0.5, 0.6312683)
North
+
20
@@ -170,6 +172,7 @@
true
(0.2772866, -0.5, 0.6135693)
North
+
diff --git a/1.5/Defs/AnimationDefs/Cunnilingus/Stage6.xml b/1.5/Defs/AnimationDefs/Cunnilingus/Stage6.xml
index e82e43d..2aac216 100644
--- a/1.5/Defs/AnimationDefs/Cunnilingus/Stage6.xml
+++ b/1.5/Defs/AnimationDefs/Cunnilingus/Stage6.xml
@@ -43,7 +43,6 @@
true
(-0.2359883, -1, 0.2536873)
East
- Moan
100
@@ -130,7 +129,6 @@
(0.5073743, 0, 0.06489658)
West
Cum
- Scream
10
@@ -146,8 +144,8 @@
true
(0.5073743, 0, 0.06489658)
West
- Cum
-
+ Cum
+
30
112
@@ -155,7 +153,6 @@
(0.5073743, 0, 0.06489658)
West
Slimy
- Scream
35
@@ -231,6 +228,7 @@
true
(0.2772866, -0.5, 0.6135693)
North
+
10
@@ -238,6 +236,7 @@
true
(0.2890859, -0.5, 0.5663717)
North
+
15
@@ -245,6 +244,7 @@
true
(0.2182891, -0.5, 0.6666666)
North
+
30
@@ -252,6 +252,7 @@
true
(0.2831856, -0.5, 0.5781713)
North
+
45
@@ -259,6 +260,7 @@
true
(0.2064892, -0.5, 0.6430678)
North
+
70
@@ -266,6 +268,7 @@
false
(0.3303832, -0.5, 0.2654868)
North
+
diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage1.xml b/1.5/Defs/AnimationDefs/DoublePenetration/Stage1.xml
index 5313e3c..a6d5019 100644
--- a/1.5/Defs/AnimationDefs/DoublePenetration/Stage1.xml
+++ b/1.5/Defs/AnimationDefs/DoublePenetration/Stage1.xml
@@ -22,7 +22,7 @@
true
(-0.6, -1, -0.42)
East
- Clap
+ Fuck
40
@@ -30,7 +30,6 @@
true
(-0.6, -1, -0.37)
East
- Fuck
80
@@ -85,7 +84,6 @@
true
(-0.6, 0, 0.15)
West
- Grunt
40
@@ -154,7 +152,6 @@
true
(0.25, -1, 0.2)
West
- Fuck
40
@@ -162,6 +159,7 @@
true
(0.2, -1, 0.2)
West
+ Fuck
80
diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2a.xml b/1.5/Defs/AnimationDefs/DoublePenetration/Stage2a.xml
index 6cc8b36..9a8c749 100644
--- a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2a.xml
+++ b/1.5/Defs/AnimationDefs/DoublePenetration/Stage2a.xml
@@ -23,7 +23,6 @@
(-0.6, -1, -0.37)
East
Fuck
- Moan
40
@@ -85,7 +84,6 @@
true
(-0.4, 0, 0.1)
West
- MoanShort
40
@@ -135,7 +133,6 @@
true
(0.3, -1, 0.2)
West
- Fuck
40
@@ -143,7 +140,7 @@
true
(0.2, -1, 0.2)
West
- Clap
+ Fuck
diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2b.xml b/1.5/Defs/AnimationDefs/DoublePenetration/Stage2b.xml
index f116bea..8e607f2 100644
--- a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2b.xml
+++ b/1.5/Defs/AnimationDefs/DoublePenetration/Stage2b.xml
@@ -77,7 +77,6 @@
true
(-0.45, 0, 0.12)
West
- MoanShort
30
@@ -134,8 +133,6 @@
true
(0.3, -1, 0.2)
West
- Fuck
- Moan
40
@@ -143,7 +140,7 @@
true
(0.2, -1, 0.2)
West
- Clap
+ Fuck
diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2c.xml b/1.5/Defs/AnimationDefs/DoublePenetration/Stage2c.xml
index be857a2..d28c52e 100644
--- a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2c.xml
+++ b/1.5/Defs/AnimationDefs/DoublePenetration/Stage2c.xml
@@ -91,7 +91,6 @@
true
(-0.38, 0, 0.08)
West
- Grunt
30
diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2d.xml b/1.5/Defs/AnimationDefs/DoublePenetration/Stage2d.xml
index 09f0544..7995c42 100644
--- a/1.5/Defs/AnimationDefs/DoublePenetration/Stage2d.xml
+++ b/1.5/Defs/AnimationDefs/DoublePenetration/Stage2d.xml
@@ -87,9 +87,9 @@
15
- -39
+ -35
true
- (-0.5743952, 0, 0.1317991)
+ (-0.48, 0, 0.12)
West
@@ -125,7 +125,6 @@
0
true
South
- Scream
@@ -217,7 +216,7 @@
true
(-0.1, 1, -0.03)
North
- Slap
+ Slap
15
diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage3.xml b/1.5/Defs/AnimationDefs/DoublePenetration/Stage3.xml
index 8c582fa..9547341 100644
--- a/1.5/Defs/AnimationDefs/DoublePenetration/Stage3.xml
+++ b/1.5/Defs/AnimationDefs/DoublePenetration/Stage3.xml
@@ -23,7 +23,6 @@
(-0.64, -1, -0.3)
East
Fuck
- Moan
25
@@ -85,7 +84,6 @@
true
(-0.5, 0, 0.18)
West
- Grunt
25
@@ -148,7 +146,6 @@
(0.2, -1, 0.28)
West
Fuck
- Moan
25
diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage4.xml b/1.5/Defs/AnimationDefs/DoublePenetration/Stage4.xml
index 454edd6..521f72d 100644
--- a/1.5/Defs/AnimationDefs/DoublePenetration/Stage4.xml
+++ b/1.5/Defs/AnimationDefs/DoublePenetration/Stage4.xml
@@ -30,7 +30,6 @@
true
(-0.6, -1, -0.37)
East
- Grunt
@@ -85,7 +84,6 @@
true
(-0.56, 0, 0.22)
West
- Grunt
17
@@ -148,7 +146,6 @@
(0.23, -1, 0.28)
West
Fuck
- MoanShort
17
diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage5a.xml b/1.5/Defs/AnimationDefs/DoublePenetration/Stage5a.xml
index 53d4933..bc5e6e0 100644
--- a/1.5/Defs/AnimationDefs/DoublePenetration/Stage5a.xml
+++ b/1.5/Defs/AnimationDefs/DoublePenetration/Stage5a.xml
@@ -53,7 +53,6 @@
(-0.6, -1, -0.37)
East
Cum
- Scream
105
@@ -122,7 +121,6 @@
true
(-0.45, 0, 0.12)
West
- Scream
60
@@ -144,7 +142,6 @@
true
(-0.55, 0, 0.12)
West
- Scream
180
@@ -243,7 +240,6 @@
(0.16, -1, 0.2)
West
Cum
- Grunt
135
diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage5b.xml b/1.5/Defs/AnimationDefs/DoublePenetration/Stage5b.xml
index 2fd949d..677eddc 100644
--- a/1.5/Defs/AnimationDefs/DoublePenetration/Stage5b.xml
+++ b/1.5/Defs/AnimationDefs/DoublePenetration/Stage5b.xml
@@ -22,7 +22,6 @@
true
(-0.6, -1, -0.37)
East
- Fuck
25
@@ -30,7 +29,7 @@
true
(-0.6, -1, -0.37)
East
- Clap
+ Fuck
50
@@ -46,7 +45,6 @@
true
(-0.6, -1, -0.37)
East
- Moan
100
@@ -123,7 +121,6 @@
true
(-0.45, 0, 0.12)
West
- Scream
60
@@ -138,7 +135,6 @@
true
(-0.6, 0, 0)
West
- Scream
180
@@ -208,7 +204,6 @@
true
(0.16, -1, 0.2)
West
- Grunt
70
@@ -224,7 +219,6 @@
true
(0.16, -1, 0.2)
West
- Grunt
130
diff --git a/1.5/Defs/AnimationDefs/DoublePenetration/Stage5c.xml b/1.5/Defs/AnimationDefs/DoublePenetration/Stage5c.xml
index 8eada5b..ce1cb0e 100644
--- a/1.5/Defs/AnimationDefs/DoublePenetration/Stage5c.xml
+++ b/1.5/Defs/AnimationDefs/DoublePenetration/Stage5c.xml
@@ -22,7 +22,6 @@
true
(-0.6, -1, -0.37)
East
- Fuck
25
@@ -30,7 +29,7 @@
true
(-0.6, -1, -0.37)
East
- Clap
+ Fuck
50
@@ -46,7 +45,6 @@
true
(-0.6, -1, -0.37)
East
- Grunt
100
@@ -130,7 +128,6 @@
true
(-0.45, 0, 0.12)
West
- Scream
60
@@ -138,7 +135,6 @@
true
(-0.5, 0, 0.12)
West
- Scream
65
@@ -167,7 +163,6 @@
true
(-0.5, 0, 0.12)
West
- Scream
180
@@ -250,7 +245,6 @@
true
(0.33, -1, 0.2)
West
- Fuck
23
@@ -258,7 +252,7 @@
true
(0.16, -1, 0.2)
West
- Clap
+ Fuck
70
@@ -274,7 +268,6 @@
true
(0.16, -1, 0.2)
West
- Grunt
130
diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage1.xml b/1.5/Defs/AnimationDefs/Missionary/Stage1.xml
index 2c80c22..f795658 100644
--- a/1.5/Defs/AnimationDefs/Missionary/Stage1.xml
+++ b/1.5/Defs/AnimationDefs/Missionary/Stage1.xml
@@ -30,7 +30,6 @@
(-0.75, 0, 0.38)
East
Fuck
- Grunt
66
@@ -135,7 +134,6 @@
true
(0.1, -1, 0)
West
- Grunt
100
diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage2.xml b/1.5/Defs/AnimationDefs/Missionary/Stage2.xml
index 0a8c545..9362acf 100644
--- a/1.5/Defs/AnimationDefs/Missionary/Stage2.xml
+++ b/1.5/Defs/AnimationDefs/Missionary/Stage2.xml
@@ -23,7 +23,6 @@
true
(-0.6, 0, 0.38)
East
- Moan
35
@@ -114,7 +113,6 @@
true
(0.03, -1, 0)
West
- Moan
10
diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage2b.xml b/1.5/Defs/AnimationDefs/Missionary/Stage2b.xml
index 5341439..96e85d8 100644
--- a/1.5/Defs/AnimationDefs/Missionary/Stage2b.xml
+++ b/1.5/Defs/AnimationDefs/Missionary/Stage2b.xml
@@ -23,7 +23,6 @@
true
(-0.6, 0, 0.38)
East
- Moan
35
@@ -114,7 +113,6 @@
true
(0.03, -1, 0)
West
- Moan
10
diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage2c.xml b/1.5/Defs/AnimationDefs/Missionary/Stage2c.xml
index db7f170..ac1f762 100644
--- a/1.5/Defs/AnimationDefs/Missionary/Stage2c.xml
+++ b/1.5/Defs/AnimationDefs/Missionary/Stage2c.xml
@@ -23,7 +23,6 @@
true
(-0.6, 0, 0.38)
East
- Moan
35
@@ -121,7 +120,6 @@
true
(0.12, -1, 0.03)
West
- Moan
35
diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage4.xml b/1.5/Defs/AnimationDefs/Missionary/Stage4.xml
index 63700ce..816af01 100644
--- a/1.5/Defs/AnimationDefs/Missionary/Stage4.xml
+++ b/1.5/Defs/AnimationDefs/Missionary/Stage4.xml
@@ -23,7 +23,6 @@
true
(-0.42, 0, 0.42)
East
- MoanShort
20
@@ -100,7 +99,6 @@
true
(0.2, -1, 0)
West
- MoanShort
20
diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage5.xml b/1.5/Defs/AnimationDefs/Missionary/Stage5.xml
index 151741e..8a88271 100644
--- a/1.5/Defs/AnimationDefs/Missionary/Stage5.xml
+++ b/1.5/Defs/AnimationDefs/Missionary/Stage5.xml
@@ -23,7 +23,6 @@
true
(-0.45, 0, 0.42)
East
- Grunt
13
@@ -100,7 +99,6 @@
true
(0.16, -1, 0)
West
- Grunt
13
diff --git a/1.5/Defs/AnimationDefs/Missionary/Stage6.xml b/1.5/Defs/AnimationDefs/Missionary/Stage6.xml
index d0c9409..746ff38 100644
--- a/1.5/Defs/AnimationDefs/Missionary/Stage6.xml
+++ b/1.5/Defs/AnimationDefs/Missionary/Stage6.xml
@@ -23,7 +23,6 @@
(-0.43, 0, 0.42)
East
Fuck
- Scream
80
@@ -54,7 +53,6 @@
true
(-0.43, 0, 0.42)
East
- Scream
200
@@ -138,7 +136,6 @@
true
(0.23, -1, 0)
West
- Scream
80
@@ -146,7 +143,6 @@
true
(0.2, -1, 0)
West
- Scream
85
@@ -161,7 +157,6 @@
true
(0.2, -1, 0)
West
- Scream
155
diff --git a/1.5/Defs/VoiceDefs/VoiceDef_Human.xml b/1.5/Defs/VoiceDefs/VoiceDef_Human.xml
new file mode 100644
index 0000000..89c2f3e
--- /dev/null
+++ b/1.5/Defs/VoiceDefs/VoiceDef_Human.xml
@@ -0,0 +1,21 @@
+
+
+
+ Voice_HumanFemale
+ Human
+ Female
+
+
+
+
+
+
+ Voice_HumanMale
+ Human
+ Male
+
+
+
+
+
+
diff --git a/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanFemale.xml b/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanFemale.xml
deleted file mode 100644
index d142e25..0000000
--- a/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanFemale.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-
-
-
- Moan_HumanFemale
- MapOnly
-
- 5
- 5
-
-
-
-
- Voices/FVoice/Moan1
-
-
- Voices/FVoice/Moan2
-
-
- Voices/FVoice/Moan3
-
-
- Voices/FVoice/Moan4
-
-
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
- NeverTwice
- false
-
-
-
-
-
- MoanShort_HumanFemale
- MapOnly
-
- 5
- 5
-
-
-
-
- Voices/FVoice/MoanShort1
-
-
- Voices/FVoice/MoanShort2
-
-
- Voices/FVoice/MoanShort3
-
-
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
- NeverTwice
- false
-
-
-
-
-
- Grunt_HumanFemale
- MapOnly
-
- 5
- 5
-
-
-
-
- Voices/FVoice/Grunt1
-
-
- Voices/FVoice/Grunt2
-
-
- Voices/FVoice/Grunt3
-
-
- Voices/FVoice/Grunt4
-
-
- Voices/FVoice/Grunt5
-
-
- Voices/FVoice/Grunt6
-
-
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
- NeverTwice
- false
-
-
-
-
-
- Scream_HumanFemale
- MapOnly
-
- 5
- 5
-
-
-
-
- Voices/FVoice/Scream1
-
-
- Voices/FVoice/Scream2
-
-
- Voices/FVoice/Scream3
-
-
- Voices/FVoice/Scream4
-
-
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
- NeverTwice
- false
-
-
-
-
diff --git a/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanMale.xml b/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanMale.xml
deleted file mode 100644
index eb1e184..0000000
--- a/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanMale.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
-
- Moan_HumanMale
- MapOnly
-
- 5
- 5
-
-
-
-
- Voices/MVoice/Moan1
-
-
- Voices/MVoice/Moan2
-
-
- Voices/MVoice/Moan3
-
-
- Voices/MVoice/Moan4
-
-
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
- NeverTwice
- false
-
-
-
-
-
- MoanShort_HumanMale
- MapOnly
-
- 5
- 5
-
-
-
-
- Voices/MVoice/MoanShort1
-
-
- Voices/MVoice/MoanShort2
-
-
- Voices/MVoice/MoanShort3
-
-
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
- NeverTwice
- false
-
-
-
-
-
- Grunt_HumanMale
- MapOnly
-
- 5
- 5
-
-
-
-
- Voices/MVoice/Grunt1
-
-
- Voices/MVoice/Grunt2
-
-
- Voices/MVoice/Grunt3
-
-
- Voices/MVoice/Grunt4
-
-
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
- NeverTwice
- false
-
-
-
-
-
- Scream_HumanMale
- MapOnly
-
- 5
- 5
-
-
-
-
- Voices/MVoice/Scream1
-
-
- Voices/MVoice/Scream2
-
-
- Voices/MVoice/Scream3
-
-
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
- NeverTwice
- false
-
-
-
-
diff --git a/1.5/Defs/VoiceDefs/VoiceDef_Human/VoiceDef_Human.xml b/1.5/Defs/VoiceDefs/VoiceDef_Human/VoiceDef_Human.xml
deleted file mode 100644
index 46141bb..0000000
--- a/1.5/Defs/VoiceDefs/VoiceDef_Human/VoiceDef_Human.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
- Voice_HumanFemale
- Female
-
- MoanMoan_HumanFemale
- MoanShortMoanShort_HumanFemale
- GruntGrunt_HumanFemale
- ScreamScream_HumanFemale
-
-
-
-
- Voice_HumanMale
- Male
-
- MoanMoan_HumanMale
- MoanShortMoanShort_HumanMale
- GruntGrunt_HumanMale
- ScreamScream_HumanMale
-
-
-
-
diff --git a/1.5/Defs/VoiceDefs/VoiceDef_Orassan.xml b/1.5/Defs/VoiceDefs/VoiceDef_Orassan.xml
index be5bec0..0026987 100644
--- a/1.5/Defs/VoiceDefs/VoiceDef_Orassan.xml
+++ b/1.5/Defs/VoiceDefs/VoiceDef_Orassan.xml
@@ -3,9 +3,7 @@
-
-
- Scream
- 1
-
-
\ No newline at end of file
diff --git a/1.5/Sounds/Voices/FVoice/Grunt1.wav b/1.5/Sounds/Voices/FVoice/Grunt1.wav
deleted file mode 100644
index 3ae3ca3..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Grunt1.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Grunt2.wav b/1.5/Sounds/Voices/FVoice/Grunt2.wav
deleted file mode 100644
index 496a02d..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Grunt2.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Grunt3.wav b/1.5/Sounds/Voices/FVoice/Grunt3.wav
deleted file mode 100644
index 3e905dd..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Grunt3.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Grunt4.wav b/1.5/Sounds/Voices/FVoice/Grunt4.wav
deleted file mode 100644
index 4586e8a..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Grunt4.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Grunt5.wav b/1.5/Sounds/Voices/FVoice/Grunt5.wav
deleted file mode 100644
index 6fad8c2..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Grunt5.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Grunt6.wav b/1.5/Sounds/Voices/FVoice/Grunt6.wav
deleted file mode 100644
index e660f30..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Grunt6.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Moan1.wav b/1.5/Sounds/Voices/FVoice/Moan1.wav
deleted file mode 100644
index 14d19bc..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Moan1.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Moan2.wav b/1.5/Sounds/Voices/FVoice/Moan2.wav
deleted file mode 100644
index 7aba4b5..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Moan2.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Moan3.wav b/1.5/Sounds/Voices/FVoice/Moan3.wav
deleted file mode 100644
index d3fbf99..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Moan3.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Moan4.wav b/1.5/Sounds/Voices/FVoice/Moan4.wav
deleted file mode 100644
index cfe3606..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Moan4.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/MoanShort1.wav b/1.5/Sounds/Voices/FVoice/MoanShort1.wav
deleted file mode 100644
index 48eea21..0000000
Binary files a/1.5/Sounds/Voices/FVoice/MoanShort1.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/MoanShort2.wav b/1.5/Sounds/Voices/FVoice/MoanShort2.wav
deleted file mode 100644
index 4e3b5b8..0000000
Binary files a/1.5/Sounds/Voices/FVoice/MoanShort2.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/MoanShort3.wav b/1.5/Sounds/Voices/FVoice/MoanShort3.wav
deleted file mode 100644
index bcd4b49..0000000
Binary files a/1.5/Sounds/Voices/FVoice/MoanShort3.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Scream1.wav b/1.5/Sounds/Voices/FVoice/Scream1.wav
deleted file mode 100644
index 58ddb69..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Scream1.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Scream2.wav b/1.5/Sounds/Voices/FVoice/Scream2.wav
deleted file mode 100644
index 75bbd9b..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Scream2.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Scream3.wav b/1.5/Sounds/Voices/FVoice/Scream3.wav
deleted file mode 100644
index 251126d..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Scream3.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/FVoice/Scream4.wav b/1.5/Sounds/Voices/FVoice/Scream4.wav
deleted file mode 100644
index bd7ca69..0000000
Binary files a/1.5/Sounds/Voices/FVoice/Scream4.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/Grunt1.wav b/1.5/Sounds/Voices/MVoice/Grunt1.wav
deleted file mode 100644
index d73ca08..0000000
Binary files a/1.5/Sounds/Voices/MVoice/Grunt1.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/Grunt2.wav b/1.5/Sounds/Voices/MVoice/Grunt2.wav
deleted file mode 100644
index 8307871..0000000
Binary files a/1.5/Sounds/Voices/MVoice/Grunt2.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/Grunt3.wav b/1.5/Sounds/Voices/MVoice/Grunt3.wav
deleted file mode 100644
index 9cf9162..0000000
Binary files a/1.5/Sounds/Voices/MVoice/Grunt3.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/Grunt4.wav b/1.5/Sounds/Voices/MVoice/Grunt4.wav
deleted file mode 100644
index c8b7efa..0000000
Binary files a/1.5/Sounds/Voices/MVoice/Grunt4.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/Moan1.wav b/1.5/Sounds/Voices/MVoice/Moan1.wav
deleted file mode 100644
index eafc035..0000000
Binary files a/1.5/Sounds/Voices/MVoice/Moan1.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/Moan2.wav b/1.5/Sounds/Voices/MVoice/Moan2.wav
deleted file mode 100644
index 636b445..0000000
Binary files a/1.5/Sounds/Voices/MVoice/Moan2.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/Moan3.wav b/1.5/Sounds/Voices/MVoice/Moan3.wav
deleted file mode 100644
index b47f6c3..0000000
Binary files a/1.5/Sounds/Voices/MVoice/Moan3.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/Moan4.wav b/1.5/Sounds/Voices/MVoice/Moan4.wav
deleted file mode 100644
index dc92d64..0000000
Binary files a/1.5/Sounds/Voices/MVoice/Moan4.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/MoanShort1.wav b/1.5/Sounds/Voices/MVoice/MoanShort1.wav
deleted file mode 100644
index 9bf94e4..0000000
Binary files a/1.5/Sounds/Voices/MVoice/MoanShort1.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/MoanShort2.wav b/1.5/Sounds/Voices/MVoice/MoanShort2.wav
deleted file mode 100644
index 481ca2d..0000000
Binary files a/1.5/Sounds/Voices/MVoice/MoanShort2.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/MoanShort3.wav b/1.5/Sounds/Voices/MVoice/MoanShort3.wav
deleted file mode 100644
index 34d5ee1..0000000
Binary files a/1.5/Sounds/Voices/MVoice/MoanShort3.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/Scream1.wav b/1.5/Sounds/Voices/MVoice/Scream1.wav
deleted file mode 100644
index 2d987a0..0000000
Binary files a/1.5/Sounds/Voices/MVoice/Scream1.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/Scream2.wav b/1.5/Sounds/Voices/MVoice/Scream2.wav
deleted file mode 100644
index b71293b..0000000
Binary files a/1.5/Sounds/Voices/MVoice/Scream2.wav and /dev/null differ
diff --git a/1.5/Sounds/Voices/MVoice/Scream3.wav b/1.5/Sounds/Voices/MVoice/Scream3.wav
deleted file mode 100644
index f7b73c3..0000000
Binary files a/1.5/Sounds/Voices/MVoice/Scream3.wav and /dev/null differ
diff --git a/1.5/Source/Comps/CompExtendedAnimator.cs b/1.5/Source/Comps/CompExtendedAnimator.cs
index d086c32..d86bdbf 100644
--- a/1.5/Source/Comps/CompExtendedAnimator.cs
+++ b/1.5/Source/Comps/CompExtendedAnimator.cs
@@ -284,32 +284,28 @@ namespace Rimworld_Animations {
sound.PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
}
- if (RJWAnimationSettings.playVoices)
+ //play voice sounds
+ VoiceTagDef voiceTag = animWorker.voiceAtTick(rootNode.tree.AnimationTick);
+ if (voiceTag != null)
{
- //play voice sounds
- VoiceTagDef voiceTag = animWorker.voiceAtTick(rootNode.tree.AnimationTick);
- if (voiceTag != null)
+ if (voice != null && voice.sounds.ContainsKey(voiceTag))
{
- if (voice != null && voice.sounds.ContainsKey(voiceTag))
+ voice.sounds[voiceTag].PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
+ }
+
+ else if (pawn.RaceProps.Humanlike && RJWAnimationSettings.playHumanlikeVoicesAsDefault)
+ {
+ //play default voice
+ VoiceDef pawnDefaultVoice = (pawn.gender == Gender.Male ? VoiceDefOf.Voice_HumanMale : VoiceDefOf.Voice_HumanFemale);
+ if (pawnDefaultVoice.sounds.ContainsKey(voiceTag))
{
- voice.sounds[voiceTag].PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
- }
-
- else if (pawn.RaceProps.Humanlike && RJWAnimationSettings.playHumanlikeVoicesAsDefault)
- {
- //play default voice
- VoiceDef pawnDefaultVoice = (pawn.gender == Gender.Male ? VoiceDefOf.Voice_HumanMale : VoiceDefOf.Voice_HumanFemale);
- if (pawnDefaultVoice.sounds.ContainsKey(voiceTag))
- {
- pawnDefaultVoice.sounds[voiceTag].PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
- }
-
-
+ pawnDefaultVoice.sounds[voiceTag].PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
}
+
}
- }
+ }
}
@@ -326,27 +322,25 @@ namespace Rimworld_Animations {
sound.PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
}
- if (RJWAnimationSettings.playVoices)
+ //play voice sounds
+ VoiceTagDef voiceTag = childrenAnimWorker.voiceAtTick(rootNode.tree.AnimationTick);
+ if (voiceTag != null)
{
- //play voice sounds
- VoiceTagDef voiceTag = childrenAnimWorker.voiceAtTick(rootNode.tree.AnimationTick);
- if (voiceTag != null)
+ if (voice != null && voice.sounds.ContainsKey(voiceTag))
+ {
+ voice.sounds[voiceTag].PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
+ }
+ else if (pawn.RaceProps.Humanlike && RJWAnimationSettings.playHumanlikeVoicesAsDefault)
{
- if (voice != null && voice.sounds.ContainsKey(voiceTag))
- {
- voice.sounds[voiceTag].PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
- }
- else if (pawn.RaceProps.Humanlike && RJWAnimationSettings.playHumanlikeVoicesAsDefault)
- {
- VoiceDef pawnDefaultVoice = (pawn.gender == Gender.Male ? VoiceDefOf.Voice_HumanMale : VoiceDefOf.Voice_HumanFemale);
- if (pawnDefaultVoice.sounds.ContainsKey(voiceTag))
- {
- pawnDefaultVoice.sounds[voiceTag].PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
- }
+ VoiceDef pawnDefaultVoice = (pawn.gender == Gender.Male ? VoiceDefOf.Voice_HumanMale : VoiceDefOf.Voice_HumanFemale);
+ if (pawnDefaultVoice.sounds.ContainsKey(voiceTag))
+ {
+ pawnDefaultVoice.sounds[voiceTag].PlayOneShot(new TargetInfo(pawn.Position, pawn.Map));
}
}
}
+
}
}
}
diff --git a/1.5/Source/Patches/RJWPatches/RJWAnimationSettings.cs b/1.5/Source/Patches/RJWPatches/RJWAnimationSettings.cs
index 0553c68..0716cb8 100644
--- a/1.5/Source/Patches/RJWPatches/RJWAnimationSettings.cs
+++ b/1.5/Source/Patches/RJWPatches/RJWAnimationSettings.cs
@@ -15,7 +15,7 @@ namespace Rimworld_Animations {
PlayAnimForNonsexualActs = true;
//probably move this setting to a different mod menu if moving rjw parts of code
- public static bool playVoices = true, playHumanlikeVoicesAsDefault = true;
+ public static bool playHumanlikeVoicesAsDefault = true;
public static float floatRangeInRenderTreeMenu = 1f;
public static bool offsetTab = false, debugMode = false;
@@ -24,7 +24,7 @@ namespace Rimworld_Animations {
public override void ExposeData() {
base.ExposeData();
- Scribe_Values.Look(ref playVoices, "RJWAnimations_PlayVoices", true);
+
Scribe_Values.Look(ref playHumanlikeVoicesAsDefault, "RJWAnimations-playHumanlikeVoicesAsDefault", true);
Scribe_Values.Look(ref debugMode, "RJWAnimations-AnimsDebugMode", false);
Scribe_Values.Look(ref offsetTab, "RJWAnimations-EnableOffsetTab", false);
@@ -61,12 +61,7 @@ namespace Rimworld_Animations {
listingStandard.CheckboxLabeled("RimAnim_HeartsDuringLovin".Translate(), ref RJWAnimationSettings.hearts);
listingStandard.CheckboxLabeled("RimAnim_PlayNonsexual".Translate(), ref RJWAnimationSettings.PlayAnimForNonsexualActs);
listingStandard.CheckboxLabeled("RimAnim_AnimManagerTab".Translate(), ref RJWAnimationSettings.offsetTab);
- listingStandard.CheckboxLabeled("RimAnim_Voices".Translate(), ref RJWAnimationSettings.playVoices);
- if (RJWAnimationSettings.playVoices)
- {
- listingStandard.CheckboxLabeled("RimAnim_HumanlikeVoicesDefault".Translate(), ref RJWAnimationSettings.playHumanlikeVoicesAsDefault);
- }
-
+ listingStandard.CheckboxLabeled("RimAnim_HumanlikeVoicesDefault".Translate(), ref RJWAnimationSettings.playHumanlikeVoicesAsDefault);
listingStandard.Label("RimAnim_ShiverIntensity".Translate() + RJWAnimationSettings.shiverIntensity);
RJWAnimationSettings.shiverIntensity = listingStandard.Slider(RJWAnimationSettings.shiverIntensity, 0.0f, 12f);
diff --git a/1.5/Source/Voices/VoiceDef.cs b/1.5/Source/Voices/VoiceDef.cs
index ace112b..9dd6c0d 100644
--- a/1.5/Source/Voices/VoiceDef.cs
+++ b/1.5/Source/Voices/VoiceDef.cs
@@ -11,7 +11,7 @@ namespace Rimworld_Animations
public class VoiceDef : Def
{
- public List races = new List();
+ public ThingDef race;
public Gender gender = Gender.None;
public List traits = new List();
public bool takesPriority = false;
@@ -22,8 +22,8 @@ namespace Rimworld_Animations
public bool VoiceFitsPawn(Pawn pawn)
{
- //doesn't match any of the races
- if (!races.Exists(x => x == pawn.def)) return false;
+ //doesn't match race
+ if (pawn.def != race) return false;
//doesn't match gender
if (gender != Gender.None && pawn.gender != gender) return false;
diff --git a/Languages/ChineseSimplified/Keyed/RJWAnimations-LanguageData.xml b/Languages/ChineseSimplified/Keyed/RJWAnimations-LanguageData.xml
index f72918a..01c1efe 100644
--- a/Languages/ChineseSimplified/Keyed/RJWAnimations-LanguageData.xml
+++ b/Languages/ChineseSimplified/Keyed/RJWAnimations-LanguageData.xml
@@ -11,17 +11,12 @@
播放非性行为的动画 (牵手、亲热)
启用动画管理器选项卡
颤抖/颤动强度 (默认为 2):
-
- 默认情况下播放类似人类的声音
调试模式
- 调整渲染树偏移表单的浮动范围:
Animation Manager
- 警告--一般情况下,你不想更改人类偏移值,只想更改外星种族偏移值或动物偏移值
+ 警告--一般情况下,你不想更改人类偏移值,只想更改外星種族偏移值或动物偏移值
将偏移值复制到剪贴板
将偏移值粘贴到 OffsetDef 中,或在 Discord 中共享
-
-
\ No newline at end of file
diff --git a/Languages/ChineseTraditional/Keyed/RJWAnimations-LanguageData.xml b/Languages/ChineseTraditional/Keyed/RJWAnimations-LanguageData.xml
index 735e081..413ee6e 100644
--- a/Languages/ChineseTraditional/Keyed/RJWAnimations-LanguageData.xml
+++ b/Languages/ChineseTraditional/Keyed/RJWAnimations-LanguageData.xml
@@ -11,10 +11,7 @@
播放非性行為的動畫 (牽手、親熱)
啟用動畫管理器選項卡
顫抖/顫動強度 (預設為 2):
-
- 默認情況下播放類似人類的聲音
除錯模式
- 調整渲染樹偏移表單的浮動範圍:
Animation Manager
@@ -22,6 +19,4 @@
將偏移值複製到剪貼板
將偏移值黏貼到 OffsetDef 中,或在 Discord 中共享
-
-
\ No newline at end of file
diff --git a/Languages/English/Keyed/RJWAnimations-LanguageData.xml b/Languages/English/Keyed/RJWAnimations-LanguageData.xml
index 5d671f3..418ffef 100644
--- a/Languages/English/Keyed/RJWAnimations-LanguageData.xml
+++ b/Languages/English/Keyed/RJWAnimations-LanguageData.xml
@@ -11,18 +11,15 @@
Play animation for nonsexual acts (handholding, makeout)
Enable Animation Manager Tab
Shiver/Quiver Intensity (default 2):
- Play voices during animations
- Play human voices by default, when none found for humanlike race
+ Play humanlike voices by default
Debug Mode
- Float range for Debug Render Tree offset menu:
-
Animation Manager
Warning--You generally don't want to change human offsets, only alien offsets or animals
Copy Offset to Clipboard
Paste offset values in OffsetDef, or share in Discord
-
+ Float range for Debug Render Tree offset menu:
\ No newline at end of file
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 90a869b..153b40d 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -30,7 +30,6 @@
Patch_HumanoidAlienRaces/1.5
Patch_SexToysMasturbation/1.5
Patch_FacialAnimation/1.5
- Patch_NoRimNudeWorld/1.5
diff --git a/Patch_NoRimNudeWorld/1.5/Defs/PawnRenderNodeTagDef.xml b/Patch_NoRimNudeWorld/1.5/Defs/PawnRenderNodeTagDef.xml
deleted file mode 100644
index 004ac6a..0000000
--- a/Patch_NoRimNudeWorld/1.5/Defs/PawnRenderNodeTagDef.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
- RimNude_Penis
-
-
diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj
index 2ae8965..1388e50 100644
--- a/Rimworld-Animations.csproj
+++ b/Rimworld-Animations.csproj
@@ -244,9 +244,7 @@
-
-
-
+
@@ -291,37 +289,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -350,7 +317,6 @@
-