pulling base wall type into common types

- re: #5
satisfactory-dev · Nov 5, 2024 · b86c794 · b86c794
1 parent b1edcb4
commit b86c794
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 23 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -56,6 +56,7 @@
 	"common_type__common_base__FGBuildablePipeReservoir__type": "classes/CoreUObject/FGBuildablePipeReservoir",
 	"common_type__common_base__FGBuildablePoleLightweight__type": "classes/CoreUObject/FGBuildablePoleLightweight",
 	"common_type__common_base__FGBuildableTradingPost__type": "classes/CoreUObject/FGBuildableTradingPost",
+	"common_type__common_base__FGBuildableWall__base__type": "classes/CoreUObject/FGBuildableWall",
 	"common_type__common_base__FGBuildingDescriptor__type": "classes/CoreUObject/FGBuildingDescriptor",
 	"common_type__common_base__FGBuildingDescriptor__ClassName__type": "classes/CoreUObject/FGBuildingDescriptor",
 	"common_type__common_base__FGBuildingDescriptor__mForm__type": "classes/CoreUObject/FGBuildingDescriptor",

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableWall.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableWall.ts
@@ -6,11 +6,13 @@ import {FGBuildable__base__type} from './FGBuildable';
 
 import {decimal_string__type} from '../../../common/common/scalar';
 
+import {common_base__FGBuildableWall__base__type} from '../../../common/classes/CoreUObject/FGBuildableWall';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGBuildableWall__base__type = FGBuildable__base__type & {
-	mHeight: decimal_string__type;
-};
+export type FGBuildableWall__base__type =
+	common_base__FGBuildableWall__base__type &
+		FGBuildable__base__type;
 
 export type FGBuildableWall__base__rectangle__type =
 	FGBuildableWall__base__type & {

diff --git a/generated-types/common/classes/CoreUObject/FGBuildableWall.ts b/generated-types/common/classes/CoreUObject/FGBuildableWall.ts
@@ -0,0 +1,8 @@
+import {decimal_string__type} from '../../common/scalar';
+
+import {common_base__FGBuildable__base__type} from './FGBuildable';
+
+export type common_base__FGBuildableWall__base__type =
+	common_base__FGBuildable__base__type & {
+		mHeight: decimal_string__type;
+	};
diff --git a/generated-types/common/classes/CoreUObject/FGFauxEntry.ts b/generated-types/common/classes/CoreUObject/FGFauxEntry.ts
@@ -32,6 +32,7 @@ import {
 	faux_29__type,
 	faux_30__type,
 	faux_31__type,
+	faux_32__type,
 	NativeClass__type,
 } from '../../common/unassigned';
 
@@ -77,6 +78,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & {
 			| faux_29__type
 			| faux_30__type
 			| faux_31__type
+			| faux_32__type
 		),
 		...(
 			| faux_1__type
@@ -114,6 +116,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & {
 			| faux_29__type
 			| faux_30__type
 			| faux_31__type
+			| faux_32__type
 		)[],
 	];
 };
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -81,6 +81,8 @@ import {common_base__FGRecipe__type} from '../classes/CoreUObject/FGRecipe';
 
 import {common_base__FGBuildableBlueprintDesigner__type} from '../classes/CoreUObject/FGBuildableBlueprintDesigner';
 
+import {common_base__FGBuildableWall__base__type} from '../classes/CoreUObject/FGBuildableWall';
+
 export type class__type = class__no_description__type & {
 	mDescription: string;
 };
@@ -282,6 +284,11 @@ export type faux_31__type = class__type & {
 	ref: common_base__FGSchematic__mUnlocks_Class__type;
 };
 
+export type faux_32__type = class__type & {
+	faux?: 'FGBuildableWall--base';
+	ref: common_base__FGBuildableWall__base__type;
+};
+
 export type faux_4__type = class__type & {
 	faux_texture: Texture2D__type;
 };

diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableWall.ts b/generated-types/update8/classes/CoreUObject/FGBuildableWall.ts
@@ -6,11 +6,13 @@ import {FGBuildable__base__type} from './FGBuildable';
 
 import {decimal_string__type} from '../../../common/common/scalar';
 
+import {common_base__FGBuildableWall__base__type} from '../../../common/classes/CoreUObject/FGBuildableWall';
+
 import {NativeClass__type} from '../../../common/common/unassigned';
 
-export type FGBuildableWall__base__type = FGBuildable__base__type & {
-	mHeight: decimal_string__type;
-};
+export type FGBuildableWall__base__type =
+	common_base__FGBuildableWall__base__type &
+		FGBuildable__base__type;
 
 export type FGBuildableWall__base__rectangle__type =
 	FGBuildableWall__base__type & {

diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json
@@ -817,14 +817,14 @@
 			}
 		},
 		"FGBuildableWall--base": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--base",
