AblativeAbsolute/rimworld-animations
1
0
Fork 0
mirror of https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git synced 2024-08-15 00:43:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: AblativeAbsolute:2a6a9366d3469b4937f9f585fd39889fef81956e
Branches Tags
AblativeAbsolute:master
AblativeAbsolute:masturbateTickFix
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:8363cddd6a088d173d9a01b98ed126c834b8eadb
Branches Tags
AblativeAbsolute:masturbateTickFix
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

3 commits
2a6a9366d3 ... 8363cddd6a

Author SHA1 Message Date
c0ffee
8363cddd6a Tweaked volume levels for voices and sounds 2024-05-08 14:59:18 -07:00
c0ffee
e97d74f4cd build 2024-05-08 09:25:37 -07:00
c0ffee
6eaaa539e9 Added trait-based pawn test 2024-05-08 09:25:17 -07:00
6 changed files with 69 additions and 115 deletions
Show stats Expand all files Collapse all files

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

Binary file not shown.

35
1.5/Defs/SoundDefs/Sounds_Sex.xml
View file

@ -83,21 +83,21 @@
<li Class="AudioGrain_Clip">
<clipPath>Sex/Suck/Suck_5</clipPath>
</li>
<li Class="AudioGrain_Clip">
<clipPath>Sex/Suck/Suck_6</clipPath>
</li>
<li Class="AudioGrain_Clip">
<clipPath>Sex/Suck/Suck_7</clipPath>
</li>
<li Class="AudioGrain_Clip">
<clipPath>Sex/Suck/Suck_8</clipPath>
</li>
<li Class="AudioGrain_Clip">
<clipPath>Sex/Suck/Suck_9</clipPath>
</li>
<li Class="AudioGrain_Clip">
<clipPath>Sex/Suck/Suck_10</clipPath>
</li>
<li Class="AudioGrain_Clip">
<clipPath>Sex/Suck/Suck_6</clipPath>
</li>
<li Class="AudioGrain_Clip">
<clipPath>Sex/Suck/Suck_7</clipPath>
</li>
<li Class="AudioGrain_Clip">
<clipPath>Sex/Suck/Suck_8</clipPath>
</li>
<li Class="AudioGrain_Clip">
<clipPath>Sex/Suck/Suck_9</clipPath>
</li>
<li Class="AudioGrain_Clip">
<clipPath>Sex/Suck/Suck_10</clipPath>
</li>
</grains>
<volumeRange>
<min>20</min>
@ -150,10 +150,7 @@
<clipPath>Sex/Clap_8</clipPath>
</li>
</grains>
<volumeRange>
<min>45</min>
<max>70</max>
</volumeRange>
<volumeRange>35~45</volumeRange>
<pitchRange>
<min>1.0</min>
<max>1.0</max>

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

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

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

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

27
1.5/Source/Animations/PawnTests/PawnTest_Trait.cs Normal file
View file

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

1
Rimworld-Animations.csproj
View file

@ -93,6 +93,7 @@
<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_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\CompProperties_ExtendedAnimator.cs" />
<Compile Include="1.5\Source\Comps\CompProperties_ThingAnimator.cs" />