Changed Material Variant from Short to Byte

Author: Lunaretic

xivModdingFramework/Variants/DataContainers/XivImc.cs

@@ -31,7 +31,12 @@ public class XivImc
         /// <summary>
         /// The Material Set / Variant #
         /// </summary>
-        public ushort Variant { get; set; }
+        public byte Variant { get; set; }
+
+        /// <summary>
+        /// Unknown byte next to the Variant
+        /// </summary>
+        public byte Unknown { get; set; }
 
         /// <summary>
         /// The IMC mask data

xivModdingFramework/Variants/FileTypes/Imc.cs

@@ -127,28 +127,32 @@ public async Task<FullImcInfo> GetFullImcInfo(string path)
                     if (imcData.TypeIdentifier == ImcType.NonSet)
                     {
                         // This type uses the first short for both Variant and VFX.
-                        var variantAndVfx = br.ReadUInt16();
-                        var mask = br.ReadUInt16();
-                        var alwaysZero = br.ReadUInt16();
+                        byte variant = br.ReadByte();
+                        byte unknown = br.ReadByte();
+                        ushort mask = br.ReadUInt16();
+                        ushort alwaysZero = br.ReadUInt16();
 
                         imcData.DefaultSubset.Add(new XivImc
                         {
-                            Variant = variantAndVfx,
+                            Variant = variant,
+                            Unknown = unknown,
                             Mask = mask,
-                            Vfx = variantAndVfx
+                            Vfx = variant
                         });
 
                         for (var i = 0; i < subsetCount; i++)
                         {
-                            variantAndVfx = br.ReadUInt16();
+                            variant = br.ReadByte();
+                            unknown = br.ReadByte();
                             mask = br.ReadUInt16();
                             alwaysZero = br.ReadUInt16();
 
                             var newEntry = new XivImc
                             {
-                                Variant = variantAndVfx,
+                                Variant = variant,
+                                Unknown = unknown,
                                 Mask = mask,
-                                Vfx = variantAndVfx
+                                Vfx = variant
                             };
                             var subset = new List<XivImc>() { newEntry };
                         }
@@ -159,15 +163,15 @@ public async Task<FullImcInfo> GetFullImcInfo(string path)
                         imcData.DefaultSubset = new List<XivImc>()
                         {
                             new XivImc
-                                {Variant = br.ReadUInt16(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
+                                {Variant = br.ReadByte(), Unknown = br.ReadByte(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
                             new XivImc
-                                {Variant = br.ReadUInt16(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
+                                {Variant = br.ReadByte(), Unknown = br.ReadByte(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
                             new XivImc
-                                {Variant = br.ReadUInt16(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
+                                {Variant = br.ReadByte(), Unknown = br.ReadByte(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
                             new XivImc
-                                {Variant = br.ReadUInt16(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
+                                {Variant = br.ReadByte(), Unknown = br.ReadByte(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
                             new XivImc
-                                {Variant = br.ReadUInt16(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
+                                {Variant = br.ReadByte(), Unknown = br.ReadByte(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
                         };
 
                         for (var i = 0; i < subsetCount; i++)
@@ -176,17 +180,16 @@ public async Task<FullImcInfo> GetFullImcInfo(string path)
                             var imcGear = new List<XivImc>()
                             {
                                 new XivImc
-                                    {Variant = br.ReadUInt16(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
+                                    {Variant = br.ReadByte(), Unknown = br.ReadByte(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
                                 new XivImc
-                                    {Variant = br.ReadUInt16(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
+                                    {Variant = br.ReadByte(), Unknown = br.ReadByte(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
                                 new XivImc
-                                    {Variant = br.ReadUInt16(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
+                                    {Variant = br.ReadByte(), Unknown = br.ReadByte(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
                                 new XivImc
-                                    {Variant = br.ReadUInt16(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
+                                    {Variant = br.ReadByte(), Unknown = br.ReadByte(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
                                 new XivImc
-                                    {Variant = br.ReadUInt16(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
+                                    {Variant = br.ReadByte(), Unknown = br.ReadByte(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()},
                             };
-
                             imcData.SubsetList.Add(imcGear);
                         }
                     } else