@etothepii/satisfactory-file-parser 0.1.10 → 0.1.12

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.9  (Reading only) |
+| U8             |  ⚠️ >= 0.1.12  (Reading only) |
 
 
 ## Installation via npm

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

@@ -245,6 +245,8 @@ export declare class SetProperty<T> extends BasicProperty {
     static CalcOverhead(property: SetProperty<any>): number;
     static Serialize(writer: ByteWriter, property: SetProperty<any>): void;
 }
+export type GENERIC_MAP_KEY_TYPE = number | ObjectReference | boolean | GENERIC_STRUCT_PROPERTY_VALUE;
+export type GENERIC_MAP_VALUE_TYPE = number | ObjectReference | boolean | GENERIC_STRUCT_PROPERTY_VALUE;
 export declare class MapProperty extends BasicProperty {
     keyType: string;
     valueType: string;
@@ -253,10 +255,7 @@ export declare class MapProperty extends BasicProperty {
     modeUnk2: string;
     modeUnk3: string;
     remainingData: number[];
-    values: {
-        key: any;
-        value: any;
-    }[];
+    values: [key: GENERIC_MAP_KEY_TYPE, value: GENERIC_MAP_VALUE_TYPE][];
     constructor(keyType: string, valueType: string, ueType: string, index: number);
     static Parse(reader: BinaryReadable, propertyName: string, buildVersion: number, size: number, ueType?: string, index?: number): MapProperty;
     static CalcOverhead(property: MapProperty): number;

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

@@ -844,11 +844,14 @@ class SetProperty extends BasicProperty {
     }
     static Parse(reader, ueType, index, propertyName) {
         const subtype = reader.readString();
-        reader.skipBytes(1);
-        reader.skipBytes(4);
+        const unk2 = reader.skipBytes(1);
+        const unk3 = reader.skipBytes(4);
         const elementCount = reader.readInt32();
         let property;
         switch (subtype) {
+            case "UInt32Property":
+                property = new SetProperty(subtype, new Array(elementCount).fill(0).map(() => Uint32Property.ReadValue(reader)), ueType, index);
+                break;
             case "IntProperty":
                 property = new SetProperty(subtype, new Array(elementCount).fill(0).map(() => Int32Property.ReadValue(reader)), ueType, index);
                 break;
@@ -858,11 +861,6 @@ class SetProperty extends BasicProperty {
             case "NameProperty":
                 property = new SetProperty(subtype, new Array(elementCount).fill(0).map(() => StrProperty.ReadValue(reader)), ueType, index);
                 break;
-            case "StructProperty":
-                if (propertyName === 'mRemovalLocations') {
-                    property = new SetProperty(subtype, new Array(elementCount).fill(0).map(() => (0, util_types_1.ParseVec3f)(reader)), ueType, index);
-                }
-                break;
             default:
                 throw new Error('Not Implemented.');
         }
@@ -900,7 +898,7 @@ class MapProperty extends BasicProperty {
         super('MapProperty', ueType, undefined, index);
         this.keyType = keyType;
         this.valueType = valueType;
-        this.modeType = 2;
+        this.modeType = 0;
         this.modeUnk2 = '';
         this.modeUnk3 = '';
         this.remainingData = [];
@@ -909,9 +907,68 @@ class MapProperty extends BasicProperty {
     static Parse(reader, propertyName, buildVersion, size, ueType = 'MapProperty', index = 0) {
         const start = reader.getBufferPosition();
         const property = new MapProperty(reader.readString(), reader.readString(), ueType, index);
-        reader.skipBytes(1);
+        const unk = reader.readByte();
         property.modeType = reader.readInt32();
-        property.remainingData = Array.from(reader.readBytes(size - 4));
+        const elementCount = reader.readInt32();
+        for (let i = 0; i < elementCount; i++) {
+            let key;
+            let value;
+            switch (property.keyType) {
+                case 'StructProperty':
+                    if (propertyName === 'mSaveData' || propertyName === 'mUnresolvedSaveData') {
+                        key = propertyName;
+                        reader.skipBytes(12);
+                    }
+                    else {
+                        key = (0, exports.ParseDynamicStructData)(reader, 0, 'MapPropertyKey-' + property.keyType);
+                    }
+                    break;
+                case 'ObjectProperty':
+                    key = ObjectProperty.ReadValue(reader);
+                    break;
+                case 'StrProperty':
+                case 'NameProperty':
+                    key = StrProperty.ReadValue(reader);
+                    break;
+                case 'EnumProperty':
+                    key = EnumProperty.ReadValue(reader);
+                    break;
+                case 'IntProperty':
+                case 'Int32Property':
+                    key = Int32Property.ReadValue(reader);
+                    break;
+                case 'ByteProperty':
+                    key = ByteProperty.ReadValue(reader);
+                    break;
+                default:
+                    throw new Error(`not implemented map key type ${property.keyType}`);
+            }
+            switch (property.valueType) {
+                case 'StructProperty':
+                    value = (0, exports.ParseDynamicStructData)(reader, 0, 'MapPropertyValue-' + property.valueType);
+                    break;
+                case 'ObjectProperty':
+                    value = ObjectProperty.ReadValue(reader);
+                    break;
+                case 'StrProperty':
+                case 'NameProperty':
+                    value = StrProperty.ReadValue(reader);
+                    break;
+                case 'EnumProperty':
+                    value = EnumProperty.ReadValue(reader);
+                    break;
+                case 'IntProperty':
+                case 'Int32Property':
+                    value = Int32Property.ReadValue(reader);
+                    break;
+                case 'ByteProperty':
+                    value = ByteProperty.ReadValue(reader);
+                    break;
+                default:
+                    throw new Error(`not implemented map value type ${property.valueType}`);
+            }
+            property.values.push([key, value]);
+        }
         return property;
     }
     static CalcOverhead(property) {

package/package.json

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