diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll
index 1eb329b..d5aa87f 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/SoundDefs/Sounds_Sex.xml b/1.5/Defs/SoundDefs/Sounds_Sex.xml
index d0b4c12..b42fc01 100644
--- a/1.5/Defs/SoundDefs/Sounds_Sex.xml
+++ b/1.5/Defs/SoundDefs/Sounds_Sex.xml
@@ -83,21 +83,21 @@
Sex/Suck/Suck_5
-
- Sex/Suck/Suck_6
-
-
- Sex/Suck/Suck_7
-
-
- Sex/Suck/Suck_8
-
-
- Sex/Suck/Suck_9
-
-
- Sex/Suck/Suck_10
-
+
+ Sex/Suck/Suck_6
+
+
+ Sex/Suck/Suck_7
+
+
+ Sex/Suck/Suck_8
+
+
+ Sex/Suck/Suck_9
+
+
+ Sex/Suck/Suck_10
+
20
@@ -150,10 +150,7 @@
Sex/Clap_8
-
- 45
- 70
-
+ 35~45
1.0
1.0
diff --git a/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanFemale.xml b/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanFemale.xml
index d142e25..7c9cb6c 100644
--- a/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanFemale.xml
+++ b/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanFemale.xml
@@ -22,18 +22,9 @@
Voices/FVoice/Moan4
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
+ 40~50
+ 0.99~1.02
+ 10~50
NeverTwice
false
@@ -59,18 +50,9 @@
Voices/FVoice/MoanShort3
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
+ 40~50
+ 0.99~1.02
+ 10~50
NeverTwice
false
@@ -105,18 +87,9 @@
Voices/FVoice/Grunt6
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
+ 40~50
+ 0.99~1.02
+ 10~50
NeverTwice
false
@@ -145,18 +118,10 @@
Voices/FVoice/Scream4
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
+
+ 0.99~1.02
+ 40~50
+ 10~50
NeverTwice
false
diff --git a/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanMale.xml b/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanMale.xml
index eb1e184..5420a05 100644
--- a/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanMale.xml
+++ b/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanMale.xml
@@ -22,18 +22,9 @@
Voices/MVoice/Moan4
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
+ 0.99~1.02
+ 40~50
+ 10~50
NeverTwice
false
@@ -59,18 +50,9 @@
Voices/MVoice/MoanShort3
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
+ 0.99~1.02
+ 40~50
+ 10~50
NeverTwice
false
@@ -99,18 +81,9 @@
Voices/MVoice/Grunt4
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
+ 0.99~1.02
+ 40~50
+ 10~50
NeverTwice
false
@@ -136,18 +109,9 @@
Voices/MVoice/Scream3
-
- 55
- 65
-
-
- 0.9
- 1.1
-
-
- 0
- 100
-
+ 0.99~1.02
+ 40~50
+ 10~50
NeverTwice
false
diff --git a/1.5/Source/Animations/PawnTests/PawnTest_Trait.cs b/1.5/Source/Animations/PawnTests/PawnTest_Trait.cs
new file mode 100644
index 0000000..dd67038
--- /dev/null
+++ b/1.5/Source/Animations/PawnTests/PawnTest_Trait.cs
@@ -0,0 +1,27 @@
+using RimWorld;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Verse;
+
+namespace Rimworld_Animations
+{
+ public class PawnTest_Trait : BasePawnTest
+ {
+ TraitDef traitDef;
+ int? degree;
+
+ public override bool PawnTest(Pawn pawn)
+ {
+
+ if (degree != null)
+ {
+ return pawn.story.traits.HasTrait(traitDef, (int)degree);
+ }
+
+ return pawn.story.traits.HasTrait(traitDef);
+ }
+ }
+}
diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj
index b8ae4cf..9e14a16 100644
--- a/Rimworld-Animations.csproj
+++ b/Rimworld-Animations.csproj
@@ -93,6 +93,7 @@
+