diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index 42d4230..e6fa89d 100644 Binary files a/1.2/Assemblies/Rimworld-Animations.dll and b/1.2/Assemblies/Rimworld-Animations.dll differ diff --git a/About/Manifest.xml b/About/Manifest.xml index a530787..06ccf7c 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,5 +1,5 @@ - + Rimworld-Animations - 1.1.4 - \ No newline at end of file + 1.1.5 + diff --git a/Sounds/Sex/Slime/Slimy1.mp3 b/Sounds/Sex/Slime/Slimy1.mp3 deleted file mode 100644 index 7277d15..0000000 Binary files a/Sounds/Sex/Slime/Slimy1.mp3 and /dev/null differ diff --git a/Sounds/Sex/Slime/Slimy1.wav b/Sounds/Sex/Slime/Slimy1.wav new file mode 100644 index 0000000..3cfbd74 Binary files /dev/null and b/Sounds/Sex/Slime/Slimy1.wav differ diff --git a/Sounds/Sex/Slime/Slimy2.mp3 b/Sounds/Sex/Slime/Slimy2.mp3 deleted file mode 100644 index 8311746..0000000 Binary files a/Sounds/Sex/Slime/Slimy2.mp3 and /dev/null differ diff --git a/Sounds/Sex/Slime/Slimy2.wav b/Sounds/Sex/Slime/Slimy2.wav new file mode 100644 index 0000000..36a9197 Binary files /dev/null and b/Sounds/Sex/Slime/Slimy2.wav differ diff --git a/Sounds/Sex/Slime/Slimy3.mp3 b/Sounds/Sex/Slime/Slimy3.mp3 deleted file mode 100644 index 797adc0..0000000 Binary files a/Sounds/Sex/Slime/Slimy3.mp3 and /dev/null differ diff --git a/Sounds/Sex/Slime/Slimy3.wav b/Sounds/Sex/Slime/Slimy3.wav new file mode 100644 index 0000000..40aff1e Binary files /dev/null and b/Sounds/Sex/Slime/Slimy3.wav differ diff --git a/Sounds/Sex/Slime/Slimy4.mp3 b/Sounds/Sex/Slime/Slimy4.mp3 deleted file mode 100644 index 8e568f7..0000000 Binary files a/Sounds/Sex/Slime/Slimy4.mp3 and /dev/null differ diff --git a/Sounds/Sex/Slime/Slimy4.wav b/Sounds/Sex/Slime/Slimy4.wav new file mode 100644 index 0000000..0b6404e Binary files /dev/null and b/Sounds/Sex/Slime/Slimy4.wav differ diff --git a/Sounds/Sex/Slime/Slimy5.mp3 b/Sounds/Sex/Slime/Slimy5.mp3 deleted file mode 100644 index ba1d554..0000000 Binary files a/Sounds/Sex/Slime/Slimy5.mp3 and /dev/null differ diff --git a/Sounds/Sex/Slime/Slimy5.wav b/Sounds/Sex/Slime/Slimy5.wav new file mode 100644 index 0000000..ea310db Binary files /dev/null and b/Sounds/Sex/Slime/Slimy5.wav differ diff --git a/Sounds/Sex/Suck/Suck_1.mp3 b/Sounds/Sex/Suck/Suck_1.mp3 deleted file mode 100644 index fc82452..0000000 Binary files a/Sounds/Sex/Suck/Suck_1.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Suck_1.wav b/Sounds/Sex/Suck/Suck_1.wav new file mode 100644 index 0000000..4f1eafd Binary files /dev/null and b/Sounds/Sex/Suck/Suck_1.wav differ diff --git a/Sounds/Sex/Suck/Suck_10.mp3 b/Sounds/Sex/Suck/Suck_10.mp3 deleted file mode 100644 index 70ac207..0000000 Binary files a/Sounds/Sex/Suck/Suck_10.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Suck_10.wav b/Sounds/Sex/Suck/Suck_10.wav new file mode 100644 index 0000000..284cda3 Binary files /dev/null and b/Sounds/Sex/Suck/Suck_10.wav differ diff --git a/Sounds/Sex/Suck/Suck_3.mp3 b/Sounds/Sex/Suck/Suck_3.mp3 deleted file mode 100644 index 838322f..0000000 Binary files a/Sounds/Sex/Suck/Suck_3.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Suck_3.wav b/Sounds/Sex/Suck/Suck_3.wav new file mode 100644 index 0000000..95e7348 Binary files /dev/null and b/Sounds/Sex/Suck/Suck_3.wav differ diff --git a/Sounds/Sex/Suck/Suck_4.mp3 b/Sounds/Sex/Suck/Suck_4.mp3 deleted file mode 100644 index 54f701d..0000000 Binary files a/Sounds/Sex/Suck/Suck_4.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Suck_4.wav b/Sounds/Sex/Suck/Suck_4.wav new file mode 100644 index 0000000..753a023 Binary files /dev/null and b/Sounds/Sex/Suck/Suck_4.wav differ diff --git a/Sounds/Sex/Suck/Suck_5.mp3 b/Sounds/Sex/Suck/Suck_5.mp3 deleted file mode 100644 index f3f399e..0000000 Binary files a/Sounds/Sex/Suck/Suck_5.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Suck_5.wav b/Sounds/Sex/Suck/Suck_5.wav new file mode 100644 index 0000000..8ecda9c Binary files /dev/null and b/Sounds/Sex/Suck/Suck_5.wav differ diff --git a/Sounds/Sex/Suck/Suck_6.mp3 b/Sounds/Sex/Suck/Suck_6.mp3 deleted file mode 100644 index 94c8de1..0000000 Binary files a/Sounds/Sex/Suck/Suck_6.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Suck_6.wav b/Sounds/Sex/Suck/Suck_6.wav new file mode 100644 index 0000000..08567d6 Binary files /dev/null and b/Sounds/Sex/Suck/Suck_6.wav differ diff --git a/Sounds/Sex/Suck/Suck_7.mp3 b/Sounds/Sex/Suck/Suck_7.mp3 deleted file mode 100644 index f429c8e..0000000 Binary files a/Sounds/Sex/Suck/Suck_7.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Suck_7.wav b/Sounds/Sex/Suck/Suck_7.wav new file mode 100644 index 0000000..a63b0e4 Binary files /dev/null and b/Sounds/Sex/Suck/Suck_7.wav differ diff --git a/Sounds/Sex/Suck/Suck_8.mp3 b/Sounds/Sex/Suck/Suck_8.mp3 deleted file mode 100644 index 2a29cd8..0000000 Binary files a/Sounds/Sex/Suck/Suck_8.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Suck_8.wav b/Sounds/Sex/Suck/Suck_8.wav new file mode 100644 index 0000000..320da09 Binary files /dev/null and b/Sounds/Sex/Suck/Suck_8.wav differ diff --git a/Sounds/Sex/Suck/Suck_9.mp3 b/Sounds/Sex/Suck/Suck_9.mp3 deleted file mode 100644 index 2655ec9..0000000 Binary files a/Sounds/Sex/Suck/Suck_9.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Suck_9.wav b/Sounds/Sex/Suck/Suck_9.wav new file mode 100644 index 0000000..7ab538a Binary files /dev/null and b/Sounds/Sex/Suck/Suck_9.wav differ diff --git a/Sounds/Sex/Suck/Swallow_1.mp3 b/Sounds/Sex/Suck/Swallow_1.mp3 deleted file mode 100644 index c4a489b..0000000 Binary files a/Sounds/Sex/Suck/Swallow_1.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Swallow_1.wav b/Sounds/Sex/Suck/Swallow_1.wav new file mode 100644 index 0000000..f3276cc Binary files /dev/null and b/Sounds/Sex/Suck/Swallow_1.wav differ diff --git a/Sounds/Sex/Suck/Swallow_2.mp3 b/Sounds/Sex/Suck/Swallow_2.mp3 deleted file mode 100644 index d0c8adf..0000000 Binary files a/Sounds/Sex/Suck/Swallow_2.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Swallow_2.wav b/Sounds/Sex/Suck/Swallow_2.wav new file mode 100644 index 0000000..09a7a00 Binary files /dev/null and b/Sounds/Sex/Suck/Swallow_2.wav differ diff --git a/Sounds/Sex/Suck/Swallow_3.mp3 b/Sounds/Sex/Suck/Swallow_3.mp3 deleted file mode 100644 index 1d9b59b..0000000 Binary files a/Sounds/Sex/Suck/Swallow_3.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/Swallow_3.wav b/Sounds/Sex/Suck/Swallow_3.wav new file mode 100644 index 0000000..2817b29 Binary files /dev/null and b/Sounds/Sex/Suck/Swallow_3.wav differ diff --git a/Sounds/Sex/Suck/suck_2.mp3 b/Sounds/Sex/Suck/suck_2.mp3 deleted file mode 100644 index a44f0e5..0000000 Binary files a/Sounds/Sex/Suck/suck_2.mp3 and /dev/null differ diff --git a/Sounds/Sex/Suck/suck_2.wav b/Sounds/Sex/Suck/suck_2.wav new file mode 100644 index 0000000..a8305c1 Binary files /dev/null and b/Sounds/Sex/Suck/suck_2.wav differ diff --git a/Source/Actors/Actor.cs b/Source/Actors/Actor.cs index 55e4f79..34766e0 100644 --- a/Source/Actors/Actor.cs +++ b/Source/Actors/Actor.cs @@ -20,6 +20,7 @@ namespace Rimworld_Animations { public List bodyDefTypes = new List(); public BodyTypeOffset bodyTypeOffset = new BodyTypeOffset(); public Vector3 offset = new Vector2(0, 0); + public List requiredGender; } } diff --git a/Source/AnimationUtility.cs b/Source/AnimationUtility.cs index 02899dd..5bb091a 100644 --- a/Source/AnimationUtility.cs +++ b/Source/AnimationUtility.cs @@ -39,7 +39,22 @@ namespace Rimworld_Animations { return false; } } - + if (x.actors[i].requiredGender != null && !x.actors[i].requiredGender.Contains(localParticipants[i].gender.ToStringSafe())) + { + if (AnimationSettings.debugMode) + { + Log.Message(string.Concat(new string[] + { + x.defName.ToStringSafe(), + " not selected -- ", + localParticipants[i].def.defName.ToStringSafe(), + " ", + localParticipants[i].Name.ToStringSafe(), + " does not match required gender" + }), false); + } + return false; + } if ((x.actors[i].blacklistedRaces != null) && x.actors[i].blacklistedRaces.Contains(localParticipants[i].def.defName)) { if(AnimationSettings.debugMode) Log.Message(x.defName.ToStringSafe() + " not selected -- " + localParticipants[i].def.defName.ToStringSafe() + " " + localParticipants[i].Name.ToStringSafe() + " is blacklisted");