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
8 changes: 8 additions & 0 deletions Maple2.File.Parser/Enum/WeddingRewardLimit.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace Maple2.File.Parser.Enum;

public enum WeddingRewardLimit {
none,
day,
week,
month,
}
11 changes: 11 additions & 0 deletions Maple2.File.Parser/Enum/WeddingRewardType.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
namespace Maple2.File.Parser.Enum;

public enum WeddingRewardType {
none,
marriedLife,
attendance,
coupleMessage,
marriageRegister,
weddingExpItem,
logoutPanelty,
}
7 changes: 7 additions & 0 deletions Maple2.File.Parser/Enum/WeddingSkillType.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace Maple2.File.Parser.Enum;

public enum WeddingSkillType {
none,
passive,
item,
}
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.1.28</PackageVersion>
<PackageVersion>2.1.29</PackageVersion>
<TargetFramework>net8.0</TargetFramework>
<PackageReadmeFile>README.md</PackageReadmeFile>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
52 changes: 52 additions & 0 deletions Maple2.File.Parser/TableParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ public class TableParser {
private readonly XmlSerializer fieldMissionSerializer;
private readonly XmlSerializer worldMapSerializer;
private readonly XmlSerializer mapleSurvivalSkinInfoSerializer;
private readonly XmlSerializer weddingExpSerializer;
private readonly XmlSerializer weddingPackageSerializer;
private readonly XmlSerializer weddingRewardSerializer;
private readonly XmlSerializer weddingSkillSerializer;

public TableParser(M2dReader xmlReader) {
this.xmlReader = xmlReader;
Expand Down Expand Up @@ -168,6 +172,10 @@ public TableParser(M2dReader xmlReader) {
fieldMissionSerializer = new XmlSerializer(typeof(FieldMissionRoot));
worldMapSerializer = new XmlSerializer(typeof(WorldMapRoot));
mapleSurvivalSkinInfoSerializer = new XmlSerializer(typeof(MapleSurvivalSkinInfoRoot));
weddingExpSerializer = new XmlSerializer(typeof(WeddingExpRoot));
weddingPackageSerializer = new XmlSerializer(typeof(WeddingPackageRoot));
weddingRewardSerializer = new XmlSerializer(typeof(WeddingRewardRoot));
weddingSkillSerializer = new XmlSerializer(typeof(WeddingSkillRoot));

// var seen = new HashSet<string>();
// this.bankTypeSerializer.UnknownAttribute += (sender, args) => {
Expand Down Expand Up @@ -1225,4 +1233,48 @@ public IEnumerable<JobTable> ParseJobTable() {
yield return (entry.id, entry);
}
}

public IEnumerable<(int Grade, WeddingExp Exp)> ParseWeddingExp() {
string xml = Sanitizer.RemoveEmpty(xmlReader.GetString(xmlReader.GetEntry("table/weddingexp.xml")));
var reader = XmlReader.Create(new StringReader(xml));
var data = weddingExpSerializer.Deserialize(reader) as WeddingExpRoot;
Debug.Assert(data != null);

foreach (WeddingExp entry in data.v) {
yield return (entry.grade, entry);
}
}

public IEnumerable<(int Grade, WeddingPackage Package)> ParseWeddingPackage() {
string xml = Sanitizer.RemoveEmpty(xmlReader.GetString(xmlReader.GetEntry("table/weddingpackage.xml")));
var reader = XmlReader.Create(new StringReader(xml));
var data = weddingPackageSerializer.Deserialize(reader) as WeddingPackageRoot;
Debug.Assert(data != null);

foreach (WeddingPackage entry in data.package) {
yield return (entry.id, entry);
}
}

public IEnumerable<(WeddingRewardType Type, WeddingReward Reward)> ParseWeddingReward() {
string xml = Sanitizer.RemoveEmpty(xmlReader.GetString(xmlReader.GetEntry("table/weddingreward.xml")));
var reader = XmlReader.Create(new StringReader(xml));
var data = weddingRewardSerializer.Deserialize(reader) as WeddingRewardRoot;
Debug.Assert(data != null);

foreach (WeddingReward entry in data.v) {
yield return (entry.type, entry);
}
}

public IEnumerable<(int Id, WeddingSkill Reward)> ParseWeddingSkill() {
string xml = Sanitizer.RemoveEmpty(xmlReader.GetString(xmlReader.GetEntry("table/weddingskill.xml")));
var reader = XmlReader.Create(new StringReader(xml));
var data = weddingSkillSerializer.Deserialize(reader) as WeddingSkillRoot;
Debug.Assert(data != null);

foreach (WeddingSkill entry in data.v) {
yield return (entry.id, entry);
}
}
}
14 changes: 14 additions & 0 deletions Maple2.File.Parser/Xml/Table/WeddingExp.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System.Xml.Serialization;

namespace Maple2.File.Parser.Xml.Table;

// ./data/xml/table/weddingexp.xml
[XmlRoot("ms2")]
public class WeddingExpRoot {
[XmlElement] public List<WeddingExp> v;
}

public class WeddingExp {
[XmlAttribute] public int grade;
[XmlAttribute] public int value;
}
36 changes: 36 additions & 0 deletions Maple2.File.Parser/Xml/Table/WeddingPackage.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Xml.Serialization;
using M2dXmlGenerator;

namespace Maple2.File.Parser.Xml.Table;

// ./data/xml/table/weddingpackage.xml
[XmlRoot("ms2")]
public partial class WeddingPackageRoot {
[M2dFeatureLocale(Selector = "id")] private IList<WeddingPackage> _package;
}

public partial class WeddingPackage : IFeatureLocale {
[XmlAttribute] public int id;
[XmlAttribute] public int planner;
[XmlElement] public List<WeddingHall> weddingHall;
}

public class WeddingHall {
[XmlAttribute] public int id;
[XmlAttribute] public int fieldID;
[XmlAttribute] public int nightFieldID;
[XmlAttribute] public byte grade;
[XmlAttribute] public int merat;
[XmlAttribute] public string videoPath = string.Empty;
[XmlAttribute] public string desc = string.Empty;
[XmlAttribute] public string mcillust = string.Empty;
[XmlElement] public List<WeddingItem> weddingItem;
[XmlElement] public List<WeddingItem> weddingCompleteItem;
}

public class WeddingItem {
[XmlAttribute] public int itemID;
[XmlAttribute] public byte grade;
[XmlAttribute] public int count;
[XmlAttribute] public bool nightReward;
}
17 changes: 17 additions & 0 deletions Maple2.File.Parser/Xml/Table/WeddingReward.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System.Xml.Serialization;
using M2dXmlGenerator;
using Maple2.File.Parser.Enum;

namespace Maple2.File.Parser.Xml.Table;

// ./data/xml/table/weddingreward.xml
[XmlRoot("ms2")]
public class WeddingRewardRoot {
[XmlElement] public List<WeddingReward> v;
}

public partial class WeddingReward {
[M2dEnum] public WeddingRewardType type;
[XmlAttribute] public int rewardExp;
[M2dEnum] public WeddingRewardLimit rewardLimit;
}
24 changes: 24 additions & 0 deletions Maple2.File.Parser/Xml/Table/WeddingSkill.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
using System.Xml.Serialization;
using M2dXmlGenerator;
using Maple2.File.Parser.Enum;

namespace Maple2.File.Parser.Xml.Table;

// ./data/xml/table/weddingskill.xml
[XmlRoot("ms2")]
public partial class WeddingSkillRoot {
[M2dFeatureLocale(Selector = "id")] private IList<WeddingSkill> _v;
}

public partial class WeddingSkill : IFeatureLocale {
[XmlAttribute] public int id;
[M2dEnum] public WeddingSkillType type;
[XmlAttribute] public byte requireGrade;
[XmlAttribute] public int additionalEffectID;
[XmlAttribute] public float startValue;
[XmlAttribute] public float addValue;
[XmlAttribute] public int maxCount;
[XmlAttribute] public int itemID;
[XmlAttribute] public byte grade;
[XmlAttribute] public int count;
}
36 changes: 36 additions & 0 deletions Maple2.File.Tests/TableParserTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -772,4 +772,40 @@ public void TestMapleSurvivalSkinInfo() {
continue;
}
}

[TestMethod]
public void TestWeddingExp() {
var parser = new TableParser(TestUtils.XmlReader);

foreach ((_, _) in parser.ParseWeddingExp()) {
continue;
}
}
Comment thread
Zintixx marked this conversation as resolved.

[TestMethod]
public void TestWeddingPackage() {
var parser = new TableParser(TestUtils.XmlReader);

foreach ((_, _) in parser.ParseWeddingPackage()) {
continue;
}
}
Comment thread
Zintixx marked this conversation as resolved.

[TestMethod]
public void TestWeddingSkill() {
var parser = new TableParser(TestUtils.XmlReader);

foreach ((_, _) in parser.ParseWeddingSkill()) {
continue;
}
}
Comment thread
Zintixx marked this conversation as resolved.

[TestMethod]
public void TestWeddingReward() {
var parser = new TableParser(TestUtils.XmlReader);

foreach ((_, _) in parser.ParseWeddingReward()) {
continue;
}
}
Comment thread
Zintixx marked this conversation as resolved.
}