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.3</PackageVersion>
<PackageVersion>2.4.4</PackageVersion>
<TargetFramework>net8.0</TargetFramework>
<PackageReadmeFile>README.md</PackageReadmeFile>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
4 changes: 2 additions & 2 deletions Maple2.File.Parser/ServerTableParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -541,14 +541,14 @@ public ServerTableParser(M2dReader xmlReader) {
}
}

public IEnumerable<(int Code, FishLure Lure)> ParseFishLure() {
public IEnumerable<(int Code, int Level, FishLure Lure)> ParseFishLure() {
string xml = Sanitizer.RemoveEmpty(xmlReader.GetString(xmlReader.GetEntry("table/Server/fishLure.xml")));
var reader = XmlReader.Create(new StringReader(xml));
var data = fishLureSerializer.Deserialize(reader) as FishLureRoot;
Debug.Assert(data != null);

foreach (FishLure lure in data.lure) {
yield return (lure.additionalEffectCode, lure);
yield return (lure.additionalEffectCode, lure.additionalEffectLevel, lure);
}
}

Expand Down
2 changes: 1 addition & 1 deletion Maple2.File.Parser/Xml/Table/Server/FishLure.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace Maple2.File.Parser.Xml.Table.Server;
// ./data/server/table/Server/fishLure.xml
[XmlRoot("ms2")]
public partial class FishLureRoot {
[M2dFeatureLocale(Selector = "additionalEffectCode")] private IList<FishLure> _lure;
[M2dFeatureLocale(Selector = "additionalEffectCode|additionalEffectLevel")] private IList<FishLure> _lure;
}

public partial class FishLure : IFeatureLocale {
Expand Down
2 changes: 1 addition & 1 deletion Maple2.File.Tests/ServerTableParserTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ public void TestFishingSpot() {
public void TestFishLure() {
var parser = new ServerTableParser(TestUtils.ServerReader);

foreach ((_, _) in parser.ParseFishLure()) {
foreach ((_, _ ,_) in parser.ParseFishLure()) {
continue;
}
}
Expand Down
Loading