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:c24416e043a83ab36bdea1d753ff2cba82f86625
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:bc283ec08e184f6bd18b67e6f3b2b63a4ce9f93c
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
c24416e043 ... bc283ec08e

Author SHA1 Message Date
c0ffee
bc283ec08e better fix for NALS facial anims; no more artifacting 2024-05-04 13:09:56 -07:00
c0ffee
0f6a37d83b fix for null ref error from sound probability 2024-05-04 10:14:57 -07:00
c0ffee
964a861d30 added probability to voicetagdefs, to make voice clips play at random intervals 2024-05-04 08:58:07 -07:00
8 changed files with 46 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

12
1.5/Source/Animations/AnimationWorkers/AnimationWorker_KeyframesExtended.cs
View file

@ -35,7 +35,17 @@ namespace Rimworld_Animations
{ {
if (tick == keyframe.tick) if (tick == keyframe.tick)
{ {
return (keyframe as ExtendedKeyframe).voice; VoiceTagDef voiceTag = (keyframe as ExtendedKeyframe).voice;
//probability checking null fix
if (voiceTag != null && Rand.Chance(voiceTag.probability))
{
return voiceTag;
}
return null;
} }
} }

2
1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs
View file

@ -71,8 +71,10 @@ namespace Rimworld_Animations
{ {
foreach (BaseAnimationOffset offset in offsets) foreach (BaseAnimationOffset offset in offsets)
{ {
if (offset.appliesToPawn(node.tree.pawn)) if (offset.appliesToPawn(node.tree.pawn))
{ {
//modify offset of prop for animationOffset position //modify offset of prop for animationOffset position
regularOffsets += offset.getOffset(node.tree.pawn) ?? Vector3.zero; regularOffsets += offset.getOffset(node.tree.pawn) ?? Vector3.zero;
return regularOffsets; return regularOffsets;

10
1.5/Source/RenderSubWorkers/PawnRenderSubWorker_HideWhenAnimating.cs
View file

@ -1,4 +1,5 @@
using System; using RimWorld;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@ -17,9 +18,16 @@ namespace Rimworld_Animations
|| node.tree.rootNode.children.Any(x => x.AnimationWorker is AnimationWorker_KeyframesExtended)) || node.tree.rootNode.children.Any(x => x.AnimationWorker is AnimationWorker_KeyframesExtended))
{ {
material.color = Color.clear; material.color = Color.clear;
material.shader = ShaderTypeDefOf.Transparent.Shader;
} }
} }
public override void TransformLayer(PawnRenderNode node, PawnDrawParms parms, ref float layer)
{
base.TransformLayer(node, parms, ref layer);
layer -= 1000;
}
} }
} }

3
1.5/Source/Voices/VoiceTagDef.cs
View file

@ -9,5 +9,8 @@ namespace Rimworld_Animations
{ {
public class VoiceTagDef : Def public class VoiceTagDef : Def
{ {
public float probability = 1;
} }
} }

BIN
Patch_HumanoidAlienRaces/1.5/Assemblies/Patch_HumanoidAlienRaces.dll
View file

Binary file not shown.

BIN
Patch_SexToysMasturbation/1.5/Assemblies/Patch_SexToysMasturbation.dll
View file

Binary file not shown.

71
Rimworld-Animations.csproj
View file

@ -186,56 +186,27 @@
<Content Include="1.5\Defs\AnimationDefs\Missionary\Stage6.xml" /> <Content Include="1.5\Defs\AnimationDefs\Missionary\Stage6.xml" />
<Content Include="1.5\Defs\AnimationPropDefs\AnimationPropDef_Hand.xml" /> <Content Include="1.5\Defs\AnimationPropDefs\AnimationPropDef_Hand.xml" />
<Content Include="1.5\Defs\OffsetDefs\OffsetDef_Placeholder.xml" /> <Content Include="1.5\Defs\OffsetDefs\OffsetDef_Placeholder.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\AnimationPropDef_BEV.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\1 Intro\Doggystyle Intro1.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\Doggystyle Intro1.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\1 Intro\Doggystyle Intro2.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\Doggystyle Intro2.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\1 Intro\Doggystyle Intro3.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\Doggystyle Intro3.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\1 Intro\Doggystyle1a.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\Doggystyle1.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\2 Main\Doggystyle1b.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\Doggystyle2.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\2 Main\Doggystyle2.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\Doggystyle3.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\2 Main\Doggystyle3.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\Doggystyle4.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\2 Main\Doggystyle4.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\Doggystyle5.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\2 Main\Doggystyle5.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\Doggystyle6.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\2 Main\Doggystyle6.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\Doggystyle7.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\2 Main\Doggystyle7.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\Doggystyle8.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\3 Ending\Doggystyle8.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\GroupAnimation_Doggystyle_Condom_BEV.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\3 Ending\Doggystyle8a.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\OffsetDef_Doggystyle_BEV_Bottom.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\3 Ending\Doggystyle8b.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\OffsetDef_Doggystyle_BEV_Top.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\3 Ending\Doggystyle8c.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationDefs\Doggystyle Condom\TexPathVariants_Doggystyle_BEV.xml" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\3 Ending\Doggystyle8d.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\Condom.png" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\3 Ending\Doggystyle8e.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomOpened.png" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\Misc\AnimationPropDef_BEV.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomUnused.png" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\Misc\GroupAnimation_Doggystyle_Condom_BEV.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithCumStages\CondomWithCumStage1.png" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\Misc\OffsetDef_Doggystyle_BEV.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithCumStages\CondomWithCumStage10.png" /> <Content Include="1.5\Defs\TestDoNotPush\Experimental\Misc\TexPathVariants_Doggystyle_BEV.xml" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithCumStages\CondomWithCumStage11.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithCumStages\CondomWithCumStage2.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithCumStages\CondomWithCumStage3.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithCumStages\CondomWithCumStage4.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithCumStages\CondomWithCumStage5.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithCumStages\CondomWithCumStage6.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithCumStages\CondomWithCumStage7.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithCumStages\CondomWithCumStage8.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithCumStages\CondomWithCumStage9.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\CondomWithPenis.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Condom\UsedCondom.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Cum\Cum_Drop.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Cum\Cum_Drop_Flipped.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Cum\Cum_Splash.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Cum\Image1.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Cum\Image2.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Cum\Image3.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Cum\Image4.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Cum\Image5.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Cum\Image6.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Cum\Image7.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Food\Grape.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Food\VineofGrapes.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Hands\Hand.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Hands\HandClean.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Misc\Image1.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Misc\Phone.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Penis\Penis.png" />
<Content Include="1.5\Defs\TestDoNotPush\AnimationProps\BEV\Water\Drop.png" />
<Content Include="1.5\Defs\TexPathVariantsDefs\TexPathVariants_XrayPenis_Human.xml" /> <Content Include="1.5\Defs\TexPathVariantsDefs\TexPathVariants_XrayPenis_Human.xml" />
<Content Include="1.5\Defs\AnimationDefs\TestAnimation1.xml" /> <Content Include="1.5\Defs\AnimationDefs\TestAnimation1.xml" />
<Content Include="1.5\Defs\AnimationDefs\TestAnimation2.xml" /> <Content Include="1.5\Defs\AnimationDefs\TestAnimation2.xml" />