Merge pull request #33 from Lunaretic/master

IMC Fixes

Author: KoraLyn

xivModdingFramework/Variants/DataContainers/XivImc.cs

@@ -19,6 +19,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using xivModdingFramework.Helpers;
+using xivModdingFramework.Variants.FileTypes;
 
 namespace xivModdingFramework.Variants.DataContainers
 {
@@ -30,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
@@ -54,12 +60,22 @@ public class XivImc
         /// Returns the raw bytes that make up this IMC entry.
         /// </summary>
         /// <returns></returns>
-        public byte[] GetBytes()
+        public byte[] GetBytes(ImcType type)
         {
             var bytes = new List<byte>();
             bytes.AddRange(BitConverter.GetBytes(Variant));
             bytes.AddRange(BitConverter.GetBytes(Mask));
-            bytes.AddRange(BitConverter.GetBytes(Vfx));
+            if (type == ImcType.NonSet)
+            {
+                // Always 0 for non-set entries, their VFX number is the
+                // same as their Material Variant #.
+                bytes.AddRange(BitConverter.GetBytes(((ushort)0)));
+            }
+            else
+            {
+                // Actual VFX number.
+                bytes.AddRange(BitConverter.GetBytes(Vfx));
+            }
             return bytes.ToArray();
         }
 

xivModdingFramework/Variants/FileTypes/Imc.cs

@@ -14,19 +14,15 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-using HelixToolkit.SharpDX.Core;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using xivModdingFramework.General.Enums;
-using xivModdingFramework.Helpers;
 using xivModdingFramework.Items;
 using xivModdingFramework.Items.DataContainers;
 using xivModdingFramework.Items.Enums;
 using xivModdingFramework.Items.Interfaces;
-using xivModdingFramework.Models.FileTypes;
-using xivModdingFramework.Resources;
 using xivModdingFramework.SqPack.FileTypes;
 using xivModdingFramework.Variants.DataContainers;
 
@@ -130,19 +126,35 @@ public async Task<FullImcInfo> GetFullImcInfo(string path)
                     //weapons and monsters do not have variant sets
                     if (imcData.TypeIdentifier == ImcType.NonSet)
                     {
-                        // Identifier used by weapons and monsters.
+                        // This type uses the first short for both Variant and VFX.
+                        byte variant = br.ReadByte();
+                        byte unknown = br.ReadByte();
+                        ushort mask = br.ReadUInt16();
+                        ushort alwaysZero = br.ReadUInt16();
+
                         imcData.DefaultSubset.Add(new XivImc
                         {
-                            Variant = br.ReadUInt16(),
-                            Mask = br.ReadUInt16(),
-                            Vfx = br.ReadUInt16()
+                            Variant = variant,
+                            Unknown = unknown,
+                            Mask = mask,
+                            Vfx = variant
                         });
 
                         for (var i = 0; i < subsetCount; i++)
                         {
-                            var subset = new List<XivImc>() {
-                                new XivImc {Variant = br.ReadUInt16(), Mask = br.ReadUInt16(), Vfx = br.ReadUInt16()}
+                            variant = br.ReadByte();
+                            unknown = br.ReadByte();
+                            mask = br.ReadUInt16();
+                            alwaysZero = br.ReadUInt16();
+
+                            var newEntry = new XivImc
+                            {
+                                Variant = variant,
+                                Unknown = unknown,
+                                Mask = mask,
+                                Vfx = variant
                             };
+                            var subset = new List<XivImc>() { newEntry };
                         }
                     }
                     else if(imcData.TypeIdentifier == ImcType.Set)
@@ -151,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++)
@@ -168,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
@@ -252,14 +263,14 @@ public async Task SaveFullImcInfo(FullImcInfo info, string path, string itemName
             // The rest of this is easy, it's literally just post all the sets in order.
             foreach(var entry in info.DefaultSubset)
             {
-                data.AddRange(entry.GetBytes());
+                data.AddRange(entry.GetBytes(info.TypeIdentifier));
             }
 
             foreach(var set in info.SubsetList)
             {
                 foreach (var entry in set)
                 {
-                    data.AddRange(entry.GetBytes());
+                    data.AddRange(entry.GetBytes(info.TypeIdentifier));
                 }
             }