Skip to content

Commit

Permalink
pulling resource extractors & train buildings into common types
Browse files Browse the repository at this point in the history
-   re: #5
  • Loading branch information
SignpostMarv committed Nov 14, 2024
1 parent d6c6c1e commit 34bc85f
Show file tree
Hide file tree
Showing 26 changed files with 891 additions and 974 deletions.
7 changes: 7 additions & 0 deletions common-imports.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
"common_type__common_base__FGBuildableFactory__generic__type": "classes/CoreUObject/FGBuildableFactory",
"common_type__common_base__FGBuildableFactory__jump_pad__type": "classes/CoreUObject/FGBuildableFactory",
"common_type__common_base__FGBuildableFactory__landing_pad__type": "classes/CoreUObject/FGBuildableFactory",
"common_type__common_base__FGBuildableFrackingActivator__type": "classes/CoreUObject/FGBuildableFrackingActivator",
"common_type__common_base__FGBuildableFrackingExtractor__type": "classes/CoreUObject/FGBuildableFrackingExtractor",
"common_type__common_base__FGBuildableGenerator__base__type": "classes/CoreUObject/FGBuildableGenerator",
"common_type__common_base__FGBuildableGeneratorFuel__base__type": "classes/CoreUObject/FGBuildableGeneratorFuel",
"common_type__common_base__FGBuildableGeneratorFuel__biogen__type": "classes/CoreUObject/FGBuildableGeneratorFuel",
Expand Down Expand Up @@ -90,13 +92,18 @@
"common_type__common_base__FGBuildablePipeReservoir__type": "classes/CoreUObject/FGBuildablePipeReservoir",
"common_type__common_base__FGBuildablePoleLightweight__type": "classes/CoreUObject/FGBuildablePoleLightweight",
"common_type__common_base__FGBuildablePowerPole__type": "classes/CoreUObject/FGBuildablePowerPole",
"common_type__common_base__FGBuildableRailroadSignal__type": "classes/CoreUObject/FGBuildableRailroadSignal",
"common_type__common_base__FGBuildableRailroadStation__type": "classes/CoreUObject/FGBuildableRailroadStation",
"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",
"common_type__common_base__FGBuildableTrainPlatform__base__type": "classes/CoreUObject/FGBuildableTrainPlatform",
"common_type__common_base__FGBuildableTrainPlatformCargo__type": "classes/CoreUObject/FGBuildableTrainPlatformCargo",
"common_type__common_base__FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type": "classes/CoreUObject/FGBuildableTrainPlatformCargo",
"common_type__common_base__FGBuildableWalkway__type": "classes/CoreUObject/FGBuildableWalkway",
"common_type__common_base__FGBuildableWalkway__base__type": "classes/CoreUObject/FGBuildableWalkway",
"common_type__common_base__FGBuildableWalkwayLightweight__type": "classes/CoreUObject/FGBuildableWalkwayLightweight",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
import {FGBuildable__extractor_base__shared__type} from './FGBuildable';

import {
None__type,
empty_object__type,
UnrealEngineString__array__type,
NativeClass__type,
} from '../../../common/common/unassigned';
import {common_base__FGBuildableFrackingActivator__type} from '../../../common/classes/CoreUObject/FGBuildableFrackingActivator';

import {
decimal_string__type,
boolean__type,
integer_string__type,
} from '../../../common/common/scalar';
import {NativeClass__type} from '../../../common/common/unassigned';

export type FGBuildableFrackingActivator__type =
FGBuildable__extractor_base__shared__type & {
mExtractorTypeName?: None__type;
CurrentPotentialChangedDelegate: empty_object__type;
ConnectedExtractorCountChangedDelegate: empty_object__type;
mActivationStartupTime: decimal_string__type;
mActivationStartupTimer: decimal_string__type;
mSatelliteActivationComplete: boolean__type;
mSatelliteNodeCount: integer_string__type;
mConnectedExtractorCount: integer_string__type;
mDefaultPotentialExtractionPerMinute: decimal_string__type;
mAllowedResources: UnrealEngineString__array__type;
};
FGBuildableFrackingActivator__merged__type;

