adding vehicles to common types

- re: #5
satisfactory-dev · Nov 14, 2024 · 4a1acb9 · 4a1acb9
1 parent 4e2db38
commit 4a1acb9
Show file tree

Hide file tree

Showing 11 changed files with 208 additions and 101 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -155,6 +155,9 @@
 	"common_type__FGSchematic__mUnlocks_mTapeUnlocks__type": "classes/CoreUObject/FGSchematic",
 	"common_type__FGSchematic__mUnlocks_resources_to_scan__type": "classes/CoreUObject/FGSchematic",
 	"common_type__common_base__FGSuitBase__type": "classes/CoreUObject/FGSuitBase",
+	"common_type__common_base__FGVehicleDescriptor__fueled_with_inventory__type": "classes/CoreUObject/FGVehicleDescriptor",
+	"common_type__common_base__FGVehicleDescriptor__powered_no_inventory__type": "classes/CoreUObject/FGVehicleDescriptor",
+	"common_type__common_base__FGVehicleDescriptor__with_inventory__type": "classes/CoreUObject/FGVehicleDescriptor",
 	"common_type__UnrealEngineString": "utils/validators",
 	"common_type__StringStartsWith": "utils/validators",
 	"common_type__StringPassedRegExp": "utils/validators"

diff --git a/generated-types/1.0/classes/CoreUObject/FGVehicleDescriptor.ts b/generated-types/1.0/classes/CoreUObject/FGVehicleDescriptor.ts
@@ -1,32 +1,36 @@
 import {FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type} from './FGItemDescriptor';
 
 import {
-	decimal_string__type,
-	integer_string__type,
-} from '../../../common/common/scalar';
+	common_base__FGVehicleDescriptor__fueled_with_inventory__type,
+	common_base__FGVehicleDescriptor__powered_no_inventory__type,
+	common_base__FGVehicleDescriptor__with_inventory__type,
+} from '../../../common/classes/CoreUObject/FGVehicleDescriptor';
 
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGVehicleDescriptor__fueled_with_inventory__type =
-	FGVehicleDescriptor__with_inventory__type & {
-		mFuelConsumption: decimal_string__type;
-	};
+	FGVehicleDescriptor__fueled_with_inventory__merged__type;
+
+export type FGVehicleDescriptor__fueled_with_inventory__merged__type =
+	common_base__FGVehicleDescriptor__fueled_with_inventory__type &
+		FGVehicleDescriptor__with_inventory__type;
 
 export type FGVehicleDescriptor__powered_no_inventory__type =
-	FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-		mPowerConsumption: {
-			Min: decimal_string__type;
-			Max: decimal_string__type;
-		};
-	};
+	FGVehicleDescriptor__powered_no_inventory__merged__type;
+
+export type FGVehicleDescriptor__powered_no_inventory__merged__type =
+	common_base__FGVehicleDescriptor__powered_no_inventory__type &
+		FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 
 export type FGVehicleDescriptor__unfueled_with_inventory__type =
 	FGVehicleDescriptor__with_inventory__type;
 
 export type FGVehicleDescriptor__with_inventory__type =
-	FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-		mInventorySize: integer_string__type;
-	};
+	FGVehicleDescriptor__with_inventory__merged__type;
+
+export type FGVehicleDescriptor__with_inventory__merged__type =
+	common_base__FGVehicleDescriptor__with_inventory__type &
+		FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 
 export type FGVehicleDescriptor__NativeClass =
 	NativeClass__type & {

diff --git a/generated-types/common/classes/CoreUObject/FGVehicleDescriptor.ts b/generated-types/common/classes/CoreUObject/FGVehicleDescriptor.ts
@@ -0,0 +1,21 @@
+import {decimal_string__type, integer_string__type} from '../../common/scalar';
+
+import {common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type} from './FGItemDescriptor';
+
+export type common_base__FGVehicleDescriptor__fueled_with_inventory__type =
+	common_base__FGVehicleDescriptor__with_inventory__type & {
+		mFuelConsumption: decimal_string__type;
+	};
+
+export type common_base__FGVehicleDescriptor__powered_no_inventory__type =
+	common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
+		mPowerConsumption: {
+			Min: decimal_string__type;
+			Max: decimal_string__type;
+		};
+	};
+
+export type common_base__FGVehicleDescriptor__with_inventory__type =
+	common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
+		mInventorySize: integer_string__type;
+	};
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -111,6 +111,12 @@ import {
 	common_base__FGItemDescriptorNuclearFuel__type,
 } from '../classes/CoreUObject/FGItemDescriptorNuclearFuel';
 
