pulling jetpack & hoverpack into common types

- re: #5
satisfactory-dev · Nov 9, 2024 · 95ce81c · 95ce81c
1 parent d057213
commit 95ce81c
Show file tree

Hide file tree

Showing 14 changed files with 333 additions and 389 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -78,10 +78,12 @@
 	"common_type__common_base__FGEquipmentStunSpear__type": "classes/CoreUObject/FGEquipmentStunSpear",
 	"common_type__common_base__FGEquipmentStunSpear__base__type": "classes/CoreUObject/FGEquipmentStunSpear",
 	"common_type__common_base__FGEquipmentStunSpear__xeno_zapper__type": "classes/CoreUObject/FGEquipmentStunSpear",
+	"common_type__common_base__FGHoverPack__type": "classes/CoreUObject/FGHoverPack",
 	"common_type__common_base__FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type": "classes/CoreUObject/FGItemDescriptor",
 	"common_type__common_base__FGItemDescriptor__FGResourceDescriptor__type": "classes/CoreUObject/FGItemDescriptor",
 	"common_type__common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type": "classes/CoreUObject/FGItemDescriptor",
 	"common_type__common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__mSubCategories__type": "classes/CoreUObject/FGItemDescriptor",
+	"common_type__common_base__FGJetPack__type": "classes/CoreUObject/FGJetPack",
 	"common_type__common_base__FGPoleDescriptor__type": "classes/CoreUObject/FGPoleDescriptor",
 	"common_type__common_base__FGRecipe__type": "classes/CoreUObject/FGRecipe",
 	"common_type__common_base__FGResourceDescriptor__type": "classes/CoreUObject/FGResourceDescriptor",