export type FGBuildableFrackingActivator__merged__type =
common_base__FGBuildableFrackingActivator__type &
FGBuildable__extractor_base__shared__type;

export type FGBuildableFrackingActivator__NativeClass =
NativeClass__type & {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
import {FGBuildable__extractor_base__type} from './FGBuildable';

import {
None__type,
UnrealEngineString__array__type,
NativeClass__type,
} from '../../../common/common/unassigned';
import {common_base__FGBuildableFrackingExtractor__type} from '../../../common/classes/CoreUObject/FGBuildableFrackingExtractor';

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

export type FGBuildableFrackingExtractor__type =
FGBuildable__extractor_base__type & {
mAllowedResourceForms: [
'RF_LIQUID' | 'RF_GAS',
...('RF_LIQUID' | 'RF_GAS')[],
];
mExtractorTypeName: None__type;
mAllowedResources: UnrealEngineString__array__type;
};
FGBuildableFrackingExtractor__merged__type;

export type FGBuildableFrackingExtractor__merged__type =
common_base__FGBuildableFrackingExtractor__type &
FGBuildable__extractor_base__type;

export type FGBuildableFrackingExtractor__NativeClass =
NativeClass__type & {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
import {FGBuildable__base__type} from './FGBuildable';

import {
mAspect__type,
empty_object__type,
NativeClass__type,
} from '../../../common/common/unassigned';
import {common_base__FGBuildableRailroadSignal__type} from '../../../common/classes/CoreUObject/FGBuildableRailroadSignal';

import {
boolean__type,
integer_string__type,
decimal_string__type,
} from '../../../common/common/scalar';
import {NativeClass__type} from '../../../common/common/unassigned';

export type FGBuildableRailroadSignal__type = FGBuildable__base__type & {
mPreviousAspect?: mAspect__type;
mOnAspectChangedDelegate: empty_object__type;
mOnBlockValidationChangedDelegate: empty_object__type;
mDrawDebugVisualState: boolean__type;
mGuardedConnections: '';
mObservedConnections: '';
mAspect: mAspect__type;
mBlockValidation: 'RBV_Unvalidated';
mIsPathSignal: boolean__type;
mIsBiDirectional: boolean__type;
mVisualState: integer_string__type;
mSignificanceRange: decimal_string__type;
};
export type FGBuildableRailroadSignal__type =
FGBuildableRailroadSignal__merged__type;

export type FGBuildableRailroadSignal__merged__type =
common_base__FGBuildableRailroadSignal__type &
FGBuildable__base__type;

export type FGBuildableRailroadSignal__NativeClass =
NativeClass__type & {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
import {FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type} from './FGBuildableTrainPlatformCargo';

import {boolean__type} from '../../../common/common/scalar';
import {common_base__FGBuildableRailroadStation__type} from '../../../common/classes/CoreUObject/FGBuildableRailroadStation';

import {
mDockingRuleSet__type,
NativeClass__type,
} from '../../../common/common/unassigned';
import {NativeClass__type} from '../../../common/common/unassigned';

export type FGBuildableRailroadStation__type =
FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type & {
mMapText: 'Train Station';
mShouldTeleportHere: boolean__type;
mDockedPlatformList: '';
mCurrentDockedWithRuleSet: mDockingRuleSet__type;
};
FGBuildableRailroadStation__merged__type;

export type FGBuildableRailroadStation__merged__type =
common_base__FGBuildableRailroadStation__type &
FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type;

export type FGBuildableRailroadStation__NativeClass =
NativeClass__type & {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,10 @@
import {UnrealEngineString, StringStartsWith} from '../../utils/validators';

import {FGBuildable__consumes_power_base__type} from './FGBuildable';

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

import {
mPlatformDockingStatus__type,
empty_object__type,
} from '../../../common/common/unassigned';
import {common_base__FGBuildableTrainPlatform__base__type} from '../../../common/classes/CoreUObject/FGBuildableTrainPlatform';

export type FGBuildableTrainPlatform__base__type =
FGBuildable__consumes_power_base__type & {
mPlatformConnections: [
UnrealEngineString<
'/Script/FactoryGame.FGTrainPlatformConnection',
StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Station/'>
>,
...UnrealEngineString<
'/Script/FactoryGame.FGTrainPlatformConnection',
StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Station/'>
>[],
];
mIsOrientationReversed: boolean__type;
mPlatformDockingStatus: mPlatformDockingStatus__type;
mSavedDockingStatus: mPlatformDockingStatus__type;
mDockingSequenceTimerHandle: empty_object__type;
mIdleUpdateTimerHandle: empty_object__type;
mDockWasCancelled: boolean__type;
};
FGBuildableTrainPlatform__base__merged__type;

export type FGBuildableTrainPlatform__base__merged__type =
common_base__FGBuildableTrainPlatform__base__type &
FGBuildable__consumes_power_base__type;
Original file line number Diff line number Diff line change
@@ -1,58 +1,25 @@
import {FGBuildableTrainPlatform__base__type} from './FGBuildableTrainPlatform';

import {
integer_string__type,
boolean__type,
decimal_string__type,
} from '../../../common/common/scalar';
common_base__FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type,
common_base__FGBuildableTrainPlatformCargo__type,
} from '../../../common/classes/CoreUObject/FGBuildableTrainPlatformCargo';

import {
empty_object__type,
mDockingRuleSet__type,
NativeClass__type,
} from '../../../common/common/unassigned';
import {NativeClass__type} from '../../../common/common/unassigned';

export type FGBuildableTrainPlatformCargo__type =
FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type & {
mStorageSizeX: integer_string__type;
mStorageSizeY: integer_string__type;
mOnTransferRateUpdated: empty_object__type;
mFreightCargoType: 'FCT_Standard' | 'FCT_Liquid';
mCanUnloadAny: boolean__type;
mIsFullUnload: boolean__type;
mCanLoadAny: boolean__type;
mIsFullLoad: boolean__type;
mTimeToCompleteLoad: decimal_string__type;
mTimeToSwapLoadVisibility: decimal_string__type;
mTimeToCompleteUnload: decimal_string__type;
mTimeToSwapUnloadVisibility: decimal_string__type;
mWaitForConditionUpdatePeriod: decimal_string__type;
mStorageInputConnections: '';
mPipeInputConnections: '';
mPipeOutputConnections: '';
mDockingRuleSet: mDockingRuleSet__type;
mLoadItemFilter: '';
mUnloadItemFilter: '';
mHasFullyLoadUnloadRule: boolean__type;
mDockForDuration: decimal_string__type;
mMustDockForDuration: boolean__type;
mHasAnyRelevantStacksToMove: boolean__type;
mAllowDepartureNoValidItemsToTransfer: boolean__type;
mShouldExecuteLoadOrUnload: boolean__type;
mRanCompleteBeforeNone: boolean__type;
mSwapCargoVisibilityTimerHandle: empty_object__type;
mTimeSinceLastLoadTransferUpdate: decimal_string__type;
mTimeSinceLastUnloadTransferUpdate: decimal_string__type;
mSmoothedLoadRate: decimal_string__type;
mSmoothedUnloadRate: decimal_string__type;
mReplicatedOutflowRate: decimal_string__type;
mReplicatedInflowRate: decimal_string__type;
};
FGBuildableTrainPlatformCargo__merged__type;

export type FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type =
FGBuildableTrainPlatform__base__type & {
mCurrentDockForDuration: decimal_string__type;
};
FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__merged__type;

export type FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__merged__type =
common_base__FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type &
FGBuildableTrainPlatform__base__type;

export type FGBuildableTrainPlatformCargo__merged__type =
common_base__FGBuildableTrainPlatformCargo__type &
FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type;

export type FGBuildableTrainPlatformCargo__NativeClass =
NativeClass__type & {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import {
None__type,
empty_object__type,
UnrealEngineString__array__type,
} from '../../common/unassigned';

import {
decimal_string__type,
boolean__type,
integer_string__type,
} from '../../common/scalar';

import {common_base__FGBuildable__extractor_base__shared__type} from './FGBuildable';

export type common_base__FGBuildableFrackingActivator__type =
common_base__FGBuildable__extractor_base__shared__type & {
mExtractorTypeName?: None__type;
CurrentPotentialChangedDelegate: empty_object__type;
ConnectedExtractorCountChangedDelegate: empty_object__type;
mActivationStartupTime: decimal_string__type;
mActivationStartupTimer: decimal_string__type;
mSatelliteActivationComplete: boolean__type;
mSatelliteNodeCount: integer_string__type;
mConnectedExtractorCount: integer_string__type;
mDefaultPotentialExtractionPerMinute: decimal_string__type;
mAllowedResources: UnrealEngineString__array__type;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import {
None__type,
UnrealEngineString__array__type,
} from '../../common/unassigned';

import {common_base__FGBuildable__extractor_base__type} from './FGBuildable';

export type common_base__FGBuildableFrackingExtractor__type =
common_base__FGBuildable__extractor_base__type & {
mAllowedResourceForms: [
'RF_LIQUID' | 'RF_GAS',
...('RF_LIQUID' | 'RF_GAS')[],
];
mExtractorTypeName: None__type;
mAllowedResources: UnrealEngineString__array__type;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import {mAspect__type, empty_object__type} from '../../common/unassigned';

import {
boolean__type,
integer_string__type,
decimal_string__type,
} from '../../common/scalar';

import {common_base__FGBuildable__base__type} from './FGBuildable';

export type common_base__FGBuildableRailroadSignal__type =
common_base__FGBuildable__base__type & {
mPreviousAspect?: mAspect__type;
mOnAspectChangedDelegate: empty_object__type;
mOnBlockValidationChangedDelegate: empty_object__type;
mDrawDebugVisualState: boolean__type;
mGuardedConnections: '';
mObservedConnections: '';
mAspect: mAspect__type;
mBlockValidation: 'RBV_Unvalidated';
mIsPathSignal: boolean__type;
mIsBiDirectional: boolean__type;
mVisualState: integer_string__type;
mSignificanceRange: decimal_string__type;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import {boolean__type} from '../../common/scalar';

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

import {common_base__FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type} from './FGBuildableTrainPlatformCargo';

export type common_base__FGBuildableRailroadStation__type =
common_base__FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type & {
mMapText: 'Train Station';
mShouldTeleportHere: boolean__type;
mDockedPlatformList: '';
mCurrentDockedWithRuleSet: mDockingRuleSet__type;
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import {UnrealEngineString, StringStartsWith} from '../../utils/validators';

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

import {
mPlatformDockingStatus__type,
empty_object__type,
} from '../../common/unassigned';

import {common_base__FGBuildable__consumes_power_base__type} from './FGBuildable';

export type common_base__FGBuildableTrainPlatform__base__type =
common_base__FGBuildable__consumes_power_base__type & {
mPlatformConnections: [
UnrealEngineString<
'/Script/FactoryGame.FGTrainPlatformConnection',
StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Station/'>
>,
...UnrealEngineString<
'/Script/FactoryGame.FGTrainPlatformConnection',
StringStartsWith<'/Game/FactoryGame/Buildable/Factory/Train/Station/'>
>[],
];
mIsOrientationReversed: boolean__type;
mPlatformDockingStatus: mPlatformDockingStatus__type;
mSavedDockingStatus: mPlatformDockingStatus__type;
mDockingSequenceTimerHandle: empty_object__type;
mIdleUpdateTimerHandle: empty_object__type;
mDockWasCancelled: boolean__type;
};
Loading

0 comments on commit 34bc85f

Please sign in to comment.