@etothepii/satisfactory-file-parser 0.1.8 → 0.1.10

package/README.md

@@ -19,7 +19,7 @@ U8 has only read support so far and only for save files, not for blueprint files
 |:--------------:|:-----------------------------|
 | <= U5          |  ❌                          |
 | U6 + U7        |  ✅ 0.0.1 - 0.0.34              |
-| U8             |  ⚠️ >= 0.1.8  (Reading only) |
+| U8             |  ⚠️ >= 0.1.9  (Reading only) |
 
 
 ## Installation via npm

package/build/parser/satisfactory/objects/DataFields.d.ts

@@ -5,7 +5,7 @@ import { vec3 } from "../structs/util.types";
 import { ObjectReference } from "./ObjectReference";
 import { AbstractBaseProperty } from "./Property";
 import { SaveObject } from "./SaveObject";
-export type SpecialAnyProperty = {} | PowerLineSpecialProperty;
+export type SpecialAnyProperty = {} | PowerLineSpecialProperty | PlayerSpecialProperty;
 export type PowerLineSpecialProperty = {
     num: number;
     source: ObjectReference;
@@ -31,7 +31,7 @@ export declare class DataFields {
     constructor();
     static ParseProperties(obj: SaveObject, length: number, reader: BinaryReadable, buildVersion: number, typePath: string): void;
     static ParseAdditionalSpecialProperties(reader: BinaryReadable, typePath: string, remainingLen: number): SpecialAnyProperty;
-    static ParseProperty(reader: BinaryReadable, buildVersion: number, propertyName: string): AbstractBaseProperty | null;
+    static ParseProperty(reader: BinaryReadable, buildVersion: number, propertyName: string): AbstractBaseProperty;
     static Serialize(obj: SaveObject, writer: SaveWriter, buildVersion: number, typePath: string): void;
     static SerializeAdditionalSpecialProperties(writer: ByteWriter, typePath: string, property: SpecialAnyProperty): void;
     static SerializeProperty(writer: ByteWriter, property: AbstractBaseProperty, propertyName: string, buildVersion: number): void;

package/build/parser/satisfactory/objects/DataFields.js

@@ -8,14 +8,22 @@ class DataFields {
     }
     static ParseProperties(obj, length, reader, buildVersion, typePath) {
         const start = reader.getBufferPosition();
-        obj.properties = [];
+        obj.properties = {};
         if (length === 0) {
             return;
         }
         let propertyName = reader.readString();
         while (propertyName !== 'None') {
-            const property = DataFields.ParseProperty(reader, buildVersion, propertyName);
-            obj.properties.push(property);
+            const parsedProperty = DataFields.ParseProperty(reader, buildVersion, propertyName);
+            if (obj.properties[propertyName]) {
+                if (!Array.isArray(obj.properties[propertyName])) {
+                    obj.properties[propertyName] = [obj.properties[propertyName]];
+                }
+                obj.properties[propertyName].push(parsedProperty);
+            }
+            else {
+                obj.properties[propertyName] = parsedProperty;
+            }
             propertyName = reader.readString();
         }
         let padding = reader.readInt32();
@@ -81,9 +89,6 @@ class DataFields {
     }
     static ParseProperty(reader, buildVersion, propertyName) {
         let currentProperty = {};
-        if (currentProperty.name === 'None') {
-            return null;
-        }
         const propertyType = reader.readString();
         const binarySize = reader.readInt32();
         const index = reader.readInt32();
@@ -174,7 +179,7 @@ class DataFields {
         return currentProperty;
     }
     static Serialize(obj, writer, buildVersion, typePath) {
-        for (const property of Object.values(obj.properties)) {
+        for (const property of Object.values(obj.properties).flatMap(val => Array.isArray(val) ? val : [val])) {
             writer.writeString(property.name);
             DataFields.SerializeProperty(writer, property, property.name, buildVersion);
         }

package/build/parser/satisfactory/objects/Property.d.ts

@@ -2,8 +2,8 @@ import { ByteWriter } from "../../..";
 import { BinaryReadable } from "../../byte/binary-readable.interface";
 import { col4, vec3, vec4 } from "../structs/util.types";
 import { ObjectReference } from "./ObjectReference";
-export type Properties = {
-    [key: string]: string | number | boolean | any;
+export type PropertiesMap = {
+    [name: string]: AbstractBaseProperty | AbstractBaseProperty[];
 };
 export declare abstract class AbstractProperty {
     type: string;
@@ -201,7 +201,7 @@ export type FICFrameRangeStructPropertyValue = {
 };
 export type DynamicStructPropertyValue = {
     type: string;
-    properties: AbstractBaseProperty[];
+    properties: PropertiesMap;
 };
 export type GENERIC_STRUCT_PROPERTY_VALUE = BasicMultipleStructPropertyValue | BasicStructPropertyValue | BoxStructPropertyValue | RailroadTrackPositionStructPropertyValue | InventoryItemStructPropertyValue | FICFrameRangeStructPropertyValue | DynamicStructPropertyValue | col4 | vec3 | vec4 | string;
 export declare class StructProperty extends AbstractBaseProperty {

package/build/parser/satisfactory/objects/Property.js

@@ -518,14 +518,14 @@ class StructProperty extends AbstractBaseProperty {
                 value = (0, util_types_1.ParseCol4RGBA)(reader);
                 break;
             case 'Vector':
-                value = (0, util_types_1.ParseVec3)(reader);
+                value = (size === 12) ? (0, util_types_1.ParseVec3f)(reader) : (0, util_types_1.ParseVec3)(reader);
                 break;
             case 'Rotator':
             case 'Vector2D':
                 value = (0, util_types_1.ParseVec3f)(reader);
                 break;
             case 'Quat':
-                value = (0, util_types_1.ParseVec4)(reader);
+                value = value = (size === 16) ? (0, util_types_1.ParseVec4f)(reader) : (0, util_types_1.ParseVec4)(reader);
                 break;
             case 'Vector4':
             case 'Vector4D':
@@ -928,13 +928,21 @@ class MapProperty extends BasicProperty {
 exports.MapProperty = MapProperty;
 const ParseDynamicStructData = (reader, buildVersion, type) => {
     const data = {
-        type, properties: []
+        type, properties: {}
     };
     const pos = reader.getBufferPosition();
     let propertyName = reader.readString();
     while (propertyName !== 'None') {
-        const property = DataFields_1.DataFields.ParseProperty(reader, buildVersion, propertyName);
-        data.properties.push(property);
+        const parsedProperty = DataFields_1.DataFields.ParseProperty(reader, buildVersion, propertyName);
+        if (data.properties[propertyName]) {
+            if (!Array.isArray(data.properties[propertyName])) {
+                data.properties[propertyName] = [data.properties[propertyName]];
+            }
+            data.properties[propertyName].push(parsedProperty);
+        }
+        else {
+            data.properties[propertyName] = parsedProperty;
+        }
         propertyName = reader.readString();
     }
     return data;
@@ -943,7 +951,9 @@ exports.ParseDynamicStructData = ParseDynamicStructData;
 const SerializeDynamicStructData = (writer, buildVersion, data) => {
     for (const key in data.properties) {
         writer.writeString(key);
-        DataFields_1.DataFields.SerializeProperty(writer, data.properties[key], key, buildVersion);
+        for (const prop of (Array.isArray(data.properties[key]) ? data.properties[key] : [data.properties[key]])) {
+            DataFields_1.DataFields.SerializeProperty(writer, prop, key, buildVersion);
+        }
     }
     writer.writeString('None');
 };

package/build/parser/satisfactory/objects/SaveObject.d.ts

@@ -1,7 +1,7 @@
 import { BinaryReadable } from "../../byte/binary-readable.interface";
 import { ByteWriter } from "../../byte/byte-writer.class";
 import { SpecialAnyProperty } from "./DataFields";
-import { AbstractBaseProperty } from "./Property";
+import { PropertiesMap } from "./Property";
 export interface SaveObjectHeader {
     typePath: string;
     rootObject: string;
@@ -11,7 +11,7 @@ export declare abstract class SaveObject implements SaveObjectHeader {
     typePath: string;
     rootObject: string;
     instanceName: string;
-    properties: AbstractBaseProperty[];
+    properties: PropertiesMap;
     specialProperties: SpecialAnyProperty;
     trailingData: number[];
     unknownType1: number;

package/build/parser/satisfactory/objects/SaveObject.js

@@ -7,7 +7,7 @@ class SaveObject {
         this.typePath = typePath;
         this.rootObject = rootObject;
         this.instanceName = instanceName;
-        this.properties = [];
+        this.properties = {};
         this.specialProperties = {};
         this.trailingData = [];
         this.unknownType1 = 0;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@etothepii/satisfactory-file-parser",
 	"author": "etothepii",
-	"version": "0.1.8",
+	"version": "0.1.10",
 	"description": "A file parser for satisfactory files. Includes save files and blueprint files.",
 	"types": "./build/index.d.ts",
 	"main": "./build/index.js",