adding pole descriptor to common types

- re: #5
satisfactory-dev · Nov 7, 2024 · 52a7cbe · 52a7cbe
1 parent 7af910e
commit 52a7cbe
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 104 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -73,6 +73,7 @@
 	"common_type__common_base__FGItemDescriptor__FGResourceDescriptor__type": "classes/CoreUObject/FGItemDescriptor",
 	"common_type__common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type": "classes/CoreUObject/FGItemDescriptor",
 	"common_type__common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__mSubCategories__type": "classes/CoreUObject/FGItemDescriptor",
+	"common_type__common_base__FGPoleDescriptor__type": "classes/CoreUObject/FGPoleDescriptor",
 	"common_type__common_base__FGRecipe__type": "classes/CoreUObject/FGRecipe",
 	"common_type__common_base__FGResourceDescriptor__type": "classes/CoreUObject/FGResourceDescriptor",
 	"common_type__common_base__FGSchematic__base__type": "classes/CoreUObject/FGSchematic",

diff --git a/generated-types/1.0/classes/CoreUObject/FGPoleDescriptor.ts b/generated-types/1.0/classes/CoreUObject/FGPoleDescriptor.ts
@@ -1,27 +1,14 @@
-import {UnrealEngineString} from '../../utils/validators';
-
 import {FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type} from './FGItemDescriptor';
 
+import {common_base__FGPoleDescriptor__type} from '../../../common/classes/CoreUObject/FGPoleDescriptor';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGPoleDescriptor__type =
-	FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-		mForm: 'RF_INVALID';
-		mSubCategories: [
-			UnrealEngineString<
-				'/Script/Engine.BlueprintGeneratedClass',
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_ConverPole.SC_ConverPole_C'
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_PipeSupport.SC_PipeSupport_C'
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_HyperTubes.SC_HyperTubes_C'
-			>,
-			...UnrealEngineString<
-				'/Script/Engine.BlueprintGeneratedClass',
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_ConverPole.SC_ConverPole_C'
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_PipeSupport.SC_PipeSupport_C'
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_HyperTubes.SC_HyperTubes_C'
-			>[],
-		];
-	};
+export type FGPoleDescriptor__type = FGPoleDescriptor__merged__type;
+
+export type FGPoleDescriptor__merged__type =
+	common_base__FGPoleDescriptor__type &
+		FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 
 export type FGPoleDescriptor__NativeClass = NativeClass__type & {
 	Classes: [FGPoleDescriptor__type, ...FGPoleDescriptor__type[]];

diff --git a/generated-types/common/classes/CoreUObject/FGPoleDescriptor.ts b/generated-types/common/classes/CoreUObject/FGPoleDescriptor.ts
@@ -0,0 +1,22 @@
+import {UnrealEngineString} from '../../utils/validators';
+
+import {common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type} from './FGItemDescriptor';
+
+export type common_base__FGPoleDescriptor__type =
+	common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
+		mForm: 'RF_INVALID';
+		mSubCategories: [
+			UnrealEngineString<
+				'/Script/Engine.BlueprintGeneratedClass',
+				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_ConverPole.SC_ConverPole_C'
+				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_PipeSupport.SC_PipeSupport_C'
+				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_HyperTubes.SC_HyperTubes_C'
+			>,
+			...UnrealEngineString<
+				'/Script/Engine.BlueprintGeneratedClass',
+				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_ConverPole.SC_ConverPole_C'
+				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_PipeSupport.SC_PipeSupport_C'
+				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_HyperTubes.SC_HyperTubes_C'
+			>[],
+		];
+	};
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -99,6 +99,8 @@ import {
 
 import {common_base__FGBuildableRailroadTrack__type} from '../classes/CoreUObject/FGBuildableRailroadTrack';
 
+import {common_base__FGPoleDescriptor__type} from '../classes/CoreUObject/FGPoleDescriptor';
+
 export type class__type = class__no_description__type & {
 	mDescription: string;
 };
@@ -343,8 +345,9 @@ export type faux_9__type = class__type & {
 };
 
 export type faux_9b__type = class__type & {
-	faux: 'common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor';
-	FGPoleDescriptor: common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
+	faux: 'stashing all the remaining descriptors here';
+	FGItemDescriptor_FGResourceDescriptor_FGPoleDescriptor?: common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
+	FGPoleDescriptor?: common_base__FGPoleDescriptor__type;
 };
 
 export type InfinityExtrap__type = 'RCCE_Constant';

diff --git a/generated-types/update8/classes/CoreUObject/FGPoleDescriptor.ts b/generated-types/update8/classes/CoreUObject/FGPoleDescriptor.ts
@@ -1,27 +1,14 @@
-import {UnrealEngineString} from '../../utils/validators';
-
 import {FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type} from './FGItemDescriptor';
 
+import {common_base__FGPoleDescriptor__type} from '../../../common/classes/CoreUObject/FGPoleDescriptor';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGPoleDescriptor__type =
-	FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-		mForm: 'RF_INVALID';
-		mSubCategories: [
-			UnrealEngineString<
-				'/Script/Engine.BlueprintGeneratedClass',
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_ConverPole.SC_ConverPole_C'
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_PipeSupport.SC_PipeSupport_C'
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_HyperTubes.SC_HyperTubes_C'
-			>,
-			...UnrealEngineString<
-				'/Script/Engine.BlueprintGeneratedClass',
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_ConverPole.SC_ConverPole_C'
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_PipeSupport.SC_PipeSupport_C'
-				| '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_HyperTubes.SC_HyperTubes_C'
-			>[],
-		];
-	};
+export type FGPoleDescriptor__type = FGPoleDescriptor__merged__type;
+
+export type FGPoleDescriptor__merged__type =
+	common_base__FGPoleDescriptor__type &
+		FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 
 export type FGPoleDescriptor__NativeClass = NativeClass__type & {
 	Classes: [FGPoleDescriptor__type, ...FGPoleDescriptor__type[]];

diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json
@@ -985,35 +985,20 @@
 			"$ref": "#/$defs/FGBuildablePoleLightweight--merged",
 			"unevaluatedProperties": false
 		},
