adding equipment descriptors to common types

- re: #5
satisfactory-dev · Nov 10, 2024 · b4c819e · b4c819e
1 parent 7a96111
commit b4c819e
Show file tree

Hide file tree

Showing 11 changed files with 129 additions and 27 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -77,6 +77,8 @@
 	"common_type__common_base__FGChainsaw__type": "classes/CoreUObject/FGChainsaw",
 	"common_type__common_base__FGCustomizationRecipe__FGRecipe__type": "classes/CoreUObject/FGCustomizationRecipe",
 	"common_type__common_base__FGEquipment__base__type": "classes/CoreUObject/FGEquipment",
+	"common_type__common_base__FGEquipmentDescriptor__type": "classes/CoreUObject/FGEquipmentDescriptor",
+	"common_type__common_base__FGEquipmentDescriptor__base__type": "classes/CoreUObject/FGEquipmentDescriptor",
 	"common_type__common_base__FGEquipmentStunSpear__type": "classes/CoreUObject/FGEquipmentStunSpear",
 	"common_type__common_base__FGEquipmentStunSpear__base__type": "classes/CoreUObject/FGEquipmentStunSpear",
 	"common_type__common_base__FGEquipmentStunSpear__xeno_zapper__type": "classes/CoreUObject/FGEquipmentStunSpear",

diff --git a/generated-types/1.0/classes/CoreUObject/FGEquipmentDescriptor.ts b/generated-types/1.0/classes/CoreUObject/FGEquipmentDescriptor.ts
@@ -3,16 +3,25 @@ import {
 	FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type,
 } from './FGItemDescriptor';
 
-import {integer_string__type} from '../../../common/common/scalar';
+import {
+	common_base__FGEquipmentDescriptor__base__type,
+	common_base__FGEquipmentDescriptor__type,
+} from '../../../common/classes/CoreUObject/FGEquipmentDescriptor';
 
 import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGEquipmentDescriptor__type = FGEquipmentDescriptor__base__type;
+export type FGEquipmentDescriptor__type = FGEquipmentDescriptor__merged__type;
 
 export type FGEquipmentDescriptor__base__type =
-	FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-		mResourceSinkPoints: integer_string__type;
-	};
+	FGEquipmentDescriptor__base__merged__type;
+
+export type FGEquipmentDescriptor__base__merged__type =
+	common_base__FGEquipmentDescriptor__base__type &
+		FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
+
+export type FGEquipmentDescriptor__merged__type =
+	common_base__FGEquipmentDescriptor__type &
+		FGEquipmentDescriptor__base__type;
 
 export type FGEquipmentDescriptor__NativeClass =
 	NativeClass__type & {

diff --git a/generated-types/common/classes/CoreUObject/FGEquipmentDescriptor.ts b/generated-types/common/classes/CoreUObject/FGEquipmentDescriptor.ts
@@ -0,0 +1,11 @@
+import {integer_string__type} from '../../common/scalar';
+
+import {common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type} from './FGItemDescriptor';
+
+export type common_base__FGEquipmentDescriptor__type =
+	common_base__FGEquipmentDescriptor__base__type;
+
+export type common_base__FGEquipmentDescriptor__base__type =
+	common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
+		mResourceSinkPoints: integer_string__type;
+	};
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -136,6 +136,11 @@ import {common_base__FGBuildablePowerPole__type} from '../classes/CoreUObject/FG
 
 import {common_base__FGPoleDescriptor__type} from '../classes/CoreUObject/FGPoleDescriptor';
 
+import {
+	common_base__FGEquipmentDescriptor__base__type,
+	common_base__FGEquipmentDescriptor__type,
+} from '../classes/CoreUObject/FGEquipmentDescriptor';
+
 export type class__type = class__no_description__type & {
 	mDescription: string;
 };
