1.5/Defs/AnimationDefs/TestAnimation2.xml

@@ -2,7 +2,7 @@
 <Defs>
 	<AnimationDef>
 		<defName>TestAnimation2</defName>
-		<durationTicks>400</durationTicks>
+		<durationTicks>120</durationTicks>
 		<startOnRandomTick>False</startOnRandomTick>
 		<playWhenDowned>False</playWhenDowned>
 
@@ -13,35 +13,32 @@
 					<workerClass>Rimworld_Animations.AnimationWorker_KeyframesExtended</workerClass>
 					<keyframes>
 						<li Class="Rimworld_Animations.ExtendedKeyframe">
+							<offset>(1, 0, 0)</offset>
 							<tick>0</tick>
 							<angle>0</angle>
-							<rotation>South</rotation>
+							<rotation>North</rotation>
 						</li>
 						<li Class="Rimworld_Animations.ExtendedKeyframe">
-						  <tick>100</tick>
+						  <offset>(0, 0, 0)</offset>
-						  <angle>45</angle>
+						  <tick>30</tick>
-						  <rotation>South</rotation>
+						  <angle>15</angle>
+						  <rotation>North</rotation>
 						</li>
 						<li Class="Rimworld_Animations.ExtendedKeyframe">
-						  <tick>0</tick>
+						  <offset>(-1, 0, 0)</offset>
-						  <offset>(-0.73, 0, -0.02)</offset>
+						  <tick>60</tick>
 						  <angle>0</angle>
-						  <rotation>East</rotation>
+						  <rotation>North</rotation>
 						</li>
 						<li Class="Rimworld_Animations.ExtendedKeyframe">
-						  <tick>200</tick>
+						  <offset>(0, 0, 0)</offset>
-						  <angle>90</angle>
+						  <tick>90</tick>
-						  <rotation>South</rotation>
+						  <angle>-15</angle>
-						</li>
+						  <rotation>North</rotation>
-						<li Class="Rimworld_Animations.ExtendedKeyframe">
-						  <tick>300</tick>
-						  <angle>135</angle>
-						  <rotation>South</rotation>
 						</li>
 					</keyframes>
 				</value>
 			</li>
-			<!--
 			<li>
 				<key>Head</key>
 				<value>
@@ -70,7 +67,6 @@
 					</keyframes>
 				</value>
 			</li>
-			-->
 		</animationParts>
 	</AnimationDef>
 </Defs>

1.5/Defs/GroupAnimationDefs/TestGroupAnimation1.xml

@@ -10,16 +10,16 @@
 					<li>
 						<probability>3</probability>
 						<animationDefs>
-							<li>TestAnimation2</li>
+							<li>TestAnimation3</li>
-							<li>TestAnimation2</li>
+							<li>TestAnimation3</li>
 						</animationDefs>
 						
 					</li>
 					<li>
 						<probability>1</probability>
 						<animationDefs>
-							<li>TestAnimation2</li>
+							<li>TestAnimation3</li>
-							<li>TestAnimation2</li>
+							<li>TestAnimation3</li>
 						</animationDefs>
 					</li>
 				</loopOptions>

1.5/Source/Comps/CompExtendedAnimator.cs

@@ -197,12 +197,6 @@ namespace Rimworld_Animations {
 
                         PawnRenderNodeProperties props = animationProp.animPropProperties;
 
-                        if (props.texPath.NullOrEmpty())
-                        {
-                            props.texPath = "AnimationProps/MissingTexture/MissingTexture";
-                        }
-                        
-
                         //create new render node
                         PawnRenderNode animRenderNode = (PawnRenderNode)Activator.CreateInstance(props.nodeClass, new object[] {
                             this.pawn,

1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNode.cs

@@ -41,9 +41,7 @@ namespace Rimworld_Animations
 
         }
     }
-    /*
+
-     * no longer needed; taken care of by graphic variants
-     * 
     // For changing texture path of thing to variant
     [HarmonyPatch(typeof(PawnRenderNode), "TexPathFor")]
     public static class HarmonyPatch_PawnRenderNode2
@@ -56,6 +54,4 @@ namespace Rimworld_Animations
             }
         }
     }
-
-    */
 }

