add support for flags savedata 5 and zombies save data 10

Author: RestoreMonarchy

UnturnedMapMergeTool/DataMergeTools/FlagsDataMergeTool.cs

@@ -25,7 +25,7 @@ public class FlagsDataMergeTool : DataMergeToolBase
         public override void CombineAndSaveData(OutputMap outputMap)
         {
             byte flagsSaveVersion = 4;
-            byte flagsDataSaveVersion = 4;
+            byte flagsDataSaveVersion = 5;
 
             FlagsDataContent flagsContent = new(flagsSaveVersion, 0);
             FlagsDataDataContent flagsDataContent = new(flagsDataSaveVersion, 0);
@@ -37,7 +37,8 @@ public override void CombineAndSaveData(OutputMap outputMap)
 
                 if (flagDataItem.Content.FlagsData.Count != flagItem.Content.Flags.Count)
                 {
-                    throw new Exception("Flags data count and flags count should be the same");
+                    flagDataItem.Content.FlagsData.RemoveAt(FlagsData.Count - 1);
+                    //throw new Exception("Flags data count and flags count should be the same");
                 }
 
                 for (int i = 0; i < flagItem.Content.Count; i++)

UnturnedMapMergeTool/Models/Contents/FlagsData/FlagDataData.cs

@@ -12,5 +12,6 @@ public class FlagDataData
         public byte MaxZombies { get; set; }
         public bool SpawnZombies { get; set; }
         public bool HyperAgro { get; set; }
+        public int MaxBossZombies { get; set; }
     }
 }

UnturnedMapMergeTool/Models/Contents/FlagsDataDataContent.cs

@@ -36,6 +36,7 @@ public void SaveToFile(string fileNamePath)
                 river.writeByte(flagData.MaxZombies);
                 river.writeBoolean(flagData.SpawnZombies);
                 river.writeBoolean(flagData.HyperAgro);
+                river.writeInt32(flagData.MaxBossZombies);
             }
 
             river.closeRiver();
@@ -75,7 +76,12 @@ public static FlagsDataDataContent FromFile(string fileNamePath)
                 {
                     flagData.HyperAgro = river.readBoolean();
                 }
-                
+
+                flagData.MaxBossZombies = -1;
+                if (content.SaveDataVersion >= 5)
+                {
+                    flagData.MaxBossZombies = river.readInt32();
+                }                
             }
 
             river.closeRiver();

UnturnedMapMergeTool/Models/Contents/Zombies/ZombieTableData.cs

@@ -9,6 +9,7 @@ namespace UnturnedMapMergeTool.Models.Contents.Zombies
 {
     public class ZombieTableData
     {
+        public Guid TableUniqueId { get; set; }
         public Color Color { get; set; }
         public string Name { get; set; }
         public bool IsMega { get; set; }

UnturnedMapMergeTool/Models/Contents/ZombiesDataContent.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using UnturnedMapMergeTool.Models.Contents.Zombies;
@@ -81,6 +82,11 @@ public static ZombiesDataContent FromFile(string fileNamePath)
                 block.readSteamID();
             }
 
+            if (content.SaveDataVersion >= 10)
+            {
+                block.readInt32();
+            }
+
             content.Tables = new();
 
             // TODO: Add support for SavedataVersion < 2
@@ -91,6 +97,11 @@ public static ZombiesDataContent FromFile(string fileNamePath)
                 ZombieTableData zombieTable = new();
                 content.Tables.Add(zombieTable);
 
+                if (content.SaveDataVersion >= 10)
+                {
+                    block.readInt32();
+                }
+                
                 zombieTable.Color = block.readColor();
                 zombieTable.Name = block.readString();
                 zombieTable.IsMega = block.readBoolean();
@@ -130,9 +141,9 @@ public static ZombiesDataContent FromFile(string fileNamePath)
                     zombieTable.DifficultyGuid = block.readString();
                 }
 
-                zombieTable.Slots = new ZombieSlotData[4];
                 zombieTable.SlotsCount = block.readByte();
-
+                zombieTable.Slots = new ZombieSlotData[zombieTable.SlotsCount];
+                
                 for (byte j = 0; j < zombieTable.SlotsCount; j++)
                 {
                     ZombieSlotData zombieSlot = new();