@@ -413,6 +418,8 @@ export type faux_9b__type = class__type & {
 	faux: 'stashing all the remaining descriptors here';
 	FGItemDescriptor_FGResourceDescriptor_FGPoleDescriptor?: common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 	FGPoleDescriptor?: common_base__FGPoleDescriptor__type;
+	FGEquipmentDescriptor_base?: common_base__FGEquipmentDescriptor__base__type;
+	FGEquipmentDescriptor?: common_base__FGEquipmentDescriptor__type;
 };
 
 export type InfinityExtrap__type = 'RCCE_Constant';

diff --git a/generated-types/update8/classes/CoreUObject/FGEquipmentDescriptor.ts b/generated-types/update8/classes/CoreUObject/FGEquipmentDescriptor.ts
@@ -3,16 +3,25 @@ import {
 	FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type,
 } from './FGItemDescriptor';
 
-import {integer_string__type} from '../../../common/common/scalar';
+import {
+	common_base__FGEquipmentDescriptor__base__type,
+	common_base__FGEquipmentDescriptor__type,
+} from '../../../common/classes/CoreUObject/FGEquipmentDescriptor';
 
 import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGEquipmentDescriptor__type = FGEquipmentDescriptor__base__type;
+export type FGEquipmentDescriptor__type = FGEquipmentDescriptor__merged__type;
 
 export type FGEquipmentDescriptor__base__type =
-	FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-		mResourceSinkPoints: integer_string__type;
-	};
+	FGEquipmentDescriptor__base__merged__type;
+
+export type FGEquipmentDescriptor__base__merged__type =
+	common_base__FGEquipmentDescriptor__base__type &
+		FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
+
+export type FGEquipmentDescriptor__merged__type =
+	common_base__FGEquipmentDescriptor__type &
+		FGEquipmentDescriptor__base__type;
 
 export type FGEquipmentDescriptor__NativeClass =
 	NativeClass__type & {

diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json
@@ -3554,19 +3554,33 @@
 				}
 			}
 		},
+		"FGEquipmentDescriptor--base--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGEquipmentDescriptor--base"
+				},
+				{
+					"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor"
+				}
+			]
+		},
 		"FGEquipmentDescriptor--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor",
-			"required": ["mResourceSinkPoints"],
-			"properties": {
-				"mResourceSinkPoints": {
-					"$ref": "common.schema.json#/$defs/integer-string"
+			"$ref": "#/$defs/FGEquipmentDescriptor--base--merged"
+		},
+		"FGEquipmentDescriptor--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGEquipmentDescriptor"
+				},
+				{
+					"$ref": "#/$defs/FGEquipmentDescriptor--base"
 				}
-			}
+			]
 		},
 		"FGEquipmentDescriptor": {
 			"type": "object",
-			"$ref": "#/$defs/FGEquipmentDescriptor--base",
+			"$ref": "#/$defs/FGEquipmentDescriptor--merged",
 			"unevaluatedProperties": false
 		},
 		"FGConsumableDescriptor--base": {

diff --git a/schema/common.schema.json b/schema/common.schema.json
@@ -3051,6 +3051,20 @@
 				}
 			}
 		},
+		"common-base--FGEquipmentDescriptor--base": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor",
+			"required": ["mResourceSinkPoints"],
+			"properties": {
+				"mResourceSinkPoints": {
+					"$ref": "common.schema.json#/$defs/integer-string"
+				}
+			}
+		},
+		"common-base--FGEquipmentDescriptor": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGEquipmentDescriptor--base"
+		},
 		"faux-1": {
 			"type": "object",
 			"$ref": "#/$defs/class",
@@ -3224,6 +3238,12 @@
 				},
 				"FGPoleDescriptor": {
 					"$ref": "#/$defs/common-base--FGPoleDescriptor"
+				},
+				"FGEquipmentDescriptor_base": {
+					"$ref": "#/$defs/common-base--FGEquipmentDescriptor--base"
+				},
+				"FGEquipmentDescriptor": {
+					"$ref": "#/$defs/common-base--FGEquipmentDescriptor"
 				}
 			}
 		},

diff --git a/schema/update8.schema.json b/schema/update8.schema.json
@@ -1327,19 +1327,33 @@
 				}
 			}
 		},