-		"FGPoleDescriptor": {
-			"type": "object",
-			"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor",
-			"unevaluatedProperties": false,
-			"required": ["mSubCategories", "mForm"],
-			"properties": {
-				"mForm": {
-					"type": "string",
-					"const": "RF_INVALID"
+		"FGPoleDescriptor--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGPoleDescriptor"
 				},
-				"mSubCategories": {
-					"type": "string",
-					"minLength": 1,
-					"typed_string": {
-						"minItems": 1,
-						"items": {
-							"type": "string",
-							"minLength": 1,
-							"UnrealEngineString": {
-								"right": [
-									"/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_ConverPole.SC_ConverPole_C",
-									"/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_PipeSupport.SC_PipeSupport_C",
-									"/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_HyperTubes.SC_HyperTubes_C"
-								]
-							}
-						}
-					}
+				{
+					"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor"
 				}
-			}
+			]
+		},
+		"FGPoleDescriptor": {
+			"type": "object",
+			"$ref": "#/$defs/FGPoleDescriptor--merged",
+			"unevaluatedProperties": false
 		},
 		"FGBuildableConveyorBelt--base": {
 			"type": "object",

diff --git a/schema/common.schema.json b/schema/common.schema.json
@@ -1244,6 +1244,35 @@
 				}
 			}
 		},
