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

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

@@ -1,15 +1,11 @@
 import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { Montage_1P__type, Montage_3P__type, CameraAnim__type } from '../../common/unassigned';
 import { FGEquipment__base__type } from './FGEquipment';
-import { boolean__type, decimal_string__type } from '../../../common/common/scalar';
-import { mDamageTypes__type, empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGGasMask__type = FGEquipment__base__type & {
-    mDamageTypesToProtectAgainst: mDamageTypes__type;
-    mPostProcessEnabled: boolean__type;
-    mFilterCountdown: decimal_string__type;
-    mFilterDuration: decimal_string__type;
-    mIsInPoisonGas: boolean__type;
-    mEquipMontage?: {
+import { boolean__type } from '../../../common/common/scalar';
+import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
+import { common_base__FGGasMask__type } from '../../../common/classes/CoreUObject/FGGasMask';
+export type FGGasMask__type = FGGasMask__merged__type & {
+    mEquipMontage: {
         Montages: [
             {
                 Montage_1P: Montage_1P__type;
@@ -21,9 +17,10 @@ export type FGGasMask__type = FGEquipment__base__type & {
             }
         ];
     };
-    mStingerMontage?: empty_object__type;
-    mUnEquipMontage?: FGGasMask__mUnEquipMontage__type;
+    mStingerMontage: empty_object__type;
+    mUnEquipMontage: FGGasMask__mUnEquipMontage__type;
 };
+export type FGGasMask__merged__type = common_base__FGGasMask__type & FGEquipment__base__type;
 export type FGGasMask__mUnEquipMontage__type = {
     AudioEvent: UnrealEngineString<'/Script/AkAudio.AkAudioEvent', StringStartsWith<'/Game/WwiseAudio/Events/Equipment/Equipment_Gear/GasMask/'>>;
 };

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

@@ -1,11 +1,11 @@
 import { Montage_1P__type, Montage_3P__type } from '../../common/unassigned';
 import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FGEquipment__base__type } from './FGEquipment';
-import { boolean__type, decimal_string__type } from '../../../common/common/scalar';
 import { xyz__type, empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGGolfCartDispenser__type = FGEquipment__base__type & {
+import { decimal_string__type } from '../../../common/common/scalar';
+import { common_base__FGGolfCartDispenser__type } from '../../../common/classes/CoreUObject/FGGolfCartDispenser';
+export type FGGolfCartDispenser__type = FGGolfCartDispenser__merged__type & {
     mBuildDisqualifierText: 'Vehicles cannot be built or deployed on top of existing vehicles!';
-    canDisplayDisqualifier: boolean__type;
     mChristmasMaterial: 'None' | '/Game/FactoryGame/Buildable/Vehicle/Golfcart/Material/MI_ChrismasCart_Inst.MI_ChrismasCart_Inst';
     mChristmasMaterial1P: 'None' | '/Game/FactoryGame/Buildable/Vehicle/Golfcart/Material/MI_ChrismasCart_Inst_1p.MI_ChrismasCart_Inst_1p';
     mCartPlacementClearance: xyz__type;
@@ -23,6 +23,7 @@ export type FGGolfCartDispenser__type = FGEquipment__base__type & {
         AudioEvent: UnrealEngineString<'/Script/AkAudio.AkAudioEvent', StringStartsWith<'/Game/WwiseAudio/Events/Character/Player/ResourcePickUp/'>>;
     };
 };
+export type FGGolfCartDispenser__merged__type = common_base__FGGolfCartDispenser__type & FGEquipment__base__type;
 export type FGGolfCartDispenser__NativeClass = NativeClass__type & {
     Classes: [FGGolfCartDispenser__type, FGGolfCartDispenser__type];
 };

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

@@ -2,38 +2,14 @@ import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FilterMontageTag__type } from '../../common/unassigned';
 import { FGEquipment__base__type } from './FGEquipment';
 import { boolean__type, decimal_string__type } from '../../../common/common/scalar';
-import { empty_object__type, xyz__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGHoverPack__type = FGEquipment__base__type & {
+import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
+import { common_base__FGHoverPack__type } from '../../../common/classes/CoreUObject/FGHoverPack';
+export type FGHoverPack__type = FGHoverPack__merged__type & {
     mCurrentPlayerVelocity_SFX: decimal_string__type;
     mCurrentMouseDelta_SFX: decimal_string__type;
     mLowBatteryWarningActive_SFX: boolean__type;
     mPropellerVFX: '';
-    ConnectionLocationUpdatedDelegate: empty_object__type;
-    ConnectionStatusUpdatedDelegate: empty_object__type;
-    HoverModeChangedDelegate: empty_object__type;
-    RangeWarningToggleDelegate: empty_object__type;
-    mHoverSpeed: decimal_string__type;
-    mHoverAccelerationSpeed: decimal_string__type;
-    mHoverSprintMultiplier: decimal_string__type;
-    mHoverFriction: decimal_string__type;
-    mJumpKeyHoldActivationTime: decimal_string__type;
-    mFallSpeedLimitWhenPowered: decimal_string__type;
-    mPowerConnectionSearchRadius: decimal_string__type;
-    mPowerConnectionSearchTickRate: decimal_string__type;
-    mPowerConnectionDisconnectionTime: decimal_string__type;
-    mPowerCapacity: decimal_string__type;
-    mPowerDrainRate: decimal_string__type;
-    mPowerConsumption: decimal_string__type;
-    mCurrentPowerLevel: decimal_string__type;
-    mRangeWarningNormalizedDistanceThreshold: decimal_string__type;
     mDisplayRangeWarning: boolean__type;
-    mCurrentHoverMode: 'HPM_Inactive';
-    mHasConnection: boolean__type;
-    mShouldAutomaticallyHoverWhenConnected: boolean__type;
-    mCrouchHoverCancelTime: decimal_string__type;
-    mCharacterUseDistanceWhenActive: decimal_string__type;
-    mActiveNoiseFrequency: decimal_string__type;
-    mCurrentConnectionLocation: xyz__type;
     mEquipMontage?: {
         Montages: [
             {
@@ -56,6 +32,7 @@ export type FGHoverPack__type = FGEquipment__base__type & {
     };
 };
 export type FGHoverPack__AudioEvent__type = UnrealEngineString<'/Script/AkAudio.AkAudioEvent', StringStartsWith<'/Game/WwiseAudio/Events/Equipment/HoverPack/'>>;
+export type FGHoverPack__merged__type = common_base__FGHoverPack__type & FGEquipment__base__type;
 export type FGHoverPack__NativeClass = NativeClass__type & {
     Classes: [FGHoverPack__type];
 };

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

@@ -1,20 +1,16 @@
 import { mGasType__type } from '../../common/unassigned';
 import { StringStartsWith } from '../../utils/validators';
-import { boolean__type, integer_string__type } from '../../../common/common/scalar';
-import { common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__mSubCategories__type, mForm__type, None__type, common_base__FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type, NativeClass__type } from '../../../common/common/unassigned';
+import { boolean__type } from '../../../common/common/scalar';
+import { None__type, NativeClass__type } from '../../../common/common/unassigned';
+import { common_base__FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type, common_base__FGItemDescriptor__FGResourceDescriptor__type, common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type } from '../../../common/classes/CoreUObject/FGItemDescriptor';
 export type FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type = common_base__FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type & {
     mGasType: mGasType__type;
     mClassToScanFor: None__type | StringStartsWith<'/Game/FactoryGame/Resource/Environment/'> | StringStartsWith<'/Game/FactoryGame/World/Benefit/'> | StringStartsWith<'/Game/FactoryGame/Prototype/WAT/'>;
     mIsAlienItem: boolean__type;
     mNeedsPickUpMarker: boolean__type;
 };
-export type FGItemDescriptor__FGResourceDescriptor__type = FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-    mResourceSinkPoints: integer_string__type;
-};
-export type FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type = FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type & {
-    mSubCategories: common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__mSubCategories__type;
-    mForm: mForm__type;
-};
+export type FGItemDescriptor__FGResourceDescriptor__type = common_base__FGItemDescriptor__FGResourceDescriptor__type & FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
+export type FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type = common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type;
 export type FGItemDescriptor__NativeClass = NativeClass__type & {
     Classes: [
         FGItemDescriptor__FGResourceDescriptor__type,

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

@@ -1,6 +1,8 @@
 import { FGItemDescriptor__FGResourceDescriptor__type } from './FGItemDescriptor';
+import { common_base__FGItemDescriptorBiomass__type } from '../../../common/classes/CoreUObject/FGItemDescriptorBiomass';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGItemDescriptorBiomass__type = FGItemDescriptor__FGResourceDescriptor__type;
+export type FGItemDescriptorBiomass__type = FGItemDescriptorBiomass__merged__type;
+export type FGItemDescriptorBiomass__merged__type = common_base__FGItemDescriptorBiomass__type & FGItemDescriptor__FGResourceDescriptor__type;
 export type FGItemDescriptorBiomass__NativeClass = NativeClass__type & {
     Classes: [
         FGItemDescriptor__FGResourceDescriptor__type,

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

@@ -1,11 +1,10 @@
-import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FGItemDescriptor__FGResourceDescriptor__type } from './FGItemDescriptor';
-import { integer_string__type } from '../../../common/common/scalar';
-import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGItemDescriptorNuclearFuel__type = FGItemDescriptor__FGResourceDescriptor__type & {
-    mSpentFuelClass: UnrealEngineString<'/Script/Engine.BlueprintGeneratedClass', StringStartsWith<'/Game/FactoryGame/Resource/Parts/NuclearWaste/'>> | 'None';
-    mAmountOfWaste: integer_string__type;
+import { common_base__FGItemDescriptorNuclearFuel__waste__type, common_base__FGItemDescriptorNuclearFuel__type } from '../../../common/classes/CoreUObject/FGItemDescriptorNuclearFuel';
+import { None__type, NativeClass__type } from '../../../common/common/unassigned';
+export type FGItemDescriptorNuclearFuel__type = FGItemDescriptorNuclearFuel__merged__type & {
+    mSpentFuelClass: common_base__FGItemDescriptorNuclearFuel__waste__type | None__type;
 };
+export type FGItemDescriptorNuclearFuel__merged__type = common_base__FGItemDescriptorNuclearFuel__type & FGItemDescriptor__FGResourceDescriptor__type;
 export type FGItemDescriptorNuclearFuel__NativeClass = NativeClass__type & {
     Classes: [
         FGItemDescriptorNuclearFuel__type,

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

@@ -1,25 +1,14 @@
 import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FGEquipment__base__type } from './FGEquipment';
 import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-import { decimal_string__type, boolean__type, integer_string__type } from '../../../common/common/scalar';
-export type FGJetPack__type = FGEquipment__base__type & {
-    FuelTypeDescriptos: '';
-    mOnFuelAmountChanged: empty_object__type;
-    mOnBurnPercentChanged: empty_object__type;
-    mOnFuelTypeChanged: empty_object__type;
-    mDefaultAirControl: decimal_string__type;
-    mRTPCInterval: decimal_string__type;
-    mCurrentFuel: decimal_string__type;
-    mIsThrusting: boolean__type;
+import { common_base__FGJetPack__type } from '../../../common/classes/CoreUObject/FGJetPack';
+export type FGJetPack__type = FGJetPack__merged__type & {
     mAllowedFuelTypes: [
         UnrealEngineString<'/Script/FactoryGame.FGJetPackFuelParameters', StringStartsWith<'/Game/FactoryGame/Equipment/JetPack/FuelTypes/'>>,
         ...UnrealEngineString<'/Script/FactoryGame.FGJetPackFuelParameters', StringStartsWith<'/Game/FactoryGame/Equipment/JetPack/FuelTypes/'>>[]
     ];
-    mSelectedFuelType: integer_string__type;
-    mCurrentFuelType: integer_string__type;
     mUnlockedFuelTypes: '';
     mAvailableFuelTypes: '';
-    mActiveNoiseFrequency: decimal_string__type;
     mEquipMontage?: {
         Montages: [
             {
@@ -32,6 +21,7 @@ export type FGJetPack__type = FGEquipment__base__type & {
         AudioEvent: UnrealEngineString<'/Script/AkAudio.AkAudioEvent', StringStartsWith<'/Game/WwiseAudio/Events/Equipment/JetPack/'>>;
     };
 };
+export type FGJetPack__merged__type = common_base__FGJetPack__type & FGEquipment__base__type;
 export type FGJetPack__NativeClass = NativeClass__type & {
     Classes: [FGJetPack__type];
 };

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

@@ -1,17 +1,17 @@
 import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FGEquipment__base__type } from './FGEquipment';
-import { boolean__type, decimal_string__type } from '../../../common/common/scalar';
+import { boolean__type } from '../../../common/common/scalar';
 import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGJumpingStilts__type = FGEquipment__base__type & {
-    mSprintSpeedFactor: decimal_string__type;
-    mJumpSpeedFactor: decimal_string__type;
-    mEquipMontage?: {
+import { common_base__FGJumpingStilts__type } from '../../../common/classes/CoreUObject/FGJumpingStilts';
+export type FGJumpingStilts__type = FGJumpingStilts__merged__type & {
+    mEquipMontage: {
         Montages: [FGJumpingStilts__Montage__type];
     };
-    mStingerMontage?: empty_object__type;
-    mUnEquipMontage?: FGJumpingStilts__Montage__type;
+    mStingerMontage: empty_object__type;
+    mUnEquipMontage: FGJumpingStilts__Montage__type;
 };
 export type FGJumpingStilts__AudioEvent__type = UnrealEngineString<'/Script/AkAudio.AkAudioEvent', StringStartsWith<'/Game/WwiseAudio/Events/Equipment/BladeRunners/' | '/Game/WwiseAudio/Events/Equipment/Equipment_Gear/BladeRunners/'>>;
+export type FGJumpingStilts__merged__type = common_base__FGJumpingStilts__type & FGEquipment__base__type;
 export type FGJumpingStilts__Montage__type = {
     AudioEvent: FGJumpingStilts__AudioEvent__type;
     bSeparate3PAudioEvent: boolean__type;

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

@@ -2,8 +2,8 @@ import { Montage_1P__type, Montage_3P__type } from '../../common/unassigned';
 import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FGEquipment__base__type } from './FGEquipment';
 import { xyz__type, empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-import { decimal_string__type, boolean__type } from '../../../common/common/scalar';
-export type FGObjectScanner__type = FGEquipment__base__type & {
+import { common_base__FGObjectScanner__type } from '../../../common/classes/CoreUObject/FGObjectScanner';
+export type FGObjectScanner__type = FGObjectScanner__merged__type & {
     mScannerCycleLeftMontage: {
         Montage_1P: Montage_1P__type;
         Montage_Equipment: UnrealEngineString<'/Script/Engine.AnimMontage', StringStartsWith<'/Game/FactoryGame/Equipment/ObjectScanner/Animation/'>>;
@@ -14,16 +14,9 @@ export type FGObjectScanner__type = FGEquipment__base__type & {
         Montage_Equipment: UnrealEngineString<'/Script/Engine.AnimMontage', StringStartsWith<'/Game/FactoryGame/Equipment/ObjectScanner/Animation/'>>;
         AudioEvent: UnrealEngineString<'/Script/AkAudio.AkAudioEvent', StringStartsWith<'/Game/WwiseAudio/Events/Equipment/ObjectScanner/'>>;
     };
-    mBeepDelayMax: decimal_string__type;
-    mBeepDelayMin: decimal_string__type;
-    mDetectionRange: decimal_string__type;
-    mUpdateClosestObjectTime: decimal_string__type;
     mClosestObject: {
         ActorLocation: xyz__type;
     };
-    mClosestObjectInScanRange: boolean__type;
-    mNormalizedDistanceToClosestObject: decimal_string__type;
-    mAngleToClosestObject: decimal_string__type;
     mEquipMontage?: {
         Montages: [
             {
@@ -38,6 +31,7 @@ export type FGObjectScanner__type = FGEquipment__base__type & {
         AudioEvent: UnrealEngineString<'/Script/AkAudio.AkAudioEvent', StringStartsWith<'/Game/WwiseAudio/Events/Equipment/ObjectScanner/'>>;
     };
 };
+export type FGObjectScanner__merged__type = common_base__FGObjectScanner__type & FGEquipment__base__type;
 export type FGObjectScanner__NativeClass = NativeClass__type & {
     Classes: [FGObjectScanner__type];
 };

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

@@ -1,10 +1,10 @@
 import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FilterMontageTag__type, Montage_1P__type, Montage_3P__type, CameraAnim__type } from '../../common/unassigned';
 import { FGEquipment__base__type } from './FGEquipment';
-import { boolean__type, decimal_string__type } from '../../../common/common/scalar';
+import { boolean__type } from '../../../common/common/scalar';
 import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGParachute__type = FGEquipment__base__type & {
-    DeployedVFXComponents: '';
+import { common_base__FGParachute__type } from '../../../common/classes/CoreUObject/FGParachute';
+export type FGParachute__type = FGParachute__merged__type & {
     mParachuteDeployMontageList: {
         Montages: [
             ({
@@ -100,11 +100,9 @@ export type FGParachute__type = FGEquipment__base__type & {
             })
         ];
     };
-    mUseDistanceOverride: decimal_string__type;
-    mIsDeployed: boolean__type;
-    mEquipMontage?: FGParachute__mEquipMontage__type;
-    mStingerMontage?: empty_object__type;
-    mUnEquipMontage?: FGParachute__mUnEquipMontage__type;
+    mEquipMontage: FGParachute__mEquipMontage__type;
+    mStingerMontage: empty_object__type;
+    mUnEquipMontage: FGParachute__mUnEquipMontage__type;
 };
 export type FGParachute__AudioEvent__type = UnrealEngineString<'/Script/AkAudio.AkAudioEvent', StringStartsWith<'/Game/WwiseAudio/Events/Equipment/Parachute/' | '/Game/WwiseAudio/Events/Equipment/Equipment_Gear/Parachute/'>>;
 export type FGParachute__mEquipMontage__type = {
@@ -114,6 +112,7 @@ export type FGParachute__mEquipMontage__type = {
         }
     ];
 };
+export type FGParachute__merged__type = common_base__FGParachute__type & FGEquipment__base__type;
 export type FGParachute__mUnEquipMontage__type = {
     AudioEvent: FGParachute__AudioEvent__type;
 };

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

@@ -1,19 +1,8 @@
 import { FGBuildable__consumes_power_base__type } from './FGBuildable';
-import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-import { boolean__type, decimal_string__type } from '../../../common/common/scalar';
-export type FGPipeHyperStart__type = FGBuildable__consumes_power_base__type & {
-    mWindDirectionFromTurbine: empty_object__type;
-    ['mIsWindSoundPlaying?']: boolean__type;
-    mAudioTimerCounter: decimal_string__type;
-    AudioCounterTimer: empty_object__type;
-    IsEnginePlaying: boolean__type;
-    mOpeningOffset: decimal_string__type;
-    mInitialMinSpeedFactor: decimal_string__type;
-    mLength: decimal_string__type;
-    mCanStack: boolean__type;
-    mStackHeight: decimal_string__type;
-    mUseStaticHeight: boolean__type;
-};
+import { common_base__FGPipeHyperStart__type } from '../../../common/classes/CoreUObject/FGPipeHyperStart';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGPipeHyperStart__type = FGPipeHyperStart__merged__type;
+export type FGPipeHyperStart__merged__type = common_base__FGPipeHyperStart__type & FGBuildable__consumes_power_base__type;
 export type FGPipeHyperStart__NativeClass = NativeClass__type & {
     Classes: [FGPipeHyperStart__type];
 };

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

@@ -1,13 +1,8 @@
-import { UnrealEngineString } from '../../utils/validators';
 import { FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type } from './FGItemDescriptor';
+import { common_base__FGPoleDescriptor__type } from '../../../common/classes/CoreUObject/FGPoleDescriptor';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGPoleDescriptor__type = FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-    mForm: 'RF_INVALID';
-    mSubCategories: [
-        UnrealEngineString<'/Script/Engine.BlueprintGeneratedClass', '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_ConverPole.SC_ConverPole_C' | '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_PipeSupport.SC_PipeSupport_C' | '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_HyperTubes.SC_HyperTubes_C'>,
-        ...UnrealEngineString<'/Script/Engine.BlueprintGeneratedClass', '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_ConverPole.SC_ConverPole_C' | '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_PipeSupport.SC_PipeSupport_C' | '/Game/FactoryGame/Interface/UI/InGame/BuildMenu/BuildCategories/Sub_Transport/SC_HyperTubes.SC_HyperTubes_C'>[]
-    ];
-};
+export type FGPoleDescriptor__type = FGPoleDescriptor__merged__type;
+export type FGPoleDescriptor__merged__type = common_base__FGPoleDescriptor__type & FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 export type FGPoleDescriptor__NativeClass = NativeClass__type & {
     Classes: [FGPoleDescriptor__type, ...FGPoleDescriptor__type[]];
 };

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

@@ -1,8 +1,9 @@
 import { Montage_1P__type, Montage_3P__type } from '../../common/unassigned';
 import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FGEquipment__placeable__type } from './FGEquipment';
+import { common_base__FGPortableMinerDispenser__type } from '../../../common/classes/CoreUObject/FGPortableMinerDispenser';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGPortableMinerDispenser__type = FGEquipment__placeable__type & {
+export type FGPortableMinerDispenser__type = FGPortableMinerDispenser__merged__type & {
     mEquipMontage: {
         Montages: [
             {
@@ -27,6 +28,7 @@ export type FGPortableMinerDispenser__type = FGEquipment__placeable__type & {
         AudioEvent: UnrealEngineString<'/Script/AkAudio.AkAudioEvent', StringStartsWith<'/Game/WwiseAudio/Events/Character/Player/ResourcePickUp/'>>;
     };
 };
+export type FGPortableMinerDispenser__merged__type = common_base__FGPortableMinerDispenser__type & FGEquipment__placeable__type;
 export type FGPortableMinerDispenser__NativeClass = NativeClass__type & {
     Classes: [FGPortableMinerDispenser__type];
 };

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

@@ -1,9 +1,10 @@
 import { FGCustomizationRecipe__FGRecipe__type } from './FGCustomizationRecipe';
 import { ItemClass__amount_required__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGRecipe__type = FGCustomizationRecipe__FGRecipe__type & {
+import { common_base__FGRecipe__type } from '../../../common/classes/CoreUObject/FGRecipe';
+export type FGRecipe__type = FGRecipe__merged__type & {
     mIngredients: ItemClass__amount_required__type | '';
-    mProduct: ItemClass__amount_required__type;
 };
+export type FGRecipe__merged__type = common_base__FGRecipe__type & FGCustomizationRecipe__FGRecipe__type;
 export type FGRecipe__NativeClass = NativeClass__type & {
     Classes: [FGRecipe__type, ...FGRecipe__type[]];
 };

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

@@ -1,12 +1,10 @@
 import { FGItemDescriptor__FGResourceDescriptor__type } from './FGItemDescriptor';
-import { decimal_string__type } from '../../../common/common/scalar';
-import { color_decimal__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGResourceDescriptor__type = FGItemDescriptor__FGResourceDescriptor__type & {
-    mDecalSize: decimal_string__type;
-    mPingColor: color_decimal__type;
-    mCollectSpeedMultiplier: decimal_string__type;
+import { common_base__FGResourceDescriptor__type } from '../../../common/classes/CoreUObject/FGResourceDescriptor';
+import { NativeClass__type } from '../../../common/common/unassigned';
+export type FGResourceDescriptor__type = FGResourceDescriptor__merged__type & {
     mManualMiningAudioName: 'Metal' | 'Sam';
 };
+export type FGResourceDescriptor__merged__type = common_base__FGResourceDescriptor__type & FGItemDescriptor__FGResourceDescriptor__type;
 export type FGResourceDescriptor__NativeClass = NativeClass__type & {
     Classes: [FGResourceDescriptor__type, ...FGResourceDescriptor__type[]];
 };

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

@@ -1,5 +1,6 @@
 import { integer_string__type, decimal_string__type, boolean__type } from '../../../common/common/scalar';
-import { UnrealEngineString__array__type, common_base__FGSchematic__mUnlocks__type, common_base__FGSchematic__base__mSchematicDependencies__mRequireAllSchematicsToBePurchased__type, common_base__FGSchematic__base__mSchematicDependencies__mGamePhase__type, empty_object__type, common_base__FGSchematic__base__type, NativeClass__type } from '../../../common/common/unassigned';
+import { UnrealEngineString__array__type, empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
+import { common_base__FGSchematic__mUnlocks__type, common_base__FGSchematic__base__mSchematicDependencies__mRequireAllSchematicsToBePurchased__type, common_base__FGSchematic__base__mSchematicDependencies__mGamePhase__type, common_base__FGSchematic__base__type, common_base__FGSchematic__mUnlocks_Class__type, common_base__FGSchematic__with_unlocks__type } from '../../../common/classes/CoreUObject/FGSchematic';
 export type FGSchematic__type = FGSchematic__base__type;
 export type FGSchematic__base__type = common_base__FGSchematic__base__type & {
     mType: 'EST_Custom' | 'EST_Customization' | 'EST_ResourceSink' | 'EST_Milestone' | 'EST_Alternate' | 'EST_MAM' | 'EST_HardDrive' | 'EST_Tutorial';
@@ -27,7 +28,7 @@ export type FGSchematic__mNumSlotsToUnlock__type = {
     Class: 'BP_UnlockCentralStorageUploadSlots_C';
     mNumSlotsToUnlock: integer_string__type;
 };
-export type FGSchematic__mUnlocks_Class__type = {
+export type FGSchematic__mUnlocks_Class__type = common_base__FGSchematic__mUnlocks_Class__type & {
     Class: 'BP_UnlockInfoOnly_C' | 'BP_UnlockCheckmark_C' | 'BP_UnlockCustomizer_C' | 'BP_UnlockMap_C' | 'BP_UnlockBuildEfficiency_C' | 'BP_UnlockBuildOverclock_C' | 'BP_UnlockBuildProductionBoost_C';
 };
 export type FGSchematic__mUnlocks_mCustomizationUnlocks__type = {
@@ -38,13 +39,8 @@ export type FGSchematic__mUploadSpeedPercentageDecrease__type = {
     Class: 'BP_UnlockCentralStorageUploadSpeed_C';
     mUploadSpeedPercentageDecrease: decimal_string__type;
 };
-export type FGSchematic__with_unlocks__type = FGSchematic__base__type & {
-    mUnlockName: Exclude<string, ''>;
-    mUnlockDescription: string;
-    mUnlockIconBig: 'Unsupported texture. Contact developer for support';
-    mUnlockIconSmall: 'Unsupported texture. Contact developer for support';
-    mUnlockIconCategory: 'Unsupported texture. Contact developer for support';
-};
+export type FGSchematic__with_unlocks__type = FGSchematic__with_unlocks__merged__type;
+export type FGSchematic__with_unlocks__merged__type = common_base__FGSchematic__with_unlocks__type & FGSchematic__base__type;
 export type FGSchematic__NativeClass = NativeClass__type & {
     Classes: [
         FGSchematic__type | FGSchematic__with_unlocks__type,

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

@@ -1,16 +1,8 @@
 import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FGEquipment__base__type } from './FGEquipment';
-import { decimal_string__type, boolean__type } from '../../../common/common/scalar';
 import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGSuitBase__type = FGEquipment__base__type & {
-    mImmunity: decimal_string__type;
-    mIsWorking: boolean__type;
-    mHasNegatedDamage: boolean__type;
-    mDamageNegated: decimal_string__type;
-    mFilterDuration: decimal_string__type;
-    mCountdown: decimal_string__type;
-    mDisableEffectTimer: decimal_string__type;
-    mIsBurningFuel: boolean__type;
+import { common_base__FGSuitBase__type } from '../../../common/classes/CoreUObject/FGSuitBase';
+export type FGSuitBase__type = FGSuitBase__merged__type & {
     mSuitMeshMaterials: [
         {
             SlotName: 'Pioneer_torso' | 'Pioneer_Legs';
@@ -35,6 +27,7 @@ export type FGSuitBase__type = FGEquipment__base__type & {
         AudioEvent: UnrealEngineString<'/Script/AkAudio.AkAudioEvent', StringStartsWith<'/Game/WwiseAudio/Events/Equipment/HazmatSuit/'>>;
     };
 };
+export type FGSuitBase__merged__type = common_base__FGSuitBase__type & FGEquipment__base__type;
 export type FGSuitBase__NativeClass = NativeClass__type & {
     Classes: [FGSuitBase__type];
 };

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

@@ -1,19 +1,13 @@
 import { FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type } from './FGItemDescriptor';
-import { decimal_string__type, integer_string__type } from '../../../common/common/scalar';
+import { common_base__FGVehicleDescriptor__fueled_with_inventory__type, common_base__FGVehicleDescriptor__powered_no_inventory__type, common_base__FGVehicleDescriptor__with_inventory__type } from '../../../common/classes/CoreUObject/FGVehicleDescriptor';
 import { NativeClass__type } from '../../../common/common/unassigned';
-export type FGVehicleDescriptor__fueled_with_inventory__type = FGVehicleDescriptor__with_inventory__type & {
-    mFuelConsumption: decimal_string__type;
-};
-export type FGVehicleDescriptor__powered_no_inventory__type = FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-    mPowerConsumption: {
-        Min: decimal_string__type;
-        Max: decimal_string__type;
-    };
-};
+export type FGVehicleDescriptor__fueled_with_inventory__type = FGVehicleDescriptor__fueled_with_inventory__merged__type;
+export type FGVehicleDescriptor__fueled_with_inventory__merged__type = common_base__FGVehicleDescriptor__fueled_with_inventory__type & FGVehicleDescriptor__with_inventory__type;
+export type FGVehicleDescriptor__powered_no_inventory__type = FGVehicleDescriptor__powered_no_inventory__merged__type;
+export type FGVehicleDescriptor__powered_no_inventory__merged__type = common_base__FGVehicleDescriptor__powered_no_inventory__type & FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 export type FGVehicleDescriptor__unfueled_with_inventory__type = FGVehicleDescriptor__with_inventory__type;
-export type FGVehicleDescriptor__with_inventory__type = FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & {
-    mInventorySize: integer_string__type;
-};
+export type FGVehicleDescriptor__with_inventory__type = FGVehicleDescriptor__with_inventory__merged__type;
+export type FGVehicleDescriptor__with_inventory__merged__type = common_base__FGVehicleDescriptor__with_inventory__type & FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type;
 export type FGVehicleDescriptor__NativeClass = NativeClass__type & {
     Classes: [
         (FGVehicleDescriptor__powered_no_inventory__type | FGVehicleDescriptor__unfueled_with_inventory__type | FGVehicleDescriptor__fueled_with_inventory__type),

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

@@ -1,32 +1,12 @@
-import { Montage_1P__type, Montage_3P__type, CameraAnim__type, weaponState__type } from '../../common/unassigned';
+import { Montage_1P__type, Montage_3P__type, CameraAnim__type } from '../../common/unassigned';
 import { UnrealEngineString, StringStartsWith } from '../../utils/validators';
 import { FGEquipment__base__type } from './FGEquipment';
-import { decimal_string__type, boolean__type, integer_string__type } from '../../../common/common/scalar';
-import { empty_object__type, UnrealEngineString__array__type, NativeClass__type } from '../../../common/common/unassigned';
-export type FGWeapon__base__type = FGEquipment__base__type & {
-    mShowCycleAmmoRadialMenuTimer: empty_object__type;
-    mOnWeaponStateChanged: empty_object__type;
-    mWeaponState: weaponState__type;
-    mAutomaticallyReload: boolean__type;
-    mAutoReloadDelay: decimal_string__type;
-    mAutoReloadTimerHandle: empty_object__type;
-    mCurrentAmmoCount: integer_string__type;
-    mAllowedAmmoClasses: UnrealEngineString__array__type;
-    mAttachMagazineToPlayer: boolean__type;
-    mMuzzleSocketName: 'muzzleSocket' | 'MuzzleSocket' | 'None';
-    mCurrentMagazineBoneName: 'CurrentMagazine' | 'hand_rSocket';
-    mEjectMagazineBoneName: 'EjectMagazine' | 'hand_rSocket';
-    mDispersionOnNoMagazine: decimal_string__type;
-    mWeaponDamageMultiplier: decimal_string__type;
-    mFiringBlocksDispersionReduction: boolean__type;
-    mCurrentDispersion: decimal_string__type;
-    mReloadTime: decimal_string__type;
-    mAmmoSwitchUsedRadialMenu: boolean__type;
-    mOnAmmoCyclingPressed: empty_object__type;
-    mOnAmmoCyclingReleased: empty_object__type;
-    mBlockSprintWhenFiring: boolean__type;
-};
-export type FGWeapon__gun_base__type = FGWeapon__base__type & {
+import { decimal_string__type, boolean__type } from '../../../common/common/scalar';
+import { empty_object__type, NativeClass__type } from '../../../common/common/unassigned';
+import { common_base__FGWeapon__base__type, common_base__FGWeapon__gun_base__type, common_base__FGWeapon__rebar_gun__type, common_base__FGWeapon__rifle__type } from '../../../common/classes/CoreUObject/FGWeapon';
+export type FGWeapon__base__type = FGWeapon__base__merged__type;
+export type FGWeapon__base__merged__type = common_base__FGWeapon__base__type & FGEquipment__base__type;
+export type FGWeapon__gun_base__type = FGWeapon__gun_base__merged__type & {
     mFireMontage: {
         Montage_1P: Montage_1P__type;
         Montage_3P: Montage_3P__type;
@@ -36,8 +16,8 @@ export type FGWeapon__gun_base__type = FGWeapon__base__type & {
     };
     mSupressDryFireMontage: boolean__type;
 };
-export type FGWeapon__rebar_gun__type = FGWeapon__gun_base__type & {
-    ClassName: 'Equip_RebarGun_Projectile_C';
+export type FGWeapon__gun_base__merged__type = common_base__FGWeapon__gun_base__type & FGWeapon__base__type;
+export type FGWeapon__rebar_gun__type = FGWeapon__rebar_gun__merged__type & {
     mReloadMontageList: {
         Montages: [
             {
@@ -97,11 +77,9 @@ export type FGWeapon__rebar_gun__type = FGWeapon__gun_base__type & {
         AudioEvent: UnrealEngineString<'/Script/AkAudio.AkAudioEvent', StringStartsWith<'/Game/WwiseAudio/Events/Equipment/RebarGun/'>>;
     };
 };
-export type FGWeapon__rifle__type = FGWeapon__gun_base__type & {
-    ClassName?: 'Equip_Rifle_C';
-    Fire: empty_object__type;
-    mHasReloadedOnce: boolean__type;
-    mReloadMontageList?: {
+export type FGWeapon__rebar_gun__merged__type = common_base__FGWeapon__rebar_gun__type & FGWeapon__gun_base__type;
+export type FGWeapon__rifle__type = FGWeapon__rifle__merged__type & {
+    mReloadMontageList: {
         Montages: [
             {
                 Montage_1P: Montage_1P__type;
@@ -113,7 +91,7 @@ export type FGWeapon__rifle__type = FGWeapon__gun_base__type & {
             }
         ];
     };
-    mAmmoSwapMontageList?: {
+    mAmmoSwapMontageList: {
         Montages: [
             {
                 Montage_1P: Montage_1P__type;
@@ -125,8 +103,8 @@ export type FGWeapon__rifle__type = FGWeapon__gun_base__type & {
             }
         ];
     };
-    mFailedToFireMontageList?: empty_object__type;
-    mEquipMontage?: {
+    mFailedToFireMontageList: empty_object__type;
+    mEquipMontage: {
         Montages: [
             {
                 Montage_1P: Montage_1P__type;
@@ -138,7 +116,7 @@ export type FGWeapon__rifle__type = FGWeapon__gun_base__type & {
             }
         ];
     };
-    mStingerMontage?: {
+    mStingerMontage: {
         Montages: [
             {
                 Montage_1P: Montage_1P__type;
@@ -150,11 +128,9 @@ export type FGWeapon__rifle__type = FGWeapon__gun_base__type & {
             }
         ];
     };
-    mUnEquipMontage?: empty_object__type;
+    mUnEquipMontage: empty_object__type;
 };
+export type FGWeapon__rifle__merged__type = common_base__FGWeapon__rifle__type & FGWeapon__gun_base__type;
 export type FGWeapon__NativeClass = NativeClass__type & {
-    Classes: [
-        FGWeapon__rebar_gun__type | FGWeapon__rifle__type,
-        ...(FGWeapon__rebar_gun__type | FGWeapon__rifle__type)[]
-    ];
+    Classes: [FGWeapon__rebar_gun__type, FGWeapon__rifle__type];
 };