pulling FGResourceDescriptor into common types

- re: #5
satisfactory-dev · Nov 7, 2024 · 884c46d · 884c46d
1 parent 0a20ca2
commit 884c46d
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 63 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -73,6 +73,7 @@
 	"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__FGRecipe__type": "classes/CoreUObject/FGRecipe",
+	"common_type__common_base__FGResourceDescriptor__type": "classes/CoreUObject/FGResourceDescriptor",
 	"common_type__common_base__FGSchematic__base__type": "classes/CoreUObject/FGSchematic",
 	"common_type__common_base__FGSchematic__base__mSchematicDependencies__mGamePhase__type": "classes/CoreUObject/FGSchematic",
 	"common_type__common_base__FGSchematic__base__mSchematicDependencies__mRequireAllSchematicsToBePurchased__type": "classes/CoreUObject/FGSchematic",

diff --git a/generated-types/1.0/classes/CoreUObject/FGResourceDescriptor.ts b/generated-types/1.0/classes/CoreUObject/FGResourceDescriptor.ts
@@ -1,19 +1,16 @@
 import {FGItemDescriptor__FGResourceDescriptor__type} from './FGItemDescriptor';
 
-import {decimal_string__type} from '../../../common/common/scalar';
+import {common_base__FGResourceDescriptor__type} from '../../../common/classes/CoreUObject/FGResourceDescriptor';
 
-import {
-	color_decimal__type,
-	NativeClass__type,
-} from '../../../common/common/unassigned';
+import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGResourceDescriptor__type =
-	FGItemDescriptor__FGResourceDescriptor__type & {
-		mDecalSize: decimal_string__type;
-		mPingColor: color_decimal__type;
-		mCollectSpeedMultiplier: decimal_string__type;
-		mManualMiningAudioName: 'Metal' | 'Sam';
-	};
+export type FGResourceDescriptor__type = FGResourceDescriptor__merged__type & {
+	mManualMiningAudioName: 'Metal' | 'Sam';
+};
+
+export type FGResourceDescriptor__merged__type =
+	common_base__FGResourceDescriptor__type &
+		FGItemDescriptor__FGResourceDescriptor__type;
 
 export type FGResourceDescriptor__NativeClass =
 	NativeClass__type & {

diff --git a/generated-types/common/classes/CoreUObject/FGResourceDescriptor.ts b/generated-types/common/classes/CoreUObject/FGResourceDescriptor.ts
@@ -0,0 +1,13 @@
+import {decimal_string__type} from '../../common/scalar';
+
+import {color_decimal__type} from '../../common/unassigned';
+
+import {common_base__FGItemDescriptor__FGResourceDescriptor__type} from './FGItemDescriptor';
+
+export type common_base__FGResourceDescriptor__type =
+	common_base__FGItemDescriptor__FGResourceDescriptor__type & {
+		mDecalSize: decimal_string__type;
+		mPingColor: color_decimal__type;
+		mCollectSpeedMultiplier: decimal_string__type;
+		mManualMiningAudioName: Exclude<string, ''>;
+	};
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -78,6 +78,8 @@ import {
 	common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type,
 } from '../classes/CoreUObject/FGItemDescriptor';
 
+import {common_base__FGResourceDescriptor__type} from '../classes/CoreUObject/FGResourceDescriptor';
+
 import {common_base__FGRecipe__type} from '../classes/CoreUObject/FGRecipe';
 
 import {common_base__FGBuildableBlueprintDesigner__type} from '../classes/CoreUObject/FGBuildableBlueprintDesigner';
@@ -275,6 +277,7 @@ export type faux_27__type = class__type & {
 export type faux_28__type = class__type & {
 	faux?: 'FGItemDescriptor--FGResourceDescriptor';
 	ref: common_base__FGItemDescriptor__FGResourceDescriptor__type;
+	resource_descriptor?: common_base__FGResourceDescriptor__type;
 };
 
 export type faux_29__type = class__type & {

diff --git a/generated-types/update8/classes/CoreUObject/FGResourceDescriptor.ts b/generated-types/update8/classes/CoreUObject/FGResourceDescriptor.ts
@@ -1,19 +1,16 @@
 import {FGItemDescriptor__FGResourceDescriptor__type} from './FGItemDescriptor';
 
-import {decimal_string__type} from '../../../common/common/scalar';
+import {common_base__FGResourceDescriptor__type} from '../../../common/classes/CoreUObject/FGResourceDescriptor';
 
-import {
-	color_decimal__type,
-	NativeClass__type,
-} from '../../../common/common/unassigned';
+import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGResourceDescriptor__type =
-	FGItemDescriptor__FGResourceDescriptor__type & {
-		mDecalSize: decimal_string__type;
-		mPingColor: color_decimal__type;
-		mCollectSpeedMultiplier: decimal_string__type;
-		mManualMiningAudioName: 'Metal';
-	};
+export type FGResourceDescriptor__type = FGResourceDescriptor__merged__type & {
+	mManualMiningAudioName: 'Metal';
+};
+
+export type FGResourceDescriptor__merged__type =
+	common_base__FGResourceDescriptor__type &
+		FGItemDescriptor__FGResourceDescriptor__type;
 
 export type FGResourceDescriptor__NativeClass =
 	NativeClass__type & {

diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json
@@ -878,26 +878,22 @@
 			"$ref": "#/$defs/FGBuildableDoor--automated--merged",
 			"unevaluatedProperties": false
 		},
+		"FGResourceDescriptor--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGResourceDescriptor"
+				},
+				{
+					"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor"
+				}
+			]
+		},
 		"FGResourceDescriptor": {
 			"type": "object",
-			"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor",
+			"$ref": "#/$defs/FGResourceDescriptor--merged",
 			"unevaluatedProperties": false,
-			"required": [
-				"mDecalSize",
-				"mPingColor",
-				"mCollectSpeedMultiplier",
-				"mManualMiningAudioName"
-			],
+			"required": ["mManualMiningAudioName"],
 			"properties": {
-				"mDecalSize": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mPingColor": {
-					"$ref": "common.schema.json#/$defs/color-decimal"
-				},
-				"mCollectSpeedMultiplier": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
 				"mManualMiningAudioName": {
 					"type": "string",
 					"enum": ["Metal", "Sam"]

diff --git a/schema/common.schema.json b/schema/common.schema.json
@@ -2100,6 +2100,31 @@
 				}
 			}
 		},
