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.38</PackageVersion>
<PackageVersion>2.4.39</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 @@ -38,6 +38,7 @@ public class TableParser {
private readonly XmlSerializer guildNpcSerializer;
private readonly XmlSerializer guildPropertySerializer;
private readonly XmlSerializer guildQuestRewardFactorSerializer;
private readonly XmlSerializer guildRaidSerializer;
private readonly XmlSerializer instrumentCategoryInfoSerializer;
private readonly XmlSerializer instrumentInfoSerializer;
private readonly XmlSerializer interactObjectSerializer;
Expand Down Expand Up @@ -161,6 +162,7 @@ public TableParser(M2dReader xmlReader, string language) {
guildNpcSerializer = new XmlSerializer(typeof(GuildNpcRoot));
guildPropertySerializer = new XmlSerializer(typeof(GuildPropertyRoot));
guildQuestRewardFactorSerializer = new XmlSerializer(typeof(GuildQuestRewardFactorRoot));
guildRaidSerializer = new XmlSerializer(typeof(GuildRaidRoot));
instrumentCategoryInfoSerializer = new XmlSerializer(typeof(InstrumentCategoryInfoRoot));
instrumentInfoSerializer = new XmlSerializer(typeof(InstrumentInfoRoot));
interactObjectSerializer = new XmlSerializer(typeof(InteractObjectRoot));
Expand Down Expand Up @@ -548,6 +550,16 @@ public IEnumerable<UnitedWeeklyReward> ParseUnitedWeeklyReward() {
}
}

public IEnumerable<(int DungeonRoomId, GuildRaid Raid)> ParseGuildRaid() {
XmlReader reader = xmlReader.GetXmlReader(xmlReader.GetEntry("table/guildraid.xml"));
var data = guildRaidSerializer.Deserialize(reader) as GuildRaidRoot;
Debug.Assert(data != null);

foreach (GuildRaid raid in data.guildRaid) {
yield return (raid.dungeonRoomID, raid);
}
}

public IEnumerable<(int Id, InstrumentCategoryInfo Info)> ParseInstrumentCategoryInfo() {
XmlReader reader = xmlReader.GetXmlReader(xmlReader.GetEntry("table/instrumentcategoryinfo.xml"));
var data = instrumentCategoryInfoSerializer.Deserialize(reader) as InstrumentCategoryInfoRoot;
Expand Down
17 changes: 17 additions & 0 deletions Maple2.File.Parser/Xml/Table/GuildRaid.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System.Xml.Serialization;
using M2dXmlGenerator;

namespace Maple2.File.Parser.Xml.Table;

// ./data/xml/table/guildraid.xml
[XmlRoot("ms2")]
public partial class GuildRaidRoot {
[M2dFeatureLocale(Selector = "dungeonRoomID")] private IList<GuildRaid> _guildRaid;
}

public partial class GuildRaid : IFeatureLocale {
[XmlAttribute] public int dungeonRoomID;
[XmlAttribute] public int clearRaidPoint;
[XmlAttribute] public float clearGuildExp;
[XmlAttribute] public float clearGuildFund;
}
18 changes: 18 additions & 0 deletions Maple2.File.Tests/TableParserTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,24 @@ public void TestGuildQuestRewardFactor() {
}
}

[TestMethod]
public void TestGuildRaid() {
var raids = _parser.ParseGuildRaid().ToDictionary(entry => entry.DungeonRoomId, entry => entry.Raid);
CollectionAssert.AreEquivalent(new[] { 26001001, 26002001, 26003001, 26004001, 26005001 }, raids.Keys.ToArray());

Assert.AreEqual(1000, raids[26001001].clearRaidPoint);
Assert.AreEqual(1f, raids[26001001].clearGuildExp);
Assert.AreEqual(1f, raids[26001001].clearGuildFund);
Assert.AreEqual("GuildRaid01", raids[26001001].Feature);

Assert.AreEqual(1000, raids[26004001].clearRaidPoint);
Assert.AreEqual(1.3f, raids[26004001].clearGuildExp);
Assert.AreEqual(1.75f, raids[26004001].clearGuildFund);

Assert.AreEqual(1.4f, raids[26005001].clearGuildExp);
Assert.AreEqual(2f, raids[26005001].clearGuildFund);
}

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