@etothepii/satisfactory-file-parser 0.4.6 → 0.4.7

package/README.md

@@ -18,7 +18,7 @@ Game Version Files of U5 and below are NOT supported.
 | <= U5          |  ❌                          |
 | U6 + U7        |  ✅ 0.0.1 - 0.0.34           |
 | U8             |  ✅ 0.1.20 - 0.3.7           |
-| U1.0           |  ✅ >= 0.4.6                 |
+| U1.0           |  ✅ >= 0.4.7                 |
 
 
 ## Installation via npm

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

@@ -14,12 +14,14 @@ const Int8Property_1 = require("./property/generic/Int8Property");
 const MapProperty_1 = require("./property/generic/MapProperty");
 const ObjectProperty_1 = require("./property/generic/ObjectProperty");
 const SetProperty_1 = require("./property/generic/SetProperty");
+const SoftObjectProperty_1 = require("./property/generic/SoftObjectProperty");
 const StrProperty_1 = require("./property/generic/StrProperty");
 const StructProperty_1 = require("./property/generic/StructProperty");
 const TextProperty_1 = require("./property/generic/TextProperty");
 const Uint32Property_1 = require("./property/generic/Uint32Property");
 const Uint64Property_1 = require("./property/generic/Uint64Property");
 const Uint8Property_1 = require("./property/generic/Uint8Property");
