Skip to content

Commit

Permalink
pulling resource extractors into common types
Browse files Browse the repository at this point in the history
-   re: #5
  • Loading branch information
SignpostMarv committed Nov 12, 2024
1 parent 8c36019 commit b528e31
Show file tree
Hide file tree
Showing 16 changed files with 485 additions and 427 deletions.
5 changes: 5 additions & 0 deletions common-imports.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"common_type__class__no_description_or_display_name__type": "common/unassigned",
"common_type__color__type": "common/unassigned",
"common_type__color_decimal__type": "common/unassigned",
"common_type__common_base__FGBuildableResourceExtractor__miner_mk3__type": "common/unassigned",
"common_type__common_base__mChainsawState__type": "common/unassigned",
"common_type__common_base__mDisableSnapOn__type": "common/unassigned",
"common_type__common_base__mSnappedPassthroughs__type": "common/unassigned",
Expand Down Expand Up @@ -82,6 +83,9 @@
"common_type__common_base__FGBuildablePoleLightweight__type": "classes/CoreUObject/FGBuildablePoleLightweight",
"common_type__common_base__FGBuildablePowerPole__type": "classes/CoreUObject/FGBuildablePowerPole",
"common_type__common_base__FGBuildableRailroadTrack__type": "classes/CoreUObject/FGBuildableRailroadTrack",
"common_type__common_base__FGBuildableResourceExtractor__miner__type": "classes/CoreUObject/FGBuildableResourceExtractor",
"common_type__common_base__FGBuildableResourceExtractor__miner__base__type": "classes/CoreUObject/FGBuildableResourceExtractor",
"common_type__common_base__FGBuildableResourceExtractor__oil_extractor__type": "classes/CoreUObject/FGBuildableResourceExtractor",
"common_type__common_base__FGBuildableResourceSink__type": "classes/CoreUObject/FGBuildableResourceSink",
"common_type__common_base__FGBuildableResourceSinkShop__type": "classes/CoreUObject/FGBuildableResourceSinkShop",
"common_type__common_base__FGBuildableTradingPost__type": "classes/CoreUObject/FGBuildableTradingPost",
Expand Down Expand Up @@ -114,6 +118,7 @@
"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__FGItemDescriptorBiomass__type": "classes/CoreUObject/FGItemDescriptorBiomass",
"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",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,89 +1,40 @@
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';
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__base__type;
FGBuildableResourceExtractor__miner__merged__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: '';
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 =
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;
};
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 & {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
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;
FGItemDescriptorBiomass__merged__type;

export type FGItemDescriptorBiomass__merged__type =
common_base__FGItemDescriptorBiomass__type &
FGItemDescriptor__FGResourceDescriptor__type;

export type FGItemDescriptorBiomass__NativeClass =
NativeClass__type & {
Expand Down
12 changes: 6 additions & 6 deletions generated-types/1.0/common/unassigned.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
xyz__type,
quaternion__type,
empty_object__type,
common_base__FGBuildableResourceExtractor__miner_mk3__type,
} from '../../common/common/unassigned';

import {common_base__FGBuildable__consumes_power_base__type} from '../../common/classes/CoreUObject/FGBuildable';
Expand Down Expand Up @@ -89,12 +90,11 @@ export type FGBuildableResourceExtractor__miner_mk1__type =
};

export type FGBuildableResourceExtractor__miner_mk3__type =
FGBuildableResourceExtractor__miner__base__type & {
mInternalMiningState_0: 'NewEnumerator0';
mToggleMiningStateHandle_0: empty_object__type;
mMinimumDrillTime_0: decimal_string__type;
mMaximumDrillTime_0: decimal_string__type;
};
FGBuildableResourceExtractor__miner_mk3__merged__type;

export type FGBuildableResourceExtractor__miner_mk3__merged__type =
common_base__FGBuildableResourceExtractor__miner_mk3__type &
FGBuildableResourceExtractor__miner__base__type;

export type FGBuildableTradingPost__version_1__type =
common_base__FGBuildableTradingPost__type & {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import {UnrealEngineString, StringStartsWith} from '../../utils/validators';

import {boolean__type} from '../../common/scalar';

import {None__type} from '../../common/unassigned';

import {common_base__FGBuildable__extractor_base__type} from './FGBuildable';

export type common_base__FGBuildableResourceExtractor__miner__type =
common_base__FGBuildableResourceExtractor__miner__base__type;

export type common_base__FGBuildableResourceExtractor__miner__base__type =
common_base__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;
mAllowedResourceForms?: ['RF_SOLID', ...'RF_SOLID'[]];
mExtractorTypeName?: 'Miner';
mAllowedResources: '';
};

export type common_base__FGBuildableResourceExtractor__oil_extractor__type =
common_base__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;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import {common_base__FGItemDescriptor__FGResourceDescriptor__type} from './FGItemDescriptor';

export type common_base__FGItemDescriptorBiomass__type =
common_base__FGItemDescriptor__FGResourceDescriptor__type;
21 changes: 21 additions & 0 deletions generated-types/common/common/unassigned.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@ import {common_base__FGBuildableResourceSink__type} from '../classes/CoreUObject

import {common_base__FGBuildableResourceSinkShop__type} from '../classes/CoreUObject/FGBuildableResourceSinkShop';

import {common_base__FGItemDescriptorBiomass__type} from '../classes/CoreUObject/FGItemDescriptorBiomass';

import {
common_base__FGBuildableResourceExtractor__oil_extractor__type,
common_base__FGBuildableResourceExtractor__miner__base__type,
common_base__FGBuildableResourceExtractor__miner__type,
} from '../classes/CoreUObject/FGBuildableResourceExtractor';

import {
FGSchematic__mUnlocks_mSchematics__mSchematics__type,
common_base__FGSchematic__mUnlocks__type,
Expand Down Expand Up @@ -212,6 +220,14 @@ export type color_decimal__type = {
A: decimal_string__type;
};

export type common_base__FGBuildableResourceExtractor__miner_mk3__type =
common_base__FGBuildableResourceExtractor__miner__base__type & {
mInternalMiningState_0: 'NewEnumerator0';
mToggleMiningStateHandle_0: empty_object__type;
mMinimumDrillTime_0: decimal_string__type;
mMaximumDrillTime_0: decimal_string__type;
};

export type common_base__mChainsawState__type = None__type;

export type common_base__mDisableSnapOn__type =
Expand Down Expand Up @@ -434,6 +450,11 @@ export type faux_11__type = class__type & {
FGBuildableWaterPump?: common_base__FGBuildableWaterPump__type;
FGBuildableResourceSink?: common_base__FGBuildableResourceSink__type;
FGBuildableResourceSinkShop?: common_base__FGBuildableResourceSinkShop__type;
FGItemDescriptorBiomass?: common_base__FGItemDescriptorBiomass__type;
FGBuildableResourceExtractor_oil_extractor?: common_base__FGBuildableResourceExtractor__oil_extractor__type;
FGBuildableResourceExtractor_miner_base?: common_base__FGBuildableResourceExtractor__miner__base__type;
FGBuildableResourceExtractor_miner?: common_base__FGBuildableResourceExtractor__miner__type;
FGBuildableResourceExtractor_miner_mk3?: common_base__FGBuildableResourceExtractor__miner_mk3__type;
};

export type faux_12__type = class__type & {
Expand Down
Loading

0 comments on commit b528e31

Please sign in to comment.