madden-franchise 3.2.0 → 3.2.2

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/FranchiseFileTable3Field.js

@@ -1,6 +1,3 @@
-const EventEmitter = require('events').EventEmitter;
-const utilService = require('./services/utilService');
-
 class FranchiseFileTable3Field {
   constructor (index, maxLength, parent) {
     this._value = '';
@@ -42,7 +39,7 @@ class FranchiseFileTable3Field {
 
   set value (value) {
     this._value = value;    
-    this._unformattedValue = this._strategy.setUnformattedValueFromFormatted(value, this.maxLength);
+    this._unformattedValue = this._strategy.setUnformattedValueFromFormatted(value, this._unformattedValue, this.maxLength);
 
     if (this.lengthAtLastSave === null) {
       this.lengthAtLastSave = getLengthOfUnformattedValue(this._unformattedValue);

package/package.json

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

package/scripts/scratchpad.js

@@ -45,8 +45,8 @@ const schemaPath = 'C:\\Users\\Matt\\AppData\\Roaming\\madden-franchise-editor\\
     table3s.forEach((table) => { console.log(`${table.header.tableId} - ${table.name}`)});
 
     const buf = fs.readFileSync('D:\\Projects\\Madden 24\\franchise\\characterVisualIsolated.dat');
-    const test = zlib.gunzipSync(buf.subarray(2));
-    // fs.writeFileSync('D:\\Projects\\Madden 24\\franchise\\characterVisualUnzipped.dat', test);
+    const test = zlib.gunzipSync(buf.subarray(3));
+    fs.writeFileSync('D:\\Projects\\Madden 24\\franchise\\characterVisualUnzipped.dat', test);
     const test2 = zlib.gzipSync(test);
     console.log(test2);
 })();

package/strategies/common/table/FranchiseTableStrategy.js

@@ -59,4 +59,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;
+    }, 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

@@ -2,16 +2,21 @@ const zlib = require('zlib');
 
 let FranchiseTable3FieldStrategy = {};
 
+FranchiseTable3FieldStrategy.getZlibDataStartIndex = (unformattedValue) => {
+    return unformattedValue.indexOf(Buffer.from([0x1F, 0x8B]));
+};
+
 FranchiseTable3FieldStrategy.getInitialUnformattedValue = (field, data) => {
     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
 };
 
 FranchiseTable3FieldStrategy.getFormattedValueFromUnformatted = (unformattedValue) => {
-    return zlib.gunzipSync(unformattedValue.subarray(2)).toString();    // first 2 bytes are the size of the zipped data, so skip those.
+    const zlibDataStartIndex = FranchiseTable3FieldStrategy.getZlibDataStartIndex(unformattedValue);
+    return zlib.gunzipSync(unformattedValue.subarray(zlibDataStartIndex)).toString();    // first few bytes are the size of the zipped data & other flags, so skip those.
 };
 
-FranchiseTable3FieldStrategy.setUnformattedValueFromFormatted = (formattedValue, maxLength) => {
+FranchiseTable3FieldStrategy.setUnformattedValueFromFormatted = (formattedValue, oldUnformattedValue, maxLength) => {
     let zippedData = zlib.gzipSync(formattedValue);
     let padding = Buffer.alloc(maxLength - zippedData.length);  // table3s all have the same length and are zero padded to the end.
 

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;