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.10</PackageVersion>
<PackageVersion>2.4.11</PackageVersion>
<TargetFramework>net8.0</TargetFramework>
<PackageReadmeFile>README.md</PackageReadmeFile>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
15 changes: 14 additions & 1 deletion Maple2.File.Parser/ServerTableParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public class ServerTableParser {
private readonly XmlSerializer itemOptionRandomSerializer;
private readonly XmlSerializer constantsSerializer;
private readonly XmlSerializer npcStatFactorByPlayerCountSerializer;
private readonly XmlSerializer npcStatFactorByLevelSerializer;

public ServerTableParser(M2dReader xmlReader) {
this.xmlReader = xmlReader;
Expand Down Expand Up @@ -103,6 +104,7 @@ public ServerTableParser(M2dReader xmlReader) {
itemOptionRandomSerializer = new XmlSerializer(typeof(ItemOptionRandomRoot));
constantsSerializer = new XmlSerializer(typeof(Constants));
npcStatFactorByPlayerCountSerializer = new XmlSerializer(typeof(NpcStatFactorByPlayerCountRoot));
npcStatFactorByLevelSerializer = new XmlSerializer(typeof(NpcStatFactorByLevelRoot));

// var seen = new HashSet<string>();
// this.bankTypeSerializer.UnknownAttribute += (sender, args) => {
Expand Down Expand Up @@ -712,7 +714,18 @@ public IEnumerable<NpcStatFactorByPlayerCount> ParseNpcStatFactorByPlayerCount()
Debug.Assert(data != null);

foreach (NpcStatFactorByPlayerCount entry in data.PlayerCountFactor) {
yield return (entry);
yield return entry;
}
}

public IEnumerable<NpcStatFactorByLevel> ParseNpcStatFactorByLevel() {
string xml = Sanitizer.RemoveEmpty(xmlReader.GetString(xmlReader.GetEntry("table/Server/npcStatFactorByLevel.xml")));
var reader = XmlReader.Create(new StringReader(xml));
var data = npcStatFactorByLevelSerializer.Deserialize(reader) as NpcStatFactorByLevelRoot;
Debug.Assert(data != null);

foreach (NpcStatFactorByLevel entry in data.levelFactor) {
yield return entry;
}
}
}
13 changes: 13 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 questGroupSerializer;
private readonly XmlSerializer darkStreamSerializer;
private readonly XmlSerializer clubBuffSerializer;
private readonly XmlSerializer characterCreateSelectSerializer;

private readonly string locale;
private readonly string language;
Expand Down Expand Up @@ -214,6 +215,7 @@ public TableParser(M2dReader xmlReader, string language) {
questGroupSerializer = new XmlSerializer(typeof(QuestGroupRoot));
darkStreamSerializer = new XmlSerializer(typeof(DarkStreamRoot));
clubBuffSerializer = new XmlSerializer(typeof(ClubBuffRoot));
characterCreateSelectSerializer = new XmlSerializer(typeof(CharacterCreateSelect));

locale = FeatureLocaleFilter.Locale.ToLower();
this.language = language;
Expand Down Expand Up @@ -1649,4 +1651,15 @@ public IEnumerable<JobTableNew> ParseJobTableNew() {
yield return (entry.id, entry);
}
}

public IEnumerable<(string Name, CharacterCreateSelectGroup Group)> ParseCharacterCreateSelect() {
string xml = Sanitizer.RemoveSpaces(xmlReader.GetString(xmlReader.GetEntry($"table/charactercreateselect.xml")));
var reader = XmlReader.Create(new StringReader(xml));
var data = characterCreateSelectSerializer.Deserialize(reader) as CharacterCreateSelect;
Debug.Assert(data != null);

foreach (CharacterCreateSelectGroup entry in data.group) {
yield return (entry.name, entry);
}
}
}
26 changes: 26 additions & 0 deletions Maple2.File.Parser/Xml/Table/CharacterCreateSelect.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using System.Xml.Serialization;
using M2dXmlGenerator;

namespace Maple2.File.Parser.Xml.Table;

// ./data/xml/table/charactercreateselect.xml
[XmlRoot("ms2")]
public partial class CharacterCreateSelect {
[M2dFeatureLocale(Selector = "name")] private IList<CharacterCreateSelectGroup> _group;
}

public partial class CharacterCreateSelectGroup : IFeatureLocale {
[XmlAttribute] public string name = string.Empty;
[M2dFeatureLocale(Selector = "jobCode")] private IList<CharacterCreateSelectList> _list;
}

public partial class CharacterCreateSelectList : IFeatureLocale {
[XmlAttribute] public int jobCode;
[XmlAttribute] public string movie = string.Empty;
[XmlAttribute] public int descKey;

[M2dArray] public int[] order = Array.Empty<int>();
[M2dArray] public int[] disableJobCode = Array.Empty<int>();
[M2dArray] public int[] selectJobCode = Array.Empty<int>();
[M2dArray] public int[] randomselectJobCode = Array.Empty<int>();
}
19 changes: 19 additions & 0 deletions Maple2.File.Parser/Xml/Table/Server/NpcStatFactorByLevel.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System.Xml.Serialization;

namespace Maple2.File.Parser.Xml.Table.Server;

// ./data/server/table/Server/npcStatFactorByLevel.xml
[XmlRoot("ms2")]
public class NpcStatFactorByLevelRoot {
[XmlElement] public List<NpcStatFactorByLevel> levelFactor;
}

public partial class NpcStatFactorByLevel {
[XmlAttribute] public int level;
[XmlAttribute] public int @class;
[XmlAttribute] public float hp;
[XmlAttribute] public float pap;
[XmlAttribute] public float map;
[XmlAttribute] public float ndd;
[XmlAttribute] public float cap;
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public partial class NpcStatFactorByPlayerCount {
[XmlAttribute] public int @class;
[XmlAttribute] public int playerCount;
[XmlAttribute] public float hpRate;
[XmlAttribute] public int hpValue;
[XmlAttribute] public float papRate;
[XmlAttribute] public int papValue;
[XmlAttribute] public float mapRate;
Expand Down
9 changes: 9 additions & 0 deletions Maple2.File.Tests/ServerTableParserTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -455,5 +455,14 @@ public void TestNpcStatFactorByPlayerCount() {
continue;
}
}

[TestMethod]
public void TestNpcStatFactorByLevel() {
var parser = new ServerTableParser(TestUtils.ServerReader);

foreach (NpcStatFactorByLevel _ in parser.ParseNpcStatFactorByLevel()) {
continue;
}
}
}

7 changes: 7 additions & 0 deletions Maple2.File.Tests/TableParserTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -794,4 +794,11 @@ public void TestDungeonRewardCoupon() {
continue;
}
}

[TestMethod]
public void TestCharacterCreateSelect() {
foreach ((_, _) in _parser.ParseCharacterCreateSelect()) {
continue;
}
}
}
Loading