madden-franchise 2.5.3 → 2.5.6

package/FranchiseFile.js

@@ -113,7 +113,7 @@ class FranchiseFile extends EventEmitter {
 
       for (let i = 0; i < tableIndicies.length; i++) {
         const currentTable = tableIndicies[i];
-        const nextTable = tableIndicies.length >= i+1 ? tableIndicies[i+1] : null;
+        const nextTable = tableIndicies.length > i+1 ? tableIndicies[i+1] : this.unpackedFileContents.length - 8;  // Ignore trailing 8 bytes on last table
 
         const tableData = this.unpackedFileContents.slice(currentTable, nextTable);
 
@@ -190,14 +190,26 @@ class FranchiseFile extends EventEmitter {
   
       _packFile(this.unpackedFileContents, options).then((data) => {
         const dataToSave = this.strategy.file.postPackFile(this.packedFileContents, data);
-        _save(destination, dataToSave, (err) => {
+
+        if (options && options.sync) {
+          _saveSync(destination, dataToSave);
+          postSaveActions();
+        }
+        else {
+          _save(destination, dataToSave, (err) => {
+            postSaveActions(err);
+          });
+        }
+
+        function postSaveActions(err) {
           if (err) {
             reject(err);
             that.emit('save-error');
           }
+
           resolve('saved');
           that.emit('saved');
-        });
+        }
       });
     });
   };
@@ -361,6 +373,10 @@ function _save (destination, packedContents, callback) {
   fs.writeFile(destination, packedContents, callback);
 };
 
+function _saveSync (destination, packedContents) {
+  fs.writeFileSync(destination, packedContents);
+};
+
 function getFileType(data) {
   const isDataCompressed = isCompressed(data);
   const format = getFormat(data, isDataCompressed);

package/data/schemas/extra-schemas.json

@@ -675,5 +675,179 @@
                 "maxValue": "59"
             }
         ]
+    },
+    {
+        "name": "Transaction",
+        "numMembers": "11",
+        "base": "none()",
+        "attributes": [{
+                "name": "StartStage",
+                "type": "Stage"
+            },
+            {
+                "name": "CurrentStage",
+                "type": "Stage"
+            },
+            {
+                "name": "TransitionStage",
+                "type": "Stage"
+            },
+            {
+                "name": "IsDynamic",
+                "type": "bool",
+                "default": "False"
+            },            
+            {
+                "name": "IsDone",
+                "type": "bool()"
+            },
+            {
+                "name": "Process",
+                "type": "none()"
+            },
+            {
+                "name": "Sleep",
+                "type": "ITransaction_Sleep"
+            },
+            {
+                "name": "Start",
+                "type": "none()"
+            },
+            {
+                "name": "IsBlocking",
+                "type": "bool",
+                "default": "True"
+            },
+            {
+                "name": "TransitionPending",
+                "type": "bool",
+                "default": "False"
+            },
+            {
+                "name": "TimeScale",
+                "type": "float"
+            }
+        ]
+    },
+    {
+        "name": "Stage",
+        "numMembers": "6",
+        "base": "none()",
+        "attributes": [{
+                "name": "Start",
+                "type": "Expression"
+            },
+            {
+                "name": "End",
+                "type": "Expression"
+            },
+            {
+                "name": "Process",
+                "type": "Expression"
+            },
+            {
+                "name": "Transitions",
+                "type": "Transition[]"
+            },
+            {
+                "name": "IsExclusive",
+                "type": "bool"
+            },
+            {
+                "name": "IsIdle",
+                "type": "bool"
+            }
+        ]
+    },
+    {
+        "name": "UserRegistry",
+        "numMembers": "7",
+        "base": "none()",
+        "attributes": [{
+                "name": "RegisterUserEvent",
+                "type": "RegisterUserEvent"
+            },
+            {
+                "name": "TransferOwnerUserEvent",
+                "type": "TransferOwnerUserEvent"
+            },
+            {
+                "name": "UnregisterUserEvent",
+                "type": "UnregisterUserEvent"
+            },
+            {
+                "name": "UpdateUserDefaultRequestActionEvent",
+                "type": "UpdateUserDefaultRequestActionEvent"
+            },
+            {
+                "name": "Users",
+                "type": "User[]"
+            },
+            {
+                "name": "AddAdminUserEvent",
+                "type": "AddAdminUserEvent"
+            },
+            {
+                "name": "RemoveAdminUserEvent",
+                "type": "RemoveAdminUserEvent"
+            }
+        ]
+    },
+    {
+        "name": "User",
+        "numMembers": "6",
+        "base": "none()",
+        "attributes": [{
+                "name": "UserIdLower",
+                "type": "int",
+                "minValue": "0",
+                "maxValue": "-1",
+                "default": "0"
+            },
+            {
+                "name": "UserIdUpper",
+                "type": "int",
+                "minValue": "0",
+                "maxValue": "-1",
+                "default": "0"
+            },
+            {
+                "name": "UserEntity",
+                "type": "UserEntity"
+            },
+            {
+                "name": "DefaultRequestAction",
+                "type": "Action",
+                "enum": "Action",
+                "default": "Action:Respond"
+            },
+            {
+                "name": "DefaultRequestActionTimeout",
+                "type": "int",
+                "minValue": "-2000000",
+                "maxValue": "2000000",
+                "default": "0"
+            },
+            {
+                "name": "IsRetired",
+                "type": "bool",
+                "default": "False"
+            }
+        ]
+    },
+    {
+        "name": "Transition",
+        "numMembers": "2",
+        "base": "none()",
+        "attributes": [
+            {
+                "name": "Evaluate",
+                "type": "Expression"
+            },
+            {
+                "name": "Stage",
+                "type": "Stage"
+            }
+        ]
     }
 ]

package/package.json

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

package/scripts/deflate.js

@@ -1,8 +1,8 @@
 const fs = require('fs');
 const zlib = require('zlib');
 
-const filePath = 'D:\\Projects\\Madden 22\\Misc\\FTC\\tuning.frt';
-const outputPath = 'D:\\Projects\\Madden 22\\Misc\\FTC\\modified-Tuning.FTC'
+const filePath = 'D:\\Projects\\Madden 22\\Update issue\\Expressions\\Franchise-Expression-binaryMERGED.frt';
+const outputPath = 'D:\\Projects\\Madden 22\\Update issue\\Expressions\\Franchise-Expression-binaryMERGED.FTC'
 
 const stream = fs.createReadStream(filePath)
 

package/services/schemaPicker.js

@@ -9,7 +9,7 @@ schemaPicker.pick = (gameYear, major, minor, settings) => {
   let schemaDirectories = [SCHEMA_DIRECTORY];
 
   if (settings && settings.schemaDirectory) {
-    schemaDirectories.push(settings.schemaDirectory);
+    schemaDirectories.unshift(settings.schemaDirectory);
   }
 
   const schemasMeta = readSchemaDirectories(schemaDirectories);