Updating LuaConsole to account for .ms files, and fixing an error wit…

…h EasyComparer
PirateIzzy · Dec 11, 2024 · df547da · df547da
1 parent 97e66cf
commit df547da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/WzComparerR2.LuaConsole/Examples/DumpXml.lua b/WzComparerR2.LuaConsole/Examples/DumpXml.lua
@@ -37,7 +37,7 @@ end
 -- enum all wz_images
 for n in enumAllWzNodes(topNode) do
   local value = n.Value
-  if value and type(value) == "userdata" and value:GetType().Name == 'Wz_Image' then
+  if value and type(value) == "userdata" and (value:GetType().Name == 'Wz_Image' or value:GetType().Name == 'Ms_Image') then
     local img = value
 
     --extract wz image

diff --git a/WzComparerR2/Comparer/EasyComparer.cs b/WzComparerR2/Comparer/EasyComparer.cs
@@ -671,7 +671,7 @@ private void SaveTooltip(string skillTooltipPath)
                 int picH = 13;
                 GearGraphics.DrawPlainText(g, skillType, skillTypeFont, Color.FromArgb(255, 255, 255), 2, (int)Math.Ceiling(skillTypeTextInfo.Width) + 2, ref picH, 10);
 
-                string imageName = Path.Combine(skillTooltipPath, "Skill_" + skillID + '[' + (ItemStringHelper.GetJobName(int.Parse(skillID) / 10000) ?? "Etc") + "]_" + skillName + "_" + skillType + ".png")
+                string imageName = Path.Combine(skillTooltipPath, "Skill_" + skillID + '[' + (ItemStringHelper.GetJobName(int.Parse(skillID) / 10000) ?? "Etc") + "]_" + skillName + "_" + skillType + ".png");
                 if (!File.Exists(imageName))
                 {
                     resultImage.Save(imageName, System.Drawing.Imaging.ImageFormat.Png);