From 52ee02d0ab43d90250827cf06e14aea1a3e07495 Mon Sep 17 00:00:00 2001
From: Zin <62830952+Zintixx@users.noreply.github.com>
Date: Sat, 11 Apr 2026 18:24:34 -0700
Subject: [PATCH] Fix: FishLure
---
Maple2.File.Parser/Maple2.File.Parser.csproj | 2 +-
Maple2.File.Parser/ServerTableParser.cs | 4 ++--
Maple2.File.Parser/Xml/Table/Server/FishLure.cs | 2 +-
Maple2.File.Tests/ServerTableParserTest.cs | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Maple2.File.Parser/Maple2.File.Parser.csproj b/Maple2.File.Parser/Maple2.File.Parser.csproj
index 35b2326..b160d74 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.3
+ 2.4.4
net8.0
README.md
enable
diff --git a/Maple2.File.Parser/ServerTableParser.cs b/Maple2.File.Parser/ServerTableParser.cs
index 17de300..88e5000 100644
--- a/Maple2.File.Parser/ServerTableParser.cs
+++ b/Maple2.File.Parser/ServerTableParser.cs
@@ -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);
}
}
diff --git a/Maple2.File.Parser/Xml/Table/Server/FishLure.cs b/Maple2.File.Parser/Xml/Table/Server/FishLure.cs
index 797f7f3..d31463c 100644
--- a/Maple2.File.Parser/Xml/Table/Server/FishLure.cs
+++ b/Maple2.File.Parser/Xml/Table/Server/FishLure.cs
@@ -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 _lure;
+ [M2dFeatureLocale(Selector = "additionalEffectCode|additionalEffectLevel")] private IList _lure;
}
public partial class FishLure : IFeatureLocale {
diff --git a/Maple2.File.Tests/ServerTableParserTest.cs b/Maple2.File.Tests/ServerTableParserTest.cs
index 3165bdc..044e873 100644
--- a/Maple2.File.Tests/ServerTableParserTest.cs
+++ b/Maple2.File.Tests/ServerTableParserTest.cs
@@ -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;
}
}