porting over more properties to common types

- re: #4
satisfactory-dev · Oct 27, 2024 · f52d21f · f52d21f
1 parent 43973d0
commit f52d21f
Show file tree

Hide file tree

Showing 27 changed files with 233 additions and 242 deletions.
diff --git a/common-imports.json b/common-imports.json
@@ -23,11 +23,17 @@
 	"common_type__common_base__FGSchematic__base__mSchematicDependencies__mRequireAllSchematicsToBePurchased__type": "common/unassigned",
 	"common_type__common_base__FGSchematic__mUnlocks__type": "common/unassigned",
 	"common_type__empty_object__type": "common/unassigned",
+	"common_type__InfinityExtrap__type": "common/unassigned",
 	"common_type__ItemClass__type": "common/unassigned",
 	"common_type__ItemClass__amount_required__type": "common/unassigned",
+	"common_type__mAspect__type": "common/unassigned",
+	"common_type__mBatteryStatus__type": "common/unassigned",
+	"common_type__mDamageTypes__type": "common/unassigned",
+	"common_type__mDockingRuleSet__type": "common/unassigned",
 	"common_type__mEventType__type": "common/unassigned",
 	"common_type__mEventType__optional_csv__type": "common/unassigned",
 	"common_type__mForm__type": "common/unassigned",
+	"common_type__mPlatformDockingStatus__type": "common/unassigned",
 	"common_type__NativeClass__type": "common/unassigned",
 	"common_type__None__type": "common/unassigned",
 	"common_type__pitch_yaw_roll__type": "common/unassigned",

diff --git a/generated-types/1.0/classes/CoreUObject/FGAmmoTypeProjectile.ts b/generated-types/1.0/classes/CoreUObject/FGAmmoTypeProjectile.ts
@@ -3,7 +3,6 @@ import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
 import {
 	MaterialSlotName__type,
 	EditorCurveData__type,
-	mDamageTypes__type,
 } from '../../common/unassigned';
 
 import {FGItemDescriptor__FGResourceDescriptor__type} from './FGItemDescriptor';
@@ -20,6 +19,7 @@ import {
 	transformation__type,
 	xyz__type,
 	color_decimal__type,
+	mDamageTypes__type,
 	NativeClass__type,
 } from '../../../common/common/unassigned';
 

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildablePowerStorage.ts b/generated-types/1.0/classes/CoreUObject/FGBuildablePowerStorage.ts
@@ -1,14 +1,15 @@
-import {mBatteryStatus__type} from '../../common/unassigned';
-
 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';
 
