fixes for addon rotations

more robust pawnrendertree animating node selection

1.5/Defs/AnimationDefs/TestAnimation2.xml

@@ -2,7 +2,7 @@
 <Defs>
 	<AnimationDef>
 		<defName>TestAnimation2</defName>
-		<durationTicks>50</durationTicks>
+		<durationTicks>120</durationTicks>
 		<startOnRandomTick>False</startOnRandomTick>
 		<playWhenDowned>False</playWhenDowned>
 
@@ -20,20 +20,20 @@
 						</li>
 						<li Class="Rimworld_Animations.ExtendedKeyframe">
 						  <offset>(0, -1, 0)</offset>
-						  <tick>20</tick>
+						  <tick>30</tick>
-						  <angle>0</angle>
+						  <angle>15</angle>
 						  <rotation>North</rotation>
 						</li>
 						<li Class="Rimworld_Animations.ExtendedKeyframe">
 						  <offset>(-1, -1, 0)</offset>
-						  <tick>30</tick>
+						  <tick>60</tick>
 						  <angle>0</angle>
 						  <rotation>North</rotation>
 						</li>
 						<li Class="Rimworld_Animations.ExtendedKeyframe">
 						  <offset>(0, -1, 0)</offset>
-						  <tick>40</tick>
+						  <tick>90</tick>
-						  <angle>0</angle>
+						  <angle>-15</angle>
 						  <rotation>North</rotation>
 						</li>
 					</keyframes>
@@ -50,19 +50,19 @@
 							<rotation>North</rotation>
 						</li>
 						<li Class="Rimworld_Animations.ExtendedKeyframe">
-							<tick>6</tick>
+							<tick>15</tick>
-							<angle>0</angle>
+							<angle>30</angle>
-							<rotation>North</rotation>
+							<rotation>East</rotation>
 						</li>
 						<li Class="Rimworld_Animations.ExtendedKeyframe">
-							<tick>12</tick>
+							<tick>30</tick>
 							<angle>0</angle>
-							<rotation>North</rotation>
+							<rotation>South</rotation>
 						</li>
 						<li Class="Rimworld_Animations.ExtendedKeyframe">
-							<tick>18</tick>
+							<tick>45</tick>
-							<angle>0</angle>
+							<angle>-30</angle>
-							<rotation>North</rotation>
+							<rotation>West</rotation>
 						</li>
 					</keyframes>
 				</value>

1.5/Defs/XMLFile1.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+	<Rimworld_Animations.AnimationPropDef>
+		<tagDef>Root</tagDef>
+		<renderNode>
+			<debugLabel>Hand</debugLabel>
+			<nodeClass>PawnRenderNode</nodeClass>
+			<graphic>P</graphic>
+		</renderNode>
+	</Rimworld_Animations.AnimationPropDef>
+</Defs>

1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNode.cs

