fixing 2.5 patch again, there was some incorrect logic from patch 2.4 fixes

Author: zeddicus-pl

examples/stash/SharedStashSoftCoreV2_0x63.d2i

@@ -250,7 +250,7 @@ export async function readItem(
     if (item.personalized) {
       const arr = new Uint8Array(16);
       for (let i = 0; i < arr.length; i++) {
-        if (version == 0x62) {
+        if (version > 0x61) {
           arr[i] = reader.ReadUInt8(8);
         } else {
           arr[i] = reader.ReadUInt8(7);
@@ -415,13 +415,13 @@ export async function writeItem(
     if (item.personalized) {
       const name = item.personalized_name.substring(0, 16);
       for (let i = 0; i < name.length; i++) {
-        if (version == 0x62) {
+        if (version > 0x61) {
           writer.WriteUInt8(name.charCodeAt(i), 8);
         } else {
           writer.WriteUInt8(name.charCodeAt(i) & 0x7f, 7);
         }
       }
-      writer.WriteUInt8(0x00, version == 0x62 ? 8 : 7);
+      writer.WriteUInt8(0x00, version > 0x61 ? 8 : 7);
     }
 
     if (item.type === "tbk") {

src/d2/items.ts

@@ -122,7 +122,7 @@ export async function write(
 ): Promise<Uint8Array> {
   const config = Object.assign(defaultConfig, userConfig);
   const writer = new BitWriter();
-  if (version == 0x62) {
+  if (version > 0x61) {
     for (const page of data.pages) {
       writer.WriteArray(await writeStashSection(data, page, constants, config));
     }

src/d2/stash.ts

@@ -8,11 +8,11 @@ export function readHeader(char: types.ID2S, reader: BitReader, constants: types
   char.header.filesize = reader.ReadUInt32(); //0x0008
   char.header.checksum = reader.ReadUInt32().toString(16).padStart(8, "0"); //0x000c
   reader.SkipBytes(4); //0x0010
-  if (char.header.version == 0x62) {
+  if (char.header.version > 0x61) {
     reader.SeekByte(267);
   }
   char.header.name = reader.ReadString(16).replace(/\0/g, ""); //0x0014
-  if (char.header.version == 0x62) {
+  if (char.header.version > 0x61) {
     reader.SeekByte(36);
   }
   char.header.status = _readStatus(reader.ReadUInt8()); //0x0024
@@ -59,7 +59,7 @@ export function writeHeader(char: types.ID2S, writer: BitWriter, constants: type
     .WriteUInt32(0x0) //0x0008 (filesize. needs to be writen after all data)
     .WriteUInt32(0x0); //0x000c (checksum. needs to be calculated after all data writer)
 
-  if (char.header.version == 0x62) {
+  if (char.header.version > 0x61) {
     writer.WriteArray(new Uint8Array(Array(20).fill(0))); // 0x0010
   } else {
     writer
@@ -92,7 +92,7 @@ export function writeHeader(char: types.ID2S, writer: BitWriter, constants: type
     .WriteUInt16(char.header.merc_type) //0x00b9
     .WriteUInt32(char.header.merc_experience); //0x00bb
 
-  if (char.header.version == 0x62) {
+  if (char.header.version > 0x61) {
     writer
       .WriteArray(new Uint8Array(76)) //0x00bf [unk]
       .WriteString(char.header.name, 16) //0x010b

src/d2/versions/default_header.ts

@@ -22,6 +22,16 @@ describe("stash", () => {
     expect(buffer.compare(savedBytes)).to.eq(0);
   });
 
+  it("should read D2R shared stash file, with version autodetection", async () => {
+    const buffer = fs.readFileSync(path.join(__dirname, `../../examples/stash/SharedStashSoftCoreV2_0x63.d2i`));
+    const jsonData = await read(buffer, constants, null);
+    const savedBytes = await write(jsonData, constants, 0x62);
+    const savedJsonData = await read(savedBytes, constants, null);
+    jsonData.version = '';
+    savedJsonData.version = '';
+    expect(jsonData).to.deep.eq(savedJsonData);
+  });
+
   it("should read plugy shared stash file", async () => {
     const buffer = fs.readFileSync(path.join(__dirname, `../../examples/stash/_LOD_SharedStashSave.sss`));
     const jsonData = await read(buffer, constants, 0x60);