@satisfactory-dev/docs.json.ts 0.15.0 → 0.16.1

package/schema/1.0.schema.json

@@ -7,6 +7,25 @@
 			"type": "string",
 			"enum": ["GT_NORMAL", "GT_ENERGY"]
 		},
+		"mClassToScanFor": {
+			"oneOf": [
+				{
+					"$ref": "common.schema.json#/$defs/None"
+				},
+				{
+					"type": "string",
+					"string_starts_with": "/Game/FactoryGame/Resource/Environment/"
+				},
+				{
+					"type": "string",
+					"string_starts_with": "/Game/FactoryGame/World/Benefit/"
+				},
+				{
+					"type": "string",
+					"string_starts_with": "/Game/FactoryGame/Prototype/WAT/"
+				}
+			]
+		},
 		"FGItemDescriptor--FGBuildingDescriptor--FGResourceDescriptor": {
 			"type": "object",
 			"$ref": "common.schema.json#/$defs/common-base--FGItemDescriptor--FGBuildingDescriptor--FGResourceDescriptor",
@@ -21,23 +40,7 @@
 					"$ref": "#/$defs/mGasType"
 				},
 				"mClassToScanFor": {
-					"oneOf": [
-						{
-							"$ref": "common.schema.json#/$defs/None"
-						},
-						{
-							"type": "string",
-							"string_starts_with": "/Game/FactoryGame/Resource/Environment/"
-						},
-						{
-							"type": "string",
-							"string_starts_with": "/Game/FactoryGame/World/Benefit/"
-						},
-						{
-							"type": "string",
-							"string_starts_with": "/Game/FactoryGame/Prototype/WAT/"
-						}
-					]
+					"$ref": "#/$defs/mClassToScanFor"
 				},
 				"mIsAlienItem": {
 					"$ref": "common.schema.json#/$defs/boolean"
@@ -363,7 +366,7 @@
 				}
 			}
 		},
