Update 2.1.0.2

Author: KoraLyn

xivModdingFramework/General/Enums/XivRace.cs

@@ -131,7 +131,7 @@ private static void CheckTree()
             });
             dict.Add(XivRace.Roegadyn_Male, new XivRaceNode()
             {
-                Parent = dict[XivRace.Hyur_Highlander_Male],
+                Parent = dict[XivRace.Hyur_Midlander_Male],
                 Race = XivRace.Roegadyn_Male,
                 Children = new List<XivRaceNode>(),
                 HasSkin = true
@@ -191,7 +191,7 @@ private static void CheckTree()
             });
             dict.Add(XivRace.Roegadyn_Female, new XivRaceNode()
             {
-                Parent = dict[XivRace.Hyur_Highlander_Female],
+                Parent = dict[XivRace.Hyur_Midlander_Female],
                 Race = XivRace.Roegadyn_Female,
                 Children = new List<XivRaceNode>()
             });

xivModdingFramework/Items/Categories/Gear.cs

@@ -745,8 +745,36 @@ public async Task<List<IItemModel>> GetSameModelList(IItemModel item)
                 var slot = item.GetItemSlotAbbreviation();
                 var imcEntries = info.GetAllEntries(slot);
 
+                if (sameModelItems.Any(x => x.ModelInfo.ImcSubsetID != 0))
+                {
+                    // Need to list default IMC set.
+                    // Need to create a new item for it.
+                    var npcItem = new XivGear()
+                    {
+                        Name = "NPC Equipment e" + item.ModelInfo.PrimaryID + " " + slot + " Default Variant",
+                        ModelInfo = new XivGearModelInfo(),
+                        PrimaryCategory = item.PrimaryCategory,
+                        SecondaryCategory = item.SecondaryCategory,
+                        TertiaryCategory = item.TertiaryCategory,
+                        DataFile = item.DataFile,
+                    };
+                    npcItem.ModelInfo.PrimaryID = item.ModelInfo.PrimaryID;
+                    npcItem.ModelInfo.SecondaryID = item.ModelInfo.SecondaryID;
+                    npcItem.ModelInfo.ImcSubsetID = 0;
+                    try
+                    {
+                        ((XivGearModelInfo)npcItem.ModelInfo).IsWeapon = ((XivGearModelInfo)item.ModelInfo).IsWeapon;
+                    }
+                    catch
+                    {
+                        // No-op.  Should never actually get here, but safety check on the cast.
+                    }
+
+                    sameModelItems.Add(npcItem);
+                }
+
                 // Need to verify all of our IMC sets are properly represented in the item list.
-                for (int i = 0; i < imcEntries.Count; i++)
+                for (int i = 1; i <= imcEntries.Count; i++)
                 {
                     // Already in it.  All set.
                     if (sameModelItems.Any(x => x.ModelInfo.ImcSubsetID == i)) continue;

xivModdingFramework/Materials/FileTypes/Mtrl.cs

@@ -934,6 +934,7 @@ private async Task<List<TexTypePath>> GetTexNames(IEnumerable<string> texPathLis
         // Helper regexes for GetMtrlPath.
         private readonly Regex _raceRegex = new Regex("(c[0-9]{4})");
         private readonly Regex _weaponMatch = new Regex("(w[0-9]{4})");
+        private readonly Regex _tailMatch = new Regex("(t[0-9]{4})");
         private readonly Regex _skinRegex = new Regex("^/mt_c([0-9]{4})b([0-9]{4})_.+\\.mtrl$");
         /// <summary>
         /// Resolves the MTRL path for a given MDL path.
@@ -996,6 +997,17 @@ public string GetMtrlPath(string mdlPath, string mtrlName, int mtrlVariant = 1)
                     mdlPath = mdlPath.Replace(mdlMatch.Groups[1].Value, mtrlMatch.Groups[1].Value);
                 }
 
+                mdlMatch = _tailMatch.Match(mdlPath);
+                mtrlMatch = _tailMatch.Match(mtrlName);
+
+                // Both items have tail model information in their path, and the weapons DON'T match.
+                if (mdlMatch.Success && mtrlMatch.Success && mdlMatch.Groups[1].Value != mtrlMatch.Groups[1].Value)
+                {
+                    // Replacing the tail reference in the main path with the one from the MTRL.
+                    // Needless to say, this only happens with tail items.
+                    mdlPath = mdlPath.Replace(mdlMatch.Groups[1].Value, mtrlMatch.Groups[1].Value);
+                }
+
                 var mdlFolder = Path.GetDirectoryName(mdlPath);
                 mdlFolder = mdlFolder.Replace("\\", "/");
 

xivModdingFramework/Models/DataContainers/TTModel.cs

@@ -918,12 +918,21 @@ public void SaveToFile(string filePath, Action<bool, string> loggingFunction = n
                         foreach(var material in Materials)
                         {
                             // Materials
-                            query = @"insert into materials (material_id, diffuse, normal, specular, opacity) values ($material_id, $diffuse, $normal, $specular, $opacity);";
+                            query = @"insert into materials (material_id, name, diffuse, normal, specular, opacity, emissive) values ($material_id, $name, $diffuse, $normal, $specular, $opacity, $emissive);";
                             using (var cmd = new SQLiteCommand(query, db))
                             {
                                 var mtrl_prefix = directory + "\\" + Path.GetFileNameWithoutExtension(material.Substring(1)) + "_";
                                 var mtrl_suffix = ".png";
+                                var name = material;
+                                try
+                                {
+                                    name = Path.GetFileNameWithoutExtension(material);
+                                } catch
+                                {
+
+                                }
                                 cmd.Parameters.AddWithValue("material_id", matIdx);
+                                cmd.Parameters.AddWithValue("name", name);
                                 cmd.Parameters.AddWithValue("diffuse", mtrl_prefix + "d" + mtrl_suffix);
                                 cmd.Parameters.AddWithValue("normal", mtrl_prefix + "n" + mtrl_suffix);
                                 cmd.Parameters.AddWithValue("specular", mtrl_prefix + "s" + mtrl_suffix);

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -991,7 +991,7 @@ public async Task<XivMdl> GetRawMdlData(string mdlPath, bool getOriginal = false
                 xivMdl.MeshShapeData.AssignMeshAndLodNumbers(indexOffsets);
 
                 // Sets the boolean flag if the model has shape data
-                xivMdl.HasShapeData = xivMdl.ModelData.ShapeCount > 0;
+                xivMdl.HasShapeData = xivMdl.ModelData.ShapeCount > 0 && getShapeData;
 
                 // Bone index for Parts
                 var partBoneSet = new BoneSet

xivModdingFramework/Models/Helpers/ModelModifiers.cs

@@ -697,7 +697,7 @@ public static void CloneUV2(TTModel model, Action<bool, string> loggingFunction
                 loggingFunction = NoOp;
             }
 
-            loggingFunction(false, "Clearing UV2...");
+            loggingFunction(false, "Cloning UV1 to UV2...");
             foreach (var m in model.MeshGroups)
             {
                 foreach (var p in m.Parts)

xivModdingFramework/Resources/SQL/CreateImportDB.sql

@@ -120,6 +120,7 @@ CREATE TABLE "skeleton" (
 -- Materials
 CREATE TABLE "materials" (
 	"material_id"	INTEGER NOT NULL,
+	"name"			TEXT,
 	"diffuse"		TEXT,
 	"normal"		TEXT,
 	"specular"		TEXT,