@etothepii/satisfactory-file-parser 0.1.11 → 0.1.13

package/README.md

@@ -13,13 +13,13 @@ The version support of the packages is indicated below.
 
 Game Version Files of U5 and below are NOT supported.
 
-U8 has only read support so far and only for save files, not for blueprint files. More coming soon.
+U8 has read and write support for blueprints, but only read support for saves. More coming soon.
 
 | Game Version   |      Package                 |
 |:--------------:|:-----------------------------|
 | <= U5          |  ❌                          |
 | U6 + U7        |  ✅ 0.0.1 - 0.0.34              |
-| U8             |  ⚠️ >= 0.1.11  (Reading only) |
+| U8             |  ⚠️ >= 0.1.13  (readig for both saves and blueprints, writing only for blueprints) |
 
 
 ## Installation via npm

package/build/parser/satisfactory/blueprint/blueprint-reader.js

@@ -23,8 +23,9 @@ class BlueprintReader extends byte_reader_class_1.ByteReader {
         };
     }
     static ReadHeader(reader) {
-        const unk = reader.readBytes(3 * 4);
-        const positionThingOrWhat = (0, util_types_1.ParseVec3f)(reader);
+        const blueprintTypeOrWhat = reader.readBytes(4);
+        const versionThing = reader.readBytes(2 * 4);
+        const probablyDimensions = (0, util_types_1.ParseVec3f)(reader);
         let itemTypeCount = reader.readInt32();
         const itemCosts = new Array(itemTypeCount).fill(['', 0]);
         for (let i = 0; i < itemTypeCount; i++) {
@@ -104,7 +105,6 @@ class BlueprintReader extends byte_reader_class_1.ByteReader {
         const suomeChecksumThing = reader.readInt32();
         BlueprintReader.ReadBlueprintObjectContents('', reader, objects, 0);
         const pos = reader.getBufferPosition();
-        console.log(pos, reader.getBufferLength(), reader.getBufferProgress());
         return objects;
     }
     static ReadBlueprintObjectContents(levelName, reader, objectsList, buildVersion) {

package/build/parser/satisfactory/blueprint/blueprint-writer.js

@@ -13,8 +13,8 @@ class BlueprintWriter extends byte_writer_class_1.ByteWriter {
     }
     static SerializeHeader(writer, header) {
         writer.writeInt32(2);
-        writer.writeInt32(36);
-        writer.writeInt32(211839);
+        writer.writeInt32(42);
+        writer.writeInt32(249836);
         writer.writeInt32(4);
         writer.writeInt32(4);
         writer.writeInt32(4);

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

@@ -518,28 +518,25 @@ class StructProperty extends AbstractBaseProperty {
                 value = (0, util_types_1.ParseCol4RGBA)(reader);
                 break;
             case 'Vector':
-                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);
+                value = (size === 12) ? (0, util_types_1.ParseVec3f)(reader) : (0, util_types_1.ParseVec3)(reader);
                 break;
             case 'Quat':
-                value = value = (size === 16) ? (0, util_types_1.ParseVec4f)(reader) : (0, util_types_1.ParseVec4)(reader);
-                break;
             case 'Vector4':
             case 'Vector4D':
-                value = (0, util_types_1.ParseVec4f)(reader);
+                value = (size === 16) ? (0, util_types_1.ParseVec4f)(reader) : (0, util_types_1.ParseVec4)(reader);
                 break;
             case 'Box':
-                const otherBoxLike = {
-                    other1: (0, util_types_1.ParseVec3f)(reader),
-                    other2: (0, util_types_1.ParseVec3f)(reader)
-                };
-                value = {
+                console.error('found box here!!');
+                value = (size === 25) ? {
                     min: (0, util_types_1.ParseVec3f)(reader),
                     max: (0, util_types_1.ParseVec3f)(reader),
                     isValid: reader.readByte() >= 1
+                } : {
+                    min: (0, util_types_1.ParseVec3)(reader),
+                    max: (0, util_types_1.ParseVec3)(reader),
+                    isValid: reader.readByte() >= 1
                 };
                 break;
             case 'RailroadTrackPosition':
@@ -621,18 +618,18 @@ class StructProperty extends AbstractBaseProperty {
             case 'Rotator':
             case 'Vector2D':
                 value = value;
-                (0, util_types_1.SerializeVec3f)(writer, value);
+                (0, util_types_1.SerializeVec3)(writer, value);
                 break;
             case 'Quat':
             case 'Vector4':
             case 'Vector4D':
                 value = value;
-                (0, util_types_1.SerializeVec4f)(writer, value);
+                (0, util_types_1.SerializeVec4)(writer, value);
                 break;
             case 'Box':
                 value = value;
-                (0, util_types_1.SerializeVec3f)(writer, value.min);
-                (0, util_types_1.SerializeVec3f)(writer, value.max);
+                (0, util_types_1.SerializeVec3)(writer, value.min);
+                (0, util_types_1.SerializeVec3)(writer, value.max);
                 writer.writeByte(value.isValid ? 1 : 0);
                 break;
             case 'RailroadTrackPosition':
@@ -898,7 +895,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 = [];
@@ -916,10 +913,11 @@ class MapProperty extends BasicProperty {
             switch (property.keyType) {
                 case 'StructProperty':
                     if (propertyName === 'mSaveData' || propertyName === 'mUnresolvedSaveData') {
-                        key = reader.readBytes(12);
+                        key = propertyName;
+                        reader.skipBytes(12);
                     }
                     else {
-                        key = (0, exports.ParseDynamicStructData)(reader, 0, 'MapPropertyKey-' + property.keyType);
+                        key = (0, exports.ParseDynamicStructData)(reader, 0, property.keyType);
                     }
                     break;
                 case 'ObjectProperty':
@@ -944,7 +942,7 @@ class MapProperty extends BasicProperty {
             }
             switch (property.valueType) {
                 case 'StructProperty':
-                    value = (0, exports.ParseDynamicStructData)(reader, 0, 'MapPropertyValue-' + property.valueType);
+                    value = (0, exports.ParseDynamicStructData)(reader, 0, property.valueType);
                     break;
                 case 'ObjectProperty':
                     value = ObjectProperty.ReadValue(reader);
@@ -966,6 +964,7 @@ class MapProperty extends BasicProperty {
                 default:
                     throw new Error(`not implemented map value type ${property.valueType}`);
             }
+            property.values.push([key, value]);
         }
         return property;
     }
@@ -1005,8 +1004,8 @@ const ParseDynamicStructData = (reader, buildVersion, type) => {
 exports.ParseDynamicStructData = ParseDynamicStructData;
 const SerializeDynamicStructData = (writer, buildVersion, data) => {
     for (const key in data.properties) {
-        writer.writeString(key);
         for (const prop of (Array.isArray(data.properties[key]) ? data.properties[key] : [data.properties[key]])) {
+            writer.writeString(key);
             DataFields_1.DataFields.SerializeProperty(writer, prop, key, buildVersion);
         }
     }

package/package.json

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