1.5/Source/PawnRenderNode/GraphicBodyTypeVariants/PawnRenderNode_GraphicBodyTypeVariants.cs

@@ -11,7 +11,6 @@ namespace Rimworld_Animations
     public class PawnRenderNode_BodyTypeVariants : PawnRenderNode_GraphicVariants
     {
 
-        private BodyTypeDef bodyType;
         protected new PawnRenderNodeProperties_BodyTypeVariants props;
 
         public PawnRenderNode_BodyTypeVariants(Pawn pawn, PawnRenderNodeProperties props, PawnRenderTree tree) : base(pawn, props, tree)
@@ -21,39 +20,35 @@ namespace Rimworld_Animations
 
         }
 
-        protected Dictionary<int, Graphic> GraphicBodyTypeVariantsFor(Pawn pawn)
+        protected override Dictionary<int, Graphic> GraphicVariantsFor(Pawn pawn)
         {
 
             if (props.bodyTypeVariantsDef == null)
             {
-                Log.Error("[Anims] Error: Tried to use BodyTypeVariants node, but bodyTypeVariants weren't given");
+                Log.ErrorOnce("[Anims] Error: Tried to use BodyTypeVariants node, but bodyTypeVariants weren't given", 211341349);
                 return null;
             }
 
             //for each different hediff-based texpathvariants,
             foreach (TexPathVariants_BodyType texPathVariant_BodyType in props.bodyTypeVariantsDef)
             {
-                if (pawn.story?.bodyType == texPathVariant_BodyType.bodyType)
+                if (pawn.story.bodyType == texPathVariant_BodyType.bodyType)
                 {
                     //return that specific variant
-                    bodyType = texPathVariant_BodyType.bodyType;
                     return GenerateVariants(pawn, texPathVariant_BodyType.texPathVariantsDef);
 
                 }
 
             }
 
-            return null;
+            //otherwise just use default
+            return base.GraphicVariantsFor(pawn);
 
         }
 
         protected override void EnsureMaterialsInitialized()
         {
-            if (variants == null 
+            variants = GraphicVariantsFor(this.tree.pawn);
-                || this.tree.pawn.story?.bodyType != bodyType)
-            variants = GraphicBodyTypeVariantsFor(this.tree.pawn);
-
-            //call this in case variants wasn't set, and there is no graphic bodytype variants appropriate; it'll set variants based on default
             base.EnsureMaterialsInitialized();
         }
 

1.5/Source/PawnRenderNode/GraphicHediffSeverityVariants/PawnRenderNodeProperties_GraphicHediffSeverityVariants.cs

@@ -1,33 +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 PawnRenderNodeProperties_GraphicHediffSeverityVariants : PawnRenderNodeProperties_GraphicVariants
-    {
-
-        public BodyPartDef bodyPart = null;
-        public List<HediffWithSeverity> hediffSeverityVariants;
-
-    }
-
-    public class HediffWithSeverity
-    {
-        public HediffDef hediff;
-        public List<TexPathVariants_Severity> severityVariants;
-    }
-
-    public class TexPathVariants_Severity
-    {
-        public int severity;
-        public TexPathVariantsDef texPathVariantsDef;
-        
-
-    }
-
-
-}

1.5/Source/PawnRenderNode/GraphicHediffSeverityVariants/PawnRenderNodeWorker_GraphicHediffSeverityVariants.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Rimworld_Animations
-{
-    public class PawnRenderNodeWorker_GraphicHediffSeverityVariants : PawnRenderNodeWorker_GraphicVariants
-    {
-        //same functionality as graphicvariants worker
-        //just here for readability
-
-    }
-}

1.5/Source/PawnRenderNode/GraphicHediffSeverityVariants/PawnRenderNode_GraphicHediffSeverityVariants.cs