diff --git a/generated-types/1.0/classes/CoreUObject/FGHoverPack.ts b/generated-types/1.0/classes/CoreUObject/FGHoverPack.ts
@@ -11,41 +11,17 @@ import {
 
 import {
 	empty_object__type,
-	xyz__type,
 	NativeClass__type,
 } from '../../../common/common/unassigned';
 
-export type FGHoverPack__type = FGEquipment__base__type & {
+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: [
 			{
@@ -73,6 +49,9 @@ export type FGHoverPack__AudioEvent__type = UnrealEngineString<
 	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];
 };
diff --git a/generated-types/1.0/classes/CoreUObject/FGJetPack.ts b/generated-types/1.0/classes/CoreUObject/FGJetPack.ts
@@ -7,21 +7,9 @@ import {
 	NativeClass__type,
 } from '../../../common/common/unassigned';
 
-import {
-	decimal_string__type,
-	boolean__type,
-	integer_string__type,
-} from '../../../common/common/scalar';
+import {common_base__FGJetPack__type} from '../../../common/classes/CoreUObject/FGJetPack';
 
-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;
+export type FGJetPack__type = FGJetPack__merged__type & {
 	mAllowedFuelTypes: [
 		UnrealEngineString<
 			'/Script/FactoryGame.FGJetPackFuelParameters',
@@ -32,11 +20,8 @@ export type FGJetPack__type = FGEquipment__base__type & {
 			StringStartsWith<'/Game/FactoryGame/Equipment/JetPack/FuelTypes/'>
 		>[],
 	];
-	mSelectedFuelType: integer_string__type;
-	mCurrentFuelType: integer_string__type;
 	mUnlockedFuelTypes: '';
 	mAvailableFuelTypes: '';
-	mActiveNoiseFrequency: decimal_string__type;
 	mEquipMontage?: {
 		Montages: [
 			{
@@ -56,6 +41,9 @@ export type FGJetPack__type = FGEquipment__base__type & {
 	};
 };
 
+export type FGJetPack__merged__type =
+	common_base__FGJetPack__type & FGEquipment__base__type;
+
 export type FGJetPack__NativeClass = NativeClass__type & {
 	Classes: [FGJetPack__type];
 };
diff --git a/generated-types/common/classes/CoreUObject/FGHoverPack.ts b/generated-types/common/classes/CoreUObject/FGHoverPack.ts
@@ -0,0 +1,34 @@
+import {empty_object__type, xyz__type} from '../../common/unassigned';
+
+import {decimal_string__type, boolean__type} from '../../common/scalar';
+
+import {common_base__FGEquipment__base__type} from './FGEquipment';
+
+export type common_base__FGHoverPack__type =
+	common_base__FGEquipment__base__type & {
+		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;
+		mCurrentHoverMode: 'HPM_Inactive';
+		mHasConnection: boolean__type;
+		mShouldAutomaticallyHoverWhenConnected: boolean__type;
+		mCrouchHoverCancelTime: decimal_string__type;
+		mCharacterUseDistanceWhenActive: decimal_string__type;
+		mActiveNoiseFrequency: decimal_string__type;
+		mCurrentConnectionLocation: xyz__type;
+	};
diff --git a/generated-types/common/classes/CoreUObject/FGJetPack.ts b/generated-types/common/classes/CoreUObject/FGJetPack.ts
@@ -0,0 +1,24 @@
+import {empty_object__type} from '../../common/unassigned';
+
+import {
+	decimal_string__type,
+	boolean__type,
+	integer_string__type,
+} from '../../common/scalar';
+
+import {common_base__FGEquipment__base__type} from './FGEquipment';
+
+export type common_base__FGJetPack__type =
+	common_base__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;
+		mSelectedFuelType: integer_string__type;
+		mCurrentFuelType: integer_string__type;
+		mActiveNoiseFrequency: decimal_string__type;
+	};
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -47,6 +47,10 @@ import {
 	common_base__FGEquipmentStunSpear__xeno_zapper__type,
 } from '../classes/CoreUObject/FGEquipmentStunSpear';
 
+import {common_base__FGHoverPack__type} from '../classes/CoreUObject/FGHoverPack';
+
+import {common_base__FGJetPack__type} from '../classes/CoreUObject/FGJetPack';
+
 import {common_base__FGBuildableDroneStation__type} from '../classes/CoreUObject/FGBuildableDroneStation';
 
 import {
@@ -221,6 +225,8 @@ export type faux_15__type = class__type & {
 	FGEquipmentStunSpear_base?: common_base__FGEquipmentStunSpear__base__type;
 	FGEquipmentStunSpear?: common_base__FGEquipmentStunSpear__type;
 	FGEquipmentStunSpear_xeno_zapper?: common_base__FGEquipmentStunSpear__xeno_zapper__type;
+	hoverpack?: common_base__FGHoverPack__type;
+	jetpack?: common_base__FGJetPack__type;
 };
 
 export type faux_16__type = class__type & {

diff --git a/generated-types/update8/classes/CoreUObject/FGHoverPack.ts b/generated-types/update8/classes/CoreUObject/FGHoverPack.ts
@@ -2,49 +2,25 @@ import {FGEquipment__base__type} from './FGEquipment';
 
 import {
 	empty_object__type,
-	xyz__type,
 	NativeClass__type,
 } from '../../../common/common/unassigned';
 
-import {
-	decimal_string__type,
-	boolean__type,
-} from '../../../common/common/scalar';
+import {decimal_string__type} from '../../../common/common/scalar';
+
+import {common_base__FGHoverPack__type} from '../../../common/classes/CoreUObject/FGHoverPack';
 
-export type FGHoverPack__type = FGEquipment__base__type & {
+export type FGHoverPack__type = FGHoverPack__merged__type & {
 	mHoverPackActiveTimer: empty_object__type;
 	mCurrentPlayerVelocity: decimal_string__type;
 	mCurrentMouseDelta: decimal_string__type;
 	mHoverpackJoystickTimer: empty_object__type;
 	mCurrentBatteryPowerLevel: decimal_string__type;
 	m_PreviousHoverMode: 'HPM_Inactive';
-	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;
-	mCurrentHoverMode: 'HPM_Inactive';
-	mHasConnection: boolean__type;
-	mShouldAutomaticallyHoverWhenConnected: boolean__type;
-	mCrouchHoverCancelTime: decimal_string__type;
-	mCharacterUseDistanceWhenActive: decimal_string__type;
-	mActiveNoiseFrequency: decimal_string__type;
-	mCurrentConnectionLocation: xyz__type;
 };
 
+export type FGHoverPack__merged__type =
+	common_base__FGHoverPack__type & FGEquipment__base__type;
+
 export type FGHoverPack__NativeClass = NativeClass__type & {
 	Classes: [FGHoverPack__type];
 };
diff --git a/generated-types/update8/classes/CoreUObject/FGJetPack.ts b/generated-types/update8/classes/CoreUObject/FGJetPack.ts
@@ -2,27 +2,17 @@ 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;
+import {common_base__FGJetPack__type} from '../../../common/classes/CoreUObject/FGJetPack';
+
+import {NativeClass__type} from '../../../common/common/unassigned';
+
+export type FGJetPack__type = FGJetPack__merged__type & {
 	mThrustCooldown: decimal_string__type;
-	mCurrentFuel: decimal_string__type;
-	mIsThrusting: boolean__type;
 	mFuelTypes: [
 		UnrealEngineString<
 			'/Script/Engine.BlueprintGeneratedClass',
@@ -35,9 +25,11 @@ export type FGJetPack__type = FGEquipment__base__type & {
 	];
 	mSelectedFuelType: integer_string__type;
 	mCurrentFuelType: integer_string__type;
-	mActiveNoiseFrequency: decimal_string__type;
 };
 
+export type FGJetPack__merged__type =
+	common_base__FGJetPack__type & FGEquipment__base__type;
+
 export type FGJetPack__NativeClass = NativeClass__type & {
 	Classes: [FGJetPack__type];
 };