wip. make binary reader easier to debug

Author: dschu012

src/binary/bitwriter.ts

@@ -9,7 +9,7 @@ export class BitWriter {
   }
 
   public WriteBit(value: number): BitWriter {
-    if (this.offset > this.bits.length) {
+    if (this.offset >= this.bits.length) {
       const resized = new Uint8Array(this.bits.length + 8192);
       resized.set(this.bits, 0);
       this.bits = resized;

src/d2/attribute_enhancer.ts

@@ -484,7 +484,8 @@ function _groupAttributes(all_attributes: types.IMagicProperty[], constants: typ
       if (prop.dF === 23) {
         return e.id === magic_attribute.id && e.values[0] === magic_attribute.values[0] && e.values[1] === magic_attribute.values[1];
       }
-      if (prop.s === "state") {
+      if (prop.s === "state"
+          || prop.s === "item_nonclassskill") {
         //state
         return e.id === magic_attribute.id && e.values[0] === magic_attribute.values[0] && e.values[1] === magic_attribute.values[1];
       }

src/d2/items.ts

@@ -682,7 +682,7 @@ export function _writeMagicProperties(writer: BitWriter, properties: types.IMagi
             default:
               break;
           }
-          writer.WriteUInt16(param, prop.sP);
+          writer.WriteUInt32(param, prop.sP);
         }
         let v = property.values[valueIdx++]!;
         if (prop.sA) {
@@ -698,7 +698,7 @@ export function _writeMagicProperties(writer: BitWriter, properties: types.IMagi
         if (!prop.sB) {
           throw new Error(`Save Bits is undefined for stat: ${property.id}:${prop.s}`);
         }
-        writer.WriteUInt16(v, prop.sB);
+        writer.WriteUInt32(v, prop.sB);
       }
     }
   }

tests/d2/stash.spec.ts

@@ -14,7 +14,7 @@ describe("stash", () => {
     expect(jsonData.version, "version").to.eq("02");
   });
 
-  xit("should provide read and write consistency for plugy shared stash file", async () => {
+  it("should provide read and write consistency for plugy shared stash file", async () => {
     const buffer = fs.readFileSync(path.join(__dirname, `../../examples/stash/_LOD_SharedStashSave.sss`));
     const jsonData = await read(buffer, constants, 0x60);
     const newBuffer = await write(jsonData, constants, 0x60);

tests/util.spec.ts

@@ -15,12 +15,23 @@ describe("utils", () => {
   });
 
   it("should read/write", async () => {
-    const buffer = Buffer.from("4a4d100880", "hex");
-    const reader = new BitReader(buffer);
     const writer = new BitWriter();
-    writer.WriteByte(reader.ReadByte()).WriteUInt16(reader.ReadUInt16()).WriteBytes(reader.ReadBytes(2));
-    const result = Buffer.from(writer.ToArray()).toString("hex");
-    expect(result).to.eq("4a4d100880");
+    for(let i = 0; i < 90; i ++) {
+      writer.WriteByte(125)
+        .WriteUInt16(125)
+        .WriteUInt16(125, 9)
+        .WriteUInt32(125)
+        .WriteUInt32(125, 27);
+    }
+
+    const reader = new BitReader(writer.ToArray());
+    for(let i = 0; i < 90; i ++) {
+      expect(reader.ReadByte()).to.eq(125);
+      expect(reader.ReadUInt16()).to.eq(125);
+      expect(reader.ReadUInt16(9)).to.eq(125);
+      expect(reader.ReadUInt32()).to.eq(125);
+      expect(reader.ReadUInt32(27)).to.eq(125);
+    }
   });
 
   it("should write bit", async () => {