@@ -1,121 +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 PawnRenderNode_GraphicHediffSeverityVariants : PawnRenderNode_GraphicVariants
-    {
-
-        protected HediffDef hediffWithSeverity;
-        protected float curSeverity;
-
-        protected new PawnRenderNodeProperties_GraphicHediffSeverityVariants props;
-        private HediffDef curHediff;
-
-        public PawnRenderNode_GraphicHediffSeverityVariants(Pawn pawn, PawnRenderNodeProperties props, PawnRenderTree tree) : base(pawn, props, tree)
-        {
-
-            this.props = (PawnRenderNodeProperties_GraphicHediffSeverityVariants)props;
-
-        }
-
-        protected Dictionary<int, Graphic> GraphicHediffSeverityVariantsFor(Pawn pawn)
-        {
-
-
-            if (props.hediffSeverityVariants == null)
-            {
-                Log.Error("[Anims] Error: Tried to use GraphicBodyPartHediffSeverityVariants node, but hediffSeverityVariants weren't given");
-            }
-
-
-            Hediff idealHediff = null;
-            HediffWithSeverity idealHediffSeverity = null;
-
-            if (props.bodyPart == null)
-            {
-                //search the entire body for the hediff because no bodypart was set
-                for (int i = 0; i < props.hediffSeverityVariants.Count; i++)
-                {
-                    idealHediff = pawn.health.hediffSet.hediffs.Find((Hediff hediffWithSeverity) =>
-                        hediffWithSeverity.def == props.hediffSeverityVariants[i].hediff);
-
-                    if (idealHediff != null)
-                    {
-                        //get the ideal hediff severity variants, to iterate through and find the right one for the severity
-                        idealHediffSeverity = props.hediffSeverityVariants[i];
-                        break;
-
-                    }
-
-                }
-            }
-
-            else
-            {
-                //search for a hediff with a specific body part 
-
-                for (int i = 0; i < props.hediffSeverityVariants.Count; i++)
-                {
-                    //right hediff with the right hediff and right body part
-
-                    idealHediff = pawn.health.hediffSet.hediffs.Find((Hediff hediffWithSeverity) =>
-                        hediffWithSeverity.def == props.hediffSeverityVariants[i].hediff
-                        && hediffWithSeverity.Part.def == props.bodyPart);
-
-                    if (idealHediff != null) {
-
-                        //get the ideal hediff severity variants, to iterate through and find the right one for the severity
-                        idealHediffSeverity = props.hediffSeverityVariants[i];
-                        break;
-                    }
-                }
-            }
-
-            if (idealHediff != null)
-            {
-                //set severity so that recache when this is different
-                curSeverity = idealHediff.Severity;
-
-                //look for the right severity-based texpathvariants
-                TexPathVariants_Severity texPathVariants_Severity = idealHediffSeverity.severityVariants.Find((TexPathVariants_Severity texPathVariants) =>
-                    texPathVariants.severity < idealHediff.Severity);
-
-                //if null, assume value is really too small
-                if (texPathVariants_Severity == null)
-                {
-                    //return largest value
-                    return GenerateVariants(pawn, idealHediffSeverity.severityVariants.First().texPathVariantsDef);
-                }
-
-                //return right severity variants
-                return GenerateVariants(pawn, texPathVariants_Severity.texPathVariantsDef);
-
-            }
-
-            //there is no graphic hediff variants appropriate
-            curHediff = null;
-            return null;
-
-        }
-
-        protected override void EnsureMaterialsInitialized()
-        {
-            //if pawn no longer has the hediff,
-            if (variants == null ||
-                !(this.tree.pawn.health?.hediffSet?.hediffs is List<Hediff> hediffs 
-                && hediffs.Any((Hediff hediff) => hediff.def == curHediff && hediff.Severity == curSeverity)))
-            {
-                //do graphicvariantsfor
-                variants = GraphicHediffSeverityVariantsFor(this.tree.pawn);
-            }
-
-            //call this in case variants wasn't set, and there is no graphic hediff variants appropriate; it'll set variants based on default
-            base.EnsureMaterialsInitialized();
-        }
-    }
-}

