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.20</PackageVersion>
<PackageVersion>2.4.21</PackageVersion>
<TargetFramework>net8.0</TargetFramework>
<PackageReadmeFile>README.md</PackageReadmeFile>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
12 changes: 12 additions & 0 deletions Maple2.File.Parser/ServerTableParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public class ServerTableParser {
private readonly XmlSerializer npcStatFactorByLevelSerializer;
private readonly XmlSerializer maidGradeInfoSerializer;
private readonly XmlSerializer maidRecipeSerializer;
private readonly XmlSerializer defaultCharacterInfoSerializer;

public ServerTableParser(M2dReader xmlReader) {
this.xmlReader = xmlReader;
Expand Down Expand Up @@ -111,6 +112,7 @@ public ServerTableParser(M2dReader xmlReader) {
npcStatFactorByLevelSerializer = new XmlSerializer(typeof(NpcStatFactorByLevelRoot));
maidGradeInfoSerializer = new XmlSerializer(typeof(MaidGradeInfoRoot));
maidRecipeSerializer = new XmlSerializer(typeof(MaidRecipeRoot));
defaultCharacterInfoSerializer = new XmlSerializer(typeof(DefaultCharacterInfoRoot));

// var seen = new HashSet<string>();
// this.bankTypeSerializer.UnknownAttribute += (sender, args) => {
Expand Down Expand Up @@ -756,4 +758,14 @@ public IEnumerable<NpcStatFactorByLevel> ParseNpcStatFactorByLevel() {
yield return (entry.Id, entry);
}
}

public IEnumerable<(Gender Gender, DefaultCharacterInfo Info)> ParseDefaultCharacterInfo() {
XmlReader reader = xmlReader.GetXmlReader(xmlReader.GetEntry("table/Server/defaultCharacterInfo.xml"));
var data = defaultCharacterInfoSerializer.Deserialize(reader) as DefaultCharacterInfoRoot;
Debug.Assert(data != null);

foreach (DefaultCharacterInfo info in data.gender) {
yield return (info.value, info);
}
}
}
48 changes: 48 additions & 0 deletions Maple2.File.Parser/Xml/Table/Server/DefaultCharacterInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
using System.Numerics;
using System.Xml.Serialization;
using M2dXmlGenerator;
using Maple2.File.Parser.Enum;

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

// ./data/server/table/Server/defaultCharacterInfo.xml
[XmlRoot("ms2")]
public class DefaultCharacterInfoRoot {
[XmlElement] public List<DefaultCharacterInfo> gender = [];
}

public partial class DefaultCharacterInfo {
[M2dEnum] public Gender value = Gender.Invalid;
[XmlElement] public Skin skin = new();
[XmlElement] public Items items = new();

public class Skin {
[XmlAttribute] public int colorPaletteID;
// Absent where the entry keeps the palette's own default swatch.
[XmlAttribute] public int colorSN = -1;
}

public class Items {
[XmlElement] public List<Item> item = [];
}

public class Item {
[XmlAttribute] public int id;
// Equip slot code: HR, FA, FD, ER.
[XmlAttribute] public string slotHint = string.Empty;
[XmlAttribute] public int colorPaletteID;
[XmlAttribute] public int colorSN = -1;
[XmlElement] public Controls controls = new();
}

public class Controls {
[XmlElement] public List<Control> control = [];
}

public partial class Control {
[XmlAttribute] public int index;
[XmlAttribute] public float scale;
[M2dVector3] public Vector3 position;
[M2dVector3] public Vector3 rotation;
}
}
33 changes: 32 additions & 1 deletion Maple2.File.Tests/ServerTableParserTest.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Maple2.File.Parser;
using System.Numerics;
using Maple2.File.Parser;
using Maple2.File.Parser.Enum;
using Maple2.File.Parser.Xml.Table;
using Maple2.File.Parser.Xml.Table.Server;
using Microsoft.VisualStudio.TestTools.UnitTesting;
Expand Down Expand Up @@ -482,5 +484,34 @@ public void TestMaidRecipe() {
continue;
}
}

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

Dictionary<Gender, DefaultCharacterInfo> infos = parser.ParseDefaultCharacterInfo()
.ToDictionary(entry => entry.Gender, entry => entry.Info);

CollectionAssert.AreEquivalent(new[] { Gender.Male, Gender.Female }, infos.Keys.ToArray());

foreach (DefaultCharacterInfo info in infos.Values) {
Assert.IsTrue(info.skin.colorPaletteID > 0);
// The client needs a default for every gender-locked appearance slot.
CollectionAssert.AreEquivalent(new[] { "HR", "FA", "FD", "ER" },
info.items.item.Select(item => item.slotHint).ToArray());
Assert.IsTrue(info.items.item.All(item => item.id > 0));
}

// Slots with no palette override keep the sentinel rather than falling back to swatch 0.
Assert.IsTrue(infos.Values
.SelectMany(info => info.items.item)
.Any(item => item.colorSN == -1));

DefaultCharacterInfo.Item hair = infos[Gender.Female].items.item.First(item => item.slotHint == "HR");
Assert.AreEqual(2, hair.controls.control.Count);
Assert.AreNotEqual(0f, hair.controls.control[0].scale);
Assert.AreNotEqual(Vector3.Zero, hair.controls.control[0].position);
Assert.AreNotEqual(Vector3.Zero, hair.controls.control[0].rotation);
}
}

Loading