PBD/Deform Adjustments.

Author: Lunaretic

xivModdingFramework/General/Enums/XivRace.cs

@@ -291,12 +291,6 @@ private static void CheckTree()
                 Race = XivRace.Hyur_Highlander_Male_NPC,
                 Children = new List<XivRaceNode>()
             });
-            dict.Add(XivRace.Viera_Male_NPC, new XivRaceNode()
-            {
-                Parent = dict[XivRace.Hyur_Highlander_Male],
-                Race = XivRace.Viera_Male_NPC,
-                Children = new List<XivRaceNode>()
-            });
 
 
             dict.Add(XivRace.Hyur_Highlander_Female_NPC, new XivRaceNode()
@@ -368,6 +362,12 @@ private static void CheckTree()
                 Race = XivRace.Lalafell_Female_NPC,
                 Children = new List<XivRaceNode>()
             });
+            dict.Add(XivRace.Viera_Male_NPC, new XivRaceNode()
+            {
+                Parent = dict[XivRace.Viera_Male],
+                Race = XivRace.Viera_Male_NPC,
+                Children = new List<XivRaceNode>()
+            });
             dict.Add(XivRace.Viera_Female_NPC, new XivRaceNode()
             {
                 Parent = dict[XivRace.Viera_Female],
@@ -460,7 +460,28 @@ public static bool IsParentOf(this XivRace possibleParent, XivRace possibleChild
                 }
             }
             return false;
+        }
 
+        public static XivRace GetNextChildToward(this XivRace parentRace, XivRace childRace)
+        {
+            if(!parentRace.IsParentOf(childRace))
+            {
+                return XivRace.All_Races;
+            }
+
+            var node = GetNode(childRace);
+            if(node == null)
+            {
+                return XivRace.All_Races;
+            }
+
+            var race = childRace;
+            while (node.Parent != null && node.Parent.Race != parentRace)
+            {
+                node = node.Parent;
+                race = node.Race;
+            }
+            return race;
         }
 
         /// <summary>
@@ -478,12 +499,11 @@ public static bool IsDirectParentOf(this XivRace possibleParent, XivRace possibl
                 return true;
             }
 
-            var node = GetNode(possibleChild);
+            var child = GetNode(possibleChild);
 
-            if (node?.Parent != null)
+            if (child?.Parent != null)
             {
-                node = node.Parent;
-                if (node.Race == possibleParent)
+                if (child.Parent.Race == possibleParent)
                 {
                     return true;
                 }

xivModdingFramework/Models/FileTypes/PDB.cs

@@ -44,7 +44,6 @@ public struct BoneDeformTreeEntry
             public ushort FirstChildIndex;
             public ushort NextSiblingIndex;
             public ushort DeformerIndex;
-
         }
 
         public struct BoneDeform

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -1148,35 +1148,39 @@ public static async Task RaceConvertRecursive(TTModel model, XivRace targetRace,
         {
             try
             {
-                // Current race is already parent node
-                // Direct conversion
-                // [ Current > (apply deform) > Target ]
                 if (originalRace.IsDirectParentOf(targetRace))
                 {
+                    // Current race is already parent node
+                    // Direct conversion
+                    // [ Current > (apply deform) > Target ]
                     await ModelModifiers.ApplyRacialDeform(model, targetRace, false, loggingFunction, tx);
+                    return;
                 }
-                // Target race is parent node of Current race
-                // Convert to parent (invert deform)
-                // [ Current > (apply inverse deform) > Target ]
                 else if (targetRace.IsDirectParentOf(originalRace))
                 {
+                    // Target race is parent node of Current race
+                    // Convert to parent (invert deform)
+                    // [ Current > (apply inverse deform) > Target ]
                     await ModelModifiers.ApplyRacialDeform(model, originalRace, true, loggingFunction, tx);
+                    return;
                 }
-                // Current race is not parent of Target Race and Current race has parent
-                // Make a recursive call with the current races parent race
-                // [ Current > (apply inverse deform) > Current.Parent > Recursive Call ]
-                else if (originalRace.GetNode().Parent != null)
+                else if (originalRace.IsParentOf(targetRace))
                 {
-                    await ModelModifiers.ApplyRacialDeform(model, originalRace, true, loggingFunction, tx);
-                    await RaceConvertRecursive(model, targetRace, originalRace.GetNode().Parent.Race, loggingFunction, tx);
+                    // We need to transform down chain, towards the target.
+                    var race = originalRace.GetNextChildToward(targetRace);
+
+                    await ModelModifiers.ApplyRacialDeform(model, race, false, loggingFunction, tx);
+                    await ModelModifiers.RaceConvertRecursive(model, targetRace, race, loggingFunction, tx);
+                    return;
                 }
-                // Current race has no parent
-                // Make a recursive call with the target races parent race
-                // [ Target > (apply deform on Target.Parent) > Target.Parent > Recursive Call ]
                 else
                 {
-                    await ModelModifiers.ApplyRacialDeform(model, targetRace.GetNode().Parent.Race, false, loggingFunction, tx);
-                    await RaceConvertRecursive(model, targetRace, targetRace.GetNode().Parent.Race, loggingFunction, tx);
+                    // We need to transform up the chain.
+                    // Either our target is a significantly higher parent, or cannot be reached from this node.
+                    var pRace = originalRace.GetNode().Parent.Race;
+                    await ModelModifiers.ApplyRacialDeform(model, originalRace, true, loggingFunction, tx);
+                    await ModelModifiers.RaceConvertRecursive(model, targetRace, pRace, loggingFunction, tx);
+                    return;
                 }
             }
             catch (Exception ex)