+		"common-base--FGPoleDescriptor": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor",
+			"required": ["mSubCategories", "mForm"],
+			"properties": {
+				"mForm": {
+					"type": "string",
+					"const": "RF_INVALID"
+				},
+				"mSubCategories": {
+					"type": "string",
+					"minLength": 1,
+					"typed_string": {
+						"minItems": 1,
+						"items": {
+							"type": "string",
+							"minLength": 1,
+							"UnrealEngineString": {
+								"right": [
+									"/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_ConverPole.SC_ConverPole_C",
+									"/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_PipeSupport.SC_PipeSupport_C",
+									"/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_HyperTubes.SC_HyperTubes_C"
+								]
+							}
+						}
+					}
+				}
+			}
+		},
 		"common-base--FGBuildable--pipeline-accessory--base": {
 			"type": "object",
 			"$ref": "common.schema.json#/$defs/common-base--FGBuildable--consumes-power-base",
@@ -2612,15 +2641,18 @@
 		"faux-9b": {
 			"type": "object",
 			"$ref": "#/$defs/class",
-			"required": ["faux", "FGPoleDescriptor"],
+			"required": ["faux"],
 			"unevaluatedProperties": false,
 			"properties": {
 				"faux": {
 					"type": "string",
-					"const": "common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor"
+					"const": "stashing all the remaining descriptors here"
 				},
-				"FGPoleDescriptor": {
+				"FGItemDescriptor_FGResourceDescriptor_FGPoleDescriptor": {
 					"$ref": "#/$defs/common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor"
+				},
+				"FGPoleDescriptor": {
+					"$ref": "#/$defs/common-base--FGPoleDescriptor"
 				}
 			}
 		},

diff --git a/schema/update8.schema.json b/schema/update8.schema.json
@@ -676,35 +676,20 @@
 			"$ref": "#/$defs/FGBuildablePoleLightweight--merged",
 			"unevaluatedProperties": false
 		},
-		"FGPoleDescriptor": {
-			"type": "object",
-			"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor",
-			"unevaluatedProperties": false,
-			"required": ["mSubCategories", "mForm"],
-			"properties": {
-				"mForm": {
-					"type": "string",
-					"const": "RF_INVALID"
+		"FGPoleDescriptor--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGPoleDescriptor"
 				},
-				"mSubCategories": {
-					"type": "string",
-					"minLength": 1,
-					"typed_string": {
-						"minItems": 1,
-						"items": {
-							"type": "string",
-							"minLength": 1,
-							"UnrealEngineString": {
-								"right": [
-									"/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_ConverPole.SC_ConverPole_C",
-									"/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_PipeSupport.SC_PipeSupport_C",
-									"/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_HyperTubes.SC_HyperTubes_C"
-								]
-							}
-						}
-					}
+				{
+					"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor"
 				}
-			}
+			]
+		},
+		"FGPoleDescriptor": {
+			"type": "object",
+			"$ref": "#/$defs/FGPoleDescriptor--merged",
+			"unevaluatedProperties": false
 		},
 		"FGBuildableConveyorBelt--base": {
 			"type": "object",

diff --git a/types-progress--common.md b/types-progress--common.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (177 of 177)
+100.00% Complete (178 of 178)
 
 ## Basic Types
 
@@ -105,6 +105,7 @@
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor (common type)
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor (common type)
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor--mSubCategories (common type)
+-   [x] common-base--FGPoleDescriptor
 -   [x] common-base--FGRecipe
 -   [x] common-base--FGResourceDescriptor
 -   [x] common-base--FGSchematic--base (common type)

diff --git a/types-progress--update8.md b/types-progress--update8.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (281 of 281)
+100.00% Complete (283 of 283)
 
 ## Basic Types
 
@@ -26,7 +26,6 @@
 -   [x] FGObjectScanner
 -   [x] FGParachute
 -   [x] FGPipeHyperStart
--   [x] FGPoleDescriptor
 -   [x] FGPortableMinerDispenser
 -   [x] FGSuitBase
 -   [x] integer-string (common type)
@@ -90,6 +89,7 @@
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor (common type)
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor (common type)
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor--mSubCategories (common type)
+-   [x] common-base--FGPoleDescriptor (common type)
 -   [x] common-base--FGRecipe (common type)
 -   [x] common-base--FGResourceDescriptor (common type)
 -   [x] common-base--FGSchematic--base (common type)
@@ -335,6 +335,11 @@
 -   [x] FGItemDescriptor--FGResourceDescriptor
 -   [x] FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor
 
+## FGPoleDescriptor
+
+-   [x] FGPoleDescriptor
+-   [x] FGPoleDescriptor--merged
+
 ## FGRecipe
 
 -   [x] FGRecipe

diff --git a/types-progress--version_1_0_0_4.md b/types-progress--version_1_0_0_4.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (320 of 320)
+100.00% Complete (322 of 322)
 
 ## Basic Types
 
@@ -23,7 +23,6 @@
 -   [x] FGJetPack
 -   [x] FGObjectScanner
 -   [x] FGPipeHyperStart
--   [x] FGPoleDescriptor
 -   [x] FGPortableMinerDispenser
 -   [x] FGPowerShardDescriptor
 -   [x] FGSuitBase
@@ -91,6 +90,7 @@
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor (common type)
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor (common type)
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor--mSubCategories (common type)
+-   [x] common-base--FGPoleDescriptor (common type)
 -   [x] common-base--FGRecipe (common type)
 -   [x] common-base--FGResourceDescriptor (common type)
 -   [x] common-base--FGSchematic--base (common type)
@@ -397,6 +397,11 @@
 -   [x] FGParachute--mEquipMontage
 -   [x] FGParachute--mUnEquipMontage
 
+## FGPoleDescriptor
+
+-   [x] FGPoleDescriptor
+-   [x] FGPoleDescriptor--merged
+
 ## FGRecipe
 
 -   [x] FGRecipe