1.5/Source/PawnRenderNode/GraphicHediffVariants/PawnRenderNode_GraphicHediffVariants.cs

@@ -20,12 +20,12 @@ namespace Rimworld_Animations
 
         }
 
-        protected Dictionary<int, Graphic> GraphicHediffVariantsFor(Pawn pawn)
+        protected override Dictionary<int, Graphic> GraphicVariantsFor(Pawn pawn)
         {
 
             if (props.hediffVariants == null)
             {
-                Log.Error("[Anims] Error: Tried to use GraphicHediffVariants node, but hediffVariants weren't given");
+                Log.ErrorOnce("[Anims] Error: Tried to use GraphicHediffVariants node, but hediffVariants weren't given", 231321349);
                 return null;
             }
 
@@ -36,10 +36,10 @@ namespace Rimworld_Animations
                 foreach (HediffDef hediffDef in texPathVariant_Hediff.hediffs)
                 {
                     //if the pawn has that hediff,
-                    if (pawn?.health?.hediffSet?.hediffs is List<Hediff> pawnHediffs && pawnHediffs.Any((Hediff hediff) => hediff.def == hediffDef))
+                    if (pawn.health.hediffSet.hediffs.Any((Hediff hediff) => hediff.def == hediffDef))
                     {
                         //return that specific variant
-                        curHediff = hediffDef;
+                        curHediff = hediff.def;
                         return GenerateVariants(pawn, texPathVariant_Hediff.texPathVariantsDef);
 
                     }
@@ -47,25 +47,27 @@ namespace Rimworld_Animations
 
             }
 
-            //there is no graphic hediff variants appropriate
+            //otherwise just use default
             curHediff = null;
-            return null;
+            return base.GraphicVariantsFor(pawn);
 
         }
 
         protected override void EnsureMaterialsInitialized()
         {
             //if pawn no longer has the hediff,
-            if (variants == null ||
+            if (curHediff == null ||
-                !(this.tree.pawn.health?.hediffSet?.hediffs is List<Hediff> hediffs 
+                (this.tree.pawn.health?.hediffSet?.hediffs is List<Hediff> hediffs 
                 && hediffs.Any((Hediff hediff) => hediff.def == curHediff)))
             {
-                //do graphicvariantsfor
+                //redo graphicvariantsfor
-                variants = GraphicHediffVariantsFor(this.tree.pawn);
+                variants = GraphicVariantsFor(this.tree.pawn);
             }
 
-            //call this in case variants wasn't set, and there is no graphic hediff variants appropriate; it'll set variants based on default
             base.EnsureMaterialsInitialized();
         }
+
+
     }
+
 }

1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNodeWorker_GraphicVariants.cs