-		"FGBuildableDroneStation--merged": {
+		"FGBuildableDroneStation": {
 			"allOf": [
 				{
 					"$ref": "#/$defs/FGBuildableDroneStation--version-1"
@@ -373,11 +376,6 @@
 				}
 			]
 		},
-		"FGBuildableDroneStation": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableDroneStation--merged",
-			"unevaluatedProperties": false
-		},
 		"FGCustomizationRecipe--FGRecipe": {
 			"type": "object",
 			"$ref": "common.schema.json#/$defs/common-base--FGCustomizationRecipe--FGRecipe",
@@ -493,7 +491,6 @@
 		"FGBuildableBlueprintDesigner--mk1": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableBlueprintDesigner--base",
-			"unevaluatedProperties": false,
 			"properties": {
 				"ClassName": {
 					"type": "string",
@@ -508,7 +505,6 @@
 		"FGBuildableBlueprintDesigner--mk2": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableBlueprintDesigner--base",
-			"unevaluatedProperties": false,
 			"properties": {
 				"ClassName": {
 					"type": "string",
@@ -523,7 +519,6 @@
 		"FGBuildableBlueprintDesigner--mk3": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableBlueprintDesigner--base",
-			"unevaluatedProperties": false,
 			"properties": {
 				"ClassName": {
 					"type": "string",
@@ -611,12 +606,67 @@
 				}
 			}
 		},
-		"FGSchematic--base": {
+		"mStatisticGameplayTag": {
+			"type": "string",
+			"minLength": 1,
+			"typed_string": {
+				"required": ["TagName"],
+				"properties": {
+					"TagName": {
+						"type": "string",
+						"enum": [
+							"Stats.Gameplay.Schematics.Schematic2-5",
+							"Stats.Gameplay.Schematics.Schematic3-1",
+							"Stats.Gameplay.Schematics.Schematic9-2",
+							"Stats.Gameplay.Schematics.Schematic9-1",
+							"Stats.Gameplay.Schematics.Schematic5-1",
+							"Stats.Gameplay.Schematics.Schematic3-4",
+							"Stats.Gameplay.Schematics.Schematic5-4",
+							"Stats.Gameplay.Schematics.Schematic7-1",
+							"Stats.Gameplay.Schematics.Schematic4-1",
+							"Stats.Gameplay.Schematics.Schematic5-2",
+							"Stats.Gameplay.Schematics.Schematic2-1",
+							"Stats.Gameplay.Schematics.Schematic8-5",
+							"Stats.Gameplay.Schematics.Schematic7-5",
+							"Stats.Gameplay.Schematics.Schematic8-1",
+							"Stats.Gameplay.Schematics.Schematic8-2",
+							"Stats.Gameplay.Schematics.Schematic7-4",
+							"Stats.Gameplay.Schematics.Schematic7-2",
+							"Stats.Gameplay.Schematics.Schematic8-4",
+							"Stats.Gameplay.Schematics.Schematic9-5",
+							"Stats.Gameplay.Schematics.Schematic9-4",
+							"Stats.Gameplay.Schematics.Schematic9-3",
+							"Stats.Gameplay.Schematics.Schematic8-3",
+							"Stats.Gameplay.Schematics.Schematic7-3",
+							"Stats.Gameplay.Schematics.Schematic6-7",
+							"Stats.Gameplay.Schematics.Schematic6-6",
+							"Stats.Gameplay.Schematics.Schematic6-5",
+							"Stats.Gameplay.Schematics.Schematic6-3",
+							"Stats.Gameplay.Schematics.Schematic6-2",
+							"Stats.Gameplay.Schematics.Schematic6-1",
+							"Stats.Gameplay.Schematics.Schematic5-5",
+							"Stats.Gameplay.Schematics.Schematic5-3",
+							"Stats.Gameplay.Schematics.Schematic4-5",
+							"Stats.Gameplay.Schematics.Schematic4-4",
+							"Stats.Gameplay.Schematics.Schematic4-3",
+							"Stats.Gameplay.Schematics.Schematic4-2",
+							"Stats.Gameplay.Schematics.Schematic3-3",
+							"Stats.Gameplay.Schematics.Schematic3-2",
+							"Stats.Gameplay.Schematics.Schematic2-3",
+							"Stats.Gameplay.Schematics.Schematic2-2",
+							"Stats.Gameplay.Schematics.Schematic1-3",
+							"Stats.Gameplay.Schematics.Schematic1-2",
+							"Stats.Gameplay.Schematics.Schematic1-1"
+						]
+					}
+				}
+			}
+		},
+		"FGSchematic--base--properties": {
 			"type": "object",
 			"$ref": "common.schema.json#/$defs/common-base--FGSchematic--base",
 			"required": [
 				"mType",
-				"mStatisticGameplayTag",
 				"mSchematicUnlockTag",
 				"mUnlocks",
 				"mSchematicDependencies"
@@ -635,67 +685,6 @@
 						"EST_Tutorial"
 					]
 				},
-				"mStatisticGameplayTag": {
-					"oneOf": [
-						{"$ref": "common.schema.json#/$defs/empty-object"},
-						{
-							"type": "string",
-							"minLength": 1,
-							"typed_string": {
-								"required": ["TagName"],
-								"properties": {
-									"TagName": {
-										"type": "string",
-										"enum": [
-											"Stats.Gameplay.Schematics.Schematic2-5",
-											"Stats.Gameplay.Schematics.Schematic3-1",
-											"Stats.Gameplay.Schematics.Schematic9-2",
-											"Stats.Gameplay.Schematics.Schematic9-1",
-											"Stats.Gameplay.Schematics.Schematic5-1",
-											"Stats.Gameplay.Schematics.Schematic3-4",
-											"Stats.Gameplay.Schematics.Schematic5-4",
-											"Stats.Gameplay.Schematics.Schematic7-1",
-											"Stats.Gameplay.Schematics.Schematic4-1",
-											"Stats.Gameplay.Schematics.Schematic5-2",
-											"Stats.Gameplay.Schematics.Schematic2-1",
-											"Stats.Gameplay.Schematics.Schematic8-5",
-											"Stats.Gameplay.Schematics.Schematic7-5",
-											"Stats.Gameplay.Schematics.Schematic8-1",
-											"Stats.Gameplay.Schematics.Schematic8-2",
-											"Stats.Gameplay.Schematics.Schematic7-4",
-											"Stats.Gameplay.Schematics.Schematic7-2",
-											"Stats.Gameplay.Schematics.Schematic8-4",
-											"Stats.Gameplay.Schematics.Schematic9-5",
-											"Stats.Gameplay.Schematics.Schematic9-4",
-											"Stats.Gameplay.Schematics.Schematic9-3",
-											"Stats.Gameplay.Schematics.Schematic8-3",
-											"Stats.Gameplay.Schematics.Schematic7-3",
-											"Stats.Gameplay.Schematics.Schematic6-7",
-											"Stats.Gameplay.Schematics.Schematic6-6",
-											"Stats.Gameplay.Schematics.Schematic6-5",
-											"Stats.Gameplay.Schematics.Schematic6-3",
-											"Stats.Gameplay.Schematics.Schematic6-2",
-											"Stats.Gameplay.Schematics.Schematic6-1",
-											"Stats.Gameplay.Schematics.Schematic5-5",
-											"Stats.Gameplay.Schematics.Schematic5-3",
-											"Stats.Gameplay.Schematics.Schematic4-5",
-											"Stats.Gameplay.Schematics.Schematic4-4",
-											"Stats.Gameplay.Schematics.Schematic4-3",
-											"Stats.Gameplay.Schematics.Schematic4-2",
-											"Stats.Gameplay.Schematics.Schematic3-3",
-											"Stats.Gameplay.Schematics.Schematic3-2",
-											"Stats.Gameplay.Schematics.Schematic2-3",
-											"Stats.Gameplay.Schematics.Schematic2-2",
-											"Stats.Gameplay.Schematics.Schematic1-3",
-											"Stats.Gameplay.Schematics.Schematic1-2",
-											"Stats.Gameplay.Schematics.Schematic1-1"
-										]
-									}
-								}
-							}
-						}
-					]
-				},
 				"mSchematicUnlockTag": {
 					"oneOf": [
 						{"$ref": "common.schema.json#/$defs/empty-object"},
@@ -774,24 +763,27 @@
 		},
 		"FGSchematic": {
 			"type": "object",
-			"$ref": "#/$defs/FGSchematic--base",
-			"unevaluatedProperties": false
+			"$ref": "#/$defs/FGSchematic--base--properties",
+			"required": ["mStatisticGameplayTag"],
+			"properties": {
+				"mStatisticGameplayTag": {
+					"oneOf": [
+						{"$ref": "common.schema.json#/$defs/empty-object"},
+						{"$ref": "#/$defs/mStatisticGameplayTag"}
+					]
+				}
+			}
 		},
-		"FGSchematic--with-unlocks--merged": {
+		"FGSchematic--with-unlocks": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGSchematic--with-unlocks"
 				},
 				{
-					"$ref": "#/$defs/FGSchematic--base"
+					"$ref": "#/$defs/FGSchematic"
 				}
 			]
 		},
-		"FGSchematic--with-unlocks": {
-			"type": "object",
-			"$ref": "#/$defs/FGSchematic--with-unlocks--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableWall--base": {
 			"allOf": [
 				{
@@ -802,7 +794,7 @@
 				}
 			]
 		},
-		"FGBuildableWall--base--rectangle": {
+		"FGBuildableWallLightweight": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWall--base--rectangle"
@@ -812,12 +804,7 @@
 				}
 			]
 		},
-		"FGBuildableWallLightweight": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableWall--base--rectangle",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableCornerWall--merged": {
+		"FGBuildableCornerWall": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableCornerWall"
@@ -827,22 +814,17 @@
 				}
 			]
 		},
-		"FGBuildableCornerWall": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableCornerWall--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableDoor--base": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableDoor--base"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableWall--base--rectangle"
+					"$ref": "#/$defs/FGBuildableWallLightweight"
 				}
 			]
 		},
-		"FGBuildableDoor--merged": {
+		"FGBuildableDoor": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableDoor"
@@ -852,12 +834,7 @@
 				}
 			]
 		},
-		"FGBuildableDoor": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableDoor--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableDoor--automated--merged": {
+		"FGBuildableDoor--automated": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableDoor--automated"
@@ -867,11 +844,6 @@
 				}
 			]
 		},
-		"FGBuildableDoor--automated": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableDoor--automated--merged",
-			"unevaluatedProperties": false
-		},
 		"FGResourceDescriptor--merged": {
 			"allOf": [
 				{
@@ -894,7 +866,7 @@
 				}
 			}
 		},
-		"FGBuildableRailroadTrack--merged": {
+		"FGBuildableRailroadTrack": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableRailroadTrack"
@@ -904,12 +876,7 @@
 				}
 			]
 		},
-		"FGBuildableRailroadTrack": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableRailroadTrack--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildable--occupied--merged": {
+		"FGBuildable--occupied--final": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildable--occupied"
@@ -919,12 +886,7 @@
 				}
 			]
 		},
-		"FGBuildable--occupied--final": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--occupied--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildable--tiered--merged": {
+		"FGBuildable--tiered": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildable--tiered"
@@ -934,12 +896,7 @@
 				}
 			]
 		},
-		"FGBuildable--tiered": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--tiered--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildable--pole--base--no-static--merged": {
+		"FGBuildable--pole--base--no-static": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildable--pole--base--no-static"
@@ -949,22 +906,17 @@
 				}
 			]
 		},
