Merge pull request #142 from taida957789/fix-canvas-outlink-bug

Fix some canvas outlink data was not found
lastbattle · Sep 26, 2021 · 93b0768 · 93b0768
2 parents 30ff917 + bb0c956
commit 93b0768
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/MapleLib/WzLib/WzProperties/WzCanvasProperty.cs b/MapleLib/WzLib/WzProperties/WzCanvasProperty.cs
@@ -19,6 +19,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 using MapleLib.WzLib.Util;
 using System;
 using System.Drawing;
+using System.Text.RegularExpressions;
 
 namespace MapleLib.WzLib.WzProperties
 {
@@ -323,9 +324,22 @@ public WzImageProperty GetLinkedWzImageProperty()
                 {
                     if (!(currentWzObj is WzDirectory))  // keep looping if its not a WzImage
                         continue;
-
                     WzFile wzFileParent = ((WzDirectory)currentWzObj).wzFile;
-                    WzObject foundProperty = wzFileParent.GetObjectFromPath(_outlink);
+                    Match match = Regex.Match(wzFileParent.Name, @"^([A-Za-z]+)([0-9]*).wz");
+
+                    string prefixWz = match.Groups[1].Value + "/"; // remove ended numbers and .wz from wzfile name 
+
+                    WzObject foundProperty;
+
+                    if (_outlink.StartsWith(prefixWz))
+                    {
+                        // fixed root path
+                        string realpath = _outlink.Replace(prefixWz, WzFileParent.Name.Replace(".wz", "") + "/");
+                        foundProperty = wzFileParent.GetObjectFromPath(realpath);
+                    } else
+                    {
+                        foundProperty = wzFileParent.GetObjectFromPath(_outlink);
+                    }
                     if (foundProperty != null && foundProperty is WzImageProperty property)
                     {
                         return property;