Update 2.3.1.2

Author: Lunaretic

xivModdingFramework/Cache/XivDependencyGraph.cs

@@ -558,7 +558,18 @@ public async Task<List<string>> GetMaterialFiles(int materialVariant = -1)
                     materials.Add(path);
                 }
 
-                materialVariant = 1;
+                if(Info.PrimaryId == XivRace.Hrothgar.GetRaceCodeInt())
+                {
+                    // JK, Hrothgar actually have 5 material sets (that's how their fur pattern stuff is set)
+                    for (int i = 2; i <= 5; i++)
+                    {
+                        var mSet = i.ToString().PadLeft(4, '0');
+                        path = $"chara/human/c{primary}/obj/body/b{body}/material/v{mSet}/mt_c{primary}b{body}_a.mtrl";
+                        materials.Add(path);
+                    }
+                }
+
+                materialVariant = -1;
             }
             else
             {

xivModdingFramework/General/Enums/XivRace.cs

@@ -314,6 +314,19 @@ private static void CheckTree()
                 Children = new List<XivRaceNode>()
             });
 
+            dict.Add(XivRace.NPC_Male, new XivRaceNode()
+            {
+                Parent = dict[XivRace.Hyur_Midlander_Male],
+                Race = XivRace.NPC_Male,
+                Children = new List<XivRaceNode>()
+            });
+            dict.Add(XivRace.NPC_Female, new XivRaceNode()
+            {
+                Parent = dict[XivRace.Hyur_Midlander_Female],
+                Race = XivRace.NPC_Female,
+                Children = new List<XivRaceNode>()
+            });
+
 
             tree = dict[XivRace.Hyur_Midlander_Male];
         }

xivModdingFramework/Materials/FileTypes/Mtrl.cs

@@ -1098,9 +1098,9 @@ public static async Task<int> GetMaterialSetId(IItem item)
         public string GetMtrlFolder(XivDependencyRootInfo root, int materialSet = -1) 
         {
             // These types have exactly one material set, but don't have an IMC file saying so.
-            if(root.SecondaryType == XivItemType.hair ||
+            if((root.SecondaryType == XivItemType.hair ||
                 root.SecondaryType == XivItemType.body ||
-                root.SecondaryType == XivItemType.tail )
+                root.SecondaryType == XivItemType.tail ) && materialSet <= 0)
             {
                 materialSet = 1; 
             }

xivModdingFramework/Models/DataContainers/EquipmentParameter.cs

@@ -195,8 +195,8 @@ public enum EquipmentParameterFlag
         // Byte 2 - Leg
         EnableLegFlags = 16,
         Bit17 = 17,
-        Bit18 = 18,
-        LegHideHalfboot = 19,
+        LegHideShortBoot = 18,
+        LegHideHalfBoot = 19,
         Bit20 = 20,
         LegShowFoot = 21,
         Bit22 = 22,

xivModdingFramework/Mods/RootCloner.cs

@@ -136,6 +136,18 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
                 var iCat = destItem.SecondaryCategory;
                 var iName = destItem.Name;
 
+
+                var files = newModelPaths.Select(x => x.Value).Union(
+                    newMaterialPaths.Select(x => x.Value)).Union(
+                    newAvfxPaths.Select(x => x.Value)).Union(
+                    newTexturePaths.Select(x => x.Value));
+
+                var allFiles = new HashSet<string>();
+                foreach (var f in files)
+                {
+                    allFiles.Add(f);
+                }
+
                 if (ProgressReporter != null)
                 {
                     ProgressReporter.Report("Getting modlist...");
@@ -150,9 +162,19 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
                 var dPath = Destination.Info.GetRootFolder();
                 foreach (var mod in modlist.Mods)
                 {
-                    if (mod.fullPath.StartsWith(dPath))
+                    if (mod.fullPath.StartsWith(dPath) && !mod.IsInternal())
                     {
-                        await _modding.DeleteMod(mod.fullPath, false);
+                        if (Destination.Info.SecondaryType != null || Destination.Info.Slot == null)
+                        {
+                            // If this is a slotless root, purge everything.
+                            await _modding.DeleteMod(mod.fullPath, false);
+                        }
+                        else if(allFiles.Contains(mod.fullPath) || mod.fullPath.Contains(Destination.Info.Slot))
+                        {
+                            // Otherwise, only purge the files we're replacing, and anything else that
+                            // contains our slot name.
+                            await _modding.DeleteMod(mod.fullPath, false);
+                        }
                     }
                 }
 
@@ -348,24 +370,18 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
                 // Here we're going to go through and edit all the modded items to be joined together in a modpack for convenience.
                 modlist = await _modding.GetModListAsync();
 
-                var files = newModelPaths.Select(x => x.Value).Union(
-                    newMaterialPaths.Select(x => x.Value)).Union(
-                    newAvfxPaths.Select(x => x.Value)).Union(
-                    newTexturePaths.Select(x => x.Value));
-
-                var allFiles = new HashSet<string>();
-                foreach (var f in files)
-                {
-                    allFiles.Add(f);
-                }
 
 
                 var modPack = new ModPack() { author = "System", name = "Item Copy - " + srcItem.Name, url = "", version = "1.0" };
                 foreach (var mod in modlist.Mods)
                 {
                     if (allFiles.Contains(mod.fullPath))
                     {
-                        mod.modPack = modPack;
+                        // Don't claim common path items into our modpack.
+                        if (!mod.fullPath.StartsWith(CommonPath))
+                        {
+                            mod.modPack = modPack;
+                        }
                     }
                 }