Merge pull request #81 from senko-forks/pr-inthecage

Put out more neck related fires

Author: Squall-Leonhart

xivModdingFramework/Models/FileTypes/Mdl.cs

@@ -1004,9 +1004,10 @@ public static XivMdl GetXivMdl(byte[] mdlData, string mdlPath = "")
                     }
                 }
                 else { 
-                    if (xivMdl.LoDList[0].VertexDataOffset < br.BaseStream.Position
-                        || (xivMdl.LoDList[0].VertexDataOffset % 8 != br.BaseStream.Position % 8)
-                        && xivMdl.LoDList[1].VertexDataSize == 0)
+                    if ((xivMdl.LoDList[0].VertexDataOffset < br.BaseStream.Position
+                        || (xivMdl.LoDList[0].VertexDataOffset % 8 != br.BaseStream.Position % 8))
+                        && xivMdl.LoDList[1].VertexDataSize == 0 // Avoid applying this fix to vanilla models
+                        && xivMdl.ModelData.NeckMorphTableSize != 0x0A) // Avoid applying to face models, which were written incorrectly after patch 7.1
                     {
 
                         var delta = (int)(xivMdl.LoDList[0].VertexDataOffset - br.BaseStream.Position);
@@ -3608,6 +3609,10 @@ public static byte[] MakeUncompressedMdlFile(TTModel ttModel, XivMdl ogMdl, Acti
                         bones.Add((byte)boneset0Index);
                     }
 
+                    // Fully abort building neck data if we gave up inside the previous loop
+                    if (basicModelBlock[neckMorphTableSizePointer] == 0)
+                        break;
+
                     // Serialize
                     neckMorphDataBlock.AddRange(BitConverter.GetBytes(positionAdjust.X));
                     neckMorphDataBlock.AddRange(BitConverter.GetBytes(positionAdjust.Y));

xivModdingFramework/Mods/FileTypes/PMP.cs

@@ -401,15 +401,14 @@ private static void ValidateOption(PmpStandardOptionJson op)
                             var value = 1UL << i;
                             if ((selected & value) > 0)
                             {
-                                var disableOpt = group.Options[i] as PmpDisableImcOptionJson;
-                                if (disableOpt != null)
+                                var opt = group.Options[i] as PmpImcOptionJson;
+                                if (opt.IsDisableSubMod)
                                 {
                                     // No options allowed >:|
                                     disabled = true;
                                     break;
                                 }
 
-                                var opt = group.Options[i] as PmpImcOptionJson;
                                 optionIdx++;
 
                                 xivImc.AttributeMask ^= opt.AttributeMask;
@@ -420,6 +419,26 @@ private static void ValidateOption(PmpStandardOptionJson op)
                         {
                             var root = imcGroup.GetRoot();
                             var metaData = await GetImportMetadata(imported, root, tx);
+
+                            // If the OnlyAttribute flag is set on the group, fill in the fields that should be ignored from the current values instead
+                            // ( The source can be null, in the case that we're going to be synthesizing new variants from thin air )
+                            void CopyNonMaskImcValues(XivImc xivImc, XivImc src)
+                            {
+                                xivImc.Animation = src?.Animation ?? 0;
+                                xivImc.SoundId = src?.SoundId ?? 0;
+                                xivImc.MaterialSet = src?.MaterialSet ?? 0;
+                                xivImc.Decal = src?.Decal ?? 0;
+                                xivImc.Vfx = src?.Vfx ?? 0;
+                            };
+
+                            if (imcGroup.OnlyAttributes)
+                            {
+                                XivImc copyFromEntry = null;
+                                if (imcGroup.Identifier.Variant < metaData.ImcEntries.Count)
+                                    copyFromEntry = metaData.ImcEntries[(int)imcGroup.Identifier.Variant];
+                                CopyNonMaskImcValues(xivImc, copyFromEntry);
+                            }
+
                             if (metaData.ImcEntries.Count <= imcGroup.Identifier.Variant)
                             {
                                 while(metaData.ImcEntries.Count <= imcGroup.Identifier.Variant)
@@ -436,7 +455,10 @@ private static void ValidateOption(PmpStandardOptionJson op)
                             {
                                 for (int i = 0; i < metaData.ImcEntries.Count; i++)
                                 {
-                                    metaData.ImcEntries[i] = (XivImc)xivImc.Clone();
+                                    var variantXivImc = (XivImc)xivImc.Clone();
+                                    if (imcGroup.OnlyAttributes)
+                                        CopyNonMaskImcValues(variantXivImc, metaData.ImcEntries[i]);
+                                    metaData.ImcEntries[i] = variantXivImc;
                                 }
                             }
 
@@ -1479,16 +1501,13 @@ public class PmpMultiOptionJson : PmpStandardOptionJson
         public int Priority = 0;
     }
 
-    public class PmpDisableImcOptionJson : PMPOptionJson
-    {
-        public bool IsDisableSubMod = true;
-    }
-
-    [JsonConverter(typeof(JsonSubtypes))]
-    [JsonSubtypes.KnownSubTypeWithProperty(typeof(PmpDisableImcOptionJson), "IsDisableSubMod")]
     public class PmpImcOptionJson : PMPOptionJson
     {
-        public ushort AttributeMask;
+        public bool IsDisableSubMod = false;
+        public ushort AttributeMask = 0;
+
+        public bool ShouldSerializeIsDisableSubMod() { return IsDisableSubMod; }
+        public bool ShouldSerializeAttributeMask() { return !IsDisableSubMod; }
     }
 
     #endregion

xivModdingFramework/Mods/WizardData.cs

@@ -514,17 +514,12 @@ public async Task<PMPOptionJson> ToPmpOption(string tempFolder, IEnumerable<File
             PMPOptionJson op;
             if (GroupType == EGroupType.Imc)
             {
-                if (ImcData.IsDisableOption)
-                {
-                    var io = new PmpDisableImcOptionJson();
-                    op = io;
-                }
-                else
-                {
-                    var io = new PmpImcOptionJson();
-                    op = io;
+                var io = new PmpImcOptionJson();
+                op = io;
+                if (!ImcData.IsDisableOption)
                     io.AttributeMask = ImcData.AttributeMask;
-                }
+                else
+                    io.IsDisableSubMod = true;
             }
             else
             {
@@ -831,17 +826,10 @@ public static async Task<WizardGroupEntry> FromPMPGroup(PMPGroupJson pGroup, str
                 {
                     var imcData = new WizardImcOptionData();
                     var imcOp = o as PmpImcOptionJson;
-                    if (imcOp != null)
-                    {
-                        imcData.IsDisableOption = false;
+                    if (!imcOp.IsDisableSubMod)
                         imcData.AttributeMask = imcOp.AttributeMask;
-                    }
-                    var defOp = o as PmpDisableImcOptionJson;
-                    if (defOp != null)
-                    {
-                        imcData.IsDisableOption = defOp.IsDisableSubMod;
-                        imcData.AttributeMask = 0;
-                    }
+                    else
+                        imcData.IsDisableOption = imcOp.IsDisableSubMod;
                     wizOp.ImcData = imcData;
                 }