+		"common-base--FGResourceDescriptor": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGItemDescriptor--FGResourceDescriptor",
+			"required": [
+				"mDecalSize",
+				"mPingColor",
+				"mCollectSpeedMultiplier",
+				"mManualMiningAudioName"
+			],
+			"properties": {
+				"mDecalSize": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mPingColor": {
+					"$ref": "common.schema.json#/$defs/color-decimal"
+				},
+				"mCollectSpeedMultiplier": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				},
+				"mManualMiningAudioName": {
+					"type": "string",
+					"minLength": 1
+				}
+			}
+		},
 		"common-base--FGBuildableTradingPost": {
 			"type": "object",
 			"$ref": "common.schema.json#/$defs/common-base--FGBuildable--consumes-power-base",
@@ -2905,6 +2930,9 @@
 				},
 				"ref": {
 					"$ref": "#/$defs/common-base--FGItemDescriptor--FGResourceDescriptor"
+				},
+				"resource_descriptor": {
+					"$ref": "#/$defs/common-base--FGResourceDescriptor"
 				}
 			}
 		},

diff --git a/schema/update8.schema.json b/schema/update8.schema.json
@@ -532,26 +532,22 @@
 			"$ref": "#/$defs/FGBuildableDoor--automated--merged",
 			"unevaluatedProperties": false
 		},