@@ -31,10 +31,12 @@ namespace Rimworld_Animations
         {
 
             //if node is animating, and is a graphic variant type of node
-            //and node is one with graphic variants
-            //and texpathvariant is set
             if ((node.AnimationWorker is AnimationWorker_KeyframesExtended extendedAnimWorker)
+
+                //and node is one with graphic variants
                 && (node is PawnRenderNode_GraphicVariants nodeWithGraphicVariants)
+
+                //and texpathvariant is set
                 && extendedAnimWorker.TexPathVariantAtTick(node.tree.AnimationTick) != null)
             {
                 Material materialVariant = GetMaterialVariant(nodeWithGraphicVariants, parms, (int)extendedAnimWorker.TexPathVariantAtTick(node.tree.AnimationTick));

1.5/Source/PawnRenderNode/GraphicVariants/PawnRenderNode_GraphicVariants.cs

@@ -12,14 +12,13 @@ namespace Rimworld_Animations
     {
 
         protected new PawnRenderNodeProperties_GraphicVariants props;
-        protected Graphic missingTextureGraphic;
         protected Dictionary<int, Graphic> variants;
 
         public Graphic getGraphicVariant(int variant)
         {
             if (variants == null || !variants.ContainsKey(variant))
             {
-                return missingTextureGraphic;
+                return null;
             }
 
             return variants[variant];
@@ -31,6 +30,17 @@ namespace Rimworld_Animations
         
         }
 
+        protected override void EnsureMaterialsInitialized()
+        {
+
+            if (variants == null)
+            {
+                variants = GraphicVariantsFor(this.tree.pawn);
+            }
+
+            base.EnsureMaterialsInitialized();
+        }
+
         protected virtual Dictionary<int, Graphic> GraphicVariantsFor(Pawn pawn)
         {
 
@@ -43,23 +53,6 @@ namespace Rimworld_Animations
             
         }
 
-        protected override void EnsureMaterialsInitialized()
-        {
-
-            if (variants == null)
-            {
-                variants = GraphicVariantsFor(this.tree.pawn);
-            }
-            if (missingTextureGraphic == null)
-            {
-                missingTextureGraphic = GenerateMissingTextureGraphic();
-            }
-
-
-            base.EnsureMaterialsInitialized();
-        }
-
-
         //used by all, including base classes, to create texPathVariants for pawn
         protected Dictionary<int, Graphic> GenerateVariants(Pawn pawn, TexPathVariantsDef texPathVariants)
         {
@@ -82,9 +75,6 @@ namespace Rimworld_Animations
 
         }
 
-        protected Graphic GenerateMissingTextureGraphic()
+
-        {
-            return GraphicDatabase.Get<Graphic_Multi>("AnimationProps/MissingTexture");
-        }
     }
 }

Rimworld-Animations.csproj

@@ -121,9 +121,6 @@
     <Compile Include="1.5\Source\PawnRenderNode\GraphicBodyTypeVariants\PawnRenderNodeProperties_GraphicBodyTypeVariants.cs" />
     <Compile Include="1.5\Source\PawnRenderNode\GraphicBodyTypeVariants\PawnRenderNodeWorker_GraphicBodyTypeVariants.cs" />
     <Compile Include="1.5\Source\PawnRenderNode\GraphicBodyTypeVariants\PawnRenderNode_GraphicBodyTypeVariants.cs" />
-    <Compile Include="1.5\Source\PawnRenderNode\GraphicHediffSeverityVariants\PawnRenderNodeProperties_GraphicHediffSeverityVariants.cs" />
-    <Compile Include="1.5\Source\PawnRenderNode\GraphicHediffSeverityVariants\PawnRenderNodeWorker_GraphicHediffSeverityVariants.cs" />
-    <Compile Include="1.5\Source\PawnRenderNode\GraphicHediffSeverityVariants\PawnRenderNode_GraphicHediffSeverityVariants.cs" />
     <Compile Include="1.5\Source\PawnRenderNode\GraphicHediffVariants\PawnRenderNodeProperties_GraphicHediffVariants.cs" />
     <Compile Include="1.5\Source\PawnRenderNode\GraphicHediffVariants\PawnRenderNodeWorker_GraphicHediffVariants.cs" />
     <Compile Include="1.5\Source\PawnRenderNode\GraphicHediffVariants\PawnRenderNode_GraphicHediffVariants.cs" />
@@ -200,10 +197,6 @@
     <Content Include="1.5\Textures\AnimationProps\Banana\Banana_west.png" />
     <Content Include="1.5\Textures\AnimationProps\Doggystyle\Doggy_Arms_north.png" />
     <Content Include="1.5\Textures\AnimationProps\Doggystyle\Doggy_Legs_north.png" />
-    <Content Include="1.5\Textures\AnimationProps\MissingTexture\MissingTexture_east.png" />
-    <Content Include="1.5\Textures\AnimationProps\MissingTexture\MissingTexture_north.png" />
-    <Content Include="1.5\Textures\AnimationProps\MissingTexture\MissingTexture_south.png" />
-    <Content Include="1.5\Textures\AnimationProps\MissingTexture\MissingTexture_west.png" />
     <Content Include="1.5\Textures\UI\MainTab.png" />
     <Content Include="About\About.xml" />
     <Content Include="About\Manifest.xml" />