diff --git a/Maple2.File.Parser/Maple2.File.Parser.csproj b/Maple2.File.Parser/Maple2.File.Parser.csproj
index 1338cd5..93fe19a 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.38
+ 2.4.39
net8.0
README.md
enable
diff --git a/Maple2.File.Parser/TableParser.cs b/Maple2.File.Parser/TableParser.cs
index 01812bd..cebe299 100644
--- a/Maple2.File.Parser/TableParser.cs
+++ b/Maple2.File.Parser/TableParser.cs
@@ -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;
@@ -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));
@@ -548,6 +550,16 @@ public IEnumerable 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;
diff --git a/Maple2.File.Parser/Xml/Table/GuildRaid.cs b/Maple2.File.Parser/Xml/Table/GuildRaid.cs
new file mode 100644
index 0000000..f922575
--- /dev/null
+++ b/Maple2.File.Parser/Xml/Table/GuildRaid.cs
@@ -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;
+}
+
+public partial class GuildRaid : IFeatureLocale {
+ [XmlAttribute] public int dungeonRoomID;
+ [XmlAttribute] public int clearRaidPoint;
+ [XmlAttribute] public float clearGuildExp;
+ [XmlAttribute] public float clearGuildFund;
+}
diff --git a/Maple2.File.Tests/TableParserTest.cs b/Maple2.File.Tests/TableParserTest.cs
index ee04790..b010600 100644
--- a/Maple2.File.Tests/TableParserTest.cs
+++ b/Maple2.File.Tests/TableParserTest.cs
@@ -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()) {