Merge pull request #58 from matigramirez/item-fix

fix(ItemDefinition): RecLuq to uint32 on Ep6_4

src/Parsec/Common/Episode.cs

@@ -2,10 +2,17 @@
 
 public enum Episode
 {
-    Unknown,
-    EP4,
-    EP5,
-    EP6,
-    EP7,
-    EP8
+    Unknown = 0,
+
+    EP4 = 40,
+
+    EP5 = 50,
+
+    EP6 = 60,
+
+    EP6_4 = 64,
+
+    EP7 = 70,
+
+    EP8 = 80
 }

src/Parsec/Shaiya/Item/Item.cs

@@ -30,6 +30,11 @@ protected override void Write(SBinaryWriter binaryWriter)
     /// <returns><see cref="Item"/> instance</returns>
     public static Item FromCsv(string csvPath, Episode episode, Encoding? encoding = null)
     {
+        if (episode >= Episode.EP8)
+        {
+            throw new Exception("Item format is not supported for EP8 and above, use ItemData instead.");
+        }
+
         encoding ??= Encoding.ASCII;
 
         // Read item definitions from csv

src/Parsec/Shaiya/Item/ItemDefinition.cs

@@ -55,12 +55,10 @@ public sealed class ItemDefinition : ISerializable
 
     public ushort ReqWis { get; set; }
 
-    public ushort ReqLuc { get; set; }
+    public uint ReqLuc { get; set; }
 
     public ushort ReqVg { get; set; }
 
-    public ushort Unknown { get; set; }
-
     public byte ReqOg { get; set; }
 
     public byte ReqIg { get; set; }
@@ -185,18 +183,20 @@ public void Read(SBinaryReader binaryReader)
         ReqRec = binaryReader.ReadUInt16();
         ReqInt = binaryReader.ReadUInt16();
         ReqWis = binaryReader.ReadUInt16();
-        ReqLuc = binaryReader.ReadUInt16();
-        ReqVg = binaryReader.ReadUInt16();
 
-        if (episode >= Episode.EP6)
+        if (episode >= Episode.EP6_4)
+        {
+            ReqLuc = binaryReader.ReadUInt32();
+        }
+        else
         {
-            Unknown = binaryReader.ReadUInt16();
+            ReqLuc = binaryReader.ReadUInt16();
         }
 
+        ReqVg = binaryReader.ReadUInt16();
         ReqOg = binaryReader.ReadByte();
         ReqIg = binaryReader.ReadByte();
 
-
         if (episode <= Episode.EP5)
         {
             Range = binaryReader.ReadByte();
@@ -286,20 +286,23 @@ public void Write(SBinaryWriter binaryWriter)
         binaryWriter.Write(ReqRec);
         binaryWriter.Write(ReqInt);
         binaryWriter.Write(ReqWis);
-        binaryWriter.Write(ReqLuc);
-        binaryWriter.Write(ReqVg);
 
-        if (episode >= Episode.EP6)
+        if (episode >= Episode.EP6_4)
         {
-            binaryWriter.Write(Unknown);
+            binaryWriter.Write(ReqLuc);
+        }
+        else
+        {
+            binaryWriter.Write((ushort)ReqLuc);
         }
 
+        binaryWriter.Write(ReqVg);
         binaryWriter.Write(ReqOg);
         binaryWriter.Write(ReqIg);
 
         if (episode <= Episode.EP5)
         {
-            binaryWriter.Write(Range);
+            binaryWriter.Write((byte)Range);
         }
         else
         {

tests/Parsec.Tests/Parsec.Tests.csproj

@@ -4,18 +4,18 @@
 
     <IsPackable>false</IsPackable>
 
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0"/>
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0"/>
+    <PackageReference Include="xunit" Version="2.6.6"/>
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.0.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -710,7 +710,7 @@
     <None Update="Shaiya\Monster\Monster_1252.SData">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Shaiya\Item\ItemEp6_1251.SData">
+    <None Update="Shaiya\Item\ItemEp64_1251.SData">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Shaiya\TransformModel\DBTransformModelData.SData">
@@ -815,5 +815,11 @@
     <None Update="Shaiya\Dg\R2_Dun1.dg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="Shaiya\Item\Item_ES_ps0224.SData">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Shaiya\Item\Item_US_ps0216.SData">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 </Project>

tests/Parsec.Tests/Shaiya/Item/ItemTests.cs

@@ -20,28 +20,40 @@ public void ItemEp5CsvTest()
     }
 
     [Fact]
-    public void ItemEp6CsvTest()
+    public void ItemEp5ReadWriteTest()
     {
-        const string filePath = "Shaiya/Item/ItemEp6.SData";
-        const string csvPath = "Shaiya/Item/ItemEp6.SData.csv";
+        const string filePath = "Shaiya/Item/ItemEp5.SData";
+        const string outputPath = "Shaiya/Item/ItemEp5.written.SData";
+
+        var item = ParsecReader.FromFile<Parsec.Shaiya.Item.Item>(filePath, Episode.EP5, TestEncodings.Encoding1252);
+        item.WriteEncrypted(outputPath);
+
+        Assert.Equal(FileHash.Checksum(filePath), FileHash.Checksum(outputPath));
+    }
+
+    [Fact]
+    public void ItemEp64CsvTest()
+    {
+        const string filePath = "Shaiya/Item/Item_ES_ps0224.SData";
+        const string csvPath = "Shaiya/Item/Item_ES_ps0224.SData.csv";
 
-        var item = ParsecReader.FromFile<Parsec.Shaiya.Item.Item>(filePath, Episode.EP6);
+        var item = ParsecReader.FromFile<Parsec.Shaiya.Item.Item>(filePath, Episode.EP6_4, TestEncodings.Encoding1252);
         item.WriteCsv(csvPath);
-        var itemFromCsv = Parsec.Shaiya.Item.Item.FromCsv(csvPath, Episode.EP6);
-        Assert.Equal(item.GetBytes(Episode.EP6), itemFromCsv.GetBytes(Episode.EP6));
+        var itemFromCsv = Parsec.Shaiya.Item.Item.FromCsv(csvPath, Episode.EP6_4, TestEncodings.Encoding1252);
+        Assert.Equal(item.GetBytes(Episode.EP6_4, TestEncodings.Encoding1252), itemFromCsv.GetBytes(Episode.EP6_4, TestEncodings.Encoding1252));
     }
 
     [Fact]
-    public void ItemEp6Csv_EncodingTest()
+    public void ItemEp64Csv_EncodingTest()
     {
-        const string filePath = "Shaiya/Item/ItemEp6_1251.SData";
-        const string csvPath = "Shaiya/Item/ItemEp6_1252.SData.csv";
+        const string filePath = "Shaiya/Item/ItemEp64_1251.SData";
+        const string csvPath = "Shaiya/Item/ItemEp64_1251.SData.csv";
 
         var encoding = TestEncodings.Encoding1251;
-        var item = ParsecReader.FromFile<Parsec.Shaiya.Item.Item>(filePath, Episode.EP6, encoding);
+        var item = ParsecReader.FromFile<Parsec.Shaiya.Item.Item>(filePath, Episode.EP6_4, encoding);
         item.WriteCsv(csvPath, encoding);
-        var itemFromCsv = Parsec.Shaiya.Item.Item.FromCsv(csvPath, Episode.EP6, encoding);
-        Assert.Equal(item.GetBytes(Episode.EP6), itemFromCsv.GetBytes(Episode.EP6));
+        var itemFromCsv = Parsec.Shaiya.Item.Item.FromCsv(csvPath, Episode.EP6_4, encoding);
+        Assert.Equal(item.GetBytes(Episode.EP6_4), itemFromCsv.GetBytes(Episode.EP6_4));
     }
 
     [Fact]

tests/Parsec.Tests/Shaiya/SData/SDataTests.cs

@@ -60,7 +60,7 @@ public void SDataDecryptionTest()
         const string encryptedOutputPath = "Shaiya/SData/ItemEp6.encrypted.SData";
         const string decryptedOutputPath = "Shaiya/SData/ItemEp6.decrypted.SData";
 
-        var item = ParsecReader.FromFile<Parsec.Shaiya.Item.Item>(EncryptedSDataFilePath, Episode.EP6);
+        var item = ParsecReader.FromFile<Parsec.Shaiya.Item.Item>(EncryptedSDataFilePath, Episode.EP6_4);
         item.WriteEncrypted(encryptedOutputPath);
         item.WriteDecrypted(decryptedOutputPath);