-		"FGBuildable--pole--base--no-static": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--pole--base--no-static--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildable--pole--base--with-static--merged": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildable--pole--base--with-static"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--pole--base--no-static--merged"
+					"$ref": "#/$defs/FGBuildable--pole--base--no-static"
 				}
 			]
 		},
-		"FGBuildablePoleLightweight--merged": {
+		"FGBuildablePoleLightweight": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePoleLightweight"
@@ -974,12 +926,7 @@
 				}
 			]
 		},
-		"FGBuildablePoleLightweight": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildablePoleLightweight--merged",
-			"unevaluatedProperties": false
-		},
-		"FGPoleDescriptor--merged": {
+		"FGPoleDescriptor": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGPoleDescriptor"
@@ -989,11 +936,6 @@
 				}
 			]
 		},
-		"FGPoleDescriptor": {
-			"type": "object",
-			"$ref": "#/$defs/FGPoleDescriptor--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableConveyorBelt--base--merged": {
 			"allOf": [
 				{
@@ -1036,26 +978,18 @@
 				}
 			]
 		},
-		"FGBuildableConveyorBelt": {
+		"FGBuildableConveyorBelt--pre-1.1": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableConveyorBelt--merged",
-			"unevaluatedProperties": false,
 			"required": ["mMeshLength", "mSplineData", "mCustomSkins"]
 		},
-		"FGBuildableConveyorLift--merged": {
-			"allOf": [
-				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildableConveyorLift"
-				},
-				{
-					"$ref": "#/$defs/FGBuildableConveyorBelt--base"
-				}
-			]
+		"FGBuildableConveyorBelt": {
+			"type": "object",
+			"$ref": "#/$defs/FGBuildableConveyorBelt--pre-1.1",
+			"unevaluatedProperties": false
 		},
-		"FGBuildableConveyorLift": {
+		"FGBuildableConveyorLift--properties": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableConveyorLift--merged",
-			"unevaluatedProperties": false,
 			"required": ["mFlipMeshOnReverse", "mOpposingConnectionClearance"],
 			"properties": {
 				"mFlipMeshOnReverse": {
@@ -1066,25 +1000,23 @@
 				}
 			}
 		},
-		"FGBuildableWire--merged": {
+		"FGBuildableConveyorLift": {
 			"allOf": [
 				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWire"
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableConveyorLift"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--base"
+					"$ref": "#/$defs/FGBuildableConveyorBelt--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableConveyorLift--properties"
 				}
 			]
 		},
 		"FGBuildableWire": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableWire--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildablePowerPole--merged": {
 			"allOf": [
 				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePowerPole"
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWire"
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--base"
@@ -1092,9 +1024,14 @@
 			]
 		},
 		"FGBuildablePowerPole": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildablePowerPole--merged",
-			"unevaluatedProperties": false
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePowerPole"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				}
+			]
 		},
 		"FGBuildableTradingPost--version-1": {
 			"type": "object",
@@ -1185,7 +1122,7 @@
 				}
 			}
 		},
-		"FGBuildableTradingPost--merged": {
+		"FGBuildableTradingPost": {
 			"allOf": [
 				{
 					"$ref": "#/$defs/FGBuildableTradingPost--version-1"
@@ -1195,11 +1132,6 @@
 				}
 			]
 		},
-		"FGBuildableTradingPost": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableTradingPost--merged",
-			"unevaluatedProperties": false
-		},
 		"FGEquipment--base": {
 			"type": "object",
 			"$ref": "common.schema.json#/$defs/common-base--FGEquipment--base",
@@ -2512,20 +2444,9 @@
 				}
 			}
 		},
-		"FGSuitBase--merged": {
-			"allOf": [
-				{
-					"$ref": "common.schema.json#/$defs/common-base--FGSuitBase"
-				},
-				{
-					"$ref": "#/$defs/FGEquipment--base"
-				}
-			]
-		},
-		"FGSuitBase": {
+		"FGSuitBase--1.0--pre-1.1": {
 			"type": "object",
-			"$ref": "#/$defs/FGSuitBase--merged",
-			"unevaluatedProperties": false,
+			"$ref": "common.schema.json#/$defs/common-base--FGSuitBase",
 			"required": ["mSuitMeshMaterials"],
 			"properties": {
 				"mSuitMeshMaterials": {
@@ -2575,6 +2496,44 @@
 						}
 					}
 				},
+				"mStingerMontage": {
+					"$ref": "common.schema.json#/$defs/empty-object"
+				},
+				"mUnEquipMontage": {
+					"type": "string",
+					"minLength": 1,
+					"typed_string": {
+						"required": ["AudioEvent"],
+						"properties": {
+							"AudioEvent": {
+								"type": "string",
+								"minLength": 1,
+								"UnrealEngineString": {
+									"left": "/Script/AkAudio.AkAudioEvent",
+									"right": {
+										"starts_with": "/Game/WwiseAudio/Events/Equipment/HazmatSuit/"
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		},
+		"FGSuitBase--1.0--mEquipMontage--Montages--AudioEvent": {
+			"type": "string",
+			"minLength": 1,
+			"UnrealEngineString": {
+				"left": "/Script/AkAudio.AkAudioEvent",
+				"right": {
+					"starts_with": "/Game/WwiseAudio/Events/Equipment/HazmatSuit/"
+				}
+			}
+		},
+		"FGSuitBase--1.0": {
+			"type": "object",
+			"$ref": "#/$defs/FGSuitBase--1.0--pre-1.1",
+			"properties": {
 				"mEquipMontage": {
 					"type": "string",
 					"minLength": 1,
@@ -2594,14 +2553,7 @@
 											"required": ["AudioEvent"],
 											"properties": {
 												"AudioEvent": {
-													"type": "string",
-													"minLength": 1,
-													"UnrealEngineString": {
-														"left": "/Script/AkAudio.AkAudioEvent",
-														"right": {
-															"starts_with": "/Game/WwiseAudio/Events/Equipment/HazmatSuit/"
-														}
-													}
+													"$ref": "#/$defs/FGSuitBase--1.0--mEquipMontage--Montages--AudioEvent"
 												}
 											}
 										}
@@ -2610,31 +2562,19 @@
 							}
 						}
 					}
-				},
-				"mStingerMontage": {
-					"$ref": "common.schema.json#/$defs/empty-object"
-				},
-				"mUnEquipMontage": {
-					"type": "string",
-					"minLength": 1,
-					"typed_string": {
-						"required": ["AudioEvent"],
-						"properties": {
-							"AudioEvent": {
-								"type": "string",
-								"minLength": 1,
-								"UnrealEngineString": {
-									"left": "/Script/AkAudio.AkAudioEvent",
-									"right": {
-										"starts_with": "/Game/WwiseAudio/Events/Equipment/HazmatSuit/"
-									}
-								}
-							}
-						}
-					}
 				}
 			}
 		},
+		"FGSuitBase": {
+			"allOf": [
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				},
+				{
+					"$ref": "#/$defs/FGSuitBase--1.0"
+				}
+			]
+		},
 		"FGGasMask--mUnEquipMontage": {
 			"type": "string",
 			"minLength": 1,
@@ -2770,7 +2710,6 @@
 		"FGChainsaw": {
 			"type": "object",
 			"$ref": "#/$defs/FGChainsaw--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"StartUpToIdleID",
 				"mChainsawEngageMontage",
@@ -3917,7 +3856,7 @@
 			"$ref": "#/$defs/FGConsumableDescriptor--healing--base",
 			"unevaluatedProperties": false
 		},
-		"FGBuildablePillarLightweight--merged": {
+		"FGBuildablePillarLightweight": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePillarLightweight"
@@ -3927,12 +3866,7 @@
 				}
 			]
 		},
