fix sanitize (#47)

Author: Zintixx

Maple2.File.Parser/Maple2.File.Parser.csproj

@@ -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.2.5</PackageVersion>
+        <PackageVersion>2.2.6</PackageVersion>
         <TargetFramework>net8.0</TargetFramework>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <ImplicitUsings>enable</ImplicitUsings>

Maple2.File.Parser/ServerTableParser.cs

@@ -100,7 +100,7 @@ public ServerTableParser(M2dReader xmlReader) {
     }
 
     public IEnumerable<(int NpcId, IDictionary<int, NpcScriptCondition> ScriptConditions)> ParseNpcScriptCondition() {
-        string xml = Sanitizer.RemoveEmpty(xmlReader.GetString(xmlReader.GetEntry("table/Server/npcScriptCondition_Final.xml")));
+        string xml = xmlReader.GetString(xmlReader.GetEntry("table/Server/npcScriptCondition_Final.xml"));
         var reader = XmlReader.Create(new StringReader(xml));
         var data = npcScriptConditionSerializer.Deserialize(reader) as NpcScriptConditionRoot;
         Debug.Assert(data != null);
@@ -111,7 +111,7 @@ public ServerTableParser(M2dReader xmlReader) {
     }
 
     public IEnumerable<(int QuestId, IDictionary<int, QuestScriptCondition> ScriptConditions)> ParseQuestScriptCondition() {
-        string xml = Sanitizer.RemoveEmpty(xmlReader.GetString(xmlReader.GetEntry("table/Server/QuestScriptCondition_final.xml")));
+        string xml = xmlReader.GetString(xmlReader.GetEntry("table/Server/QuestScriptCondition_final.xml"));
         var reader = XmlReader.Create(new StringReader(xml));
         var data = questScriptConditionSerializer.Deserialize(reader) as QuestScriptConditionRoot;
         Debug.Assert(data != null);

Maple2.File.Parser/Xml/Table/Server/QuestScriptCondition.cs

@@ -19,17 +19,17 @@ public partial class QuestScriptCondition : IFeatureLocale {
     [XmlAttribute] public string maid_mood_time = string.Empty;
     [XmlAttribute] public string maid_affinity_time = string.Empty;
     [XmlAttribute] public int maid_affinity_grade = 0;
-    [XmlAttribute] public int privilege;
-    [XmlAttribute] public int panelty;
+    [XmlAttribute] public int privilege = -1;
+    [XmlAttribute] public int panelty = -1;
     [M2dArray] public short[] job = Array.Empty<short>();
     [XmlAttribute] public string level = string.Empty;
     [M2dArray] public string[] quest_start = Array.Empty<string>();
     [M2dArray] public string[] quest_complete = Array.Empty<string>();
     [M2dArray] public string[] item = Array.Empty<string>();
     [M2dArray] public string[] itemCount = Array.Empty<string>();
-    [XmlAttribute] public int weddingState;
-    [XmlAttribute] public int weddingHallBooking;
-    [XmlAttribute] public int marriageDate;
+    [XmlAttribute] public int weddingState = -1;
+    [XmlAttribute] public int weddingHallBooking = -1;
+    [XmlAttribute] public int marriageDate = -1;
     [XmlAttribute] public string weddingHallEntryType = string.Empty;
     [XmlAttribute] public string weddingHallState = string.Empty;
     [XmlAttribute] public string coolingOff = string.Empty;