Beta 2.3.2.1

Author: Lunaretic

xivModdingFramework/Cache/XivCache.cs

@@ -29,7 +29,7 @@ public static class XivCache
         private static GameInfo _gameInfo;
         private static DirectoryInfo _dbPath;
         private static DirectoryInfo _rootCachePath;
-        public static readonly Version CacheVersion = new Version("1.0.2.0");
+        public static readonly Version CacheVersion = new Version("1.0.2.1");
         private const string dbFileName = "mod_cache.db";
         private const string rootCacheFileName = "item_sets.db";
         private const string creationScript = "CreateCacheDB.sql";

xivModdingFramework/Items/Categories/Gear.cs

@@ -227,6 +227,19 @@ await Task.Run(() => Parallel.ForEach(itemDictionary, (item) =>
                             secondaryItem.SecondaryCategory = XivStrings.Dual_Wield;
                         }
 
+                        // Rings
+                        if(slotNum == 12)
+                        {
+                            // Make this the Right ring, and create the Left Ring entry.
+                            secondaryItem = (XivGear)xivGear.Clone();
+
+                            xivGear.Name += " - " + XivStrings.Right;
+                            secondaryItem.Name += " - " + XivStrings.Left;
+
+                            xivGear.PairedItem = secondaryItem;
+                            secondaryItem.PairedItem = xivGear;
+                        }
+
                         lock (_gearLock)
                         {
                             xivGearList.Add(xivGear);

xivModdingFramework/Items/ItemType.cs

@@ -182,6 +182,19 @@ public static string GetItemSlotAbbreviation(this IItem item)
                 }
             }
 
+            if(item.SecondaryCategory == XivStrings.Rings)
+            {
+                // Rings contain both left and right rings.
+                if (item.Name.EndsWith(XivStrings.Left))
+                {
+                    return "ril";
+                }
+                else if (item.Name.EndsWith(XivStrings.Right))
+                {
+                    return "rir";
+                }
+            }
+
             if(item.GetType() == typeof(XivMount))
             {
                 var m = (XivMount)item;

xivModdingFramework/Mods/RootCloner.cs

@@ -355,18 +355,21 @@ public static async Task CloneRoot(XivDependencyRoot Source, XivDependencyRoot D
                 }
 
                 // Poke through the variants and adjust any that point to null Material Sets to instead use a valid one.
-                var valid = newMetadata.ImcEntries.FirstOrDefault(x => x.MaterialSet != 0).MaterialSet;
-                if(valid <= 0)
+                if (newMetadata.ImcEntries.Count > 0 && originalMetadata.ImcEntries.Count > 0)
                 {
-                    valid = originalMetadata.ImcEntries.FirstOrDefault(x => x.MaterialSet != 0).MaterialSet;
-                }
+                    var valid = newMetadata.ImcEntries.FirstOrDefault(x => x.MaterialSet != 0).MaterialSet;
+                    if (valid <= 0)
+                    {
+                        valid = originalMetadata.ImcEntries.FirstOrDefault(x => x.MaterialSet != 0).MaterialSet;
+                    }
 
-                for(int i = 0; i < newMetadata.ImcEntries.Count; i++)
-                {
-                    var entry = newMetadata.ImcEntries[i];
-                    if (entry.MaterialSet == 0)
+                    for (int i = 0; i < newMetadata.ImcEntries.Count; i++)
                     {
-                        entry.MaterialSet = valid;
+                        var entry = newMetadata.ImcEntries[i];
+                        if (entry.MaterialSet == 0)
+                        {
+                            entry.MaterialSet = valid;
+                        }
                     }
                 }
 

xivModdingFramework/Resources/XivStrings.Designer.cs

@@ -894,4 +894,10 @@
   <data name="HUD" xml:space="preserve">
     <value>HUD</value>
   </data>
+  <data name="Left" xml:space="preserve">
+    <value>Left</value>
+  </data>
+  <data name="Right" xml:space="preserve">
+    <value>Right</value>
+  </data>
 </root>