-		"FGBuildablePillarLightweight": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildablePillarLightweight--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableFactory--jump-pad--merged": {
+		"FGBuildableFactory--jump-pad": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableFactory--jump-pad"
@@ -3942,12 +3876,7 @@
 				}
 			]
 		},
-		"FGBuildableFactory--jump-pad": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableFactory--jump-pad--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableFactory--landing-pad--merged": {
+		"FGBuildableFactory--landing-pad": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableFactory--landing-pad"
@@ -3957,12 +3886,7 @@
 				}
 			]
 		},
-		"FGBuildableFactory--landing-pad": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableFactory--landing-pad--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableWalkway--base--merged": {
+		"FGBuildableWalkway--base": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWalkway--base"
@@ -3972,11 +3896,7 @@
 				}
 			]
 		},
-		"FGBuildableWalkway--base": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableWalkway--base--merged"
-		},
-		"FGBuildableWalkwayLightweight--merged": {
+		"FGBuildableWalkwayLightweight": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWalkwayLightweight"
@@ -3986,12 +3906,7 @@
 				}
 			]
 		},
-		"FGBuildableWalkwayLightweight": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableWalkwayLightweight--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableWalkway--merged": {
+		"FGBuildableWalkway": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWalkway"
@@ -4001,12 +3916,7 @@
 				}
 			]
 		},
-		"FGBuildableWalkway": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableWalkway--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableGenerator--base--merged": {
+		"FGBuildableGenerator--base": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableGenerator--base"
@@ -4016,10 +3926,6 @@
 				}
 			]
 		},
-		"FGBuildableGenerator--base": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableGenerator--base--merged"
-		},
 		"FGBuildableGeneratorFuel--base--merged": {
 			"allOf": [
 				{
@@ -4041,7 +3947,7 @@
 				}
 			}
 		},
-		"FGBuildableGeneratorFuel--solid--merged": {
+		"FGBuildableGeneratorFuel--solid": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableGeneratorFuel--solid"
@@ -4051,11 +3957,6 @@
 				}
 			]
 		},
-		"FGBuildableGeneratorFuel--solid": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableGeneratorFuel--solid--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableGeneratorFuel--liquid--merged": {
 			"allOf": [
 				{
@@ -4069,7 +3970,6 @@
 		"FGBuildableGeneratorFuel--liquid": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableGeneratorFuel--liquid--merged",
-			"unevaluatedProperties": false,
 			"required": ["mDefaultFuelClasses", "mFuel"],
 			"properties": {
 				"mDefaultFuelClasses": {
@@ -4141,7 +4041,6 @@
 		"FGBuildableGeneratorFuel--biogen": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableGeneratorFuel--biogen--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"mDefaultFuelClasses",
 				"mFuel",
@@ -4206,7 +4105,7 @@
 				}
 			}
 		},
-		"FGBuildableGeneratorGeoThermal--merged": {
+		"FGBuildableGeneratorGeoThermal": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableGeneratorGeoThermal"
@@ -4216,11 +4115,6 @@
 				}
 			]
 		},
-		"FGBuildableGeneratorGeoThermal": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableGeneratorGeoThermal--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableGeneratorNuclear--mFuel--FicsoniumFuelRod": {
 			"type": "object",
 			"unevaluatedProperties": false,
@@ -4241,20 +4135,8 @@
 				}
 			}
 		},
-		"FGBuildableGeneratorNuclear--merged": {
-			"allOf": [
-				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildableGeneratorNuclear"
-				},
-				{
-					"$ref": "#/$defs/FGBuildableGeneratorFuel--base"
-				}
-			]
-		},
-		"FGBuildableGeneratorNuclear": {
+		"FGBuildableGeneratorNuclear--properties": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableGeneratorNuclear--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"mDefaultFuelClasses",
 				"mFuel",
@@ -4295,10 +4177,21 @@
 				}
 			}
 		},
-		"FGBuildablePipelineSupport": {
+		"FGBuildableGeneratorNuclear": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableGeneratorNuclear"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableGeneratorFuel--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableGeneratorNuclear--properties"
+				}
+			]
+		},
+		"FGBuildablePipelineSupport--properties": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--pole--base--with-static--merged",
-			"unevaluatedProperties": false,
 			"required": ["mLength", "mVerticalAngle"],
 			"properties": {
 				"mLength": {
@@ -4309,20 +4202,18 @@
 				}
 			}
 		},
-		"FGBuildablePipeline--merged": {
+		"FGBuildablePipelineSupport": {
 			"allOf": [
 				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePipeline"
+					"$ref": "#/$defs/FGBuildable--pole--base--with-static--merged"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--base"
+					"$ref": "#/$defs/FGBuildablePipelineSupport--properties"
 				}
 			]
 		},
-		"FGBuildablePipeline": {
+		"FGBuildablePipeline--properties": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildablePipeline--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"mSoundSplineComponentEmitterInterval",
 				"mLastElapsedTime",
@@ -4344,6 +4235,19 @@
 				}
 			}
 		},
+		"FGBuildablePipeline": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePipeline"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildablePipeline--properties"
+				}
+			]
+		},
 		"FGBuildable--pipeline-accessory--base": {
 			"allOf": [
 				{
@@ -4399,7 +4303,7 @@
 				}
 			}
 		},
-		"FGBuildablePipelinePump--merged": {
+		"FGBuildablePipelinePump": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePipelinePump"
@@ -4409,12 +4313,7 @@
 				}
 			]
 		},
-		"FGBuildablePipelinePump": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildablePipelinePump--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildablePipelinePump--valve--merged": {
+		"FGBuildablePipelinePump--valve": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePipelinePump--valve"
@@ -4424,12 +4323,7 @@
 				}
 			]
 		},
-		"FGBuildablePipelinePump--valve": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildablePipelinePump--valve--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildablePipeReservoir--merged": {
+		"FGBuildablePipeReservoir": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePipeReservoir"
@@ -4439,11 +4333,6 @@
 				}
 			]
 		},
