pulling portable miner & nuclear fuel into common types

- re: #5
satisfactory-dev · Nov 14, 2024 · 4e2db38 · 4e2db38
1 parent 6edd603
commit 4e2db38
Show file tree

Hide file tree

Showing 17 changed files with 308 additions and 129 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -114,6 +114,7 @@
 	"common_type__common_base__FGConsumableDescriptor__healing__type": "classes/CoreUObject/FGConsumableDescriptor",
 	"common_type__common_base__FGCustomizationRecipe__FGRecipe__type": "classes/CoreUObject/FGCustomizationRecipe",
 	"common_type__common_base__FGEquipment__base__type": "classes/CoreUObject/FGEquipment",
+	"common_type__common_base__FGEquipment__placeable__type": "classes/CoreUObject/FGEquipment",
 	"common_type__common_base__FGEquipmentDescriptor__type": "classes/CoreUObject/FGEquipmentDescriptor",
 	"common_type__common_base__FGEquipmentDescriptor__base__type": "classes/CoreUObject/FGEquipmentDescriptor",
 	"common_type__common_base__FGEquipmentStunSpear__type": "classes/CoreUObject/FGEquipmentStunSpear",
@@ -127,11 +128,14 @@
 	"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__FGItemDescriptorBiomass__type": "classes/CoreUObject/FGItemDescriptorBiomass",
+	"common_type__common_base__FGItemDescriptorNuclearFuel__type": "classes/CoreUObject/FGItemDescriptorNuclearFuel",
+	"common_type__common_base__FGItemDescriptorNuclearFuel__waste__type": "classes/CoreUObject/FGItemDescriptorNuclearFuel",
 	"common_type__common_base__FGJetPack__type": "classes/CoreUObject/FGJetPack",
 	"common_type__common_base__FGJumpingStilts__type": "classes/CoreUObject/FGJumpingStilts",
 	"common_type__common_base__FGObjectScanner__type": "classes/CoreUObject/FGObjectScanner",
 	"common_type__common_base__FGParachute__type": "classes/CoreUObject/FGParachute",
 	"common_type__common_base__FGPoleDescriptor__type": "classes/CoreUObject/FGPoleDescriptor",
+	"common_type__common_base__FGPortableMinerDispenser__type": "classes/CoreUObject/FGPortableMinerDispenser",
 	"common_type__common_base__FGRecipe__type": "classes/CoreUObject/FGRecipe",
 	"common_type__common_base__FGResourceDescriptor__type": "classes/CoreUObject/FGResourceDescriptor",
 	"common_type__common_base__FGSchematic__base__type": "classes/CoreUObject/FGSchematic",

