diff --git a/Maple2.File.Parser/Maple2.File.Parser.csproj b/Maple2.File.Parser/Maple2.File.Parser.csproj index 6f21f50..1338cd5 100644 --- a/Maple2.File.Parser/Maple2.File.Parser.csproj +++ b/Maple2.File.Parser/Maple2.File.Parser.csproj @@ -13,7 +13,7 @@ MapleStory2, File, Parser, m2d, xml true - 2.4.37 + 2.4.38 net8.0 README.md enable diff --git a/Maple2.File.Parser/TableParser.cs b/Maple2.File.Parser/TableParser.cs index 8933f5f..01812bd 100644 --- a/Maple2.File.Parser/TableParser.cs +++ b/Maple2.File.Parser/TableParser.cs @@ -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; @@ -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)); @@ -1677,6 +1679,16 @@ public IEnumerable 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)); diff --git a/Maple2.File.Parser/Xml/Table/MapContinent.cs b/Maple2.File.Parser/Xml/Table/MapContinent.cs new file mode 100644 index 0000000..359f17a --- /dev/null +++ b/Maple2.File.Parser/Xml/Table/MapContinent.cs @@ -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 continent; +} + +public partial class MapContinent { + [XmlAttribute] public int id; + [XmlAttribute] public int hideOtherWorldQuest; + [XmlAttribute] public int shadowContinent; + [XmlAttribute] public int representWorldmapContinent; +} diff --git a/Maple2.File.Tests/TableParserTest.cs b/Maple2.File.Tests/TableParserTest.cs index 5d0049f..ee04790 100644 --- a/Maple2.File.Tests/TableParserTest.cs +++ b/Maple2.File.Tests/TableParserTest.cs @@ -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()) {