-		"FGBuildablePipeReservoir": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildablePipeReservoir--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildable--extractor-base--shared--merged": {
 			"allOf": [
 				{
@@ -4472,7 +4361,7 @@
 			"type": "object",
 			"$ref": "#/$defs/FGBuildable--extractor-base--merged"
 		},
-		"FGBuildableWaterPump--merged": {
+		"FGBuildableWaterPump": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableWaterPump"
@@ -4482,25 +4371,8 @@
 				}
 			]
 		},
-		"FGBuildableWaterPump": {
+		"FGBuildableResourceSink--properties": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableWaterPump--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableResourceSink--merged": {
-			"allOf": [
-				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildableResourceSink"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--consumes-power-base"
-				}
-			]
-		},
-		"FGBuildableResourceSink": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableResourceSink--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"IsAnimationProducing",
 				"EnableTickGrinder",
@@ -4534,20 +4406,28 @@
 				}
 			}
 		},
-		"FGBuildableResourceSinkShop--merged": {
+		"FGBuildableResourceSink": {
 			"allOf": [
 				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildableResourceSinkShop"
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableResourceSink"
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--consumes-power-base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableResourceSink--properties"
 				}
 			]
 		},
 		"FGBuildableResourceSinkShop": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableResourceSinkShop--merged",
-			"unevaluatedProperties": false
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableResourceSinkShop"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--consumes-power-base"
+				}
+			]
 		},
 		"FGItemDescriptorBiomass--merged": {
 			"allOf": [
@@ -4564,7 +4444,7 @@
 			"$ref": "#/$defs/FGItemDescriptorBiomass--merged",
 			"unevaluatedProperties": false
 		},
-		"FGBuildableResourceExtractor--oil-extractor--merged": {
+		"FGBuildableResourceExtractor--oil-extractor": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableResourceExtractor--oil-extractor"
@@ -4574,11 +4454,6 @@
 				}
 			]
 		},
-		"FGBuildableResourceExtractor--oil-extractor": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableResourceExtractor--oil-extractor--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableResourceExtractor--miner--base--merged": {
 			"allOf": [
 				{
@@ -4600,7 +4475,7 @@
 				}
 			}
 		},
-		"FGBuildableResourceExtractor--miner--merged": {
+		"FGBuildableResourceExtractor--miner": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableResourceExtractor--miner"
@@ -4610,15 +4485,9 @@
 				}
 			]
 		},
-		"FGBuildableResourceExtractor--miner": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableResourceExtractor--miner--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableResourceExtractor--miner-mk1": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableResourceExtractor--miner--base",
-			"unevaluatedProperties": false,
 			"required": ["InternalStartUpTimer"],
 			"properties": {
 				"InternalStartUpTimer": {
@@ -4626,7 +4495,7 @@
 				}
 			}
 		},
-		"FGBuildableResourceExtractor--miner-mk3--merged": {
+		"FGBuildableResourceExtractor--miner-mk3": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableResourceExtractor--miner-mk3"
@@ -4636,11 +4505,6 @@
 				}
 			]
 		},
-		"FGBuildableResourceExtractor--miner-mk3": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableResourceExtractor--miner-mk3--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableManufacturer--base--merged": {
 			"allOf": [
 				{
@@ -4655,25 +4519,10 @@
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableManufacturer--base--merged"
 		},
-		"FGBuildableManufacturer--merged": {
-			"allOf": [
-				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildableManufacturer"
-				},
-				{
-					"$ref": "#/$defs/FGBuildableManufacturer--base"
-				}
-			]
-		},
 		"FGBuildableManufacturer": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableManufacturer--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableManufacturer--packager--merged": {
 			"allOf": [
 				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildableManufacturer--packager"
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableManufacturer"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base"
@@ -4681,14 +4530,9 @@
 			]
 		},
 		"FGBuildableManufacturer--packager": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableManufacturer--packager--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableManufacturer--blender--merged": {
 			"allOf": [
 				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildableManufacturer--blender"
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableManufacturer--packager"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base"
@@ -4696,14 +4540,9 @@
 			]
 		},
 		"FGBuildableManufacturer--blender": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableManufacturer--blender--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableManufacturer--smelter--merged": {
 			"allOf": [
 				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildableManufacturer--smelter"
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableManufacturer--blender"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base"
@@ -4711,24 +4550,17 @@
 			]
 		},
 		"FGBuildableManufacturer--smelter": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableManufacturer--smelter--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableManufacturer--constructor--merged": {
 			"allOf": [
 				{
-					"$ref": "common.schema.json#/$defs/common-base--FGBuildableManufacturer--constructor"
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableManufacturer--smelter"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base"
 				}
 			]
 		},
-		"FGBuildableManufacturer--constructor": {
+		"FGBuildableManufacturer--constructor--properties": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableManufacturer--constructor--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"mAOAttenuationScalingFactor",
 				"mAOLayerZOffset",
@@ -4754,6 +4586,19 @@
 				}
 			}
 		},
+		"FGBuildableManufacturer--constructor": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGBuildableManufacturer--constructor"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableManufacturer--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableManufacturer--constructor--properties"
+				}
+			]
+		},
 		"FGBuildableManufacturerVariablePower--base--merged": {
 			"allOf": [
 				{
@@ -4778,7 +4623,7 @@
 				}
 			}
 		},
-		"FGBuildableManufacturerVariablePower--HadronCollider--merged": {
+		"FGBuildableManufacturerVariablePower--HadronCollider": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableManufacturerVariablePower--HadronCollider"
@@ -4788,11 +4633,6 @@
 				}
 			]
 		},
-		"FGBuildableManufacturerVariablePower--HadronCollider": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableManufacturerVariablePower--HadronCollider--merged",
-			"unevaluatedProperties": false
-		},
 		"FGEquipment--placeable--merged": {
 			"allOf": [
 				{
@@ -5032,7 +4872,7 @@
 			"$ref": "#/$defs/FGVehicleDescriptor--fueled-with-inventory--merged",
 			"unevaluatedProperties": false
 		},
-		"FGBuildableFrackingExtractor--merged": {
+		"FGBuildableFrackingExtractor": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableFrackingExtractor"
@@ -5042,12 +4882,7 @@
 				}
 			]
 		},
-		"FGBuildableFrackingExtractor": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableFrackingExtractor--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableFrackingActivator--merged": {
+		"FGBuildableFrackingActivator": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableFrackingActivator"
@@ -5057,11 +4892,6 @@
 				}
 			]
 		},