diff --git a/generated-types/1.0/classes/CoreUObject/FGEquipment.ts b/generated-types/1.0/classes/CoreUObject/FGEquipment.ts
@@ -7,7 +7,10 @@ import {
 
 import {empty_object__type} from '../../../common/common/unassigned';
 
-import {common_base__FGEquipment__base__type} from '../../../common/classes/CoreUObject/FGEquipment';
+import {
+	common_base__FGEquipment__base__type,
+	common_base__FGEquipment__placeable__type,
+} from '../../../common/classes/CoreUObject/FGEquipment';
 
 export type FGEquipment__base__type =
 	common_base__FGEquipment__base__type & {
@@ -88,6 +91,9 @@ export type FGEquipment__base__type =
 		mEquipmentLookAtDescOverride: string;
 	};
 
-export type FGEquipment__placeable__type = FGEquipment__base__type & {
-	mAllowedResourceForms: ['RF_SOLID', ...'RF_SOLID'[]];
-};
+export type FGEquipment__placeable__type =
+	FGEquipment__placeable__merged__type;
+
+export type FGEquipment__placeable__merged__type =
+	common_base__FGEquipment__placeable__type &
+		FGEquipment__base__type;
diff --git a/generated-types/1.0/classes/CoreUObject/FGItemDescriptorNuclearFuel.ts b/generated-types/1.0/classes/CoreUObject/FGItemDescriptorNuclearFuel.ts
@@ -1,22 +1,26 @@
-import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
-
 import {FGItemDescriptor__FGResourceDescriptor__type} from './FGItemDescriptor';
 
-import {integer_string__type} from '../../../common/common/scalar';
+import {
+	common_base__FGItemDescriptorNuclearFuel__waste__type,
+	common_base__FGItemDescriptorNuclearFuel__type,
+} from '../../../common/classes/CoreUObject/FGItemDescriptorNuclearFuel';
 
-import {NativeClass__type} from '../../../common/common/unassigned';
+import {
+	None__type,
+	NativeClass__type,
+} from '../../../common/common/unassigned';
 
 export type FGItemDescriptorNuclearFuel__type =
-	FGItemDescriptor__FGResourceDescriptor__type & {
+	FGItemDescriptorNuclearFuel__merged__type & {
 		mSpentFuelClass:
-			| UnrealEngineString<
-					'/Script/Engine.BlueprintGeneratedClass',
-					StringStartsWith<'/Game/FactoryGame/Resource/Parts/NuclearWaste/'>
-			>
-			| 'None';
-		mAmountOfWaste: integer_string__type;
+			| 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: [

diff --git a/generated-types/1.0/classes/CoreUObject/FGPortableMinerDispenser.ts b/generated-types/1.0/classes/CoreUObject/FGPortableMinerDispenser.ts
@@ -4,45 +4,52 @@ 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 & {
-	mEquipMontage: {
-		Montages: [
-			{
-				Montage_1P: Montage_1P__type;
-				Montage_3P: Montage_3P__type;
-				Montage_Equipment: UnrealEngineString<
-					'/Script/Engine.AnimMontage',
-					StringStartsWith<'/Game/FactoryGame/Equipment/PortableMiner/Animation/'>
-				>;
-				AudioEvent: UnrealEngineString<
-					'/Script/AkAudio.AkAudioEvent',
-					StringStartsWith<'/Game/WwiseAudio/Events/Equipment/PortableMiner/'>
-				>;
-			},
-		];
-	};
-	mStingerMontage: {
-		Montages: [
-			{
-				Montage_1P: Montage_1P__type;
-				Montage_3P: Montage_3P__type;
-				Montage_Equipment: Montage_1P__type;
-				AudioEvent: UnrealEngineString<
-					'/Script/AkAudio.AkAudioEvent',
-					StringStartsWith<'/Game/WwiseAudio/Events/Equipment/PortableMiner/'>
-				>;
-			},
-		];
+export type FGPortableMinerDispenser__type =
+	FGPortableMinerDispenser__merged__type & {
+		mEquipMontage: {
+			Montages: [
+				{
+					Montage_1P: Montage_1P__type;
+					Montage_3P: Montage_3P__type;
+					Montage_Equipment: UnrealEngineString<
+						'/Script/Engine.AnimMontage',
+						StringStartsWith<'/Game/FactoryGame/Equipment/PortableMiner/Animation/'>
+					>;
+					AudioEvent: UnrealEngineString<
+						'/Script/AkAudio.AkAudioEvent',
+						StringStartsWith<'/Game/WwiseAudio/Events/Equipment/PortableMiner/'>
+					>;
+				},
+			];
+		};
+		mStingerMontage: {
+			Montages: [
+				{
+					Montage_1P: Montage_1P__type;
+					Montage_3P: Montage_3P__type;
+					Montage_Equipment: Montage_1P__type;
+					AudioEvent: UnrealEngineString<
+						'/Script/AkAudio.AkAudioEvent',
+						StringStartsWith<'/Game/WwiseAudio/Events/Equipment/PortableMiner/'>
+					>;
+				},
+			];
+		};
+		mUnEquipMontage: {
+			AudioEvent: UnrealEngineString<
+				'/Script/AkAudio.AkAudioEvent',
+				StringStartsWith<'/Game/WwiseAudio/Events/Character/Player/ResourcePickUp/'>
+			>;
+		};
 	};
-	mUnEquipMontage: {
-		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 & {

diff --git a/generated-types/common/classes/CoreUObject/FGEquipment.ts b/generated-types/common/classes/CoreUObject/FGEquipment.ts
@@ -76,3 +76,8 @@ export type common_base__FGEquipment__base__type =
 		mReceivedDamageModifiers: '';
 		mSwappedOutThirdPersonMaterials: empty_object__type;
 	};
+
+export type common_base__FGEquipment__placeable__type =
+	common_base__FGEquipment__base__type & {
+		mAllowedResourceForms: ['RF_SOLID', ...'RF_SOLID'[]];
+	};
diff --git a/generated-types/common/classes/CoreUObject/FGItemDescriptorNuclearFuel.ts b/generated-types/common/classes/CoreUObject/FGItemDescriptorNuclearFuel.ts
@@ -0,0 +1,16 @@
+import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
+
+import {integer_string__type} from '../../common/scalar';
+
+import {common_base__FGItemDescriptor__FGResourceDescriptor__type} from './FGItemDescriptor';
+
+export type common_base__FGItemDescriptorNuclearFuel__type =
+	common_base__FGItemDescriptor__FGResourceDescriptor__type & {
+		mAmountOfWaste: integer_string__type;
+	};
+
+export type common_base__FGItemDescriptorNuclearFuel__waste__type =
+	UnrealEngineString<
+		'/Script/Engine.BlueprintGeneratedClass',
+		StringStartsWith<'/Game/FactoryGame/Resource/Parts/NuclearWaste/'>
+	>;
diff --git a/generated-types/common/classes/CoreUObject/FGPortableMinerDispenser.ts b/generated-types/common/classes/CoreUObject/FGPortableMinerDispenser.ts
@@ -0,0 +1,4 @@
+import {common_base__FGEquipment__placeable__type} from './FGEquipment';
+
+export type common_base__FGPortableMinerDispenser__type =
+	common_base__FGEquipment__placeable__type;
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -99,6 +99,18 @@ import {
 	common_base__FGBuildableManufacturerVariablePower__HadronCollider__type,
 } from '../classes/CoreUObject/FGBuildableManufacturerVariablePower';
 
+import {
+	common_base__FGEquipment__placeable__type,
+	common_base__FGEquipment__base__type,
+} from '../classes/CoreUObject/FGEquipment';
+
+import {common_base__FGPortableMinerDispenser__type} from '../classes/CoreUObject/FGPortableMinerDispenser';
+
+import {
+	common_base__FGItemDescriptorNuclearFuel__waste__type,
+	common_base__FGItemDescriptorNuclearFuel__type,
+} from '../classes/CoreUObject/FGItemDescriptorNuclearFuel';
+
 import {
 	FGSchematic__mUnlocks_mSchematics__mSchematics__type,
 	common_base__FGSchematic__mUnlocks__type,
@@ -118,8 +130,6 @@ import {
 	FGSchematic__mUnlocks_mItemsToGive__type,
 } from '../classes/CoreUObject/FGSchematic';
 
-import {common_base__FGEquipment__base__type} from '../classes/CoreUObject/FGEquipment';
-
 import {
 	common_base__FGEquipmentStunSpear__base__type,
 	common_base__FGEquipmentStunSpear__type,
@@ -477,6 +487,10 @@ export type faux_11__type = class__type & {
 	FGBuildableManufacturer_constructor?: common_base__FGBuildableManufacturer__constructor__type;
 	FGBuildableManufacturerVariablePower_base?: common_base__FGBuildableManufacturerVariablePower__base__type;
 	FGBuildableManufacturerVariablePower_HadronCollider?: common_base__FGBuildableManufacturerVariablePower__HadronCollider__type;
+	FGEquipment_placeable?: common_base__FGEquipment__placeable__type;
+	FGPortableMinerDispenser?: common_base__FGPortableMinerDispenser__type;
+	FGItemDescriptorNuclearFuel_waste?: common_base__FGItemDescriptorNuclearFuel__waste__type;
+	FGItemDescriptorNuclearFuel?: common_base__FGItemDescriptorNuclearFuel__type;
 };
 
 export type faux_12__type = class__type & {

diff --git a/generated-types/update8/classes/CoreUObject/FGEquipment.ts b/generated-types/update8/classes/CoreUObject/FGEquipment.ts
@@ -7,7 +7,10 @@ import {
 
 import {empty_object__type} from '../../../common/common/unassigned';
 
-import {common_base__FGEquipment__base__type} from '../../../common/classes/CoreUObject/FGEquipment';
+import {
+	common_base__FGEquipment__base__type,
+	common_base__FGEquipment__placeable__type,
+} from '../../../common/classes/CoreUObject/FGEquipment';
 
 export type FGEquipment__base__type =
 	common_base__FGEquipment__base__type & {
@@ -88,7 +91,11 @@ export type FGEquipment__base__type =
 		mOnlyVisibleToOwner: boolean__type;
 	};
 
-export type FGEquipment__placeable__type = FGEquipment__base__type & {
-	mAllowedResourceForms: ['RF_SOLID', ...'RF_SOLID'[]];
-	mPlaceDistanceMax: decimal_string__type;
-};
+export type FGEquipment__placeable__type =
+	FGEquipment__placeable__merged__type & {
+		mPlaceDistanceMax: decimal_string__type;
+	};
+
+export type FGEquipment__placeable__merged__type =
+	common_base__FGEquipment__placeable__type &
+		FGEquipment__base__type;
diff --git a/generated-types/update8/classes/CoreUObject/FGItemDescriptorNuclearFuel.ts b/generated-types/update8/classes/CoreUObject/FGItemDescriptorNuclearFuel.ts
@@ -1,20 +1,21 @@
-import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
-
 import {FGItemDescriptor__FGResourceDescriptor__type} from './FGItemDescriptor';
 
-import {integer_string__type} from '../../../common/common/scalar';
+import {
+	common_base__FGItemDescriptorNuclearFuel__waste__type,
+	common_base__FGItemDescriptorNuclearFuel__type,
+} from '../../../common/classes/CoreUObject/FGItemDescriptorNuclearFuel';
 
 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/'>
-		>;
-		mAmountOfWaste: integer_string__type;
+	FGItemDescriptorNuclearFuel__merged__type & {
+		mSpentFuelClass: common_base__FGItemDescriptorNuclearFuel__waste__type;
 	};
 
+export type FGItemDescriptorNuclearFuel__merged__type =
+	common_base__FGItemDescriptorNuclearFuel__type &
+		FGItemDescriptor__FGResourceDescriptor__type;
+
 export type FGItemDescriptorNuclearFuel__NativeClass =
 	NativeClass__type & {
 		Classes: [

diff --git a/generated-types/update8/classes/CoreUObject/FGPortableMinerDispenser.ts b/generated-types/update8/classes/CoreUObject/FGPortableMinerDispenser.ts
@@ -1,8 +1,15 @@
 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;
+
+export type FGPortableMinerDispenser__merged__type =
+	common_base__FGPortableMinerDispenser__type &
+		FGEquipment__placeable__type;
 
 export type FGPortableMinerDispenser__NativeClass =
 	NativeClass__type & {