diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index 7fc6159..d531c03 100644 Binary files a/1.5/Assemblies/Rimworld-Animations.dll and b/1.5/Assemblies/Rimworld-Animations.dll differ diff --git a/1.5/Defs/GroupAnimationDefs/Beast/DogBeast/GroupAnimation_DogBeast.xml b/1.5/Defs/GroupAnimationDefs/Beast/DogBeast/GroupAnimation_DogBeast.xml index 7168ff7..62371c8 100644 --- a/1.5/Defs/GroupAnimationDefs/Beast/DogBeast/GroupAnimation_DogBeast.xml +++ b/1.5/Defs/GroupAnimationDefs/Beast/DogBeast/GroupAnimation_DogBeast.xml @@ -128,6 +128,7 @@ 1 1 +
  • @@ -135,7 +136,6 @@
  • Wolf_Timber
  • Wolf_Arctic
    • -
  • Whitefox
  • Warg
  • Husky
  • LabradorRetriever
    • @@ -143,7 +143,6 @@ -
  • Bestiality_Vaginal
    • diff --git a/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_AgeRange.cs b/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_AgeRange.cs index d17f3c9..f9134a3 100644 --- a/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_AgeRange.cs +++ b/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_AgeRange.cs @@ -24,12 +24,6 @@ namespace Rimworld_Animations List 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 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 diff --git a/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_BodyType.cs b/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_BodyType.cs index d0d93ae..3777af7 100644 --- a/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_BodyType.cs +++ b/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_BodyType.cs @@ -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; - } } } diff --git a/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_BodyTypeGendered.cs b/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_BodyTypeGendered.cs index 5470448..f6d44a3 100644 --- a/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_BodyTypeGendered.cs +++ b/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_BodyTypeGendered.cs @@ -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; - } - - } } } diff --git a/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_Single.cs b/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_Single.cs index a728834..2744039 100644 --- a/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_Single.cs +++ b/1.5/Source/Animations/AnimationOffsets/Offsets/AnimationOffset_Single.cs @@ -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; - } } } diff --git a/1.5/Source/Animations/AnimationOffsets/Offsets/BaseAnimationOffset.cs b/1.5/Source/Animations/AnimationOffsets/Offsets/BaseAnimationOffset.cs index ab6d42d..57bab15 100644 --- a/1.5/Source/Animations/AnimationOffsets/Offsets/BaseAnimationOffset.cs +++ b/1.5/Source/Animations/AnimationOffsets/Offsets/BaseAnimationOffset.cs @@ -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); diff --git a/1.5/Source/Animations/AnimationOffsets/Offsets/BodyTypeOffset.cs b/1.5/Source/Animations/AnimationOffsets/Offsets/BodyTypeOffset.cs index b441262..df35501 100644 --- a/1.5/Source/Animations/AnimationOffsets/Offsets/BodyTypeOffset.cs +++ b/1.5/Source/Animations/AnimationOffsets/Offsets/BodyTypeOffset.cs @@ -14,6 +14,5 @@ namespace Rimworld_Animations public BodyTypeDef bodyType; public int rotation = 0; public Vector3 offset; - public Vector3 scale = Vector3.one; } } diff --git a/1.5/Source/Animations/PawnTests/PawnTest_Humanlike.cs b/1.5/Source/Animations/PawnTests/PawnTest_Humanlike.cs deleted file mode 100644 index dbbf8fe..0000000 --- a/1.5/Source/Animations/PawnTests/PawnTest_Humanlike.cs +++ /dev/null @@ -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; - } - } -} diff --git a/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs b/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs index 188d707..e45c0d3 100644 --- a/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs +++ b/1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs @@ -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 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); diff --git a/1.5/Source/Utilities/AnimationUtility.cs b/1.5/Source/Utilities/AnimationUtility.cs index ab3bb0d..1fdc73c 100644 --- a/1.5/Source/Utilities/AnimationUtility.cs +++ b/1.5/Source/Utilities/AnimationUtility.cs @@ -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().PlayGroupAnimation(allAnimationsForPawn, position, rotation, animatorAnchor); diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index b8d26fa..25ed36e 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -86,7 +86,6 @@ -