@satisfactory-dev/docs.json.ts 0.12.2 → 0.13.1

package/generated-types/1.0/classes/CoreUObject/FGBuildableLightsControlPanel.d.ts

@@ -1,14 +1,8 @@
-import { mLightControlData__type } from '../../common/unassigned';
 import { FGBuildable__circuits_base__type } from './FGBuildable';
-import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-import { boolean__type } from '../../../common/common/scalar';
-export type FGBuildableLightsControlPanel__type = FGBuildable__circuits_base__type & {
-    OnLightControlPanelStateChanged: empty_object__type;
-    mLightControlData: mLightControlData__type;
-    mIsEnabled: boolean__type;
-    mOnControlledBuildablesChanged: empty_object__type;
-    mControlledBuildables: '';
-};
+import { common_base__FGBuildableLightsControlPanel__type } from '../../../common/classes/CoreUObject/FGBuildableLightsControlPanel';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildableLightsControlPanel__type = FGBuildableLightsControlPanel__merged__type;
+export type FGBuildableLightsControlPanel__merged__type = common_base__FGBuildableLightsControlPanel__type & FGBuildable__circuits_base__type;
 export type FGBuildableLightsControlPanel__NativeClass = NativeClass__type & {
     Classes: [FGBuildableLightsControlPanel__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildableMAM.d.ts

@@ -1,14 +1,14 @@
-import { FGBuildable__occupied__type } from './FGBuildable';
+import { FGBuildable__occupied__merged__type } from './FGBuildable';
 import { decimal_string__type } from '../../../common/common/scalar';
+import { common_base__FGBuildableMAM__type } from '../../../common/classes/CoreUObject/FGBuildableMAM';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildableMAM__type = FGBuildable__occupied__type & {
-    mCurrentResearchState: 'ERS_NotResearching';
-    mSignificanceRange: decimal_string__type;
+export type FGBuildableMAM__type = FGBuildableMAM__merged__type & {
     Centrifuge_NewTrack_1_BB49BD99478F0FC67F8D7E9A54C7E849: decimal_string__type;
     Centrifuge_NewTrack_0_BB49BD99478F0FC67F8D7E9A54C7E849: decimal_string__type;
     Centrifuge__Direction_BB49BD99478F0FC67F8D7E9A54C7E849: 'Forward';
     ['Centrifuge Duration']: decimal_string__type;
 };
+export type FGBuildableMAM__merged__type = common_base__FGBuildableMAM__type & FGBuildable__occupied__merged__type;
 export type FGBuildableMAM__NativeClass = NativeClass__type & {
     Classes: [FGBuildableMAM__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildableManufacturer.d.ts

@@ -1,62 +1,25 @@
 import { FGBuildable__consumes_power_base__type } from './FGBuildable';
-import { integer_string__type, decimal_string__type, boolean__type, boolean_extended__type } from '../../../common/common/scalar';
-import { empty_object__type, color_decimal__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildableManufacturer__type = FGBuildableManufacturer__base__type;
-export type FGBuildableManufacturer__base__type = FGBuildable__consumes_power_base__type & {
-    IsPowered?: boolean__type;
-    bIsPendingToKillVfx?: boolean__type;
-    mProductionEffectsRunning?: boolean__type;
-    mCurrentRecipeChanged: empty_object__type;
-    mManufacturingSpeed: decimal_string__type;
-    mFactoryInputConnections: '';
-    mPipeInputConnections: '';
-    mFactoryOutputConnections: '';
-    mPipeOutputConnections: '';
-    mStoppedProducingAnimationSounds?: boolean__type;
-    mStoppedAkComponents?: boolean_extended__type;
-    mSocketStoppedAkComponents?: '';
-};
-export type FGBuildableManufacturer__blender__type = FGBuildableManufacturer__base__type & {
-    ClassName?: 'Build_Blender_C';
-    mCurrentColorVFX: color_decimal__type;
-    m_NotifyNameREferences: [
-        'Arm_04_ClawBase' | 'Arm_02_SFXSocket',
-        'Arm_04_ClawBase' | 'Arm_02_SFXSocket',
-        ...('Arm_04_ClawBase' | 'Arm_02_SFXSocket')[]
-    ];
-    mColor: '';
-    mIsRadioActive: boolean__type;
-};
-export type FGBuildableManufacturer__constructor__type = FGBuildableManufacturer__base__type & {
-    ClassName?: 'Build_ConstructorMk1_C';
-    mCurrentRecipeCheck: '';
-    mPreviousRecipeCheck: '';
-    CurrentPotentialConvert: [
-        [
-            integer_string__type,
-            decimal_string__type
-        ],
-        ...[
-            integer_string__type,
-            decimal_string__type
-        ][]
-    ];
+import { decimal_string__type } from '../../../common/common/scalar';
+import { common_base__FGBuildableManufacturer__base__type, common_base__FGBuildableManufacturer__blender__type, common_base__FGBuildableManufacturer__constructor__type, common_base__FGBuildableManufacturer__type, common_base__FGBuildableManufacturer__packager__type, common_base__FGBuildableManufacturer__smelter__type } from '../../../common/classes/CoreUObject/FGBuildableManufacturer';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildableManufacturer__type = FGBuildableManufacturer__merged__type;
+export type FGBuildableManufacturer__base__type = FGBuildableManufacturer__base__merged__type;
+export type FGBuildableManufacturer__base__merged__type = common_base__FGBuildableManufacturer__base__type & FGBuildable__consumes_power_base__type;
+export type FGBuildableManufacturer__blender__type = FGBuildableManufacturer__blender__merged__type;
+export type FGBuildableManufacturer__blender__merged__type = common_base__FGBuildableManufacturer__blender__type & FGBuildableManufacturer__base__type;
+export type FGBuildableManufacturer__constructor__type = FGBuildableManufacturer__constructor__merged__type & {
     mAOAttenuationScalingFactor: decimal_string__type;
     mAOLayerZOffset: decimal_string__type;
     RTPC_AO_VolumeDB: decimal_string__type;
     RTPC_AO_HighpassValue: decimal_string__type;
     RTPC_AO_Pitch: decimal_string__type;
 };
-export type FGBuildableManufacturer__packager__type = FGBuildableManufacturer__base__type & {
-    ClassName?: 'Build_Packager_C';
-    mCurrentColor_VFX: color_decimal__type;
-    CurrentPackagingMode: '';
-};
-export type FGBuildableManufacturer__smelter__type = FGBuildableManufacturer__base__type & {
-    ClassName?: 'Build_SmelterMk1_C';
-    mIsPendingToKillVFX: boolean__type;
-    mCachedCurrentPotential: integer_string__type;
-};
+export type FGBuildableManufacturer__constructor__merged__type = common_base__FGBuildableManufacturer__constructor__type & FGBuildableManufacturer__base__type;
+export type FGBuildableManufacturer__merged__type = common_base__FGBuildableManufacturer__type & FGBuildableManufacturer__base__type;
+export type FGBuildableManufacturer__packager__type = FGBuildableManufacturer__packager__merged__type;
+export type FGBuildableManufacturer__packager__merged__type = common_base__FGBuildableManufacturer__packager__type & FGBuildableManufacturer__base__type;
+export type FGBuildableManufacturer__smelter__type = FGBuildableManufacturer__smelter__merged__type;
+export type FGBuildableManufacturer__smelter__merged__type = common_base__FGBuildableManufacturer__smelter__type & FGBuildableManufacturer__base__type;
 export type FGBuildableManufacturer__NativeClass = NativeClass__type & {
     Classes: [
         FGBuildableManufacturer__type,

package/generated-types/1.0/classes/CoreUObject/FGBuildableManufacturerVariablePower.d.ts

@@ -1,24 +1,11 @@
 import { FGBuildableManufacturer__base__type } from './FGBuildableManufacturer';
-import { decimal_string__type, boolean__type } from '../../../common/common/scalar';
-import { empty_object__type, xyz_array__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildableManufacturerVariablePower__base__type = FGBuildableManufacturer__base__type & {
-    mEstimatedMininumPowerConsumption: decimal_string__type;
-    mEstimatedMaximumPowerConsumption: decimal_string__type;
-};
-export type FGBuildableManufacturerVariablePower__HadronCollider__type = FGBuildableManufacturerVariablePower__base__type & {
-    mSequenceDuration: decimal_string__type;
-    mLightningTimer: empty_object__type;
-    mGameTimeAtProducing: decimal_string__type;
-    mCurrentProducingSeekTime: decimal_string__type;
-    mStartVector_VFX_Small_Start: xyz_array__type;
-    mStartVector_VFX_Small_End: xyz_array__type;
-    mStartVector_VFX_Medium_Start: xyz_array__type;
-    mStartVector_VFX_Medium_End: xyz_array__type;
-    mStartVector_VFX_Large_Start: xyz_array__type;
-    mStartVector_VFX_Large_End: xyz_array__type;
-    mEstimatedMininumPowerConsumption: decimal_string__type;
-    mEstimatedMaximumPowerConsumption: decimal_string__type;
-};
+import { boolean__type } from '../../../common/common/scalar';
+import { common_base__FGBuildableManufacturerVariablePower__base__type, common_base__FGBuildableManufacturerVariablePower__HadronCollider__type } from '../../../common/classes/CoreUObject/FGBuildableManufacturerVariablePower';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildableManufacturerVariablePower__base__type = FGBuildableManufacturerVariablePower__base__merged__type;
+export type FGBuildableManufacturerVariablePower__base__merged__type = common_base__FGBuildableManufacturerVariablePower__base__type & FGBuildableManufacturer__base__type;
+export type FGBuildableManufacturerVariablePower__HadronCollider__type = FGBuildableManufacturerVariablePower__HadronCollider__merged__type;
+export type FGBuildableManufacturerVariablePower__HadronCollider__merged__type = common_base__FGBuildableManufacturerVariablePower__HadronCollider__type & FGBuildableManufacturerVariablePower__base__type;
 export type FGBuildableManufacturerVariablePower__QuantumEncoder__type = FGBuildableManufacturerVariablePower__base__type & {
     IsAnimProducing: boolean__type;
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildablePassthrough.d.ts

@@ -1,18 +1,8 @@
 import { FGBuildable__base__type } from './FGBuildable';
-import { decimal_string__type, boolean__type } from '../../../common/common/scalar';
-import { pitch_yaw_roll__type, xyz__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildablePassthrough__type = FGBuildable__base__type & {
-    mSnappedBuildingThickness: decimal_string__type;
-    mMidMeshLength: decimal_string__type;
-    mGenerateTunnelCollision: boolean__type;
-    mEndCapRotation: pitch_yaw_roll__type;
-    mMidMeshRotation: pitch_yaw_roll__type;
-    mEndCapTranslation: xyz__type;
-    mClearanceHeightMin: decimal_string__type;
-    mClearanceThickness: decimal_string__type;
-    mCostSegmentLength: decimal_string__type;
-    mGeneratedMeshComponents: '';
-};
+import { common_base__FGBuildablePassthrough__type } from '../../../common/classes/CoreUObject/FGBuildablePassthrough';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildablePassthrough__type = FGBuildablePassthrough__merged__type;
+export type FGBuildablePassthrough__merged__type = common_base__FGBuildablePassthrough__type & FGBuildable__base__type;
 export type FGBuildablePassthrough__NativeClass = NativeClass__type & {
     Classes: [FGBuildablePassthrough__type, ...FGBuildablePassthrough__type[]];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildablePillarLightweight.d.ts

@@ -1,10 +1,8 @@
 import { FGBuildable__base__type } from './FGBuildable';
-import { xyz__type, NativeClass__type } from '../../../common/common/unassigned';
-import { boolean__type } from '../../../common/common/scalar';
-export type FGBuildablePillarLightweight__type = FGBuildable__base__type & {
-    mSize: xyz__type;
-    mIsSupport: boolean__type;
-};
+import { common_base__FGBuildablePillarLightweight__type } from '../../../common/classes/CoreUObject/FGBuildablePillarLightweight';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildablePillarLightweight__type = FGBuildablePillarLightweight__merged__type;
+export type FGBuildablePillarLightweight__merged__type = common_base__FGBuildablePillarLightweight__type & FGBuildable__base__type;
 export type FGBuildablePillarLightweight__NativeClass = NativeClass__type & {
     Classes: [
         FGBuildablePillarLightweight__type,

package/generated-types/1.0/classes/CoreUObject/FGBuildablePipeHyper.d.ts

@@ -1,11 +1,8 @@
 import { FGBuildable__base__type } from './FGBuildable';
-import { decimal_string__type } from '../../../common/common/scalar';
+import { common_base__FGBuildablePipeHyper__type } from '../../../common/classes/CoreUObject/FGBuildablePipeHyper';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildablePipeHyper__type = FGBuildable__base__type & {
-    mMeshLength: decimal_string__type;
-    mSplineData: '';
-    mSnappedPassthroughs: '';
-};
+export type FGBuildablePipeHyper__type = FGBuildablePipeHyper__merged__type;
+export type FGBuildablePipeHyper__merged__type = common_base__FGBuildablePipeHyper__type & FGBuildable__base__type;
 export type FGBuildablePipeHyper__NativeClass = NativeClass__type & {
     Classes: [FGBuildablePipeHyper__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildablePipeReservoir.d.ts

@@ -1,11 +1,8 @@
 import { FGBuildable__pipeline_accessory__base__type } from './FGBuildable';
-import { decimal_string__type } from '../../../common/common/scalar';
-import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildablePipeReservoir__type = FGBuildable__pipeline_accessory__base__type & {
-    mStackingHeight: decimal_string__type;
-    mStorageCapacity: decimal_string__type;
-    mIndicatorData: empty_object__type;
-};
+import { common_base__FGBuildablePipeReservoir__type } from '../../../common/classes/CoreUObject/FGBuildablePipeReservoir';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildablePipeReservoir__type = FGBuildablePipeReservoir__merged__type;
+export type FGBuildablePipeReservoir__merged__type = common_base__FGBuildablePipeReservoir__type & FGBuildable__pipeline_accessory__base__type;
 export type FGBuildablePipeReservoir__NativeClass = NativeClass__type & {
     Classes: [FGBuildablePipeReservoir__type, FGBuildablePipeReservoir__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildablePipeline.d.ts

@@ -1,41 +1,14 @@
-import { StringPassedRegExp } from '../../utils/validators';
-import { mSnappedPassthroughs__type } from '../../common/unassigned';
 import { FGBuildable__base__type } from './FGBuildable';
-import { decimal_string__type, boolean__type } from '../../../common/common/scalar';
-import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildablePipeline__type = FGBuildable__base__type & {
-    mMeshLength: decimal_string__type;
-    mSplineData: '';
-    mRadius: decimal_string__type;
-    mFlowLimit: decimal_string__type;
-    mFlowIndicatorMinimumPipeLength: decimal_string__type;
+import { decimal_string__type } from '../../../common/common/scalar';
+import { common_base__FGBuildablePipeline__type } from '../../../common/classes/CoreUObject/FGBuildablePipeline';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildablePipeline__type = FGBuildablePipeline__merged__type & {
     mSoundSplineComponentEmitterInterval: decimal_string__type;
-    mPipeConnections: '';
-    mFluidBox: empty_object__type;
-    mIndicatorData: empty_object__type;
-    mMaxIndicatorTurnAngle: decimal_string__type;
-    mIgnoreActorsForIndicator: '';
-    mFluidNames: [
-        {
-            WwiseSafeName: StringPassedRegExp<'^[A-Z][A-Za-z]+(_[A-Z][A-Za-z]+)*$'>;
-            ActualName?: StringPassedRegExp<'^[A-Z][A-Za-z]+( [A-Z][A-Za-z]+)*$'>;
-        },
-        ...{
-            WwiseSafeName: StringPassedRegExp<'^[A-Z][A-Za-z]+(_[A-Z][A-Za-z]+)*$'>;
-            ActualName?: StringPassedRegExp<'^[A-Z][A-Za-z]+( [A-Z][A-Za-z]+)*$'>;
-        }[]
-    ];
-    mCurrentFluid: '';
-    mLastContentForSound: decimal_string__type;
-    mLastFlowForSound: decimal_string__type;
     mLastElapsedTime: decimal_string__type;
     mLastFlowForSoundUpdateThreshold: decimal_string__type;
-    mRattleLimit: decimal_string__type;
-    mIsRattling: boolean__type;
-    mUpdateSoundsHandle: empty_object__type;
     mUpdateSoundsTimerInterval: decimal_string__type;
-    mSnappedPassthroughs: mSnappedPassthroughs__type;
 };
+export type FGBuildablePipeline__merged__type = common_base__FGBuildablePipeline__type & FGBuildable__base__type;
 export type FGBuildablePipeline__NativeClass = NativeClass__type & {
     Classes: [FGBuildablePipeline__type, ...FGBuildablePipeline__type[]];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildablePipelineJunction.d.ts

@@ -1,6 +1,8 @@
 import { FGBuildable__pipeline_accessory__type } from './FGBuildable';
+import { common_base__FGBuildablePipelineJunction__type } from '../../../common/classes/CoreUObject/FGBuildablePipelineJunction';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildablePipelineJunction__type = FGBuildable__pipeline_accessory__type;
+export type FGBuildablePipelineJunction__type = FGBuildablePipelineJunction__merged__type;
+export type FGBuildablePipelineJunction__merged__type = common_base__FGBuildablePipelineJunction__type & FGBuildable__pipeline_accessory__type;
 export type FGBuildablePipelineJunction__NativeClass = NativeClass__type & {
     Classes: [FGBuildablePipelineJunction__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildablePipelinePump.d.ts

@@ -1,12 +1,10 @@
 import { FGBuildable__pipeline_flow_accessory__type } from './FGBuildable';
-import { boolean__type, decimal_string__type } from '../../../common/common/scalar';
+import { common_base__FGBuildablePipelinePump__type, common_base__FGBuildablePipelinePump__valve__type } from '../../../common/classes/CoreUObject/FGBuildablePipelinePump';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildablePipelinePump__type = FGBuildable__pipeline_flow_accessory__type & {
-    mIsPipePumpPlaying: boolean__type;
-    mIsExceedingHeadLift: boolean__type;
-    mCurrentAudioHeadLift: decimal_string__type;
-};
-export type FGBuildablePipelinePump__valve__type = FGBuildable__pipeline_flow_accessory__type;
+export type FGBuildablePipelinePump__type = FGBuildablePipelinePump__merged__type;
+export type FGBuildablePipelinePump__merged__type = common_base__FGBuildablePipelinePump__type & FGBuildable__pipeline_flow_accessory__type;
+export type FGBuildablePipelinePump__valve__type = FGBuildablePipelinePump__valve__merged__type;
+export type FGBuildablePipelinePump__valve__merged__type = common_base__FGBuildablePipelinePump__valve__type & FGBuildable__pipeline_flow_accessory__type;
 export type FGBuildablePipelinePump__NativeClass = NativeClass__type & {
     Classes: [
         FGBuildablePipelinePump__valve__type | FGBuildablePipelinePump__type,

package/generated-types/1.0/classes/CoreUObject/FGBuildablePipelineSupport.d.ts

@@ -1,7 +1,7 @@
-import { FGBuildable__pole__base__type } from './FGBuildable';
+import { FGBuildable__pole__base__with_static__merged__type } from './FGBuildable';
 import { decimal_string__type } from '../../../common/common/scalar';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildablePipelineSupport__type = FGBuildable__pole__base__type & {
+export type FGBuildablePipelineSupport__type = FGBuildable__pole__base__with_static__merged__type & {
     mLength: decimal_string__type;
     mVerticalAngle: decimal_string__type;
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildablePoleLightweight.d.ts

@@ -1,10 +1,8 @@
-import { FGBuildable__pole__base__type } from './FGBuildable';
-import { decimal_string__type, integer_string__signed__type } from '../../../common/common/scalar';
+import { FGBuildable__pole__base__with_static__merged__type } from './FGBuildable';
+import { common_base__FGBuildablePoleLightweight__type } from '../../../common/classes/CoreUObject/FGBuildablePoleLightweight';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildablePoleLightweight__type = FGBuildable__pole__base__type & {
-    mHeight: decimal_string__type;
-    mSelectedPoleVersion: integer_string__signed__type;
-};
+export type FGBuildablePoleLightweight__type = FGBuildablePoleLightweight__merged__type;
+export type FGBuildablePoleLightweight__merged__type = common_base__FGBuildablePoleLightweight__type & FGBuildable__pole__base__with_static__merged__type;
 export type FGBuildablePoleLightweight__NativeClass = NativeClass__type & {
     Classes: [FGBuildablePoleLightweight__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildablePowerPole.d.ts

@@ -1,12 +1,8 @@
 import { FGBuildable__base__type } from './FGBuildable';
-import { decimal_string__type, boolean__type } from '../../../common/common/scalar';
+import { common_base__FGBuildablePowerPole__type } from '../../../common/classes/CoreUObject/FGBuildablePowerPole';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildablePowerPole__type = FGBuildable__base__type & {
-    mPowerConnections: '';
-    mPowerPoleType: 'PPT_POLE' | 'PPT_WALL' | 'PPT_TOWER' | 'PPT_WALL_DOUBLE';
-    mPowerTowerWireMaxLength: decimal_string__type;
-    mHasPower: boolean__type;
-};
+export type FGBuildablePowerPole__type = FGBuildablePowerPole__merged__type;
+export type FGBuildablePowerPole__merged__type = common_base__FGBuildablePowerPole__type & FGBuildable__base__type;
 export type FGBuildablePowerPole__NativeClass = NativeClass__type & {
     Classes: [FGBuildablePowerPole__type, ...FGBuildablePowerPole__type[]];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildablePowerStorage.d.ts

@@ -1,20 +1,13 @@
 import { FGBuildable__consumes_power_base__type } from './FGBuildable';
-import { mBatteryStatus__type, NativeClass__type } from '../../../common/common/unassigned';
-import { decimal_string__type, integer_string__type } from '../../../common/common/scalar';
-export type FGBuildablePowerStorage__type = FGBuildable__consumes_power_base__type & {
-    m_PreviousBatteryStatus: mBatteryStatus__type;
-    mCurrentGameTimeSinceStateChange: decimal_string__type;
-    mActivationEventID: integer_string__type;
+import { integer_string__type, decimal_string__type } from '../../../common/common/scalar';
+import { common_base__FGBuildablePowerStorage__type } from '../../../common/classes/CoreUObject/FGBuildablePowerStorage';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildablePowerStorage__type = FGBuildablePowerStorage__merged__type & {
     mStatusPrimitiveID: integer_string__type;
     mChargePrimitiveID: integer_string__type;
-    mBatteryStatus: mBatteryStatus__type;
-    mPowerStore: decimal_string__type;
-    mPowerStoreCapacity: decimal_string__type;
     mPowerInput: decimal_string__type;
-    mPowerInputCapacity: decimal_string__type;
-    mIndicatorLevelMax: integer_string__type;
-    mIndicatorLevel: integer_string__type;
 };
+export type FGBuildablePowerStorage__merged__type = common_base__FGBuildablePowerStorage__type & FGBuildable__consumes_power_base__type;
 export type FGBuildablePowerStorage__NativeClass = NativeClass__type & {
     Classes: [FGBuildablePowerStorage__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildablePriorityPowerSwitch.d.ts

@@ -1,10 +1,8 @@
 import { FGBuildable__power_switch__base__type } from './FGBuildable';
-import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-import { integer_string__type } from '../../../common/common/scalar';
-export type FGBuildablePriorityPowerSwitch__type = FGBuildable__power_switch__base__type & {
-    mOnPriorityChanged: empty_object__type;
-    mPriority: integer_string__type;
-};
+import { common_base__FGBuildablePriorityPowerSwitch__type } from '../../../common/classes/CoreUObject/FGBuildablePriorityPowerSwitch';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildablePriorityPowerSwitch__type = FGBuildablePriorityPowerSwitch__merged__type;
+export type FGBuildablePriorityPowerSwitch__merged__type = common_base__FGBuildablePriorityPowerSwitch__type & FGBuildable__power_switch__base__type;
 export type FGBuildablePriorityPowerSwitch__NativeClass = NativeClass__type & {
     Classes: [FGBuildablePriorityPowerSwitch__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildableRadarTower.d.ts

@@ -1,11 +1,8 @@
 import { FGBuildable__consumes_power_base__type } from './FGBuildable';
-import { decimal_string__type } from '../../../common/common/scalar';
-import { UnrealEngineString__array__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildableRadarTower__type = FGBuildable__consumes_power_base__type & {
-    mMapText: 'Radar Tower';
-    mRevealRadius: decimal_string__type;
-    mScannableDescriptors: UnrealEngineString__array__type;
-};
+import { common_base__FGBuildableRadarTower__type } from '../../../common/classes/CoreUObject/FGBuildableRadarTower';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildableRadarTower__type = FGBuildableRadarTower__merged__type;
+export type FGBuildableRadarTower__merged__type = common_base__FGBuildableRadarTower__type & FGBuildable__consumes_power_base__type;
 export type FGBuildableRadarTower__NativeClass = NativeClass__type & {
     Classes: [FGBuildableRadarTower__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadSignal.d.ts

@@ -1,20 +1,8 @@
 import { FGBuildable__base__type } from './FGBuildable';
-import { mAspect__type, empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-import { boolean__type, integer_string__type, decimal_string__type } from '../../../common/common/scalar';
-export type FGBuildableRailroadSignal__type = FGBuildable__base__type & {
-    mPreviousAspect?: mAspect__type;
-    mOnAspectChangedDelegate: empty_object__type;
-    mOnBlockValidationChangedDelegate: empty_object__type;
-    mDrawDebugVisualState: boolean__type;
-    mGuardedConnections: '';
-    mObservedConnections: '';
-    mAspect: mAspect__type;
-    mBlockValidation: 'RBV_Unvalidated';
-    mIsPathSignal: boolean__type;
-    mIsBiDirectional: boolean__type;
-    mVisualState: integer_string__type;
-    mSignificanceRange: decimal_string__type;
-};
+import { common_base__FGBuildableRailroadSignal__type } from '../../../common/classes/CoreUObject/FGBuildableRailroadSignal';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildableRailroadSignal__type = FGBuildableRailroadSignal__merged__type;
+export type FGBuildableRailroadSignal__merged__type = common_base__FGBuildableRailroadSignal__type & FGBuildable__base__type;
 export type FGBuildableRailroadSignal__NativeClass = NativeClass__type & {
     Classes: [
         FGBuildableRailroadSignal__type,

package/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadStation.d.ts

@@ -1,12 +1,8 @@
 import { FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type } from './FGBuildableTrainPlatformCargo';
-import { boolean__type } from '../../../common/common/scalar';
-import { mDockingRuleSet__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildableRailroadStation__type = FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type & {
-    mMapText: 'Train Station';
-    mShouldTeleportHere: boolean__type;
-    mDockedPlatformList: '';
-    mCurrentDockedWithRuleSet: mDockingRuleSet__type;
-};
+import { common_base__FGBuildableRailroadStation__type } from '../../../common/classes/CoreUObject/FGBuildableRailroadStation';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildableRailroadStation__type = FGBuildableRailroadStation__merged__type;
+export type FGBuildableRailroadStation__merged__type = common_base__FGBuildableRailroadStation__type & FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type;
 export type FGBuildableRailroadStation__NativeClass = NativeClass__type & {
     Classes: [FGBuildableRailroadStation__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadTrack.d.ts

@@ -1,21 +1,8 @@
-import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FGBuildable__base__type } from './FGBuildable';
-import { decimal_string__type, boolean__type, integer_string__signed__type, integer_string__type } from '../../../common/common/scalar';
-import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildableRailroadTrack__type = FGBuildable__base__type & {
-    ClassName?: 'Build_RailroadTrack_C';
-    mMeshLength: decimal_string__type;
-    mConnections: [
-        UnrealEngineString<'/Script/FactoryGame.FGRailroadTrackConnectionComponent', StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Track/'>>,
-        ...UnrealEngineString<'/Script/FactoryGame.FGRailroadTrackConnectionComponent', StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Track/'>>[]
-    ];
-    mIsOwnedByPlatform: boolean__type;
-    mTrackGraphID: integer_string__signed__type;
-    mOverlappingTracks: '';
-    mVehicles: empty_object__type;
-    mSignalBlockID: integer_string__type;
-    mBlockVisualizationColorDataStartIndex: integer_string__type;
-};
+import { common_base__FGBuildableRailroadTrack__type } from '../../../common/classes/CoreUObject/FGBuildableRailroadTrack';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildableRailroadTrack__type = FGBuildableRailroadTrack__merged__type;
+export type FGBuildableRailroadTrack__merged__type = common_base__FGBuildableRailroadTrack__type & FGBuildable__base__type;
 export type FGBuildableRailroadTrack__NativeClass = NativeClass__type & {
     Classes: [FGBuildableRailroadTrack__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildableRamp.d.ts

@@ -1,7 +1,7 @@
 import { FGBuildableFoundation__base__type } from './FGBuildableFoundation';
 import { boolean__type } from '../../../common/common/scalar';
-export type FGBuildableRamp__type = FGBuildableFoundation__base__type & {
-    mIsDoubleRamp: boolean__type;
-    mIsRoof: boolean__type;
+import { common_base__FGBuildableRamp__type } from '../../../common/classes/CoreUObject/FGBuildableRamp';
+export type FGBuildableRamp__type = FGBuildableRamp__merged__type & {
     mIsInverted: boolean__type;
 };
+export type FGBuildableRamp__merged__type = common_base__FGBuildableRamp__type & FGBuildableFoundation__base__type;

package/generated-types/1.0/classes/CoreUObject/FGBuildableResourceExtractor.d.ts

@@ -1,35 +1,15 @@
-import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FGBuildableResourceExtractor__miner_mk1__type, FGBuildableResourceExtractor__miner_mk3__type } from '../../common/unassigned';
 import { FGBuildable__extractor_base__type } from './FGBuildable';
-import { boolean__type } from '../../../common/common/scalar';
-import { None__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildableResourceExtractor__miner__type = FGBuildableResourceExtractor__miner__base__type;
-export type FGBuildableResourceExtractor__miner__base__type = FGBuildable__extractor_base__type & {
-    mParticleMap: [
-        {
-            ResourceNode_16_2100B5C34EE8DF7958D78A974512F3C3: '/Game/FactoryGame/Resource/RawResources/Coal/Desc_Coal.Desc_Coal_C' | '/Game/FactoryGame/Resource/RawResources/Stone/Desc_Stone.Desc_Stone_C' | '/Game/FactoryGame/Resource/RawResources/OreIron/Desc_OreIron.Desc_OreIron_C' | '/Game/FactoryGame/Resource/RawResources/OreBauxite/Desc_OreBauxite.Desc_OreBauxite_C' | '/Game/FactoryGame/Resource/RawResources/OreCopper/Desc_OreCopper.Desc_OreCopper_C' | '/Game/FactoryGame/Resource/RawResources/CrudeOil/Desc_LiquidOil.Desc_LiquidOil_C' | '/Game/FactoryGame/Resource/RawResources/OreGold/Desc_OreGold.Desc_OreGold_C' | '/Game/FactoryGame/Resource/RawResources/RawQuartz/Desc_RawQuartz.Desc_RawQuartz_C' | '/Game/FactoryGame/Resource/RawResources/Sulfur/Desc_Sulfur.Desc_Sulfur_C' | '/Game/FactoryGame/Resource/RawResources/OreUranium/Desc_OreUranium.Desc_OreUranium_C';
-            ParticleSystem1_9_F0CF81514E1E1C5007AC99B0C59C63CD: UnrealEngineString<'/Script/Engine.ParticleSystem', StringStartsWith<'/Game/FactoryGame/VFX/Factory/' | '/Game/FactoryGame/Buildable/Factory/'>>;
-        },
-        ...{
-            ResourceNode_16_2100B5C34EE8DF7958D78A974512F3C3: '/Game/FactoryGame/Resource/RawResources/Coal/Desc_Coal.Desc_Coal_C' | '/Game/FactoryGame/Resource/RawResources/Stone/Desc_Stone.Desc_Stone_C' | '/Game/FactoryGame/Resource/RawResources/OreIron/Desc_OreIron.Desc_OreIron_C' | '/Game/FactoryGame/Resource/RawResources/OreBauxite/Desc_OreBauxite.Desc_OreBauxite_C' | '/Game/FactoryGame/Resource/RawResources/OreCopper/Desc_OreCopper.Desc_OreCopper_C' | '/Game/FactoryGame/Resource/RawResources/CrudeOil/Desc_LiquidOil.Desc_LiquidOil_C' | '/Game/FactoryGame/Resource/RawResources/OreGold/Desc_OreGold.Desc_OreGold_C' | '/Game/FactoryGame/Resource/RawResources/RawQuartz/Desc_RawQuartz.Desc_RawQuartz_C' | '/Game/FactoryGame/Resource/RawResources/Sulfur/Desc_Sulfur.Desc_Sulfur_C' | '/Game/FactoryGame/Resource/RawResources/OreUranium/Desc_OreUranium.Desc_OreUranium_C';
-            ParticleSystem1_9_F0CF81514E1E1C5007AC99B0C59C63CD: UnrealEngineString<'/Script/Engine.ParticleSystem', StringStartsWith<'/Game/FactoryGame/VFX/Factory/' | '/Game/FactoryGame/Buildable/Factory/'>>;
-        }[]
-    ];
-    mCanPlayAfterStartUpStopped?: boolean__type;
-    CanPlayAfterStartUpStopped?: boolean__type;
-    SAMReference?: '/Game/FactoryGame/Resource/RawResources/SAM/Desc_SAM.Desc_SAM_C';
-    mAllowedResourceForms?: ['RF_SOLID', ...'RF_SOLID'[]];
-    mExtractorTypeName?: 'Miner';
-    mAllowedResources: '';
-};
-export type FGBuildableResourceExtractor__oil_extractor__type = FGBuildable__extractor_base__type & {
-    mAllowedResourceForms: ['RF_LIQUID', ...'RF_LIQUID'[]];
-    mAllowedResources: [
-        UnrealEngineString<'/Script/Engine.BlueprintGeneratedClass', '/Game/FactoryGame/Resource/RawResources/CrudeOil/Desc_LiquidOil.Desc_LiquidOil_C'>,
-        ...UnrealEngineString<'/Script/Engine.BlueprintGeneratedClass', '/Game/FactoryGame/Resource/RawResources/CrudeOil/Desc_LiquidOil.Desc_LiquidOil_C'>[]
-    ];
-    mExtractorTypeName: None__type;
+import { common_base__FGBuildableResourceExtractor__miner__base__type, common_base__FGBuildableResourceExtractor__miner__type, common_base__FGBuildableResourceExtractor__oil_extractor__type } from '../../../common/classes/CoreUObject/FGBuildableResourceExtractor';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGBuildableResourceExtractor__miner__type = FGBuildableResourceExtractor__miner__merged__type;
+export type FGBuildableResourceExtractor__miner__base__type = FGBuildableResourceExtractor__miner__base__merged__type & {
+    SAMReference: '/Game/FactoryGame/Resource/RawResources/SAM/Desc_SAM.Desc_SAM_C';
 };
+export type FGBuildableResourceExtractor__miner__base__merged__type = common_base__FGBuildableResourceExtractor__miner__base__type & FGBuildable__extractor_base__type;
+export type FGBuildableResourceExtractor__miner__merged__type = common_base__FGBuildableResourceExtractor__miner__type & FGBuildableResourceExtractor__miner__base__type;
+export type FGBuildableResourceExtractor__oil_extractor__type = FGBuildableResourceExtractor__oil_extractor__merged__type;
+export type FGBuildableResourceExtractor__oil_extractor__merged__type = common_base__FGBuildableResourceExtractor__oil_extractor__type & FGBuildable__extractor_base__type;
 export type FGBuildableResourceExtractor__NativeClass = NativeClass__type & {
     Classes: [
         FGBuildableResourceExtractor__oil_extractor__type,

package/generated-types/1.0/classes/CoreUObject/FGBuildableResourceSink.d.ts

@@ -1,7 +1,8 @@
 import { FGBuildable__consumes_power_base__type } from './FGBuildable';
 import { boolean__type, decimal_string__type } from '../../../common/common/scalar';
+import { common_base__FGBuildableResourceSink__type } from '../../../common/classes/CoreUObject/FGBuildableResourceSink';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildableResourceSink__type = FGBuildable__consumes_power_base__type & {
+export type FGBuildableResourceSink__type = FGBuildableResourceSink__merged__type & {
     IsAnimationProducing: boolean__type;
     EnableTickGrinder: boolean__type;
     EnableTickEngine: boolean__type;
@@ -10,6 +11,7 @@ export type FGBuildableResourceSink__type = FGBuildable__consumes_power_base__ty
     mProcessingTime: decimal_string__type;
     mProducingTimer: decimal_string__type;
 };
+export type FGBuildableResourceSink__merged__type = common_base__FGBuildableResourceSink__type & FGBuildable__consumes_power_base__type;
 export type FGBuildableResourceSink__NativeClass = NativeClass__type & {
     Classes: [FGBuildableResourceSink__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildableResourceSinkShop.d.ts

@@ -1,9 +1,8 @@
 import { FGBuildable__consumes_power_base__type } from './FGBuildable';
-import { integer_string__type } from '../../../common/common/scalar';
+import { common_base__FGBuildableResourceSinkShop__type } from '../../../common/classes/CoreUObject/FGBuildableResourceSinkShop';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildableResourceSinkShop__type = FGBuildable__consumes_power_base__type & {
-    mShopInventoryDefaultSize: integer_string__type;
-};
+export type FGBuildableResourceSinkShop__type = FGBuildableResourceSinkShop__merged__type;
+export type FGBuildableResourceSinkShop__merged__type = common_base__FGBuildableResourceSinkShop__type & FGBuildable__consumes_power_base__type;
 export type FGBuildableResourceSinkShop__NativeClass = NativeClass__type & {
     Classes: [FGBuildableResourceSinkShop__type];
 };

package/generated-types/1.0/classes/CoreUObject/FGBuildableSnowDispenser.d.ts

@@ -1,9 +1,11 @@
-import { FGBuildable__base__type, FGBuildable__occupied__type, FGBuildable__tiered__type } from './FGBuildable';
+import { FGBuildable__base__type, FGBuildable__occupied__final__type, FGBuildable__tiered__type } from './FGBuildable';
+import { common_base__FGBuildableSnowDispenser__type } from '../../../common/classes/CoreUObject/FGBuildableSnowDispenser';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGBuildableSnowDispenser__type = FGBuildable__base__type;
+export type FGBuildableSnowDispenser__type = FGBuildableSnowDispenser__merged__type;
+export type FGBuildableSnowDispenser__merged__type = common_base__FGBuildableSnowDispenser__type & FGBuildable__base__type;
 export type FGBuildableSnowDispenser__NativeClass = NativeClass__type & {
     Classes: [
-        (FGBuildable__base__type | FGBuildable__occupied__type | FGBuildable__tiered__type),
-        ...(FGBuildable__base__type | FGBuildable__occupied__type | FGBuildable__tiered__type)[]
+        (FGBuildable__base__type | FGBuildable__occupied__final__type | FGBuildable__tiered__type),
+        ...(FGBuildable__base__type | FGBuildable__occupied__final__type | FGBuildable__tiered__type)[]
     ];
 };