+		"FGEquipmentDescriptor--base--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGEquipmentDescriptor--base"
+				},
+				{
+					"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor"
+				}
+			]
+		},
 		"FGEquipmentDescriptor--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor",
-			"required": ["mResourceSinkPoints"],
-			"properties": {
-				"mResourceSinkPoints": {
-					"$ref": "common.schema.json#/$defs/integer-string"
+			"$ref": "#/$defs/FGEquipmentDescriptor--base--merged"
+		},
+		"FGEquipmentDescriptor--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGEquipmentDescriptor"
+				},
+				{
+					"$ref": "#/$defs/FGEquipmentDescriptor--base"
 				}
-			}
+			]
 		},
 		"FGEquipmentDescriptor": {
 			"type": "object",
-			"$ref": "#/$defs/FGEquipmentDescriptor--base",
+			"$ref": "#/$defs/FGEquipmentDescriptor--merged",
 			"unevaluatedProperties": false
 		},
 		"FGConsumableDescriptor--base": {

diff --git a/types-progress--common.md b/types-progress--common.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (206 of 206)
+100.00% Complete (209 of 209)
 
 ## Basic Types
 
@@ -109,6 +109,8 @@
 -   [x] common-base--FGChainsaw
 -   [x] common-base--FGCustomizationRecipe--FGRecipe (common type)
 -   [x] common-base--FGEquipment--base (common type)
+-   [x] common-base--FGEquipmentDescriptor
+-   [x] common-base--FGEquipmentDescriptor--base (common type)
 -   [x] common-base--FGEquipmentStunSpear
 -   [x] common-base--FGEquipmentStunSpear--base (common type)
 -   [x] common-base--FGEquipmentStunSpear--xeno-zapper

diff --git a/types-progress--update8.md b/types-progress--update8.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (318 of 318)
+100.00% Complete (322 of 322)
 
 ## Basic Types
 
@@ -81,6 +81,8 @@
 -   [x] common-base--FGChainsaw (common type)
 -   [x] common-base--FGCustomizationRecipe--FGRecipe (common type)
 -   [x] common-base--FGEquipment--base (common type)
+-   [x] common-base--FGEquipmentDescriptor (common type)
+-   [x] common-base--FGEquipmentDescriptor--base (common type)
 -   [x] common-base--FGEquipmentStunSpear (common type)
 -   [x] common-base--FGEquipmentStunSpear--base (common type)
 -   [x] common-base--FGEquipmentStunSpear--xeno-zapper (common type)
@@ -350,6 +352,11 @@
 -   [x] FGEquipment--placeable
 -   [x] FGEquipmentDescriptor--base
 
+## FGEquipmentDescriptor
+
+-   [x] FGEquipmentDescriptor--base--merged
+-   [x] FGEquipmentDescriptor--merged
+
 ## FGEquipmentStunSpear
 
 -   [x] FGEquipmentStunSpear--base

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 (357 of 357)
+100.00% Complete (361 of 361)
 
 ## Basic Types
 
@@ -87,6 +87,8 @@
 -   [x] common-base--FGChainsaw (common type)
 -   [x] common-base--FGCustomizationRecipe--FGRecipe (common type)
 -   [x] common-base--FGEquipment--base (common type)
+-   [x] common-base--FGEquipmentDescriptor (common type)
+-   [x] common-base--FGEquipmentDescriptor--base (common type)
 -   [x] common-base--FGEquipmentStunSpear (common type)
 -   [x] common-base--FGEquipmentStunSpear--base (common type)
 -   [x] common-base--FGEquipmentStunSpear--xeno-zapper (common type)
@@ -389,6 +391,11 @@
 -   [x] FGEquipment--placeable
 -   [x] FGEquipmentDescriptor--base
 
+## FGEquipmentDescriptor
+
+-   [x] FGEquipmentDescriptor--base--merged
+-   [x] FGEquipmentDescriptor--merged
+
 ## FGEquipmentStunSpear
 
 -   [x] FGEquipmentStunSpear--base