Fix IMC group disable options...

Author: helpful-fox-senko-san

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;
@@ -1479,16 +1478,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;
                 }