+		"FGResourceDescriptor--merged": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGResourceDescriptor"
+				},
+				{
+					"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor"
+				}
+			]
+		},
 		"FGResourceDescriptor": {
 			"type": "object",
-			"$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor",
+			"$ref": "#/$defs/FGResourceDescriptor--merged",
 			"unevaluatedProperties": false,
-			"required": [
-				"mDecalSize",
-				"mPingColor",
-				"mCollectSpeedMultiplier",
-				"mManualMiningAudioName"
-			],
+			"required": ["mManualMiningAudioName"],
 			"properties": {
-				"mDecalSize": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mPingColor": {
-					"$ref": "common.schema.json#/$defs/color-decimal"
-				},
-				"mCollectSpeedMultiplier": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
 				"mManualMiningAudioName": {
 					"type": "string",
 					"enum": ["Metal"]

diff --git a/types-progress--common.md b/types-progress--common.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (172 of 172)
+100.00% Complete (175 of 175)
 
 ## Basic Types
 
@@ -10,7 +10,7 @@
 -   [x] class--no-description (common type)
 -   [x] class--no-description-or-display-name (common type)
 -   [x] color (common type)
--   [x] color-decimal
+-   [x] color-decimal (common type)
 -   [x] decimal-string (common type)
 -   [x] decimal-string--signed (common type)
 -   [x] empty-object (common type)
@@ -100,10 +100,11 @@
 -   [x] common-base--FGCustomizationRecipe--FGRecipe (common type)
 -   [x] common-base--FGEquipment--base
 -   [x] common-base--FGItemDescriptor--FGBuildingDescriptor--FGResourceDescriptor (common type)
--   [x] common-base--FGItemDescriptor--FGResourceDescriptor
+-   [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--FGRecipe
+-   [x] common-base--FGResourceDescriptor
 -   [x] common-base--FGSchematic--base (common type)
 -   [x] common-base--FGSchematic--base--mSchematicDependencies--mGamePhase
 -   [x] common-base--FGSchematic--base--mSchematicDependencies--mRequireAllSchematicsToBePurchased

diff --git a/types-progress--update8.md b/types-progress--update8.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (277 of 277)
+100.00% Complete (279 of 279)
 
 ## Basic Types
 
@@ -28,7 +28,6 @@
 -   [x] FGPipeHyperStart
 -   [x] FGPoleDescriptor
 -   [x] FGPortableMinerDispenser
--   [x] FGResourceDescriptor
 -   [x] FGSuitBase
 -   [x] integer-string (common type)
 -   [x] integer-string--signed (common type)
@@ -91,6 +90,7 @@
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor (common type)
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor--mSubCategories (common type)
 -   [x] common-base--FGRecipe (common type)
+-   [x] common-base--FGResourceDescriptor (common type)
 -   [x] common-base--FGSchematic--base (common type)
 -   [x] common-base--FGSchematic--base--mSchematicDependencies--mGamePhase (common type)
 -   [x] common-base--FGSchematic--base--mSchematicDependencies--mRequireAllSchematicsToBePurchased (common type)
@@ -335,6 +335,11 @@
 -   [x] FGRecipe
 -   [x] FGRecipe--merged
 
+## FGResourceDescriptor
+
+-   [x] FGResourceDescriptor
+-   [x] FGResourceDescriptor--merged
+
 ## FGSchematic
 
 -   [x] FGSchematic

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 (316 of 316)
+100.00% Complete (318 of 318)
 
 ## Basic Types
 
@@ -26,7 +26,6 @@
 -   [x] FGPoleDescriptor
 -   [x] FGPortableMinerDispenser
 -   [x] FGPowerShardDescriptor
--   [x] FGResourceDescriptor
 -   [x] FGSuitBase
 -   [x] integer-string (common type)
 -   [x] integer-string--signed (common type)
@@ -92,6 +91,7 @@
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor (common type)
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor--mSubCategories (common type)
 -   [x] common-base--FGRecipe (common type)
+-   [x] common-base--FGResourceDescriptor (common type)
 -   [x] common-base--FGSchematic--base (common type)
 -   [x] common-base--FGSchematic--base--mSchematicDependencies--mGamePhase (common type)
 -   [x] common-base--FGSchematic--base--mSchematicDependencies--mRequireAllSchematicsToBePurchased (common type)
@@ -397,6 +397,11 @@
 -   [x] FGRecipe
 -   [x] FGRecipe--merged
 
+## FGResourceDescriptor
+
+-   [x] FGResourceDescriptor
+-   [x] FGResourceDescriptor--merged
+
 ## FGSchematic
 
 -   [x] FGSchematic