AblativeAbsolute
/
rimworld-animations
mirror of https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: AblativeAbsolute:8363cddd6a088d173d9a01b98ed126c834b8eadb
Branches Tags
AblativeAbsolute:master
AblativeAbsolute:1.5
AblativeAbsolute:fixingfacialanimations
AblativeAbsolute:SimpleCurveBugfix
AblativeAbsolute:ExtraPartAnim2
AblativeAbsolute:HAR-Soft-Dependency
AblativeAbsolute:No-HAR
AblativeAbsolute:Update1.4
AblativeAbsolute:ExtraPartAnim
AblativeAbsolute:ShiftSaveTest
AblativeAbsolute:toys
AblativeAbsolute:Test_GenitalRotationFix
AblativeAbsolute:ChangeSplitJobDriversToPatchesOnMain
AblativeAbsolute:HatsDisplaySelectionPatch
AblativeAbsolute:Dev
..
compare: AblativeAbsolute:2a6a9366d3469b4937f9f585fd39889fef81956e
Branches Tags
AblativeAbsolute:1.5
AblativeAbsolute:fixingfacialanimations
AblativeAbsolute:master
AblativeAbsolute:SimpleCurveBugfix
AblativeAbsolute:ExtraPartAnim2
AblativeAbsolute:HAR-Soft-Dependency
AblativeAbsolute:No-HAR
AblativeAbsolute:Update1.4
AblativeAbsolute:ExtraPartAnim
AblativeAbsolute:ShiftSaveTest
AblativeAbsolute:toys
AblativeAbsolute:Test_GenitalRotationFix
AblativeAbsolute:ChangeSplitJobDriversToPatchesOnMain
AblativeAbsolute:HatsDisplaySelectionPatch
AblativeAbsolute:Dev

No commits in common. "8363cddd6a088d173d9a01b98ed126c834b8eadb" and "2a6a9366d3469b4937f9f585fd39889fef81956e" have entirely different histories.
8363cddd6a ... 2a6a9366d3

6 changed files with 115 additions and 69 deletions
Show Stats Expand all files Collapse all files

BIN
1.5/Assemblies/Rimworld-Animations.dll
View File

Binary file not shown.

5
1.5/Defs/SoundDefs/Sounds_Sex.xml
View File

@ -150,7 +150,10 @@
<clipPath>Sex/Clap_8</clipPath> <clipPath>Sex/Clap_8</clipPath>
</li> </li>
</grains> </grains>
<volumeRange>35~45</volumeRange> <volumeRange>
<min>45</min>
<max>70</max>
</volumeRange>
<pitchRange> <pitchRange>
<min>1.0</min> <min>1.0</min>
<max>1.0</max> <max>1.0</max>

61
1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanFemale.xml
View File

@ -22,9 +22,18 @@
<clipPath>Voices/FVoice/Moan4</clipPath> <clipPath>Voices/FVoice/Moan4</clipPath>
</li> </li>
</grains> </grains>
<volumeRange>40~50</volumeRange> <volumeRange>
<pitchRange>0.99~1.02</pitchRange> <min>55</min>
<distRange>10~50</distRange> <max>65</max>
</volumeRange>
<pitchRange>
<min>0.9</min>
<max>1.1</max>
</pitchRange>
<distRange>
<min>0</min>
<max>100</max>
</distRange>
<repeatMode>NeverTwice</repeatMode> <repeatMode>NeverTwice</repeatMode>
<sustainLoop>false</sustainLoop> <sustainLoop>false</sustainLoop>
</li> </li>
@ -50,9 +59,18 @@
<clipPath>Voices/FVoice/MoanShort3</clipPath> <clipPath>Voices/FVoice/MoanShort3</clipPath>
</li> </li>
</grains> </grains>
<volumeRange>40~50</volumeRange> <volumeRange>
<pitchRange>0.99~1.02</pitchRange> <min>55</min>
<distRange>10~50</distRange> <max>65</max>
</volumeRange>
<pitchRange>
<min>0.9</min>
<max>1.1</max>
</pitchRange>
<distRange>
<min>0</min>
<max>100</max>
</distRange>
<repeatMode>NeverTwice</repeatMode> <repeatMode>NeverTwice</repeatMode>
<sustainLoop>false</sustainLoop> <sustainLoop>false</sustainLoop>
</li> </li>
@ -87,9 +105,18 @@
<clipPath>Voices/FVoice/Grunt6</clipPath> <clipPath>Voices/FVoice/Grunt6</clipPath>
</li> </li>
</grains> </grains>
<volumeRange>40~50</volumeRange> <volumeRange>
<pitchRange>0.99~1.02</pitchRange> <min>55</min>
<distRange>10~50</distRange> <max>65</max>
</volumeRange>
<pitchRange>
<min>0.9</min>
<max>1.1</max>
</pitchRange>
<distRange>
<min>0</min>
<max>100</max>
</distRange>
<repeatMode>NeverTwice</repeatMode> <repeatMode>NeverTwice</repeatMode>
<sustainLoop>false</sustainLoop> <sustainLoop>false</sustainLoop>
</li> </li>
@ -118,10 +145,18 @@
<clipPath>Voices/FVoice/Scream4</clipPath> <clipPath>Voices/FVoice/Scream4</clipPath>
</li> </li>
</grains> </grains>
<volumeRange>
<pitchRange>0.99~1.02</pitchRange> <min>55</min>
<volumeRange>40~50</volumeRange> <max>65</max>
<distRange>10~50</distRange> </volumeRange>
<pitchRange>
<min>0.9</min>
<max>1.1</max>
</pitchRange>
<distRange>
<min>0</min>
<max>100</max>
</distRange>
<repeatMode>NeverTwice</repeatMode> <repeatMode>NeverTwice</repeatMode>
<sustainLoop>false</sustainLoop> <sustainLoop>false</sustainLoop>
</li> </li>

