madden-franchise 3.0.1 → 3.0.3

package/FranchiseFileTable.js

@@ -96,6 +96,7 @@ class FranchiseFileTable extends EventEmitter {
       
       bufferArrays.push(this.data.slice(currentOffset, recordOffset));
       const recordHexData = record.hexData;
+      
       bufferArrays.push(recordHexData);
       currentOffset = recordOffset + recordHexData.length;
     }
@@ -153,6 +154,7 @@ class FranchiseFileTable extends EventEmitter {
       record.isEmpty = isEmptyReference;
     });
 
+
     // We need to determine the starting node.
     // To do that, we need to find the empty record which no other empty record points to.
     const unreachableRecords = this.records.filter((record) => { return record.isEmpty; }).filter((record) => {
@@ -426,12 +428,20 @@ class FranchiseFileTable extends EventEmitter {
           const changedRecordWasEmpty = emptyRecordReference !== null && emptyRecordReference !== undefined;
 
           if (changedRecordWasEmpty) {
-            // Check if the record's first four bytes still have a reference to the 0th table.
-            // If so, then the record is still considered empty.
+            // 1/5/23: Assume all changes to a field make the record not empty. Leaving comments
+            // below if this needs to be reverted in the future.
             
-            // We need to check the buffer because the first field is not always a reference.
-            const referenceData = utilService.getReferenceDataFromBuffer(object.data.slice(0, 4));
-            if (referenceData.tableId !== 0) {
+
+              // Check if the record's first four bytes still have a reference to the 0th table.
+              // If so, then the record is still considered empty.
+              
+              // We need to check the buffer because the first field is not always a reference.
+              // const referenceData = utilService.getReferenceDataFromBuffer(object.data.slice(0, 4));
+              // if (referenceData.tableId !== 0 || referenceData.rowNumber > this.header.recordCapacity) {
+
+              // if the record contains any string values, point the string values to
+              // their correct offsets
+              this.strategy.recalculateStringOffsets(this, object);
 
               // Delete the empty record entry because it is no longer empty
               this.emptyRecords.delete(object.index);
@@ -476,7 +486,7 @@ class FranchiseFileTable extends EventEmitter {
               if (!previousEmptyReference && !nextEmptyReference) {
                 this.setNextRecordToUse(this.header.recordCapacity);
               }
-            }
+            // }
           }
         }
 
@@ -489,7 +499,16 @@ class FranchiseFileTable extends EventEmitter {
     }
     else if (object instanceof FranchiseFileTable2Field) {
       object.isChanged = true;
-      this.emit('change');
+      
+      // When a table2 field changes, we need to check if the record is empty. If so, we need to mark it as not empty. 
+      if (object.fieldReference) {
+        this.onEvent('change', object.fieldReference._parent);
+      }
+      else {
+        // Only emit change here if the field reference is empty.
+        // the onEvent call will emit a change in the above condition.
+        this.emit('change');
+      }
     }
   };
 };

package/package.json

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

package/scripts/deflate.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const zlib = require('zlib');
 
-const filePath = 'D:\\Projects\\Madden 22\\Update issue\\Expressions\\Franchise-Expression-binaryMERGED.frt';
+const filePath = 'D:\\Projects\\Madden 23\\FranTkData\\Franchise-Expression-binary.frt';
 const outputPath = 'D:\\Projects\\Madden 22\\Update issue\\Expressions\\Franchise-Expression-binaryMERGED.FTC'
 
 const stream = fs.createReadStream(filePath)

package/scripts/inflate.js

@@ -1,11 +1,11 @@
 const fs = require('fs');
 const zlib = require('zlib');
 
-const filePath = 'C:\\Projects\\madden-franchise\\tests\\data\\CAREER-21COMPRESS';
-const outputPath = 'C:\\Projects\\madden-franchise\\tests\\data\\21UNCOMPRESS.frt'
+const filePath = 'D:\\Projects\\Madden 23\\FranTkData\\Franchise-Expression-binary.FTC';
+const outputPath = 'D:\\Projects\\Madden 23\\FranTkData\\Franchise-Expression-binary.ftx'
 
 const fileData = fs.readFileSync(filePath);
-const inflateData = zlib.inflateSync(fileData.slice(0x52));
+const inflateData = zlib.inflateSync(fileData);
 fs.writeFileSync(outputPath, inflateData);
 
 // let notDone = true;

package/services/utilService.js

@@ -221,7 +221,7 @@ utilService.toInteger = function (x) {
 utilService.getReferenceData = function (value) {
   return {
     'tableId': utilService.bin2dec(value.substring(0, 15)),
-    'rowNumber': utilService.bin2dec(value.substring(16))
+    'rowNumber': utilService.bin2dec(value.substring(15))
   }
 };
 

package/strategies/common/table/FranchiseTableStrategy.js

@@ -33,4 +33,28 @@ FranchiseTableStrategy.getMandatoryOffsets = (offsets) => {
     return [];
 };
 
+FranchiseTableStrategy.recalculateStringOffsets = (table, record) => {
+    // First, calculate length allocated per record in table2
+    const byteLengthPerRecord = table.offsetTable.filter((offsetEntry) => {
+        return offsetEntry.type === 'string';
+    }).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 === 'string';
+    }).sort((a, b) => {
+        return a.offset.index - b.offset.index;
+    }).forEach((field) => {
+        if (field.secondTableField) {
+            field.secondTableField.offset = (record.index * byteLengthPerRecord) + runningOffset;
+        }
+        
+        runningOffset += field.offset.maxLength;
+    });
+};
+
 module.exports = FranchiseTableStrategy;