-		"FGBuildableFrackingActivator": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableFrackingActivator--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableRailroadSignal--merged": {
 			"allOf": [
 				{
@@ -5074,8 +4904,7 @@
 		},
 		"FGBuildableRailroadSignal": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableRailroadSignal--merged",
-			"unevaluatedProperties": false
+			"$ref": "#/$defs/FGBuildableRailroadSignal--merged"
 		},
 		"FGBuildableTrainPlatform--base--merged": {
 			"allOf": [
@@ -5117,13 +4946,11 @@
 		},
 		"FGBuildableTrainPlatformCargo": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableTrainPlatformCargo--merged",
-			"unevaluatedProperties": false
+			"$ref": "#/$defs/FGBuildableTrainPlatformCargo--merged"
 		},
 		"FGBuildableTrainPlatformEmpty": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableTrainPlatform--base",
-			"unevaluatedProperties": false
+			"$ref": "#/$defs/FGBuildableTrainPlatform--base"
 		},
 		"FGBuildableRailroadStation--merged": {
 			"allOf": [
@@ -5137,10 +4964,9 @@
 		},
 		"FGBuildableRailroadStation": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableRailroadStation--merged",
-			"unevaluatedProperties": false
+			"$ref": "#/$defs/FGBuildableRailroadStation--merged"
 		},
-		"FGBuildableStorage--merged": {
+		"FGBuildableStorage": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableStorage"
@@ -5150,11 +4976,7 @@
 				}
 			]
 		},
-		"FGBuildableStorage": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableStorage--merged"
-		},
-		"FGPipeHyperStart--merged": {
+		"FGPipeHyperStart": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGPipeHyperStart"
@@ -5164,12 +4986,7 @@
 				}
 			]
 		},
-		"FGPipeHyperStart": {
-			"type": "object",
-			"$ref": "#/$defs/FGPipeHyperStart--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildablePipeHyper--merged": {
+		"FGBuildablePipeHyper": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePipeHyper"
@@ -5179,11 +4996,6 @@
 				}
 			]
 		},
-		"FGBuildablePipeHyper": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildablePipeHyper--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildablePowerStorage--merged": {
 			"allOf": [
 				{
@@ -5214,7 +5026,7 @@
 				}
 			}
 		},
-		"FGBuildableDockingStation--merged": {
+		"FGBuildableDockingStation": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableDockingStation"
@@ -5224,12 +5036,7 @@
 				}
 			]
 		},
-		"FGBuildableDockingStation": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableDockingStation--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableJumppad--merged": {
+		"FGBuildableJumppad": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableJumppad"
@@ -5239,25 +5046,19 @@
 				}
 			]
 		},
-		"FGBuildableJumppad": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableJumppad--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableMAM--merged": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableMAM"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--occupied--merged"
+					"$ref": "#/$defs/FGBuildable--occupied--final"
 				}
 			]
 		},
 		"FGBuildableMAM": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableMAM--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"mCurrentResearchState",
 				"mSignificanceRange",
@@ -5291,7 +5092,7 @@
 				}
 			}
 		},
-		"FGBuildableAttachmentMerger--merged": {
+		"FGBuildableAttachmentMerger": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableAttachmentMerger"
@@ -5304,11 +5105,6 @@
 				}
 			]
 		},
-		"FGBuildableAttachmentMerger": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableAttachmentMerger--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildable--splitter--base--merged": {
 			"allOf": [
 				{
@@ -5326,7 +5122,7 @@
 			"type": "object",
 			"$ref": "#/$defs/FGBuildable--splitter--base--merged"
 		},
-		"FGBuildableAttachmentSplitter--merged": {
+		"FGBuildableAttachmentSplitter": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableAttachmentSplitter"
@@ -5336,12 +5132,7 @@
 				}
 			]
 		},
-		"FGBuildableAttachmentSplitter": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableAttachmentSplitter--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableSplitterSmart--merged": {
+		"FGBuildableSplitterSmart": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableSplitterSmart"
@@ -5351,11 +5142,6 @@
 				}
 			]
 		},
-		"FGBuildableSplitterSmart": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableSplitterSmart--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableFoundation--base--merged": {
 			"allOf": [
 				{
@@ -5370,7 +5156,7 @@
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableFoundation--base--merged"
 		},
-		"FGBuildableFoundation--merged": {
+		"FGBuildableFoundation": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableFoundation"
@@ -5380,11 +5166,6 @@
 				}
 			]
 		},
-		"FGBuildableFoundation": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableFoundation--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableRamp--merged": {
 			"allOf": [
 				{
@@ -5398,7 +5179,6 @@
 		"FGBuildableRamp": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableRamp--merged",
-			"unevaluatedProperties": false,
 			"required": ["mIsInverted"],
 			"properties": {
 				"mIsInverted": {
@@ -5406,7 +5186,7 @@
 				}
 			}
 		},
-		"FGAmmoTypeProjectile--base--merged": {
+		"FGAmmoTypeProjectile--base": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGAmmoTypeProjectile--base"
@@ -5416,11 +5196,7 @@
 				}
 			]
 		},
-		"FGAmmoTypeProjectile--base": {
-			"type": "object",
-			"$ref": "#/$defs/FGAmmoTypeProjectile--base--merged"
-		},
-		"FGAmmoTypeProjectile--merged": {
+		"FGAmmoTypeProjectile": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGAmmoTypeProjectile"
@@ -5430,11 +5206,7 @@
 				}
 			]
 		},
-		"FGAmmoTypeProjectile": {
-			"type": "object",
-			"$ref": "#/$defs/FGAmmoTypeProjectile--merged"
-		},
-		"FGAmmoTypeSpreadshot--merged": {
+		"FGAmmoTypeSpreadshot": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGAmmoTypeSpreadshot"
@@ -5444,12 +5216,7 @@
 				}
 			]
 		},
-		"FGAmmoTypeSpreadshot": {
-			"type": "object",
-			"$ref": "#/$defs/FGAmmoTypeSpreadshot--merged",
-			"unevaluatedProperties": false
-		},
-		"FGAmmoTypeInstantHit--base--merged": {
+		"FGAmmoTypeInstantHit--base": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGAmmoTypeInstantHit--base"
@@ -5459,11 +5226,7 @@
 				}
 			]
 		},
-		"FGAmmoTypeInstantHit--base": {
-			"type": "object",
-			"$ref": "#/$defs/FGAmmoTypeInstantHit--base--merged"
-		},
-		"FGAmmoTypeInstantHit--chaos--merged": {
+		"FGAmmoTypeInstantHit--chaos": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGAmmoTypeInstantHit--chaos"
@@ -5473,12 +5236,7 @@
 				}
 			]
 		},
-		"FGAmmoTypeInstantHit--chaos": {
-			"type": "object",
-			"$ref": "#/$defs/FGAmmoTypeInstantHit--chaos--merged",
-			"unevaluatedProperties": false
-		},
-		"FGAmmoTypeInstantHit--standard--merged": {
+		"FGAmmoTypeInstantHit--standard": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGAmmoTypeInstantHit--standard"
@@ -5488,11 +5246,6 @@
 				}
 			]
 		},
