Update 2.3.0.2

Author: Lunaretic

xivModdingFramework/Cache/XivDependencyGraph.cs

@@ -511,7 +511,7 @@ public async Task<List<string>> GetModelFiles()
                 var modelPath = modelFolder + "/" + Info.GetSimpleModelName();
 
 
-                if (Info.PrimaryType == XivItemType.human && Info.SecondaryId / 100 >= 1)
+                if (Info.PrimaryType == XivItemType.human && Info.SecondaryType != XivItemType.hair && Info.SecondaryId / 100 >= 1)
                 {
                     // For human types, if their model is missing, the version 00xx is used instead.
                     var index = new Index(XivCache.GameInfo.GameDirectory);
@@ -586,7 +586,7 @@ public async Task<List<string>> GetMaterialFiles(int materialVariant = -1)
                                 var m = mat;
 
                                 // Human types have their material ID automatically changed over.
-                                if (Info.PrimaryType == XivItemType.human)
+                                if (Info.PrimaryType == XivItemType.human && Info.SecondaryType != XivItemType.hair)
                                 {
                                     m = secondaryRex.Replace(m, secondaryTypePrefix + Info.SecondaryId.ToString().PadLeft(4, '0'));
                                 }
@@ -603,7 +603,14 @@ public async Task<List<string>> GetMaterialFiles(int materialVariant = -1)
                                 // This is faster than re-scanning the MDL file.
                                 // And a little more thorough than simply skipping over non-matching refs.
                                 // Since some materials may not have variant references.
-                                materials.Add(_materialSetRegex.Replace(mat, replacement));
+                                var m = _materialSetRegex.Replace(mat, replacement);
+
+                                // Human types have their material ID automatically fixed to match.
+                                if (Info.PrimaryType == XivItemType.human && Info.SecondaryType != XivItemType.hair)
+                                {
+                                    m = secondaryRex.Replace(m, secondaryTypePrefix + Info.SecondaryId.ToString().PadLeft(4, '0'));
+                                }
+                                materials.Add(m);
                             }
                         }
                     }

xivModdingFramework/Helpers/IOUtil.cs

@@ -87,7 +87,7 @@ public static async Task<byte[]> Decompressor(byte[] compressedBytes, int uncomp
         /// <param name="item">The item to be saved</param>
         /// <param name="saveDirectory">The base directory to save to</param>
         /// <returns>A string containing the full save path for the given item</returns>
-        public static string MakeItemSavePath(IItem item, DirectoryInfo saveDirectory, XivRace race = XivRace.All_Races)
+        public static string MakeItemSavePath(IItem item, DirectoryInfo saveDirectory, XivRace race = XivRace.All_Races, int primaryNumber = -1)
         {
             string path, validItemName;
 
@@ -123,9 +123,12 @@ public static string MakeItemSavePath(IItem item, DirectoryInfo saveDirectory, X
                 {
                     path = $"{saveDirectory.FullName}/{item.PrimaryCategory}/{validItemName}";
                 }
-                else
+                else if(primaryNumber >= 0)
+                {
+                    path = $"{saveDirectory.FullName}/{item.PrimaryCategory}/{item.SecondaryCategory}/{race}/{primaryNumber}";
+                } else
                 {
-                    path = $"{saveDirectory.FullName}/{item.PrimaryCategory}/{validItemName}/{race}/{((IItemModel)item).ModelInfo.SecondaryID}";
+                    path = $"{saveDirectory.FullName}/{item.PrimaryCategory}/{item.SecondaryCategory}/{race}/{((IItemModel)item).ModelInfo.SecondaryID}";
                 }
             }
             else

xivModdingFramework/Models/FileTypes/Eqp.cs

@@ -463,7 +463,7 @@ public async Task SaveEqdpEntries(uint primaryId, string slot, Dictionary<XivRac
             var slotIdx = EquipmentDeformationParameterSet.SlotsAsList(isAccessory).IndexOf(slot);
 
             var byteOffset = slotIdx / 4;
-            var bitOffset = (slotIdx * 2);
+            var bitOffset = (slotIdx * 2) % 8;
 
 
 

xivModdingFramework/Variants/FileTypes/Imc.cs

@@ -718,7 +718,7 @@ public void SetEntry(XivImc info, int subsetID = -1, string slot = "", bool allo
 
                 // Get which offset the slot uses.
                 var idx = 0;
-                if (SlotOffsetDictionary.ContainsKey(slot) && SlotOffsetDictionary[slot] < subset.Count)
+                if (slot != null && SlotOffsetDictionary.ContainsKey(slot) && SlotOffsetDictionary[slot] < subset.Count)
                 {
                     idx = SlotOffsetDictionary[slot];
                 }