Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Maple2.File.Parser/Maple2.File.Parser.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.37</PackageVersion>
<PackageVersion>2.4.38</PackageVersion>
<TargetFramework>net8.0</TargetFramework>
<PackageReadmeFile>README.md</PackageReadmeFile>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
12 changes: 12 additions & 0 deletions Maple2.File.Parser/TableParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public class TableParser {
private readonly XmlSerializer statStringSerializer;
private readonly XmlSerializer autoActionPricePackageSerializer;
private readonly XmlSerializer pvpRankingDuelModeSerializer;
private readonly XmlSerializer mapContinentSerializer;
private readonly XmlSerializer questGroupSerializer;
private readonly XmlSerializer darkStreamSerializer;
private readonly XmlSerializer clubBuffSerializer;
Expand Down Expand Up @@ -232,6 +233,7 @@ public TableParser(M2dReader xmlReader, string language) {
statStringSerializer = new XmlSerializer(typeof(StatStringRoot));
autoActionPricePackageSerializer = new XmlSerializer(typeof(AutoActionPricePackageRoot));
pvpRankingDuelModeSerializer = new XmlSerializer(typeof(PvpRankingDuelModeRoot));
mapContinentSerializer = new XmlSerializer(typeof(MapContinentRoot));
questGroupSerializer = new XmlSerializer(typeof(QuestGroupRoot));
darkStreamSerializer = new XmlSerializer(typeof(DarkStreamRoot));
clubBuffSerializer = new XmlSerializer(typeof(ClubBuffRoot));
Expand Down Expand Up @@ -1677,6 +1679,16 @@ public IEnumerable<JobTableNew> ParseJobTableNew() {
}
}

public IEnumerable<(int Id, MapContinent Data)> ParseMapContinent() {
XmlReader reader = xmlReader.GetXmlReader(xmlReader.GetEntry("table/mapcontinenttable.xml"));
var data = mapContinentSerializer.Deserialize(reader) as MapContinentRoot;
Debug.Assert(data != null);

foreach (MapContinent entry in data.continent) {
yield return (entry.id, entry);
}
}

public IEnumerable<(int Id, QuestGroup Data)> ParseQuestGroup() {
string xml = Sanitizer.RemoveEmpty(xmlReader.GetString(xmlReader.GetEntry("table/questgrouptable.xml")));
var reader = XmlReader.Create(new StringReader(xml));
Expand Down
16 changes: 16 additions & 0 deletions Maple2.File.Parser/Xml/Table/MapContinent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using System.Xml.Serialization;

namespace Maple2.File.Parser.Xml.Table;

// ./data/xml/table/mapcontinenttable.xml
[XmlRoot("ms2")]
public class MapContinentRoot {
[XmlElement] public List<MapContinent> continent;
}

public partial class MapContinent {
[XmlAttribute] public int id;
[XmlAttribute] public int hideOtherWorldQuest;
[XmlAttribute] public int shadowContinent;
[XmlAttribute] public int representWorldmapContinent;
}
8 changes: 8 additions & 0 deletions Maple2.File.Tests/TableParserTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,14 @@ public void TestPvpRankingDuelMode() {
}
}

[TestMethod]
public void TestMapContinent() {
var continents = _parser.ParseMapContinent().ToDictionary(entry => entry.Id, entry => entry.Data);
Assert.AreEqual(1, continents[202].shadowContinent);
Assert.AreEqual(102, continents[202].representWorldmapContinent);
Assert.AreEqual(0, continents[102].shadowContinent);
}

[TestMethod]
public void TestQuestGroup() {
foreach ((_, _) in _parser.ParseQuestGroup()) {
Expand Down
Loading