diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index d5aa87f..1eb329b 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 b42fc01..d0b4c12 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,7 +150,10 @@ Sex/Clap_8 - 35~45 + + 45 + 70 + 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 7c9cb6c..d142e25 100644 --- a/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanFemale.xml +++ b/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanFemale.xml @@ -22,9 +22,18 @@ Voices/FVoice/Moan4 - 40~50 - 0.99~1.02 - 10~50 + + 55 + 65 + + + 0.9 + 1.1 + + + 0 + 100 + NeverTwice false @@ -50,9 +59,18 @@ Voices/FVoice/MoanShort3 - 40~50 - 0.99~1.02 - 10~50 + + 55 + 65 + + + 0.9 + 1.1 + + + 0 + 100 + NeverTwice false @@ -87,9 +105,18 @@ Voices/FVoice/Grunt6 - 40~50 - 0.99~1.02 - 10~50 + + 55 + 65 + + + 0.9 + 1.1 + + + 0 + 100 + NeverTwice false @@ -118,10 +145,18 @@ Voices/FVoice/Scream4 - - 0.99~1.02 - 40~50 - 10~50 + + 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 index 5420a05..eb1e184 100644 --- a/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanMale.xml +++ b/1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanMale.xml @@ -22,9 +22,18 @@ Voices/MVoice/Moan4 - 0.99~1.02 - 40~50 - 10~50 + + 55 + 65 + + + 0.9 + 1.1 + + + 0 + 100 + NeverTwice false @@ -50,9 +59,18 @@ Voices/MVoice/MoanShort3 - 0.99~1.02 - 40~50 - 10~50 + + 55 + 65 + + + 0.9 + 1.1 + + + 0 + 100 + NeverTwice false @@ -81,9 +99,18 @@ Voices/MVoice/Grunt4 - 0.99~1.02 - 40~50 - 10~50 + + 55 + 65 + + + 0.9 + 1.1 + + + 0 + 100 + NeverTwice false @@ -109,9 +136,18 @@ Voices/MVoice/Scream3 - 0.99~1.02 - 40~50 - 10~50 + + 55 + 65 + + + 0.9 + 1.1 + + + 0 + 100 + NeverTwice false diff --git a/1.5/Source/Animations/PawnTests/PawnTest_Trait.cs b/1.5/Source/Animations/PawnTests/PawnTest_Trait.cs deleted file mode 100644 index dd67038..0000000 --- a/1.5/Source/Animations/PawnTests/PawnTest_Trait.cs +++ /dev/null @@ -1,27 +0,0 @@ -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 9e14a16..b8ae4cf 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -93,7 +93,6 @@ -