60
1.5/Defs/VoiceDefs/VoiceDef_Human/SoundDef_HumanMale.xml
View File

@ -22,9 +22,18 @@
<clipPath>Voices/MVoice/Moan4</clipPath> <clipPath>Voices/MVoice/Moan4</clipPath>
</li> </li>
</grains> </grains>
<pitchRange>0.99~1.02</pitchRange> <volumeRange>
<volumeRange>40~50</volumeRange> <min>55</min>
<distRange>10~50</distRange> <max>65</max>
</volumeRange>
<pitchRange>
<min>0.9</min>
<max>1.1</max>
</pitchRange>
<distRange>
<min>0</min>
<max>100</max>
</distRange>
<repeatMode>NeverTwice</repeatMode> <repeatMode>NeverTwice</repeatMode>
<sustainLoop>false</sustainLoop> <sustainLoop>false</sustainLoop>
</li> </li>
@ -50,9 +59,18 @@
<clipPath>Voices/MVoice/MoanShort3</clipPath> <clipPath>Voices/MVoice/MoanShort3</clipPath>
</li> </li>
</grains> </grains>
<pitchRange>0.99~1.02</pitchRange> <volumeRange>
<volumeRange>40~50</volumeRange> <min>55</min>
<distRange>10~50</distRange> <max>65</max>
</volumeRange>
<pitchRange>
<min>0.9</min>
<max>1.1</max>
</pitchRange>
<distRange>
<min>0</min>
<max>100</max>
</distRange>
<repeatMode>NeverTwice</repeatMode> <repeatMode>NeverTwice</repeatMode>
<sustainLoop>false</sustainLoop> <sustainLoop>false</sustainLoop>
</li> </li>
@ -81,9 +99,18 @@
<clipPath>Voices/MVoice/Grunt4</clipPath> <clipPath>Voices/MVoice/Grunt4</clipPath>
</li> </li>
</grains> </grains>
<pitchRange>0.99~1.02</pitchRange> <volumeRange>
<volumeRange>40~50</volumeRange> <min>55</min>
<distRange>10~50</distRange> <max>65</max>
</volumeRange>
<pitchRange>
<min>0.9</min>
<max>1.1</max>
</pitchRange>
<distRange>
<min>0</min>
<max>100</max>
</distRange>
<repeatMode>NeverTwice</repeatMode> <repeatMode>NeverTwice</repeatMode>
<sustainLoop>false</sustainLoop> <sustainLoop>false</sustainLoop>
</li> </li>
@ -109,9 +136,18 @@
<clipPath>Voices/MVoice/Scream3</clipPath> <clipPath>Voices/MVoice/Scream3</clipPath>
</li> </li>
</grains> </grains>
<pitchRange>0.99~1.02</pitchRange> <volumeRange>
<volumeRange>40~50</volumeRange> <min>55</min>
<distRange>10~50</distRange> <max>65</max>
</volumeRange>
<pitchRange>
<min>0.9</min>
<max>1.1</max>
</pitchRange>
<distRange>
<min>0</min>
<max>100</max>
</distRange>
<repeatMode>NeverTwice</repeatMode> <repeatMode>NeverTwice</repeatMode>
<sustainLoop>false</sustainLoop> <sustainLoop>false</sustainLoop>
</li> </li>

27
1.5/Source/Animations/PawnTests/PawnTest_Trait.cs
View File

@ -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);
}
}
}

1
Rimworld-Animations.csproj
View File

@ -93,7 +93,6 @@
<Compile Include="1.5\Source\Animations\PawnTests\PawnTest_Race.cs" /> <Compile Include="1.5\Source\Animations\PawnTests\PawnTest_Race.cs" />
<Compile Include="1.5\Source\Animations\PawnTests\PawnTest_RJWCanBeFucked.cs" /> <Compile Include="1.5\Source\Animations\PawnTests\PawnTest_RJWCanBeFucked.cs" />
<Compile Include="1.5\Source\Animations\PawnTests\PawnTest_RJWCanFuck.cs" /> <Compile Include="1.5\Source\Animations\PawnTests\PawnTest_RJWCanFuck.cs" />
<Compile Include="1.5\Source\Animations\PawnTests\PawnTest_Trait.cs" />
<Compile Include="1.5\Source\Comps\CompExtendedAnimator.cs" /> <Compile Include="1.5\Source\Comps\CompExtendedAnimator.cs" />
<Compile Include="1.5\Source\Comps\CompProperties_ExtendedAnimator.cs" /> <Compile Include="1.5\Source\Comps\CompProperties_ExtendedAnimator.cs" />
<Compile Include="1.5\Source\Comps\CompProperties_ThingAnimator.cs" /> <Compile Include="1.5\Source\Comps\CompProperties_ThingAnimator.cs" />