Bug fixes:

- Fixed an issue with images not loading using a KMS (1.2.65) file structure
- Added a right click function to the save button. This will save all parsed images as a PNG in the application's folder

Author: izarooni

WzVisualizer/GUI/Form1.Designer.cs

@@ -161,7 +161,7 @@ private void AddGridRow(DataGridView grid, object wzObject)
 
             if (wzObject is WzImage image)
             {
-                if (image.WzFileParent.Name == "Npc.wz")
+                if (image.WzFileParent.Name.StartsWith("Npc"))
                 {
                     // NPC icon breadcrumb like: '{ID}/stand/0'
                     // and also sometimes contains a link STRING property instead of using UOL
@@ -179,7 +179,7 @@ private void AddGridRow(DataGridView grid, object wzObject)
                         if (image == null) return;
                     }
                     icon = (WzCanvasProperty)image.GetFromPath("stand/0");
-                } else if (image.WzFileParent.Name == "Mob.wz")
+                } else if (image.WzFileParent.Name.StartsWith("Mob"))
                 {
                     // Mob icon breadcrumb like: '{ID}/(move|stand)/0'
                     // where the 'move' or 'stand' sub property may not exist
@@ -216,7 +216,7 @@ private void AddGridRow(DataGridView grid, object wzObject)
                 }
             } else if (wzObject is WzSubProperty subProperty)
             {
-                if (subProperty.WzFileParent.Name == "Skill.wz")
+                if (subProperty.WzFileParent.Name.StartsWith("Skill"))
                 {
                     ID = int.Parse(subProperty.Name);
                     name = StringUtility.GetSkill(subProperty.Name);
@@ -639,12 +639,20 @@ private void BtnWzLoad_Click(object sender, EventArgs e)
                 {
                     _StringWZ = new WzFile(stringWzPath + ".wz", mapleVersion);
                     _StringWZ.ParseWzFile();
-                } else if (Directory.Exists(stringWzPath))
+                }
+                else if (Directory.Exists(stringWzPath))
                 { // KMS
+                    _StringWZ = new WzFile(stringWzPath, mapleVersion);
                     WzDirectory dir = new WzDirectory("String", _StringWZ);
                     _StringWZ.WzDirectory = dir;
                     RecursivelyLoadDirectory(dir, stringWzPath, mapleVersion);
                 }
+                else
+                {
+                    MessageBox.Show("Failed to load String data in the specified directory", "File not found", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    DisposeWzFiles();
+                    return;
+                }
                 StringUtility = new WzStringUtility(_StringWZ);
                 LoadWzData(mapleVersion, folderPath);
             }
@@ -665,17 +673,37 @@ private void ComboLoadType_SelectedIndexChanged(object sender, EventArgs e)
         /// upon clicking the save button, store data of the current opened grid.
         /// Some tabs may have another TabControl in which that Control contains a Grid control.
         /// </summary>
-        private void BtnSave_Click(object sender, EventArgs e)
+        private void BtnSave_Click(object sender, EventArgs ev)
         {
-            var control = TabControlMain.SelectedTab.Controls[0];
-            if (control is DataGridView grid) // no child tabs and contains 1 child Control (DataGridView)
-                GridIOUtility.ExportGrid(grid, TabControlMain.SelectedTab.Text);
-            else if (control is TabControl tab) // sub-categories (e.g. Equips.Hairs, Equips.Faces)
-            {
-                control = tab.SelectedTab; // The selected child Tab (e.g. Equips.Hairs)
-                GridIOUtility.ExportGrid((DataGridView) control.Controls[0], TabControlMain.SelectedTab.Text); // The DataGridView contained in the TabPage control
+            MouseEventArgs e = (MouseEventArgs)ev;
+            switch (e.Button) {
+                case MouseButtons.Left:
+                    {
+                        var control = TabControlMain.SelectedTab.Controls[0];
+                        if (control is DataGridView grid) // no child tabs and contains 1 child Control (DataGridView)
+                            GridIOUtility.ExportGrid(grid, TabControlMain.SelectedTab.Text);
+                        else if (control is TabControl tab) // sub-categories (e.g. Equips.Hairs, Equips.Faces)
+                        {
+                            control = tab.SelectedTab; // The selected child Tab (e.g. Equips.Hairs)
+                            GridIOUtility.ExportGrid((DataGridView)control.Controls[0], TabControlMain.SelectedTab.Text); // The DataGridView contained in the TabPage control
+                        }
+                        MessageBox.Show("Bin save complete!");
+                        break;
+                    }
+                case MouseButtons.Right:
+                    {
+                        var control = TabControlMain.SelectedTab.Controls[0];
+                        if (control is DataGridView grid) // no child tabs and contains 1 child Control (DataGridView)
+                            GridIOUtility.ExportGridImages(grid, TabControlMain.SelectedTab.Text);
+                        else if (control is TabControl tab) // sub-categories (e.g. Equips.Hairs, Equips.Faces)
+                        {
+                            control = tab.SelectedTab; // The selected child Tab (e.g. Equips.Hairs)
+                            GridIOUtility.ExportGridImages((DataGridView)control.Controls[0], TabControlMain.SelectedTab.Text); // The DataGridView contained in the TabPage control
+                        }
+                        MessageBox.Show("Image save complete!");
+                        break;
+                    }
             }
-            MessageBox.Show("Save complete!");
         }
 
         #region tab change events

WzVisualizer/GUI/Form1.cs

@@ -14,6 +14,7 @@ namespace WzVisualizer
     class GridIOUtility
     {
         private const string ExportFolder = "exports";
+        private const string ImagesFolder = "images";
 
         private static void ReadFileContents(string path, ref List<BinData> datas)
         {
@@ -58,7 +59,7 @@ private static void ReadFileContents(string path, ref List<BinData> datas)
 
         internal static void ImportGrid(string file, DataGridView grid, AddGridRowCallBack callbackTask)
         {
-            string path = string.Format("{0}/{1}", ExportFolder, file);
+            string path = string.Format("{0}/{1}", ImagesFolder, file);
             if (!File.Exists(path))
                 return;
             List<BinData> datas = new List<BinData>();
@@ -68,11 +69,33 @@ internal static void ImportGrid(string file, DataGridView grid, AddGridRowCallBa
             thread.Start();
         }
 
+        internal static void ExportGridImages(DataGridView grid, string folder)
+        {
+            string directory = string.Format("{0}/{1}", ImagesFolder, folder);
+            Directory.CreateDirectory(directory);
+            var rows = grid.Rows;
+            for (int a = 0; a < rows.Count; a++)
+            {
+                var cells = rows[a].Cells;
+                Bitmap bitmap = null;
+                string fileName = null;
+                for (int b = 0; b < cells.Count; b++)
+                {
+                    var cell = cells[b];
+                    string ownColumnName = cell.OwningColumn.Name;
+                    if (ownColumnName.EndsWith("Image")) bitmap = (Bitmap)cell.Value;
+                    if (ownColumnName.EndsWith("ID")) fileName = (int)cell.Value + ".png";
+                }
+                if (bitmap == null || fileName == null) continue;
+                bitmap.Save(string.Format("{0}/{1}", directory, fileName), ImageFormat.Png);
+            }
+        }
+
         internal static void ExportGrid(DataGridView grid, string folder)
         {
             string directory = string.Format("{0}/{1}", ExportFolder, folder);
             Directory.CreateDirectory(directory);
-            string path = string.Format("{0}/{2}.bin", directory, folder, ((TabPage)grid.Parent).Text);
+            string path = string.Format("{0}/{1}.bin", directory, ((TabPage)grid.Parent).Text);
             using (BinaryWriter bwriter = new BinaryWriter(new FileStream(path, FileMode.Create)))
             {
                 var rows = grid.Rows;