-import {NativeClass__type} from '../../../common/common/unassigned';
-
 export type FGBuildablePowerStorage__type =
 	FGBuildable__consumes_power_base__type & {
 		m_PreviousBatteryStatus: mBatteryStatus__type;

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadSignal.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadSignal.ts
@@ -1,8 +1,7 @@
-import {mAspect__type} from '../../common/unassigned';
-
 import {FGBuildable__base__type} from './FGBuildable';
 
 import {
+	mAspect__type,
 	empty_object__type,
 	NativeClass__type,
 } from '../../../common/common/unassigned';

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadStation.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadStation.ts
@@ -1,10 +1,11 @@
-import {mDockingRuleSet__type} from '../../common/unassigned';
-
 import {FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type} from './FGBuildableTrainPlatformCargo';
 
 import {boolean__type} from '../../../common/common/scalar';
 
-import {NativeClass__type} from '../../../common/common/unassigned';
+import {
+	mDockingRuleSet__type,
+	NativeClass__type,
+} from '../../../common/common/unassigned';
 
 export type FGBuildableRailroadStation__type =
 	FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatform.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatform.ts
@@ -1,12 +1,13 @@
 import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
 
-import {mPlatformDockingStatus__type} from '../../common/unassigned';
-
 import {FGBuildable__consumes_power_base__type} from './FGBuildable';
 
 import {boolean__type} from '../../../common/common/scalar';
 
-import {empty_object__type} from '../../../common/common/unassigned';
+import {
+	mPlatformDockingStatus__type,
+	empty_object__type,
+} from '../../../common/common/unassigned';
 
 export type FGBuildableTrainPlatform__base__type =
 	FGBuildable__consumes_power_base__type & {

diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts
@@ -1,5 +1,3 @@
-import {mDockingRuleSet__type} from '../../common/unassigned';
-
 import {FGBuildableTrainPlatform__base__type} from './FGBuildableTrainPlatform';
 
 import {
@@ -10,6 +8,7 @@ import {
 
 import {
 	empty_object__type,
+	mDockingRuleSet__type,
 	NativeClass__type,
 } from '../../../common/common/unassigned';
 

diff --git a/generated-types/1.0/classes/CoreUObject/FGEquipmentStunSpear.ts b/generated-types/1.0/classes/CoreUObject/FGEquipmentStunSpear.ts
@@ -2,7 +2,6 @@ import {
 	Montage_1P__type,
 	Montage_3P__type,
 	CameraAnim__type,
-	mDamageTypes__type,
 } from '../../common/unassigned';
 
 import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
@@ -14,7 +13,10 @@ import {
 	boolean__type,
 } from '../../../common/common/scalar';
 
-import {NativeClass__type} from '../../../common/common/unassigned';
+import {
+	mDamageTypes__type,
+	NativeClass__type,
+} from '../../../common/common/unassigned';
 
 export type FGEquipmentStunSpear__type = FGEquipmentStunSpear__base__type & {
 	mSecondSwingMontageList: {

diff --git a/generated-types/1.0/classes/CoreUObject/FGGasMask.ts b/generated-types/1.0/classes/CoreUObject/FGGasMask.ts
@@ -2,7 +2,6 @@ import {
 	Montage_1P__type,
 	Montage_3P__type,
 	CameraAnim__type,
-	mDamageTypes__type,
 } from '../../common/unassigned';
 
 import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
@@ -15,6 +14,7 @@ import {
 } from '../../../common/common/scalar';
 
 import {
+	mDamageTypes__type,
 	empty_object__type,
 	NativeClass__type,
 } from '../../../common/common/unassigned';

diff --git a/generated-types/1.0/common/unassigned.ts b/generated-types/1.0/common/unassigned.ts
@@ -10,6 +10,7 @@ import {
 } from '../../common/common/scalar';
 
 import {
+	InfinityExtrap__type,
 	None__type,
 	xyz__type,
 	quaternion__type,
@@ -75,10 +76,6 @@ export type FilterMontageTag__charged__type =
 	| 'MediumCharged'
 	| 'FullyCharged';
 
-export type InfinityExtrap__type = 'RCCE_Constant';
-
-export type mAspect__type = 'RSA_None';
-
 export type MaterialSlotName__type =
 	| 'lambert1'
 	| 'lambert10'
@@ -91,8 +88,6 @@ export type MaterialSlotName__type =
 	| 'Rifle'
 	| '01 - Default';
 
-export type mBatteryStatus__type = 'BS_Idle';
-
 export type mChainsawState__type = None__type;
 
 export type mClearanceData__type =
@@ -128,23 +123,6 @@ export type mClearanceData__type =
 			}[],
 	];
 
-export type mDamageTypes__type = [
-	UnrealEngineString<
-		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Energy.BP_PointDamageType_Energy_C'
-		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Gas.BP_PointDamageType_Gas_C'
-		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_RadialDamageType_Gas.BP_RadialDamageType_Gas_C'
-		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Physical.BP_PointDamageType_Physical_C'
-		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_RadialDamageType_Explosive.BP_RadialDamageType_Explosive_C'
-	>,
-	...UnrealEngineString<
-		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Energy.BP_PointDamageType_Energy_C'
-		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Gas.BP_PointDamageType_Gas_C'
-		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_RadialDamageType_Gas.BP_RadialDamageType_Gas_C'
-		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Physical.BP_PointDamageType_Physical_C'
-		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_RadialDamageType_Explosive.BP_RadialDamageType_Explosive_C'
-	>[],
-];
-
 export type mDisableSnapOn__type =
 	| {
 			Front: boolean__type;
@@ -289,10 +267,6 @@ export type mDisableSnapOn__type =
 			Top: boolean__type;
 	};
 
-export type mDockingRuleSet__type = {
-	DockForDuration: decimal_string__type;
-};
-
 export type mGasType__type = 'GT_NORMAL' | 'GT_ENERGY';
 
 export type mLightControlData__type = {
@@ -309,8 +283,6 @@ export type Montage_3P__type = UnrealEngineString<
 	StringStartsWith<'/Game/FactoryGame/Character/Player/Animation/ThirdPerson/'>
 >;
 
-export type mPlatformDockingStatus__type = 'ETPDS_None';
-
 export type mSnappedPassthroughs__type = '';
 
 export type weaponState__type = 'EWS_Unequipped';
diff --git a/generated-types/common/classes/CoreUObject/FGFauxEntry.ts b/generated-types/common/classes/CoreUObject/FGFauxEntry.ts
@@ -16,6 +16,7 @@ import {
 	faux_13__type,
 	faux_14__type,
 	faux_15__type,
+	faux_16__type,
 	NativeClass__type,
 } from '../../common/unassigned';
 
@@ -39,6 +40,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & {
 			| faux_13__type
 			| faux_14__type
 			| faux_15__type
+			| faux_16__type
 		),
 		...(
 			| faux_1__type
@@ -58,6 +60,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & {
 			| faux_13__type
 			| faux_14__type
 			| faux_15__type
+			| faux_16__type
 		)[],
 	];
 };
diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts
@@ -461,6 +461,16 @@ export type faux_15__type = class__type & {
 	FGSchematic__mUnlocks_mSchematics__mSchematics?: common_base__FGEquipment__base__type;
 };
 
+export type faux_16__type = class__type & {
+	faux: 'faux-16';
+	mAspect?: mAspect__type;
+	mPlatformDockingStatus?: mPlatformDockingStatus__type;
+	mDockingRuleSet?: mDockingRuleSet__type;
+	mBatteryStatus?: mBatteryStatus__type;
+	InfinityExtrap?: InfinityExtrap__type;
+	mDamageTypes?: mDamageTypes__type;
+};
+
 export type faux_2__type = class__type & {
 	faux_bool: boolean__type;
 };
@@ -494,6 +504,8 @@ export type faux_9__type = class__type & {
 	mSubCategories: common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__mSubCategories__type;
 };
 
+export type InfinityExtrap__type = 'RCCE_Constant';
+
 export type ItemClass__type = [
 	{
 		ItemClass: UnrealEngineString;
@@ -516,6 +528,31 @@ export type ItemClass__amount_required__type = [
 	}[],
 ];
 
+export type mAspect__type = 'RSA_None';
+
+export type mBatteryStatus__type = 'BS_Idle';
+
+export type mDamageTypes__type = [
+	UnrealEngineString<
+		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Energy.BP_PointDamageType_Energy_C'
+		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Gas.BP_PointDamageType_Gas_C'
+		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_RadialDamageType_Gas.BP_RadialDamageType_Gas_C'
+		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Physical.BP_PointDamageType_Physical_C'
+		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_RadialDamageType_Explosive.BP_RadialDamageType_Explosive_C'
+	>,
+	...UnrealEngineString<
+		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Energy.BP_PointDamageType_Energy_C'
+		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Gas.BP_PointDamageType_Gas_C'
+		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_RadialDamageType_Gas.BP_RadialDamageType_Gas_C'
+		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_PointDamageType_Physical.BP_PointDamageType_Physical_C'
+		| '/Game/FactoryGame/-Shared/Blueprint/DamageTypes/BP_RadialDamageType_Explosive.BP_RadialDamageType_Explosive_C'
+	>[],
+];
+
+export type mDockingRuleSet__type = {
+	DockForDuration: decimal_string__type;
+};
+
 export type mEventType__type = 'EV_Christmas';
 
 export type mEventType__optional_csv__type =
@@ -524,6 +561,8 @@ export type mEventType__optional_csv__type =
 
 export type mForm__type = 'RF_SOLID' | 'RF_LIQUID' | 'RF_GAS' | 'RF_INVALID';
 
+export type mPlatformDockingStatus__type = 'ETPDS_None';
+
 export type NativeClass__type = {
 	NativeClass: UnrealEngineString<
 		'/Script/CoreUObject.Class',

diff --git a/generated-types/update8/classes/CoreUObject/FGAmmoTypeProjectile.ts b/generated-types/update8/classes/CoreUObject/FGAmmoTypeProjectile.ts
@@ -3,7 +3,6 @@ import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
 import {
 	MaterialSlotName__type,
 	EditorCurveData__type,
-	mDamageTypes__type,
 } from '../../common/unassigned';
 
 import {FGItemDescriptor__FGResourceDescriptor__type} from './FGItemDescriptor';
@@ -20,6 +19,7 @@ import {
 	transformation__type,
 	xyz__type,
 	color_decimal__type,
+	mDamageTypes__type,
 	NativeClass__type,
 } from '../../../common/common/unassigned';
 

diff --git a/generated-types/update8/classes/CoreUObject/FGBuildablePowerStorage.ts b/generated-types/update8/classes/CoreUObject/FGBuildablePowerStorage.ts
@@ -1,14 +1,15 @@
-import {mBatteryStatus__type} from '../../common/unassigned';
-
 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';
 
-import {NativeClass__type} from '../../../common/common/unassigned';
-
 export type FGBuildablePowerStorage__type =
 	FGBuildable__consumes_power_base__type & {
 		m_PreviousBatteryStatus: mBatteryStatus__type;

diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableRailroadSignal.ts b/generated-types/update8/classes/CoreUObject/FGBuildableRailroadSignal.ts
@@ -1,8 +1,7 @@
-import {mAspect__type} from '../../common/unassigned';
-
 import {FGBuildable__base__type} from './FGBuildable';
 
 import {
+	mAspect__type,
 	empty_object__type,
 	NativeClass__type,
 } from '../../../common/common/unassigned';

diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableRailroadStation.ts b/generated-types/update8/classes/CoreUObject/FGBuildableRailroadStation.ts
@@ -1,10 +1,11 @@
-import {mDockingRuleSet__type} from '../../common/unassigned';
-
 import {FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type} from './FGBuildableTrainPlatformCargo';
 
 import {boolean__type} from '../../../common/common/scalar';
 
-import {NativeClass__type} from '../../../common/common/unassigned';
+import {
+	mDockingRuleSet__type,
+	NativeClass__type,
+} from '../../../common/common/unassigned';
 
 export type FGBuildableRailroadStation__type =
 	FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type & {

diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableTrainPlatform.ts b/generated-types/update8/classes/CoreUObject/FGBuildableTrainPlatform.ts
@@ -1,12 +1,13 @@
 import {UnrealEngineString, StringStartsWith} from '../../utils/validators';
 
-import {mPlatformDockingStatus__type} from '../../common/unassigned';
-
 import {FGBuildable__consumes_power_base__type} from './FGBuildable';
 
 import {boolean__type} from '../../../common/common/scalar';
 
-import {empty_object__type} from '../../../common/common/unassigned';
+import {
+	mPlatformDockingStatus__type,
+	empty_object__type,
+} from '../../../common/common/unassigned';
 
 export type FGBuildableTrainPlatform__base__type =
 	FGBuildable__consumes_power_base__type & {