+import {
+	common_base__FGVehicleDescriptor__powered_no_inventory__type,
+	common_base__FGVehicleDescriptor__with_inventory__type,
+	common_base__FGVehicleDescriptor__fueled_with_inventory__type,
+} from '../classes/CoreUObject/FGVehicleDescriptor';
+
 import {
 	FGSchematic__mUnlocks_mSchematics__mSchematics__type,
 	common_base__FGSchematic__mUnlocks__type,
@@ -491,6 +497,9 @@ export type faux_11__type = class__type & {
 	FGPortableMinerDispenser?: common_base__FGPortableMinerDispenser__type;
 	FGItemDescriptorNuclearFuel_waste?: common_base__FGItemDescriptorNuclearFuel__waste__type;
 	FGItemDescriptorNuclearFuel?: common_base__FGItemDescriptorNuclearFuel__type;
+	FGVehicleDescriptor_powered_no_inventory?: common_base__FGVehicleDescriptor__powered_no_inventory__type;
+	FGVehicleDescriptor_with_inventory?: common_base__FGVehicleDescriptor__with_inventory__type;
+	FGVehicleDescriptor_fueled_with_inventory?: common_base__FGVehicleDescriptor__fueled_with_inventory__type;
 };
 
 export type faux_12__type = class__type & {

diff --git a/generated-types/update8/classes/CoreUObject/FGVehicleDescriptor.ts b/generated-types/update8/classes/CoreUObject/FGVehicleDescriptor.ts
@@ -1,32 +1,36 @@
 import {FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type} from './FGItemDescriptor';
 
 import {
-	decimal_string__type,
-	integer_string__type,
-} from '../../../common/common/scalar';
+	common_base__FGVehicleDescriptor__fueled_with_inventory__type,
+	common_base__FGVehicleDescriptor__powered_no_inventory__type,
+	common_base__FGVehicleDescriptor__with_inventory__type,
+} from '../../../common/classes/CoreUObject/FGVehicleDescriptor';
 
 import {NativeClass__type} from '../../../common/common/unassigned';
 
 export type FGVehicleDescriptor__fueled_with_inventory__type =
-	FGVehicleDescriptor__with_inventory__type & {
-		mFuelConsumption: decimal_string__type;
-	};
+	FGVehicleDescriptor__fueled_with_inventory__merged__type;
+
+export type FGVehicleDescriptor__fueled_with_inventory__merged__type =
+	common_base__FGVehicleDescriptor__fueled_with_inventory__type &
+		FGVehicleDescriptor__with_inventory__type;
 
 export type FGVehicleDescriptor__powered_no_inventory__type =
-	FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-		mPowerConsumption: {
-			Min: decimal_string__type;
-			Max: decimal_string__type;
-		};
-	};
+	FGVehicleDescriptor__powered_no_inventory__merged__type;
+
+export type FGVehicleDescriptor__powered_no_inventory__merged__type =
+	common_base__FGVehicleDescriptor__powered_no_inventory__type &
+		FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 
 export type FGVehicleDescriptor__unfueled_with_inventory__type =
 	FGVehicleDescriptor__with_inventory__type;
 
 export type FGVehicleDescriptor__with_inventory__type =
-	FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-		mInventorySize: integer_string__type;
-	};
+	FGVehicleDescriptor__with_inventory__merged__type;
+
+export type FGVehicleDescriptor__with_inventory__merged__type =
+	common_base__FGVehicleDescriptor__with_inventory__type &
+		FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 
 export type FGVehicleDescriptor__NativeClass =
 	NativeClass__type & {

diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json
@@ -4719,54 +4719,54 @@
 				}
 			}
 		},