+const ObjectReference_1 = require("./values/ObjectReference");
 class DataFields {
     constructor() {
     }
@@ -73,9 +75,52 @@ class DataFields {
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk4/Build_ConveyorLiftMk4.Build_ConveyorLiftMk4_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk5/Build_ConveyorLiftMk5.Build_ConveyorLiftMk5_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk6/Build_ConveyorLiftMk6.Build_ConveyorLiftMk6_C':
-                const count = reader.readInt32();
+                reader.readInt32();
+                property = {};
+                break;
+            case '/Script/FactoryGame.FGConveyorChainActor':
+                const lastBelt = ObjectReference_1.ObjectReference.read(reader);
+                const firstBelt = ObjectReference_1.ObjectReference.read(reader);
+                const countBeltsInChain = reader.readInt32();
+                const beltsInChain = [];
+                for (let i = 0; i < countBeltsInChain; i++) {
+                    const chainActorRef = ObjectReference_1.ObjectReference.read(reader);
+                    const beltRef = ObjectReference_1.ObjectReference.read(reader);
+                    const someCount = reader.readInt32();
+                    const unknownUseBytes = Array.from(reader.readBytes(someCount * 3 * 24 + 12));
+                    const firstItemIndex = reader.readInt32();
+                    const lastItemIndex = reader.readInt32();
+                    const beltIndexInChain = reader.readInt32();
+                    beltsInChain.push({
+                        chainActorRef,
+                        beltRef,
+                        someCount,
+                        unknownUseBytes,
+                        firstItemIndex,
+                        lastItemIndex,
+                        beltIndexInChain
+                    });
+                }
+                const unknownInts = [reader.readInt32(), reader.readInt32()];
+                const firstChainItemIndex = reader.readInt32();
+                const lastChainItemIndex = reader.readInt32();
+                const countItemsInChain = reader.readInt32();
+                const items = [];
+                for (let n = 0; n < countItemsInChain; n++) {
+                    reader.readInt32();
+                    const itemName = reader.readString();
+                    reader.readInt32();
+                    const position = reader.readInt32();
+                    items.push({ itemName, position });
+                }
                 property = {
-                    items: []
+                    firstBelt: firstBelt,
+                    lastBelt: lastBelt,
+                    beltsInChain,
+                    unknownInts,
+                    firstChainItemIndex,
+                    lastChainItemIndex,
+                    items
                 };
                 break;
             case '/Game/FactoryGame/Buildable/Factory/PowerLine/Build_PowerLine.Build_PowerLine_C':
@@ -205,6 +250,10 @@ class DataFields {
                 currentProperty = ObjectProperty_1.ObjectProperty.Parse(reader, propertyType, index);
                 overhead = ObjectProperty_1.ObjectProperty.CalcOverhead(currentProperty);
                 break;
+            case 'SoftObjectProperty':
+                currentProperty = SoftObjectProperty_1.SoftObjectProperty.Parse(reader, propertyType, index);
+                overhead = SoftObjectProperty_1.SoftObjectProperty.CalcOverhead(currentProperty);
+                break;
             case 'EnumProperty':
                 currentProperty = EnumProperty_1.EnumProperty.Parse(reader, propertyType, index);
                 overhead = EnumProperty_1.EnumProperty.CalcOverhead(currentProperty);
@@ -257,12 +306,39 @@ class DataFields {
             case '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk3/Build_ConveyorBeltMk3.Build_ConveyorBeltMk3_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk4/Build_ConveyorBeltMk4.Build_ConveyorBeltMk4_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk5/Build_ConveyorBeltMk5.Build_ConveyorBeltMk5_C':
+            case '/Game/FactoryGame/Buildable/Factory/ConveyorBeltMk6/Build_ConveyorBeltMk6.Build_ConveyorBeltMk6_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk1/Build_ConveyorLiftMk1.Build_ConveyorLiftMk1_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk2/Build_ConveyorLiftMk2.Build_ConveyorLiftMk2_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk3/Build_ConveyorLiftMk3.Build_ConveyorLiftMk3_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk4/Build_ConveyorLiftMk4.Build_ConveyorLiftMk4_C':
             case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk5/Build_ConveyorLiftMk5.Build_ConveyorLiftMk5_C':
+            case '/Game/FactoryGame/Buildable/Factory/ConveyorLiftMk6/Build_ConveyorLiftMk6.Build_ConveyorLiftMk6_C':
+                writer.writeInt32(0);
+                break;
+            case '/Script/FactoryGame.FGConveyorChainActor':
+                ObjectReference_1.ObjectReference.write(writer, property.lastBelt);
+                ObjectReference_1.ObjectReference.write(writer, property.firstBelt);
+                writer.writeInt32(property.beltsInChain.length);
+                for (const belt of property.beltsInChain) {
+                    ObjectReference_1.ObjectReference.write(writer, belt.chainActorRef);
+                    ObjectReference_1.ObjectReference.write(writer, belt.beltRef);
+                    writer.writeInt32(belt.someCount);
+                    writer.writeBytesArray(belt.unknownUseBytes);
+                    writer.writeInt32(belt.firstItemIndex);
+                    writer.writeInt32(belt.lastItemIndex);
+                    writer.writeInt32(belt.beltIndexInChain);
+                }
+                writer.writeInt32(property.unknownInts[0]);
+                writer.writeInt32(property.unknownInts[1]);
+                writer.writeInt32(property.firstChainItemIndex);
+                writer.writeInt32(property.lastChainItemIndex);
                 writer.writeInt32(property.items.length);
+                for (const item of property.items) {
+                    writer.writeInt32(0);
+                    writer.writeString(item.itemName);
+                    writer.writeInt32(0);
+                    writer.writeInt32(item.position);
+                }
                 break;
             case '/Game/FactoryGame/Buildable/Factory/PowerLine/Build_PowerLine.Build_PowerLine_C':
             case '/Game/FactoryGame/Events/Christmas/Buildings/PowerLineLights/Build_XmassLightsLine.Build_XmassLightsLine_C':
@@ -367,6 +443,10 @@ class DataFields {
                 overhead = ObjectProperty_1.ObjectProperty.CalcOverhead(property);
                 ObjectProperty_1.ObjectProperty.Serialize(writer, property);
                 break;
+            case 'SoftObjectProperty':
+                overhead = SoftObjectProperty_1.SoftObjectProperty.CalcOverhead(property);
+                SoftObjectProperty_1.SoftObjectProperty.Serialize(writer, property);
+                break;
             case 'EnumProperty':
                 overhead = EnumProperty_1.EnumProperty.CalcOverhead(property);
                 EnumProperty_1.EnumProperty.Serialize(writer, property);

package/build/parser/satisfactory/objects/property/generic/ArrayProperty.js

@@ -16,7 +16,7 @@ const StructProperty_1 = require("./StructProperty");
 const TextProperty_1 = require("./TextProperty");
 class ArrayProperty extends BasicProperty_1.BasicProperty {
     constructor(subtype, values, ueType = 'ArrayProperty', index = 0, structValueFields) {
-        super('ArrayProperty', ueType, undefined, index);
+        super({ type: 'ArrayProperty', ueType, index });
         this.subtype = subtype;
         this.values = values;
         this.structValueFields = structValueFields;

package/build/parser/satisfactory/objects/property/generic/BasicProperty.d.ts

@@ -12,7 +12,14 @@ export declare abstract class AbstractBaseProperty extends AbstractProperty {
     name: string;
     constructor(type: string, ueType: string, index: number);
 }
+type AbstractBasePropertyOptions = {
+    type: string;
+    ueType: string;
+    guidInfo?: GUIDInfo;
+    index: number;
+};
 export declare abstract class BasicProperty extends AbstractBaseProperty {
     guidInfo: GUIDInfo;
-    constructor(type: string, ueType: string, guidInfo: GUIDInfo, index?: number);
+    constructor(options: AbstractBasePropertyOptions);
 }
+export {};

package/build/parser/satisfactory/objects/property/generic/BasicProperty.js

@@ -17,9 +17,11 @@ class AbstractBaseProperty extends AbstractProperty {
 }
 exports.AbstractBaseProperty = AbstractBaseProperty;
 class BasicProperty extends AbstractBaseProperty {
-    constructor(type, ueType, guidInfo, index = 0) {
-        super(type, ueType, index);
-        this.guidInfo = guidInfo;
+    constructor(options) {
+        super(options.type, options.ueType, options.index ?? 0);
+        if (options.guidInfo !== undefined) {
+            this.guidInfo = options.guidInfo;
+        }
     }
 }
 exports.BasicProperty = BasicProperty;

package/build/parser/satisfactory/objects/property/generic/BoolProperty.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class BoolProperty extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'BoolProperty', guidInfo = undefined, index = 0) {
-        super('BoolProperty', ueType, guidInfo, index);
+        super({ type: 'BoolProperty', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/ByteProperty.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class ByteProperty extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'ByteProperty', guidInfo = undefined, index = 0) {
-        super('ByteProperty', ueType, guidInfo, index);
+        super({ type: 'ByteProperty', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/DoubleProperty.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class DoubleProperty extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'DoubleProperty', guidInfo = undefined, index = 0) {
-        super('DoubleProperty', ueType, guidInfo, index);
+        super({ type: 'DoubleProperty', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/EnumProperty.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class EnumProperty extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'EnumProperty', guidInfo = undefined, index = 0) {
-        super('EnumProperty', ueType, guidInfo, index);
+        super({ type: 'EnumProperty', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/FloatProperty.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class FloatProperty extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'FloatProperty', guidInfo = undefined, index = 0) {
-        super('FloatProperty', ueType, guidInfo, index);
+        super({ type: 'FloatProperty', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/Int32Property.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class Int32Property extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'IntProperty', guidInfo = undefined, index = 0) {
-        super('Int32Property', ueType, guidInfo, index);
+        super({ type: 'Int32Property', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/Int64Property.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class Int64Property extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'Int64Property', guidInfo = undefined, index = 0) {
-        super('Int64Property', ueType, guidInfo, index);
+        super({ type: 'Int64Property', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/Int8Property.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class Int8Property extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'Int8Property', guidInfo = undefined, index = 0) {
-        super('Int8Property', ueType, guidInfo, index);
+        super({ type: 'Int8Property', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/MapProperty.js

@@ -11,7 +11,7 @@ const StrProperty_1 = require("./StrProperty");
 const StructProperty_1 = require("./StructProperty");
 class MapProperty extends BasicProperty_1.BasicProperty {
     constructor(keyType, valueType, ueType, index) {
-        super('MapProperty', ueType, undefined, index);
+        super({ type: 'MapProperty', ueType, index });
         this.keyType = keyType;
         this.valueType = valueType;
         this.modeType = 0;

package/build/parser/satisfactory/objects/property/generic/ObjectProperty.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class ObjectProperty extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'ObjectProperty', guidInfo = undefined, index = 0) {
-        super('ObjectProperty', ueType, guidInfo, index);
+        super({ type: 'ObjectProperty', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/SetProperty.js

@@ -10,7 +10,7 @@ const StrProperty_1 = require("./StrProperty");
 const Uint32Property_1 = require("./Uint32Property");
 class SetProperty extends BasicProperty_1.BasicProperty {
     constructor(subtype, values, ueType, index) {
-        super('SetProperty', ueType, undefined, index);
+        super({ type: 'SetProperty', ueType, index });
         this.subtype = subtype;
         this.values = values;
     }

package/build/parser/satisfactory/objects/property/generic/SoftObjectProperty.d.ts

@@ -0,0 +1,12 @@
+import { BinaryReadable } from '../../../../byte/binary-readable.interface';
+import { ByteWriter } from '../../../../byte/byte-writer.class';
+import { GUIDInfo } from '../../GUIDInfo';
+import { SoftObjectReference } from '../../values/SoftObjectReference';
+import { BasicProperty } from './BasicProperty';
+export declare class SoftObjectProperty extends BasicProperty {
+    value: SoftObjectReference;
+    constructor(value: SoftObjectReference, ueType?: string, guidInfo?: GUIDInfo, index?: number);
+    static Parse(reader: BinaryReadable, ueType: string, index?: number): SoftObjectProperty;
+    static CalcOverhead(property: SoftObjectProperty): number;
+    static Serialize(writer: ByteWriter, property: SoftObjectProperty): void;
+}

package/build/parser/satisfactory/objects/property/generic/SoftObjectProperty.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SoftObjectProperty = void 0;
+const GUIDInfo_1 = require("../../GUIDInfo");
+const SoftObjectReference_1 = require("../../values/SoftObjectReference");
+const BasicProperty_1 = require("./BasicProperty");
+class SoftObjectProperty extends BasicProperty_1.BasicProperty {
+    constructor(value, ueType = 'SoftObjectProperty', guidInfo = undefined, index = 0) {
+        super({ type: 'SoftObjectProperty', ueType, guidInfo, index });
+        this.value = value;
+    }
+    static Parse(reader, ueType, index = 0) {
+        const guidInfo = GUIDInfo_1.GUIDInfo.read(reader);
+        const value = SoftObjectReference_1.SoftObjectReference.read(reader);
+        return new SoftObjectProperty(value, ueType, guidInfo, index);
+    }
+    static CalcOverhead(property) {
+        return 1;
+    }
+    static Serialize(writer, property) {
+        GUIDInfo_1.GUIDInfo.write(writer, property.guidInfo);
+        SoftObjectReference_1.SoftObjectReference.write(writer, property.value);
+    }
+}
+exports.SoftObjectProperty = SoftObjectProperty;

package/build/parser/satisfactory/objects/property/generic/StrProperty.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class StrProperty extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'StrProperty', guidInfo = undefined, index = 0) {
-        super('StrProperty', ueType, guidInfo, index);
+        super({ type: 'StrProperty', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/TextProperty.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class TextProperty extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'TextProperty', guidInfo = undefined, index = 0) {
-        super('TextProperty', ueType, guidInfo, index);
+        super({ type: 'TextProperty', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/Uint32Property.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class Uint32Property extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'UInt32Property', guidInfo = undefined, index = 0) {
-        super('UInt32Property', ueType, guidInfo, index);
+        super({ type: 'UInt32Property', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/Uint64Property.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class UInt64Property extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'UInt64Property', guidInfo = undefined, index = 0) {
-        super('UInt64Property', ueType, guidInfo, index);
+        super({ type: 'UInt64Property', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/generic/Uint8Property.js

@@ -5,7 +5,7 @@ const GUIDInfo_1 = require("../../GUIDInfo");
 const BasicProperty_1 = require("./BasicProperty");
 class Uint8Property extends BasicProperty_1.BasicProperty {
     constructor(value, ueType = 'UInt8Property', guidInfo = undefined, index = 0) {
-        super('UInt8Property', ueType, guidInfo, index);
+        super({ type: 'UInt8Property', ueType, guidInfo, index });
         this.value = value;
     }
     static Parse(reader, ueType, index = 0) {

package/build/parser/satisfactory/objects/property/special/SpecialAnyProperty.d.ts

@@ -1,6 +1,6 @@
 import { Transform, vec3, vec4 } from '../../../structs/util.types';
 import { ObjectReference } from '../../values/ObjectReference';
-export type SpecialAnyProperty = {} | PowerLineSpecialProperty | PlayerSpecialProperty | ConveyorSpecialProperty | BuildableSubsystemSpecialProperty;
+export type SpecialAnyProperty = {} | PowerLineSpecialProperty | PlayerSpecialProperty | ConveyorChainActorSpecialProperty | BuildableSubsystemSpecialProperty;
 export type PowerLineSpecialProperty = {
     num: number;
     source: ObjectReference;
@@ -13,14 +13,27 @@ export type PlayerSpecialProperty = {
     eosData?: string;
     steamPlayerData?: string;
 };
-export type ItemSpecialProperty = {
-    length: number;
-    name: string;
+export type ConveyorItemSpecialProperty = {
     position: number;
-    pathName: string;
+    itemName: string;
 };
-export type ConveyorSpecialProperty = {
-    items: ItemSpecialProperty[];
+export type ConveyorChainSegmentSpecialProperty = {
+    chainActorRef: ObjectReference;
+    beltRef: ObjectReference;
+    someCount: number;
+    unknownUseBytes: number[];
+    firstItemIndex: number;
+    lastItemIndex: number;
+    beltIndexInChain: number;
+};
+export type ConveyorChainActorSpecialProperty = {
+    firstBelt: ObjectReference;
+    lastBelt: ObjectReference;
+    beltsInChain: ConveyorChainSegmentSpecialProperty[];
+    unknownInts: [number, number];
+    firstChainItemIndex: number;
+    lastChainItemIndex: number;
+    items: ConveyorItemSpecialProperty[];
 };
 export type BuildableSubsystemSpecialProperty = {
     buildables: {

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@etothepii/satisfactory-file-parser",
 	"author": "etothepii",
-	"version": "0.4.6",
+	"version": "0.4.7",
 	"description": "A file parser for satisfactory files. Includes save files and blueprint files.",
 	"types": "./build/index.d.ts",
 	"main": "./build/index.js",
@@ -14,7 +14,7 @@
 		"typescript"
 	],
 	"scripts": {
-		"test": "jest --config=jest.config.json --max_old_space_size=30720",
+		"test": "set PARSER_DEBUG=debug&& jest --config=jest.config.json --max_old_space_size=30720",
 		"build": "tsc && npm run bundle",
 		"bundle": "npx webpack && dts-bundle-generator -o dist/index.d.ts src/index.ts",
 		"prepublishOnly": "npm run build && npm version patch"