Parse ConfigurableCube

AngeloTadeucci · Feb 19, 2025 · 3d13137 · 3d13137
1 parent 5bfaa51
commit 3d13137
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/Maple2.File.Parser/Enum/ConfigurableCubeType.cs b/Maple2.File.Parser/Enum/ConfigurableCubeType.cs
@@ -0,0 +1,6 @@
+namespace Maple2.File.Parser.Enum;
+
+public enum ConfigurableCubeType {
+    UGCNotice = 0,
+    UGCPortal = 1,
+}
diff --git a/Maple2.File.Parser/FunctionCubeParser.cs b/Maple2.File.Parser/FunctionCubeParser.cs
@@ -17,7 +17,7 @@ public FunctionCubeParser(M2dReader xmlReader) {
         FunctionCubeSerializer = new XmlSerializer(typeof(FunctionCubeRoot));
     }
 
-    public IEnumerable<(int Id, FunctionCube Data)> Parse() {
+    public IEnumerable<(int Id, FunctionCubeRoot Data)> Parse() {
         foreach (PackFileEntry entry in xmlReader.Files.Where(entry => entry.Name.StartsWith("object/"))) {
             var reader = XmlReader.Create(new StringReader(Sanitizer.SanitizeFunctionCube(xmlReader.GetString(entry))));
             var data = FunctionCubeSerializer.Deserialize(reader) as FunctionCubeRoot;
@@ -26,7 +26,7 @@ public FunctionCubeParser(M2dReader xmlReader) {
             if (data.FunctionCube == null) continue;
 
             if (int.TryParse(Path.GetFileNameWithoutExtension(entry.Name), out int id)) {
-                yield return (id, data.FunctionCube);
+                yield return (id, data);
             }
         }
     }

diff --git a/Maple2.File.Parser/Maple2.File.Parser.csproj b/Maple2.File.Parser/Maple2.File.Parser.csproj
@@ -13,7 +13,7 @@
         <PackageTags>MapleStory2, File, Parser, m2d, xml</PackageTags>
         <!-- Use following lines to write the generated files to disk. -->
         <EmitCompilerGeneratedFiles Condition=" '$(Configuration)' == 'Debug' ">true</EmitCompilerGeneratedFiles>
-        <PackageVersion>2.2.3</PackageVersion>
+        <PackageVersion>2.2.4</PackageVersion>
         <TargetFramework>net8.0</TargetFramework>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <ImplicitUsings>enable</ImplicitUsings>

diff --git a/Maple2.File.Parser/Xml/Object/FunctionCube.cs b/Maple2.File.Parser/Xml/Object/FunctionCube.cs
@@ -8,6 +8,7 @@ namespace Maple2.File.Parser.Xml.Object;
 [XmlRoot("ms2")]
 public class FunctionCubeRoot {
     [XmlElement] public FunctionCube FunctionCube;
+    [XmlElement] public ConfigurableCube ConfigurableCube;
 }
 
 public partial class FunctionCube {
@@ -51,3 +52,8 @@ public partial class FunctionCube {
     [XmlElement] public NoticePopup noticePopup;
     [XmlElement] public Nurturing nurturing;
 }
+
+public partial class ConfigurableCube {
+    [XmlAttribute] public bool enabled;
+    [M2dEnum] public ConfigurableCubeType id;
+}
diff --git a/Maple2.File.Tests/FunctionCubeParserTest.cs b/Maple2.File.Tests/FunctionCubeParserTest.cs
@@ -13,7 +13,7 @@ public void TestFunctionCubeParser() {
         // parser.FunctionCubeSerializer.UnknownElement += TestUtils.UnknownElementHandler;
         // parser.FunctionCubeSerializer.UnknownAttribute += TestUtils.UnknownAttributeHandler;
 
-        foreach ((int id, FunctionCube data) in parser.Parse()) {
+        foreach ((int id, FunctionCubeRoot data) in parser.Parse()) {
             Assert.IsTrue(id >= 0);
             Assert.IsNotNull(data);
         }