pulling in partial FGBuildable common type

- re: re: #4
satisfactory-dev · Oct 22, 2024 · 5fdd135 · 5fdd135
1 parent b220b21
commit 5fdd135
Show file tree

Hide file tree

Showing 11 changed files with 579 additions and 646 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -10,6 +10,7 @@
 	"common_type__class__no_description_or_display_name__type": "common/unassigned",
 	"common_type__color__type": "common/unassigned",
 	"common_type__color_decimal__type": "common/unassigned",
+	"common_type__common_base__FGBuildable__base__type": "common/unassigned",
 	"common_type__common_base__FGBuildingDescriptor__ClassName__type": "common/unassigned",
 	"common_type__common_base__FGBuildingDescriptor__mForm__type": "common/unassigned",
 	"common_type__common_base__FGBuildingDescriptor__mSubCategories__type": "common/unassigned",

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildable.ts b/generated-types/1.0/classes/CoreUObject/FGBuildable.ts
diff --git a/generated-types/common/classes/CoreUObject/FGFauxEntry.ts b/generated-types/common/classes/CoreUObject/FGFauxEntry.ts
@@ -10,6 +10,7 @@ import {
 	common_base__FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type,
 	faux_9__type,
 	faux_10__type,
+	faux_11__type,
 	NativeClass__type,
 } from '../../common/unassigned';
 
@@ -27,6 +28,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & {
 			| common_base__FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type
 			| faux_9__type
 			| faux_10__type
+			| faux_11__type
 		),
 		...(
 			| faux_1__type
@@ -40,6 +42,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & {
 			| common_base__FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type
 			| faux_9__type
 			| faux_10__type
+			| faux_11__type
 		)[],
 	];
 };
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -36,6 +36,61 @@ export type color_decimal__type = {
 	A: decimal_string__type;
 };
 
+export type common_base__FGBuildable__base__type = class__type & {
+	MaxRenderDistance: decimal_string__signed__type;
+	mAlternativeMaterialRecipes:
+		| string
+		| [
+				{
+					mMaterial: Exclude<string, ''>;
+					mRecipe: Exclude<string, ''>;
+				},
+				...{
+					mMaterial: Exclude<string, ''>;
+					mRecipe: Exclude<string, ''>;
+				}[],
+		];
+	mContainsComponents: boolean__type;
+	mIsConsideredForBaseWeightValue: decimal_string__type;
+	mBuildEffectSpeed: decimal_string__type;
+	mAllowColoring: boolean__type;
+	mAllowPatterning: boolean__type;
+	mSkipBuildEffect: boolean__type;
+	mForceNetUpdateOnRegisterPlayer: boolean__type;
+	mToggleDormancyOnInteraction: boolean__type;
+	mIsMultiSpawnedBuildable: boolean__type;
+	mShouldShowAttachmentPointVisuals: boolean__type;
+	mCanContainLightweightInstances: boolean__type;
+	mAffectsOcclusion: boolean__type;
+	mOcclusionShape:
+		| 'ROCS_Box'
+		| 'ROCS_Ramp'
+		| 'ROCS_Box_Special'
+		| 'ROCS_CornerRamp';
+	mScaleCustomOffset: decimal_string__type;
+	mCustomScaleType: 'ROCSS_Center' | 'ROCSS_Top' | 'ROCSS_Bot';
+	mOcclusionBoxInfo:
+		| ''
+		| [
+				{
+					Min: xyz__type;
+					Max: xyz__type;
+					IsValid: boolean__type;
+				},
+				...{
+					Min: xyz__type;
+					Max: xyz__type;
+					IsValid: boolean__type;
+				}[],
+		];
+	mAttachmentPoints: '';
+	mInteractingPlayers: '';
+	mIsUseable: boolean__type;
+	mHideOnBuildEffectStart: boolean__type;
+	mShouldModifyWorldGrid: boolean__type;
+	mBlueprintBuildEffectID?: integer_string__signed__type;
+};
+
 export type common_base__FGBuildingDescriptor__ClassName__type = Exclude<
 	string,
 	| ''
@@ -168,6 +223,11 @@ export type faux_10__type = class__type & {
 	mSubCategories: common_base__FGBuildingDescriptor__mSubCategories__type;
 };
 
+export type faux_11__type = class__type & {
+	faux: 'FGBuildable--base';
+	FGBuildable: common_base__FGBuildable__base__type;
+};
+
 export type faux_2__type = class__type & {
 	faux_bool: boolean__type;
 };