@@ -9,7 +9,7 @@ using Verse;
 
 namespace Rimworld_Animations
 {
-    //Head Rotation Code
+    //Head Rotation Code - Textures
     [HarmonyPatch(typeof(PawnRenderNode), "AppendRequests")]
     public static class HarmonyPatch_PawnRenderNode
     {

1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderTree.cs

@@ -9,32 +9,35 @@ using Verse;
 
 namespace Rimworld_Animations
 {
+
     [HarmonyPatch(typeof(PawnRenderTree), "TryGetMatrix")]
     public class HarmonyPatch_PawnRenderTree
     {
-        public static void Prefix(PawnRenderTree __instance, PawnRenderNode node, ref PawnDrawParms parms)
+        public static void Prefix(PawnRenderTree __instance, Dictionary<PawnRenderNodeTagDef, PawnRenderNode> ___nodesByTag, PawnRenderNode node, ref PawnDrawParms parms)
         {
-            //Note: Maybe need to change this to check all ancestors if it's the head node
-            //in case of deeper nodes in the PawnRenderTree
-            //This code only checks for node and parent, if either are head
 
-
+            //find lowest parent that is animating, or nothing if not animating
-            // Change facing for all head and apparelhead nodes
+            PawnRenderNode animatingNode = node;
-            // So that the offset is based on body rotation, not head rotation
+            while (animatingNode != null
-
+                && !(animatingNode.AnimationWorker is AnimationWorker_KeyframesExtended))
-            //fixes misaligned hairs and headaddons
-            if ((node.Props.tagDef == PawnRenderNodeTagDefOf.Head || node.Props.tagDef == PawnRenderNodeTagDefOf.ApparelHead
-                || node?.parent?.Props?.tagDef == PawnRenderNodeTagDefOf.Head || node?.parent?.Props?.tagDef == PawnRenderNodeTagDefOf.ApparelHead)
-                && node.tree.rootNode.AnimationWorker is AnimationWorker_KeyframesExtended rootNodeAnimationWorker)
             {
+                animatingNode = animatingNode.parent;
+            }
 
-                // this is only for the Vector3 position to work right
+            //if animating parent node found,
-                parms.facing = rootNodeAnimationWorker.facingAtTick(node.tree.AnimationTick);
+            if (animatingNode?.AnimationWorker is AnimationWorker_KeyframesExtended animatingNodeAnimationWorker)
+            {
+                //change parm to facing to animate correctly
+                parms.facing = animatingNodeAnimationWorker.facingAtTick(__instance.AnimationTick);
             }
         }
+
     }
 
 
+
+    //recaching
+    //done here because changing parms causes recaching anyway, so might as well do it here
     [HarmonyPatch(typeof(PawnRenderTree), "AdjustParms")]
     public class HarmonyPatch_PawnRenderTree2
     {
@@ -57,7 +60,7 @@ namespace Rimworld_Animations
             {
                 if (node.AnimationWorker is AnimationWorker_KeyframesExtended animWorkerExtended)
                 {
-                    //recache during facing turn
+                    //recache during flicker on/off
                     if (animWorkerExtended.shouldRecache(animationTick))
                     {
                         node.requestRecache = true;

Patch_HumanoidAlienRaces/Patch_HumanoidAlienRaces.csproj

@@ -37,8 +37,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="AlienRace">
-      <HintPath>..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\AlienRace.dll</HintPath>
+      <HintPath>..\..\..\..\..\workshop\content\294100\839005762\1.5\Assemblies\AlienRace.dll</HintPath>
-      <Private>False</Private>
     </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</HintPath>
@@ -72,6 +71,5 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Patch_HumanoidAlienRaces/Source/HarmonyPatch_AlienRace.cs

@@ -1,354 +0,0 @@
-using HarmonyLib;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
-using Verse;
-using AlienRace;
-
-namespace Rimworld_Animations {
-
-	
-	[StaticConstructorOnStartup]
-	public static class HarmonyPatch_AlienRace
-	{
-		static HarmonyPatch_AlienRace()
-		{
-			(new Harmony("rjwanim")).Patch(AccessTools.Method(AccessTools.TypeByName("AlienRace.HarmonyPatches"), "DrawAddons"),
-							prefix: new HarmonyMethod(AccessTools.Method(typeof(HarmonyPatch_AlienRace), "Prefix_AnimateHeadAddons")));
-		}
-
-		/* todo: replace jank prefix with this
-		public static void Prefix_DrawAddonsFinalHook(ref Pawn pawn, ref AlienPartGenerator.BodyAddon addon, ref Rot4 rot, ref Graphic graphic, ref Vector3 offsetVector, ref float angle, ref Material mat)
-        {
-			CompBodyAnimator animator = pawn.TryGetComp<CompBodyAnimator>();
-
-			if (animator == null || !animator.isAnimating)
-            {
-				return;
-            }
-
-			if(addon.alignWithHead || addon.drawnInBed)
-            {
-				rot = animator.headFacing;
-				angle = animator.headAngle;
-				offsetVector += animator.deltaPos + animator.bodyAngle * animator.headBob;
-
-			}
-			else
-            {
-				rot = animator.bodyFacing;
-				angle = animator.bodyAngle;
-				offsetVector += animator.deltaPos;
-            }
-			
-        }
-		*/
-		public static bool Prefix_AnimateHeadAddons(PawnRenderFlags renderFlags, Vector3 vector, Vector3 headOffset, Pawn pawn, Quaternion quat, Rot4 rotation)
-		{
-
-			if (renderFlags.FlagSet(PawnRenderFlags.Portrait) || !CompBodyAnimator.IsAnimating(pawn)) return true;
-			if (!(pawn.def is ThingDef_AlienRace alienProps) || renderFlags.FlagSet(PawnRenderFlags.Invisible)) return false;
-
-			List<AlienPartGenerator.BodyAddon> addons = alienProps.alienRace.generalSettings.alienPartGenerator.bodyAddons;
-			AlienPartGenerator.AlienComp comp = pawn.GetComp<AlienPartGenerator.AlienComp>();
-			CompBodyAnimator pawnAnimator = pawn.TryGetComp<CompBodyAnimator>();
-
-			bool flag = renderFlags.FlagSet(PawnRenderFlags.Portrait);
-			bool flag2 = renderFlags.FlagSet(PawnRenderFlags.Invisible);
-
-			for (int i = 0; i < addons.Count; i++)
-			{
-				AlienPartGenerator.BodyAddon ba = addons[index: i];
-				
-				if (!ba.CanDrawAddon(pawn: pawn)) continue;
-
-				bool forceDrawForBody = false;
-				if (alienProps.defName.Contains("Orassan") && ba.path.ToLower().Contains("tail"))
-                {
-					forceDrawForBody = true;
-                }
-				AlienPartGenerator.RotationOffset offset = ba.defaultOffsets.GetOffset((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing);
-				Vector3 a = (offset != null) ? offset.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, pawn.story.headType) : Vector3.zero;
-				AlienPartGenerator.RotationOffset offset2 = ba.offsets.GetOffset((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing);
-				Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, pawn.story.headType) : Vector3.zero);
-				vector2.y = (ba.inFrontOfBody ? (0.3f + vector2.y) : (-0.3f - vector2.y));
-				float num = ba.angle;
-				if (((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing) == Rot4.North)
-				{
-					if (ba.layerInvert)
-					{
-						vector2.y = 0f - vector2.y;
-					}
-					num = 0f;
-				}
-				if (((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing) == Rot4.East)
-				{
-					num = 0f - num;
-					vector2.x = 0f - vector2.x;
-				}
-				Graphic addonGraphic = comp.addonGraphics[i];
-
-				addonGraphic.drawSize = ((flag && ba.drawSizePortrait != Vector2.zero) ? ba.drawSizePortrait : ba.drawSize) * (ba.scaleWithPawnDrawsize ? (ba.alignWithHead ? ((flag ? comp.customPortraitHeadDrawSize : comp.customHeadDrawSize) * (ModsConfig.BiotechActive ? (pawn.ageTracker.CurLifeStage.headSizeFactor ?? 1.5f) : 1.5f)) : ((flag ? comp.customPortraitDrawSize : comp.customDrawSize) * (ModsConfig.BiotechActive ? pawn.ageTracker.CurLifeStage.bodySizeFactor : 1f) * 1.5f)) : (Vector2.one * 1.5f));
-
-				if ((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead)
-				{
-					
-					Quaternion addonRotation = Quaternion.AngleAxis(pawnAnimator.headAngle < 0 ? 360 - (360 % pawnAnimator.headAngle) : pawnAnimator.headAngle, Vector3.up);
-
-					GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: pawnAnimator.headFacing), loc: vector + (ba.alignWithHead ? headOffset : headOffset - addonRotation * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.headFacing)) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f),
-					quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * addonRotation, mat: addonGraphic.MatAt(rot: pawnAnimator.headFacing), renderFlags.FlagSet(PawnRenderFlags.DrawNow));
-
-					
-				}
-
-				else
-				{
-					Quaternion addonRotation;
-					if (AnimationSettings.controlGenitalRotation && ba.path.ToLower().Contains("penis"))
-                    {
-						addonRotation = Quaternion.AngleAxis(pawnAnimator.genitalAngle, Vector3.up);
-					}
-					else
-                    {
-						addonRotation = Quaternion.AngleAxis(pawnAnimator.bodyAngle, Vector3.up);
-					}
-					
-					if (AnimationSettings.controlGenitalRotation && pawnAnimator.controlGenitalAngle && ba?.hediffGraphics != null && ba.hediffGraphics.Count != 0 && ba.hediffGraphics[0]?.path != null && (ba.hediffGraphics[0].path.Contains("Penis") || ba.hediffGraphics[0].path.Contains("penis")))
-					{
-						GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: rotation), loc: vector + (ba.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f),
-						quat: Quaternion.AngleAxis(angle: pawnAnimator.genitalAngle, axis: Vector3.up), mat: addonGraphic.MatAt(rot: rotation), renderFlags.FlagSet(PawnRenderFlags.DrawNow));
-					}
-
-					else
-                    {
-						GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: rotation), loc: vector + (ba.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f),
-						quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * addonRotation, mat: addonGraphic.MatAt(rot: rotation), renderFlags.FlagSet(PawnRenderFlags.DrawNow));
-					}
-
-				}
-
-
-			}
-
-			return false;
-		}
-	}
-
-
-
-	/*
-
-    [HarmonyPatch(typeof(AlienRace.HarmonyPatches), "DrawAddons")]
-    public static class HarmonyPatch_AlienRace {
-
-		public static void RenderHeadAddonInAnimation(Mesh mesh, Vector3 loc, Quaternion quat, Material mat, bool drawNow, Graphic graphic, AlienPartGenerator.BodyAddon bodyAddon, Vector3 v, Vector3 headOffset, Pawn pawn, PawnRenderFlags renderFlags, Vector3 vector, Rot4 rotation)
-        {
-
-			CompBodyAnimator pawnAnimator = pawn.TryGetComp<CompBodyAnimator>();
-			AlienPartGenerator.AlienComp comp = pawn.GetComp<AlienPartGenerator.AlienComp>();
-
-			if (pawnAnimator != null && pawnAnimator.isAnimating)
-            {
-
-				if((bodyAddon.drawnInBed || bodyAddon.alignWithHead))
-                {
-					
-					AlienPartGenerator.RotationOffset offset = bodyAddon.defaultOffsets.GetOffset(rotation);
-					Vector3 a = (offset != null) ? offset.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero;
-					AlienPartGenerator.RotationOffset offset2 = bodyAddon.offsets.GetOffset(rotation);
-					Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero);
-					vector2.y = (bodyAddon.inFrontOfBody ? (0.3f + vector2.y) : (-0.3f - vector2.y));
-					float num = bodyAddon.angle;
-					if (rotation == Rot4.North)
-					{
-						if (bodyAddon.layerInvert)
-						{
-							vector2.y = -vector2.y;
-						}
-						num = 0f;
-					}
-					if (rotation == Rot4.East)
-					{
-						num = -num;
-						vector2.x = -vector2.x;
-					}
-
-					vector = vector + Quaternion.AngleAxis(pawnAnimator.bodyAngle, Vector3.up) * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.bodyFacing) - pawnAnimator.getPawnHeadOffset(); //convert vector into pseudo body pos for head
-					quat = Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up);
-					loc = vector + (bodyAddon.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(Mathf.Acos(Quaternion.Dot(Quaternion.identity, quat)) * 2f * 57.29578f);
-					mat = graphic.MatAt(rot: pawnAnimator.headFacing);
-				}
-				else
-                {
-
-					AlienPartGenerator.RotationOffset offset = bodyAddon.defaultOffsets.GetOffset(rotation);
-					Vector3 a = (offset != null) ? offset.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero;
-					AlienPartGenerator.RotationOffset offset2 = bodyAddon.offsets.GetOffset(rotation);
-					Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero);
-					vector2.y = (bodyAddon.inFrontOfBody ? (0.3f + vector2.y) : (-0.3f - vector2.y));
-					float num = bodyAddon.angle;
-					if (rotation == Rot4.North)
-					{
-						if (bodyAddon.layerInvert)
-						{
-							vector2.y = -vector2.y;
-						}
-						num = 0f;
-					}
-					if (rotation == Rot4.East)
-					{
-						num = -num;
-						vector2.x = -vector2.x;
-					}
-					quat = Quaternion.AngleAxis(pawnAnimator.bodyAngle, Vector3.up);
-					loc = vector + (bodyAddon.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(Mathf.Acos(Quaternion.Dot(Quaternion.identity, quat)) * 2f * 57.29578f);
-					
-				}
-
-			}
-			GenDraw.DrawMeshNowOrLater(mesh, loc, quat, mat, drawNow);
-
-			/*
-			if (pawnAnimator != null && !renderFlags.FlagSet(PawnRenderFlags.Portrait) && pawnAnimator.isAnimating && (bodyAddon.drawnInBed || bodyAddon.alignWithHead))
-            {
-
-				
-				if ((pawn.def as ThingDef_AlienRace).defName == "Alien_Orassan")
-                {
-					orassan = true;
-
-					if(bodyAddon.path.Contains("closed"))
-                    {
-						return;
-                    }
-
-					if (bodyAddon.bodyPart.Contains("ear"))
-
-					{
-						orassan = true;
-
-						orassanv = new Vector3(0, 0, 0.23f);
-						if (pawnAnimator.headFacing == Rot4.North)
-						{
-							orassanv.z -= 0.1f;
-							orassanv.y += 1f;
-
-							if(bodyAddon.bodyPart.Contains("left"))
-                            {
-								orassanv.x += 0.03f;
-                            } else
-                            {
-								orassanv.x -= 0.03f;
-							}
-
-						}
-						else if (pawnAnimator.headFacing == Rot4.East)
-						{
-							orassanv.x -= 0.1f;
-						}
-						else if (pawnAnimator.headFacing == Rot4.West)
-						{
-							orassanv.x = 0.1f;
-						}
-						else
-                        {
-							orassanv.z -= 0.1f;
-							orassanv.y += 1f;
-
-							if (bodyAddon.bodyPart.Contains("right"))
-							{
-								orassanv.x += 0.05f;
-							}
-							else
-							{
-								orassanv.x -= 0.05f;
-							}
-						}
-						orassanv = orassanv.RotatedBy(pawnAnimator.headAngle);
-					}
-				}
-					
-					
-
-
-
-			GenDraw.DrawMeshNowOrLater(mesh: graphic.MeshAt(rot: headRotInAnimation), loc: loc + orassanv + (bodyAddon.alignWithHead ? headOffset : Vector3.zero),// + v.RotatedBy(Mathf.Acos(Quaternion.Dot(Quaternion.identity, quat)) * 2f * 57.29578f),
-					quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * headQuatInAnimation, mat: graphic.MatAt(rot: pawnAnimator.headFacing), drawNow: drawNow);;
-			}
-
-			else
-            {
-				
-			}
-
-			
-		}
-
-
-		public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
-        {
-			List<CodeInstruction> ins = instructions.ToList();
-			for (int i = 0; i < ins.Count; i++)
-            {
-
-				Type[] type = new Type[] { typeof(Mesh), typeof(Vector3), typeof(Quaternion), typeof(Material), typeof(bool) };
-
-
-				if (ins[i].OperandIs(AccessTools.Method(typeof(GenDraw), "DrawMeshNowOrLater", type)))
-                {
-					
-					yield return new CodeInstruction(OpCodes.Ldloc, (object)7); //graphic
-					yield return new CodeInstruction(OpCodes.Ldloc, (object)4); //bodyAddon
-					yield return new CodeInstruction(OpCodes.Ldloc, (object)5); //offsetVector/AddonOffset (v)
-					yield return new CodeInstruction(OpCodes.Ldarg, (object)2); //headOffset
-					yield return new CodeInstruction(OpCodes.Ldarg, (object)3); //pawn
-					yield return new CodeInstruction(OpCodes.Ldarg, (object)0); //renderflags
-					yield return new CodeInstruction(OpCodes.Ldarg, (object)1); //vector
-					yield return new CodeInstruction(OpCodes.Ldarg, (object)5); //rotation
-
-					yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(HarmonyPatch_AlienRace), "RenderHeadAddonInAnimation"));
-
-                }
-				
-				else
-                {
-					yield return ins[i];
-				}
-            }
-        }
-
-		public static bool Prefix(PawnRenderFlags renderFlags, ref Vector3 vector, ref Vector3 headOffset, Pawn pawn, ref Quaternion quat, ref Rot4 rotation)
-		{
-			if(pawn == null)
-            {
-				return true;
-			}
-				
-			CompBodyAnimator anim = pawn.TryGetComp<CompBodyAnimator>();
-
-			if(anim == null)
-            {
-				return true;
-            }
-
-			if (anim != null && !renderFlags.FlagSet(PawnRenderFlags.Portrait) && anim.isAnimating)
-			{
-				//quat = Quaternion.AngleAxis(anim.bodyAngle, Vector3.up);
-			}
-
-			return true;
-
-		}
-	}
-
-	
-	*/
-
-}
-
-

Rimworld-Animations.csproj

@@ -119,6 +119,7 @@
     <Content Include="1.5\Defs\MainTabDefs\MainButtonDef.xml" />
     <Content Include="1.5\Defs\OffsetDefs\OffsetDef_GroinToAppropriateHeight.xml" />
     <Content Include="1.5\Defs\SoundDefs\Sounds_Sex.xml" />
+    <Content Include="1.5\Defs\XMLFile1.xml" />
     <Content Include="1.5\Patches\AnimationPatchHSK.xml" />
     <Content Include="1.5\Patches\AnimationPatch_CompExtendedAnimator.xml" />
     <Content Include="1.5\Patches\CompatibilityPatch_FacialAnimation.xml" />
@@ -166,7 +167,6 @@
     <Content Include="LoadFolders.xml" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="1.5\Defs\SexAnimationDefs\" />
     <Folder Include="1.5\Source\Extensions\" />
     <Folder Include="1.5\Source\Patches\OtherModPatches\" />
   </ItemGroup>