mirror of
https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git
synced 2024-08-15 00:43:45 +00:00
Compare commits
No commits in common. "a458f3b83fd5bdab31e5650cb49b8c2bd9428c1f" and "0b4cca30a23a47ab8ed328197450feda4e4fa0a2" have entirely different histories.
a458f3b83f
...
0b4cca30a2
12 changed files with 2 additions and 78 deletions
Binary file not shown.
|
|
@ -128,6 +128,7 @@
|
|||
<priority>1</priority>
|
||||
<actorShift>1</actorShift>
|
||||
<whitelist>
|
||||
<li Class="Rimworld_Animations.PawnTest_RJWCanBeFucked" /> <!-- Human -->
|
||||
<li Class="Rimworld_Animations.PawnTest_Multi"> <!-- Dog -->
|
||||
<tests>
|
||||
<li Class="Rimworld_Animations.PawnTest_RJWCanFuck" />
|
||||
|
|
@ -135,7 +136,6 @@
|
|||
<races>
|
||||
<li>Wolf_Timber</li>
|
||||
<li>Wolf_Arctic</li>
|
||||
<li>Whitefox</li>
|
||||
<li>Warg</li>
|
||||
<li>Husky</li>
|
||||
<li>LabradorRetriever</li>
|
||||
|
|
@ -143,7 +143,6 @@
|
|||
</li>
|
||||
</tests>
|
||||
</li>
|
||||
<li Class="Rimworld_Animations.PawnTest_RJWCanBeFucked" /> <!-- Human -->
|
||||
</whitelist>
|
||||
<interactionDefs>
|
||||
<li>Bestiality_Vaginal</li>
|
||||
|
|
|
|||
|
|
@ -24,12 +24,6 @@ namespace Rimworld_Animations
|
|||
List<BodyTypeOffset_AgeRange> pawnOffsets = (pawn.gender == Gender.Male ? offsetsMale : offsetsFemale);
|
||||
return pawnOffsets.Find(x => x.bodyType == pawn.story.bodyType && x.ageRange.Includes(pawn.ageTracker.AgeBiologicalYears))?.rotation ?? pawnOffsets.Last().rotation;
|
||||
}
|
||||
|
||||
public override Vector3? getScale(Pawn pawn)
|
||||
{
|
||||
List<BodyTypeOffset_AgeRange> pawnOffsets = (pawn.gender == Gender.Male ? offsetsMale : offsetsFemale);
|
||||
return pawnOffsets.Find(x => x.bodyType == pawn.story.bodyType && x.ageRange.Includes(pawn.ageTracker.AgeBiologicalYears))?.scale ?? pawnOffsets.Last().scale;
|
||||
}
|
||||
}
|
||||
|
||||
public class BodyTypeOffset_AgeRange : BodyTypeOffset
|
||||
|
|
|
|||
|
|
@ -23,11 +23,6 @@ namespace Rimworld_Animations
|
|||
{
|
||||
return offsets.Find(x => x.bodyType == pawn.story.bodyType)?.rotation;
|
||||
}
|
||||
|
||||
public override Vector3? getScale(Pawn pawn)
|
||||
{
|
||||
return offsets.Find(x => x.bodyType == pawn.story.bodyType)?.scale;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,19 +40,5 @@ namespace Rimworld_Animations
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
public override Vector3? getScale(Pawn pawn)
|
||||
{
|
||||
|
||||
if (pawn.gender == Gender.Female)
|
||||
{
|
||||
return offsetsFemale.Find(x => x.bodyType == pawn.story.bodyType)?.scale;
|
||||
}
|
||||
else
|
||||
{
|
||||
return offsetsMale.Find(x => x.bodyType == pawn.story.bodyType)?.scale;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ namespace Rimworld_Animations
|
|||
|
||||
public Vector3 offset;
|
||||
public int? rotation;
|
||||
public Vector3? scale = Vector3.one;
|
||||
|
||||
public override Vector3? getOffset(Pawn pawn)
|
||||
{
|
||||
|
|
@ -24,10 +23,5 @@ namespace Rimworld_Animations
|
|||
{
|
||||
return rotation;
|
||||
}
|
||||
|
||||
public override Vector3? getScale(Pawn pawn)
|
||||
{
|
||||
return scale;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@ namespace Rimworld_Animations
|
|||
|
||||
public abstract int? getRotation(Pawn pawn);
|
||||
|
||||
public abstract Vector3? getScale(Pawn pawn);
|
||||
|
||||
public bool appliesToPawn(Pawn pawn)
|
||||
{
|
||||
return races.Contains(pawn.def);
|
||||
|
|
|
|||
|
|
@ -14,6 +14,5 @@ namespace Rimworld_Animations
|
|||
public BodyTypeDef bodyType;
|
||||
public int rotation = 0;
|
||||
public Vector3 offset;
|
||||
public Vector3 scale = Vector3.one;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Verse;
|
||||
|
||||
namespace Rimworld_Animations
|
||||
{
|
||||
public class PawnTest_Humanlike : BasePawnTest
|
||||
{
|
||||
public override bool PawnTest(Pawn pawn)
|
||||
{
|
||||
return pawn.RaceProps.Humanlike;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -87,29 +87,6 @@ namespace Rimworld_Animations
|
|||
return regularOffsets;
|
||||
}
|
||||
|
||||
public override Vector3 ScaleFor(PawnRenderNode node, PawnDrawParms parms)
|
||||
{
|
||||
Vector3 regularScale = base.ScaleFor(node, parms);
|
||||
|
||||
if ((node.Props as PawnRenderNodeProperties_GraphicVariants)?.propOffsetDef?.offsets is List<BaseAnimationOffset> offsets)
|
||||
{
|
||||
foreach (BaseAnimationOffset offset in offsets)
|
||||
{
|
||||
|
||||
if (offset.appliesToPawn(node.tree.pawn))
|
||||
{
|
||||
|
||||
//modify scale of prop for animationOffset position
|
||||
regularScale = regularScale.MultipliedBy(offset.getScale(node.tree.pawn) ?? Vector3.one);
|
||||
return regularScale;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return regularScale;
|
||||
}
|
||||
|
||||
public override Quaternion RotationFor(PawnRenderNode node, PawnDrawParms parms)
|
||||
{
|
||||
Quaternion rotation = base.RotationFor(node, parms);
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ namespace Rimworld_Animations {
|
|||
|
||||
if (RJWAnimationSettings.debugMode)
|
||||
{
|
||||
Log.Message("Now playing animation: " + groupAnimationDef.defName + " Actor Shift: " + reorder);
|
||||
Log.Message("Now playing animation: " + groupAnimationDef.defName);
|
||||
}
|
||||
|
||||
participants[i].TryGetComp<CompExtendedAnimator>().PlayGroupAnimation(allAnimationsForPawn, position, rotation, animatorAnchor);
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@
|
|||
<Compile Include="1.5\Source\Animations\AnimationProps\AnimationPropDef.cs" />
|
||||
<Compile Include="1.5\Source\Animations\AnimationWorkers\AnimationWorker_KeyframesExtended.cs" />
|
||||
<Compile Include="1.5\Source\Animations\PawnTests\BasePawnTest.cs" />
|
||||
<Compile Include="1.5\Source\Animations\PawnTests\PawnTest_Humanlike.cs" />
|
||||
<Compile Include="1.5\Source\Animations\PawnTests\PawnTest_PrisonerOfColony.cs" />
|
||||
<Compile Include="1.5\Source\Animations\PawnTests\PawnTest_SlaveOfColony.cs" />
|
||||
<Compile Include="1.5\Source\Animations\PawnTests\PawnTest_Always.cs" />
|
||||
|
|
|
|||
Loading…
Reference in a new issue