-		"FGAmmoTypeInstantHit--standard": {
-			"type": "object",
-			"$ref": "#/$defs/FGAmmoTypeInstantHit--standard--merged",
-			"unevaluatedProperties": false
-		},
 		"FGWeapon--base--merged": {
 			"allOf": [
 				{
@@ -5507,19 +5260,8 @@
 			"type": "object",
 			"$ref": "#/$defs/FGWeapon--base--merged"
 		},
-		"FGWeapon--gun-base--merged": {
-			"allOf": [
-				{
-					"$ref": "common.schema.json#/$defs/common-base--FGWeapon--gun-base"
-				},
-				{
-					"$ref": "#/$defs/FGWeapon--base"
-				}
-			]
-		},
-		"FGWeapon--gun-base": {
+		"FGWeapon--gun-base--properties": {
 			"type": "object",
-			"$ref": "#/$defs/FGWeapon--gun-base--merged",
 			"required": [
 				"mFireMontage",
 				"mReloadMontageList",
@@ -5577,20 +5319,21 @@
 				}
 			}
 		},
-		"FGWeapon--rebar-gun--merged": {
+		"FGWeapon--gun-base": {
 			"allOf": [
 				{
-					"$ref": "common.schema.json#/$defs/common-base--FGWeapon--rebar-gun"
+					"$ref": "common.schema.json#/$defs/common-base--FGWeapon--gun-base"
 				},
 				{
-					"$ref": "#/$defs/FGWeapon--gun-base"
+					"$ref": "#/$defs/FGWeapon--base"
+				},
+				{
+					"$ref": "#/$defs/FGWeapon--gun-base--properties"
 				}
 			]
 		},
-		"FGWeapon--rebar-gun": {
+		"FGWeapon--rebar-gun--properties": {
 			"type": "object",
-			"$ref": "#/$defs/FGWeapon--rebar-gun--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"mReloadMontageList",
 				"mAmmoSwapMontageList",
@@ -5890,20 +5633,21 @@
 				}
 			}
 		},
-		"FGWeapon--rifle--merged": {
+		"FGWeapon--rebar-gun": {
 			"allOf": [
 				{
-					"$ref": "common.schema.json#/$defs/common-base--FGWeapon--rifle"
+					"$ref": "common.schema.json#/$defs/common-base--FGWeapon--rebar-gun"
 				},
 				{
 					"$ref": "#/$defs/FGWeapon--gun-base"
+				},
+				{
+					"$ref": "#/$defs/FGWeapon--rebar-gun--properties"
 				}
 			]
 		},
-		"FGWeapon--rifle": {
+		"FGWeapon--rifle--properties": {
 			"type": "object",
-			"$ref": "#/$defs/FGWeapon--rifle--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"mReloadMontageList",
 				"mAmmoSwapMontageList",
@@ -6209,6 +5953,19 @@
 				}
 			}
 		},
+		"FGWeapon--rifle": {
+			"allOf": [
+				{
+					"$ref": "common.schema.json#/$defs/common-base--FGWeapon--rifle"
+				},
+				{
+					"$ref": "#/$defs/FGWeapon--gun-base"
+				},
+				{
+					"$ref": "#/$defs/FGWeapon--rifle--properties"
+				}
+			]
+		},
 		"FGChargedWeapon--merged": {
 			"allOf": [
 				{
@@ -6222,7 +5979,6 @@
 		"FGChargedWeapon": {
 			"type": "object",
 			"$ref": "#/$defs/FGChargedWeapon--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"AmmoTypeToAkEvent",
 				"mPrimaryFireStartMontageList",
@@ -6717,7 +6473,7 @@
 			"type": "object",
 			"$ref": "#/$defs/FGBuildable--power-switch--base--merged"
 		},
-		"FGBuildablePriorityPowerSwitch--merged": {
+		"FGBuildablePriorityPowerSwitch": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePriorityPowerSwitch"
@@ -6727,12 +6483,7 @@
 				}
 			]
 		},
-		"FGBuildablePriorityPowerSwitch": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildablePriorityPowerSwitch--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableCircuitSwitch--merged": {
+		"FGBuildableCircuitSwitch": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableCircuitSwitch"
@@ -6742,12 +6493,7 @@
 				}
 			]
 		},
-		"FGBuildableCircuitSwitch": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableCircuitSwitch--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableRadarTower--merged": {
+		"FGBuildableRadarTower": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableRadarTower"
@@ -6757,12 +6503,7 @@
 				}
 			]
 		},
-		"FGBuildableRadarTower": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableRadarTower--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableSnowDispenser--merged": {
+		"FGBuildableSnowDispenser": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableSnowDispenser"
@@ -6772,15 +6513,9 @@
 				}
 			]
 		},
-		"FGBuildableSnowDispenser": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableSnowDispenser--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableSnowCannon": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildable--base",
-			"unevaluatedProperties": false,
 			"required": ["SFXLocation", "mSignificanceRange"],
 			"properties": {
 				"SFXLocation": {
@@ -6812,7 +6547,7 @@
 				}
 			}
 		},
-		"FGBuildableFactorySimpleProducer--merged": {
+		"FGBuildableFactorySimpleProducer": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableFactorySimpleProducer"
@@ -6822,12 +6557,7 @@
 				}
 			]
 		},
-		"FGBuildableFactorySimpleProducer": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableFactorySimpleProducer--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableLadder--merged": {
+		"FGBuildableLadder": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableLadder"
@@ -6837,11 +6567,6 @@
 				}
 			]
 		},
-		"FGBuildableLadder": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableLadder--merged",
-			"unevaluatedProperties": false
-		},
 		"FGGolfCartDispenser--merged": {
 			"allOf": [
 				{
@@ -6947,7 +6672,7 @@
 				}
 			}
 		},
-		"FGBuildablePassthrough--merged": {
+		"FGBuildablePassthrough": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildablePassthrough"
@@ -6957,12 +6682,7 @@
 				}
 			]
 		},
-		"FGBuildablePassthrough": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildablePassthrough--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableLightsControlPanel--merged": {
+		"FGBuildableLightsControlPanel": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableLightsControlPanel"
@@ -6972,11 +6692,6 @@
 				}
 			]
 		},
-		"FGBuildableLightsControlPanel": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableLightsControlPanel--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableLightSource--base--merged": {
 			"allOf": [
 				{
@@ -6991,7 +6706,7 @@
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableLightSource--base--merged"
 		},
-		"FGBuildableLightSource--merged": {
+		"FGBuildableLightSource": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableLightSource"
@@ -7001,12 +6716,7 @@
 				}
 			]
 		},
