madden-franchise 3.2.1 → 3.2.3

package/FranchiseFileTable.js

@@ -502,6 +502,7 @@ class FranchiseFileTable extends EventEmitter {
                 // if the record contains any string values, point the string values to
                 // their correct offsets
                 this.strategy.recalculateStringOffsets(this, object);
+                this.strategy.recalculateBlobOffsets(this, object);
 
                 // Delete the empty record entry because it is no longer empty
                 this.emptyRecords.delete(object.index);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "madden-franchise",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "Tools to read a madden franchise file and get data from it",
   "main": "FranchiseFile.js",
   "scripts": {

package/scripts/sinthros-table3.js

@@ -0,0 +1,30 @@
+const fs = require('fs');
+const zlib = require('zlib');
+
+const FranchiseFile = require('../FranchiseFile');
+
+const franchisePath = 'D:\\Projects\\Madden 24\\franchise\\sinthros-issue-table3\\CAREER-M24Target';
+const savePath = 'D:\\Projects\\Madden 24\\franchise\\sinthros-issue-table3\\CAREER-VIS';
+
+(async () => {
+    function franchiseFileLoadPromise(file) {
+        return new Promise((resolve, reject) => {
+            file.on('ready', () => {
+                resolve();
+            });
+        });
+    };
+
+    const file = new FranchiseFile(franchisePath);
+    await franchiseFileLoadPromise(file);
+
+    const characterVisuals = file.getTableByUniqueId(1429178382);
+    await characterVisuals.readRecords();
+
+    for (let row = 0; row < characterVisuals.header.recordCapacity; row++) {
+        characterVisuals.records[row]['RawData'] = JSON.parse('{}');
+        characterVisuals.records[row].empty();
+    }
+
+    await file.save(savePath);
+})();

package/strategies/common/table/FranchiseTableStrategy.js

@@ -14,10 +14,15 @@ FranchiseTableStrategy.getTable2BinaryData = (table2Records, fullTable2Buffer) =
 
         if (i > 0 && recordOffset === 0) {
             // this case is true for the last few rows with no data in them. They reference the first table2 value.
-            break;
+            continue;
+        }
+
+        const preData = fullTable2Buffer.slice(currentOffset, recordOffset);
+
+        if (preData.length > 0) {
+            table2Data.push(preData);
         }
 
-        table2Data.push(fullTable2Buffer.slice(currentOffset, recordOffset));
         const recordHexData = record.hexData;
         table2Data.push(recordHexData);
 
@@ -59,4 +64,28 @@ FranchiseTableStrategy.recalculateStringOffsets = (table, record) => {
     });
 };
 
+FranchiseTableStrategy.recalculateBlobOffsets = (table, record) => {
+    // First, calculate length allocated per record in table2
+    const byteLengthPerRecord = table.offsetTable.filter((offsetEntry) => {
+        return offsetEntry.type === 'binaryblob';
+    }).reduce((accum, cur) => {
+        return accum + cur.maxLength + 2;   // +2 bytes for size, which is not considered in max length.
+    }, 0);
+
+    // Then, go through each string field sorted by offset index, and assign offsets to the table2 fields
+    let runningOffset = 0;
+
+    record.fieldsArray.filter((field) => {
+        return field.offset.type === 'binaryblob';
+    }).sort((a, b) => {
+        return a.offset.index - b.offset.index;
+    }).forEach((field) => {
+        if (field.thirdTableField) {
+            field.thirdTableField.offset = (record.index * byteLengthPerRecord) + runningOffset;
+        }
+        
+        runningOffset += field.offset.maxLength;
+    });
+};
+
 module.exports = FranchiseTableStrategy;

package/strategies/common/table3Field/FranchiseTable3FieldStrategy.js

@@ -7,7 +7,7 @@ FranchiseTable3FieldStrategy.getZlibDataStartIndex = (unformattedValue) => {
 };
 
 FranchiseTable3FieldStrategy.getInitialUnformattedValue = (field, data) => {
-    return data.slice(field.thirdTableField.index, (field.thirdTableField.index + field.offset.maxLength + 2)); 
+    return data.slice(field.thirdTableField.index, (field.thirdTableField.index + field.offset.maxLength + 2));
     // extend maxLength + 2 because the first 2 bytes are the size of the zipped data
 };
 

package/strategies/franchise/m19/M19TableStrategy.js

@@ -10,5 +10,6 @@ M19TableStrategy.getTable2BinaryData = FranchiseTableStrategy.getTable2BinaryDat
 M19TableStrategy.getTable3BinaryData = FranchiseTableStrategy.getTable2BinaryData;
 M19TableStrategy.getMandatoryOffsets = FranchiseTableStrategy.getMandatoryOffsets;
 M19TableStrategy.recalculateStringOffsets = FranchiseTableStrategy.recalculateStringOffsets;
+M19TableStrategy.recalculateBlobOffsets = FranchiseTableStrategy.recalculateBlobOffsets;
 
 module.exports = M19TableStrategy;

package/strategies/franchise/m20/M20TableStrategy.js

@@ -10,5 +10,6 @@ M20TableStrategy.getTable2BinaryData = FranchiseTableStrategy.getTable2BinaryDat
 M20TableStrategy.getTable3BinaryData = FranchiseTableStrategy.getTable2BinaryData;
 M20TableStrategy.getMandatoryOffsets = FranchiseTableStrategy.getMandatoryOffsets;
 M20TableStrategy.recalculateStringOffsets = FranchiseTableStrategy.recalculateStringOffsets;
+M20TableStrategy.recalculateBlobOffsets = FranchiseTableStrategy.recalculateBlobOffsets;
 
 module.exports = M20TableStrategy;

package/strategies/franchise/m24/M24TableStrategy.js

@@ -11,5 +11,6 @@ M24TableStrategy.getTable2BinaryData = FranchiseTableStrategy.getTable2BinaryDat
 M24TableStrategy.getTable3BinaryData = FranchiseTableStrategy.getTable2BinaryData;
 M24TableStrategy.getMandatoryOffsets = FranchiseTableStrategy.getMandatoryOffsets;
 M24TableStrategy.recalculateStringOffsets = FranchiseTableStrategy.recalculateStringOffsets;
+M24TableStrategy.recalculateBlobOffsets = FranchiseTableStrategy.recalculateBlobOffsets;
 
 module.exports = M24TableStrategy;