+		"FGVehicleDescriptor--powered-no-inventory--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGVehicleDescriptor--powered-no-inventory"
+				},
+				{
+					"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor"
+				}
+			]
+		},
 		"FGVehicleDescriptor--powered-no-inventory": {
 			"type": "object",
-			"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor",
-			"unevaluatedProperties": false,
-			"required": ["mPowerConsumption"],
-			"properties": {
-				"mPowerConsumption": {
-					"type": "string",
-					"minLength": 1,
-					"typed_string": {
-						"required": ["Min", "Max"],
-						"properties": {
-							"Min": {
-								"$ref": "common.schema.json#/$defs/decimal-string"
-							},
-							"Max": {
-								"$ref": "common.schema.json#/$defs/decimal-string"
-							}
-						}
-					}
+			"$ref": "#/$defs/FGVehicleDescriptor--powered-no-inventory--merged",
+			"unevaluatedProperties": false
+		},
+		"FGVehicleDescriptor--with-inventory--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGVehicleDescriptor--with-inventory"
+				},
+				{
+					"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor"
 				}
-			}
+			]
 		},
 		"FGVehicleDescriptor--with-inventory": {
 			"type": "object",
-			"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor",
-			"required": ["mInventorySize"],
-			"properties": {
-				"mInventorySize": {
-					"$ref": "common.schema.json#/$defs/integer-string"
-				}
-			}
+			"$ref": "#/$defs/FGVehicleDescriptor--with-inventory--merged"
 		},
 		"FGVehicleDescriptor--unfueled-with-inventory": {
 			"type": "object",
 			"$ref": "#/$defs/FGVehicleDescriptor--with-inventory",
 			"unevaluatedProperties": false
 		},
+		"FGVehicleDescriptor--fueled-with-inventory--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGVehicleDescriptor--fueled-with-inventory"
+				},
+				{
+					"$ref": "#/$defs/FGVehicleDescriptor--with-inventory"
+				}
+			]
+		},
 		"FGVehicleDescriptor--fueled-with-inventory": {
 			"type": "object",
-			"$ref": "#/$defs/FGVehicleDescriptor--with-inventory",
-			"unevaluatedProperties": false,
-			"required": ["mFuelConsumption"],
-			"properties": {
-				"mFuelConsumption": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				}
-			}
+			"$ref": "#/$defs/FGVehicleDescriptor--fueled-with-inventory--merged",
+			"unevaluatedProperties": false
 		},
 		"FGBuildableFrackingExtractor": {
 			"type": "object",

diff --git a/schema/common.schema.json b/schema/common.schema.json
@@ -4295,6 +4295,48 @@
 				}
 			}
 		},
+		"common-base--FGVehicleDescriptor--powered-no-inventory": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor",
+			"required": ["mPowerConsumption"],
+			"properties": {
+				"mPowerConsumption": {
+					"type": "string",
+					"minLength": 1,
+					"typed_string": {
+						"required": ["Min", "Max"],
+						"properties": {
+							"Min": {
+								"$ref": "common.schema.json#/$defs/decimal-string"
+							},
+							"Max": {
+								"$ref": "common.schema.json#/$defs/decimal-string"
+							}
+						}
+					}
+				}
+			}
+		},
+		"common-base--FGVehicleDescriptor--with-inventory": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor",
+			"required": ["mInventorySize"],
+			"properties": {
+				"mInventorySize": {
+					"$ref": "common.schema.json#/$defs/integer-string"
+				}
+			}
+		},
+		"common-base--FGVehicleDescriptor--fueled-with-inventory": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGVehicleDescriptor--with-inventory",
+			"required": ["mFuelConsumption"],
+			"properties": {
+				"mFuelConsumption": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				}
+			}
+		},
 		"faux-1": {
 			"type": "object",
 			"$ref": "#/$defs/class",
@@ -4690,6 +4732,15 @@
 				},
 				"FGItemDescriptorNuclearFuel": {
 					"$ref": "#/$defs/common-base--FGItemDescriptorNuclearFuel"
+				},
+				"FGVehicleDescriptor_powered_no_inventory": {
+					"$ref": "#/$defs/common-base--FGVehicleDescriptor--powered-no-inventory"
+				},
+				"FGVehicleDescriptor_with_inventory": {
+					"$ref": "#/$defs/common-base--FGVehicleDescriptor--with-inventory"
+				},
+				"FGVehicleDescriptor_fueled_with_inventory": {
+					"$ref": "#/$defs/common-base--FGVehicleDescriptor--fueled-with-inventory"
 				}
 			}
 		},