diff --git a/generated-types/update8/classes/CoreUObject/FGBuildable.ts b/generated-types/update8/classes/CoreUObject/FGBuildable.ts
diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json
@@ -89,52 +89,25 @@
 		},
 		"FGBuildable--base": {
 			"type": "object",
-			"$ref": "common.schema.json#/$defs/class",
+			"$ref": "common.schema.json#/$defs/common-base--FGBuildable--base",
 			"required": [
-				"MaxRenderDistance",
-				"mAlternativeMaterialRecipes",
-				"mContainsComponents",
-				"mIsConsideredForBaseWeightValue",
 				"bForceLegacyBuildEffect",
 				"bForceBuildEffectSolo",
-				"mBuildEffectSpeed",
-				"mAllowColoring",
-				"mAllowPatterning",
 				"mInteractionRegisterPlayerWithCircuit",
-				"mSkipBuildEffect",
-				"mForceNetUpdateOnRegisterPlayer",
-				"mToggleDormancyOnInteraction",
-				"mIsMultiSpawnedBuildable",
-				"mShouldShowAttachmentPointVisuals",
-				"mCanContainLightweightInstances",
 				"mManagedByLightweightBuildableSubsystem",
 				"mRemoveBuildableFromSubsystemOnDismantle",
 				"mHasBeenRemovedFromSubsystem",
-				"mAffectsOcclusion",
-				"mOcclusionShape",
-				"mScaleCustomOffset",
-				"mCustomScaleType",
-				"mOcclusionBoxInfo",
-				"mAttachmentPoints",
 				"mReplicatedBuiltInsideBlueprintDesigner",
-				"mInteractingPlayers",
-				"mIsUseable",
 				"mClearanceData",
-				"mHideOnBuildEffectStart",
-				"mShouldModifyWorldGrid",
 				"mTimelapseBucketId",
 				"mTimelapseDelay",
 				"mAlienOverClockingZOffset",
 				"mAlienOverClockingAttenuationScalingFactor",
 				"mAlienOverClockingVolumeDB_RTPC",
 				"mAlienOverClockingHighpass_RTPC",
-				"mAlienOverClockingPitch_RTPC",
-				"mBlueprintBuildEffectID"
+				"mAlienOverClockingPitch_RTPC"
 			],
 			"properties": {
-				"MaxRenderDistance": {
-					"$ref": "common.schema.json#/$defs/decimal-string--signed"
-				},
 				"mAlternativeMaterialRecipes": {
 					"oneOf": [
 						{
@@ -244,27 +217,12 @@
 						}
 					]
 				},
-				"mContainsComponents": {
-					"$ref": "common.schema.json#/$defs/boolean"
-				},
-				"mIsConsideredForBaseWeightValue": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
 				"bForceLegacyBuildEffect": {
 					"$ref": "common.schema.json#/$defs/boolean"
 				},
 				"bForceBuildEffectSolo": {
 					"$ref": "common.schema.json#/$defs/boolean"
 				},
-				"mBuildEffectSpeed": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mAllowColoring": {
-					"$ref": "common.schema.json#/$defs/boolean"
-				},
-				"mAllowPatterning": {
-					"$ref": "common.schema.json#/$defs/boolean"
-				},
 				"mInteractionRegisterPlayerWithCircuit": {
 					"$ref": "common.schema.json#/$defs/boolean"
 				},
@@ -283,9 +241,6 @@
 				"mShouldShowAttachmentPointVisuals": {
 					"$ref": "common.schema.json#/$defs/boolean"
 				},
-				"mCanContainLightweightInstances": {
-					"$ref": "common.schema.json#/$defs/boolean"
-				},
 				"mManagedByLightweightBuildableSubsystem": {
 					"$ref": "common.schema.json#/$defs/boolean"
 				},
@@ -295,81 +250,12 @@
 				"mHasBeenRemovedFromSubsystem": {
 					"$ref": "common.schema.json#/$defs/boolean"
 				},
-				"mAffectsOcclusion": {
-					"$ref": "common.schema.json#/$defs/boolean"
-				},
-				"mOcclusionShape": {
-					"type": "string",
-					"enum": [
-						"ROCS_Box",
-						"ROCS_Ramp",
-						"ROCS_Box_Special",
-						"ROCS_CornerRamp"
-					]
-				},
-				"mScaleCustomOffset": {
-					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mCustomScaleType": {
-					"type": "string",
-					"enum": ["ROCSS_Center", "ROCSS_Top", "ROCSS_Bot"]
-				},
-				"mOcclusionBoxInfo": {
-					"oneOf": [
-						{
-							"type": "string",
-							"const": ""
-						},
-						{
-							"type": "string",
-							"minLength": 1,
-							"typed_string": {
-								"minItems": 1,
-								"items": {
-									"type": "string",
-									"minLength": 1,
-									"typed_string": {
-										"required": ["Min", "Max", "IsValid"],
-										"properties": {
-											"Min": {
-												"$ref": "common.schema.json#/$defs/xyz"
-											},
-											"Max": {
-												"$ref": "common.schema.json#/$defs/xyz"
-											},
-											"IsValid": {
-												"$ref": "common.schema.json#/$defs/boolean"
-											}
-										}
-									}
-								}
-							}
-						}
-					]
-				},
-				"mAttachmentPoints": {
-					"type": "string",
-					"const": ""
-				},
 				"mReplicatedBuiltInsideBlueprintDesigner": {
 					"$ref": "common.schema.json#/$defs/boolean"
 				},
-				"mInteractingPlayers": {
-					"type": "string",
-					"const": ""
-				},
-				"mIsUseable": {
-					"$ref": "common.schema.json#/$defs/boolean"
-				},
 				"mClearanceData": {
 					"$ref": "#/$defs/mClearanceData"
 				},
-				"mHideOnBuildEffectStart": {
-					"$ref": "common.schema.json#/$defs/boolean"
-				},
-				"mShouldModifyWorldGrid": {
-					"$ref": "common.schema.json#/$defs/boolean"
-				},
 				"mTimelapseBucketId": {
 					"$ref": "common.schema.json#/$defs/integer-string"
 				},
@@ -390,9 +276,6 @@
 				},
 				"mAlienOverClockingPitch_RTPC": {
 					"$ref": "common.schema.json#/$defs/decimal-string"
-				},
-				"mBlueprintBuildEffectID": {
-					"$ref": "common.schema.json#/$defs/integer-string--signed"
 				}
 			}
 		},