package/strategies/franchise/m19/M19TableStrategy.js

@@ -8,5 +8,6 @@ M19TableStrategy.parseHeaderAttributesFromSchema = M19TableHeaderStrategy.parseH
 
 M19TableStrategy.getTable2BinaryData = FranchiseTableStrategy.getTable2BinaryData;
 M19TableStrategy.getMandatoryOffsets = FranchiseTableStrategy.getMandatoryOffsets;
+M19TableStrategy.recalculateStringOffsets = FranchiseTableStrategy.recalculateStringOffsets;
 
 module.exports = M19TableStrategy;

package/strategies/franchise/m20/M20TableStrategy.js

@@ -8,5 +8,6 @@ M20TableStrategy.parseHeaderAttributesFromSchema = M20TableHeaderStrategy.parseH
 
 M20TableStrategy.getTable2BinaryData = FranchiseTableStrategy.getTable2BinaryData;
 M20TableStrategy.getMandatoryOffsets = FranchiseTableStrategy.getMandatoryOffsets;
+M20TableStrategy.recalculateStringOffsets = FranchiseTableStrategy.recalculateStringOffsets;
 
 module.exports = M20TableStrategy;

package/strategies/franchise-common/m19/M19FTCTableStrategy.js

@@ -8,5 +8,6 @@ M19FTCTableStrategy.parseHeaderAttributesFromSchema = M19TableHeaderStrategy.par
 
 M19FTCTableStrategy.getTable2BinaryData = FTCTableStrategy.getTable2BinaryData;
 M19FTCTableStrategy.getMandatoryOffsets = FTCTableStrategy.getMandatoryOffsets;
+M19FTCTableStrategy.recalculateStringOffsets = () => {};
 
 module.exports = M19FTCTableStrategy;

package/strategies/franchise-common/m20/M20FTCTableStrategy.js

@@ -8,5 +8,6 @@ M20FTCTableStrategy.parseHeaderAttributesFromSchema = M20TableHeaderStrategy.par
 
 M20FTCTableStrategy.getTable2BinaryData = FTCTableStrategy.getTable2BinaryData;
 M20FTCTableStrategy.getMandatoryOffsets = FTCTableStrategy.getMandatoryOffsets;
+M20FTCTableStrategy.recalculateStringOffsets = () => {};
 
 module.exports = M20FTCTableStrategy;