-		"FGBuildableLightSource": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableLightSource--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableFloodlight--merged": {
+		"FGBuildableFloodlight": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableFloodlight"
@@ -7016,11 +6726,6 @@
 				}
 			]
 		},
-		"FGBuildableFloodlight": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableFloodlight--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableWidgetSign--merged": {
 			"allOf": [
 				{
@@ -7034,7 +6739,6 @@
 		"FGBuildableWidgetSign": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableWidgetSign--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"mTextElementToLocDataMap",
 				"mSoftActivePrefabLayout",
@@ -7058,7 +6762,7 @@
 				}
 			}
 		},
-		"FGBuildableBeamLightweight--merged": {
+		"FGBuildableBeamLightweight": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableBeamLightweight"
@@ -7068,12 +6772,7 @@
 				}
 			]
 		},
-		"FGBuildableBeamLightweight": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableBeamLightweight--merged",
-			"unevaluatedProperties": false
-		},
-		"FGBuildableFactoryBuilding--merged": {
+		"FGBuildableFactoryBuilding": {
 			"allOf": [
 				{
 					"$ref": "common.schema.json#/$defs/common-base--FGBuildableFactoryBuilding"
@@ -7083,11 +6782,6 @@
 				}
 			]
 		},
-		"FGBuildableFactoryBuilding": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableFactoryBuilding--merged",
-			"unevaluatedProperties": false
-		},
 		"FGBuildableSpaceElevator--mSpaceElevatorState": {
 			"type": "string",
 			"enum": ["ESES_Load"]
@@ -7105,7 +6799,6 @@
 		"FGBuildableSpaceElevator": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableSpaceElevator--merged",
-			"unevaluatedProperties": false,
 			"required": [
 				"mOnSpaceElevatorStateUpdated",
 				"mSpaceElevatorState"
@@ -7119,6 +6812,24 @@
 				}
 			}
 		},
+		"ClearanceBox": {
+			"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"
+					}
+				}
+			}
+		},
 		"mClearanceData": {
 			"oneOf": [
 				{
@@ -7141,26 +6852,7 @@
 										"enum": ["CT_Soft"]
 									},
 									"ClearanceBox": {
-										"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"
-												}
-											}
-										}
+										"$ref": "#/$defs/ClearanceBox"
 									},
 									"RelativeTransform": {
 										"type": "string",
@@ -7487,7 +7179,6 @@
 		"FGBuildablePowerBooster": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildable--consumes-power-base",
-			"unevaluatedProperties": false,
 			"required": [
 				"IsInProducingAnimState",
 				"LaserSocketNames",
@@ -7585,7 +7276,6 @@
 		"FGCentralStorageContainer": {
 			"type": "object",
 			"$ref": "#/$defs/FGBuildableStorage",
-			"unevaluatedProperties": false,
 			"required": [
 				"TimeToExecuteCheckAfterItemAdded",
 				"mUploadTimer",
@@ -7602,6 +7292,51 @@
 					"$ref": "common.schema.json#/$defs/decimal-string"
 				}
 			}
+		},
+		"FGCustomizationRecipe": {
+			"type": "object",
+			"$ref": "#/$defs/FGCustomizationRecipe--FGRecipe",
+			"properties": {
+				"mDisplayName": {
+					"type": "string",
+					"enum": [
+						"N/A",
+						"Custom Slot",
+						"Swatch 1",
+						"Swatch 2",
+						"Swatch 3",
+						"Swatch 4",
+						"Swatch 5",
+						"Swatch 6",
+						"Swatch 7",
+						"Swatch 8",
+						"Swatch 9",
+						"Swatch 10",
+						"Swatch 11",
+						"Swatch 12",
+						"Swatch 13",
+						"Swatch 14",
+						"Swatch 15",
+						"Unpainted metal",
+						"Copper Finish",
+						"Chrome Finish",
+						"Caterium Finish",
+						"Carbon Steel Finish"
+					]
+				},
+				"mProducedIn": {
+					"type": "string",
+					"minLength": 1,
+					"typed_string": {
+						"minItems": 1,
+						"maxItems": 1,
+						"items": {
+							"type": "string",
+							"const": "/Game/FactoryGame/Equipment/BuildGun/BP_BuildGun.BP_BuildGun_C"
+						}
+					}
+				}
+			}
 		}
 	},
 	"items": false,
@@ -7757,49 +7492,8 @@
 					"minItems": 1,
 					"items": {
 						"type": "object",
-						"$ref": "#/$defs/FGCustomizationRecipe--FGRecipe",
-						"unevaluatedProperties": false,
-						"properties": {
-							"mDisplayName": {
-								"type": "string",
-								"enum": [
-									"N/A",
-									"Custom Slot",
-									"Swatch 1",
-									"Swatch 2",
-									"Swatch 3",
-									"Swatch 4",
-									"Swatch 5",
-									"Swatch 6",
-									"Swatch 7",
-									"Swatch 8",
-									"Swatch 9",
-									"Swatch 10",
-									"Swatch 11",
-									"Swatch 12",
-									"Swatch 13",
-									"Swatch 14",
-									"Swatch 15",
-									"Unpainted metal",
-									"Copper Finish",
-									"Chrome Finish",
-									"Caterium Finish",
-									"Carbon Steel Finish"
-								]
-							},
-							"mProducedIn": {
-								"type": "string",
-								"minLength": 1,
-								"typed_string": {
-									"minItems": 1,
-									"maxItems": 1,
-									"items": {
-										"type": "string",
-										"const": "/Game/FactoryGame/Equipment/BuildGun/BP_BuildGun.BP_BuildGun_C"
-									}
-								}
-							}
-						}
+						"$ref": "#/$defs/FGCustomizationRecipe",
+						"unevaluatedProperties": false
 					}
 				}
 			}
@@ -7848,20 +7542,24 @@
 					"type": "array",
 					"minItems": 3,
 					"maxItems": 3,
-					"items": {
-						"oneOf": [
-							{
-								"type": "object",
-								"$ref": "#/$defs/FGBuildablePipelinePump--valve",
-								"unevaluatedProperties": false
-							},
-							{
-								"type": "object",
-								"$ref": "#/$defs/FGBuildablePipelinePump",
-								"unevaluatedProperties": false
-							}
-						]
-					}
+					"items": false,
+					"prefixItems": [
+						{
+							"type": "object",
+							"$ref": "#/$defs/FGBuildablePipelinePump",
+							"unevaluatedProperties": false
+						},
+						{
+							"type": "object",
+							"$ref": "#/$defs/FGBuildablePipelinePump",
+							"unevaluatedProperties": false
+						},
+						{
+							"type": "object",
+							"$ref": "#/$defs/FGBuildablePipelinePump--valve",
+							"unevaluatedProperties": false
+						}
+					]
 				}
 			}
 		},