-			"required": ["mHeight", "mDisplayName", "mDescription"],
-			"properties": {
-				"mHeight": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWall--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
 				}
-			}
+			]
 		},
 		"FGBuildableWall--base--rectangle": {
 			"type": "object",

diff --git a/schema/common.schema.json b/schema/common.schema.json
@@ -1964,6 +1964,16 @@
 				}
 			]
 		},
+		"common-base--FGBuildableWall--base": {
+			"type": "object",
+			"$ref": "common.schema.json#/$defs/common-base--FGBuildable--base",
+			"required": ["mHeight", "mDisplayName", "mDescription"],
+			"properties": {
+				"mHeight": {
+					"$ref": "common.schema.json#/$defs/decimal-string"
+				}
+			}
+		},
 		"common-base--FGBuildableTradingPost": {
 			"type": "object",
 			"$ref": "common.schema.json#/$defs/common-base--FGBuildable--consumes-power-base",
@@ -2813,6 +2823,20 @@
 					"$ref": "#/$defs/common-base--FGSchematic--mUnlocks_Class"
 				}
 			}
+		},
+		"faux-32": {
+			"type": "object",
+			"$ref": "#/$defs/class",
+			"required": ["ref"],
+			"properties": {
+				"faux": {
+					"type": "string",
+					"const": "FGBuildableWall--base"
+				},
+				"ref": {
+					"$ref": "#/$defs/common-base--FGBuildableWall--base"
+				}
+			}
 		}
 	},
 	"items": false,
@@ -3004,6 +3028,11 @@
 								"type": "object",
 								"$ref": "#/$defs/faux-31",
 								"unevaluatedProperties": false
+							},
+							{
+								"type": "object",
+								"$ref": "#/$defs/faux-32",
+								"unevaluatedProperties": false
 							}
 						]
 					}

diff --git a/schema/update8.schema.json b/schema/update8.schema.json
@@ -471,14 +471,14 @@
 			}
 		},
 		"FGBuildableWall--base": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--base",
-			"required": ["mHeight", "mDisplayName", "mDescription"],
-			"properties": {
-				"mHeight": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWall--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
 				}
-			}
+			]
 		},
 		"FGBuildableWall--base--rectangle": {
 			"type": "object",

diff --git a/types-progress--common.md b/types-progress--common.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (160 of 160)
+100.00% Complete (162 of 162)
 
 ## Basic Types
 
@@ -40,6 +40,7 @@
 -   [x] faux-3
 -   [x] faux-30
 -   [x] faux-31
+-   [x] faux-32
 -   [x] faux-4
 -   [x] faux-5
 -   [x] faux-6
@@ -86,6 +87,7 @@
 -   [x] common-base--FGBuildablePipeReservoir
 -   [x] common-base--FGBuildablePoleLightweight
 -   [x] common-base--FGBuildableTradingPost
+-   [x] common-base--FGBuildableWall--base
 -   [x] common-base--FGBuildingDescriptor
 -   [x] common-base--FGBuildingDescriptor--ClassName (common type)
 -   [x] common-base--FGBuildingDescriptor--mForm (common type)

diff --git a/types-progress--update8.md b/types-progress--update8.md
@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (266 of 266)
+100.00% Complete (267 of 267)
 
 ## Basic Types
 
@@ -74,6 +74,7 @@
 -   [x] common-base--FGBuildablePipeReservoir (common type)
 -   [x] common-base--FGBuildablePoleLightweight (common type)
 -   [x] common-base--FGBuildableTradingPost (common type)
+-   [x] common-base--FGBuildableWall--base (common type)
 -   [x] common-base--FGBuildingDescriptor (common type)
 -   [x] common-base--FGBuildingDescriptor--ClassName (common type)
 -   [x] common-base--FGBuildingDescriptor--mForm (common type)

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 (305 of 305)
+100.00% Complete (306 of 306)
 
 ## Basic Types
 
@@ -75,6 +75,7 @@
 -   [x] common-base--FGBuildablePipeReservoir (common type)
 -   [x] common-base--FGBuildablePoleLightweight (common type)
 -   [x] common-base--FGBuildableTradingPost (common type)
+-   [x] common-base--FGBuildableWall--base (common type)
 -   [x] common-base--FGBuildingDescriptor (common type)
 -   [x] common-base--FGBuildingDescriptor--ClassName (common type)
 -   [x] common-base--FGBuildingDescriptor--mForm (common type)