diff --git a/common-imports.json b/common-imports.json index 4f581e2..0454631 100644 --- a/common-imports.json +++ b/common-imports.json @@ -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", @@ -90,6 +92,8 @@ "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", @@ -97,6 +101,9 @@ "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", diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableFrackingActivator.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableFrackingActivator.ts index de20567..628b47c 100644 --- a/generated-types/1.0/classes/CoreUObject/FGBuildableFrackingActivator.ts +++ b/generated-types/1.0/classes/CoreUObject/FGBuildableFrackingActivator.ts @@ -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 & { diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableFrackingExtractor.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableFrackingExtractor.ts index 380b5e8..216e2fb 100644 --- a/generated-types/1.0/classes/CoreUObject/FGBuildableFrackingExtractor.ts +++ b/generated-types/1.0/classes/CoreUObject/FGBuildableFrackingExtractor.ts @@ -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 & { diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadSignal.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadSignal.ts index 8703e4f..171cd08 100644 --- a/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadSignal.ts +++ b/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadSignal.ts @@ -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 & { diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadStation.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadStation.ts index a122ff5..1b2884f 100644 --- a/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadStation.ts +++ b/generated-types/1.0/classes/CoreUObject/FGBuildableRailroadStation.ts @@ -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 & { diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatform.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatform.ts index 90e4e1c..f4af03a 100644 --- a/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatform.ts +++ b/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatform.ts @@ -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; diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts index f7fb23e..41786ee 100644 --- a/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts +++ b/generated-types/1.0/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts @@ -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 & { diff --git a/generated-types/common/classes/CoreUObject/FGBuildableFrackingActivator.ts b/generated-types/common/classes/CoreUObject/FGBuildableFrackingActivator.ts new file mode 100644 index 0000000..db6d46a --- /dev/null +++ b/generated-types/common/classes/CoreUObject/FGBuildableFrackingActivator.ts @@ -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; + }; diff --git a/generated-types/common/classes/CoreUObject/FGBuildableFrackingExtractor.ts b/generated-types/common/classes/CoreUObject/FGBuildableFrackingExtractor.ts new file mode 100644 index 0000000..978991f --- /dev/null +++ b/generated-types/common/classes/CoreUObject/FGBuildableFrackingExtractor.ts @@ -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; + }; diff --git a/generated-types/common/classes/CoreUObject/FGBuildableRailroadSignal.ts b/generated-types/common/classes/CoreUObject/FGBuildableRailroadSignal.ts new file mode 100644 index 0000000..11f4f36 --- /dev/null +++ b/generated-types/common/classes/CoreUObject/FGBuildableRailroadSignal.ts @@ -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; + }; diff --git a/generated-types/common/classes/CoreUObject/FGBuildableRailroadStation.ts b/generated-types/common/classes/CoreUObject/FGBuildableRailroadStation.ts new file mode 100644 index 0000000..d662d0e --- /dev/null +++ b/generated-types/common/classes/CoreUObject/FGBuildableRailroadStation.ts @@ -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; + }; diff --git a/generated-types/common/classes/CoreUObject/FGBuildableTrainPlatform.ts b/generated-types/common/classes/CoreUObject/FGBuildableTrainPlatform.ts new file mode 100644 index 0000000..2a60575 --- /dev/null +++ b/generated-types/common/classes/CoreUObject/FGBuildableTrainPlatform.ts @@ -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; + }; diff --git a/generated-types/common/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts b/generated-types/common/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts new file mode 100644 index 0000000..6d926bd --- /dev/null +++ b/generated-types/common/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts @@ -0,0 +1,54 @@ +import { + integer_string__type, + boolean__type, + decimal_string__type, +} from '../../common/scalar'; + +import { + empty_object__type, + mDockingRuleSet__type, +} from '../../common/unassigned'; + +import {common_base__FGBuildableTrainPlatform__base__type} from './FGBuildableTrainPlatform'; + +export type common_base__FGBuildableTrainPlatformCargo__type = + common_base__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; + }; + +export type common_base__FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type = + common_base__FGBuildableTrainPlatform__base__type & { + mCurrentDockForDuration: decimal_string__type; + }; diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts index e00bf19..01502d0 100644 --- a/generated-types/common/common/unassigned.ts +++ b/generated-types/common/common/unassigned.ts @@ -117,6 +117,21 @@ import { common_base__FGVehicleDescriptor__fueled_with_inventory__type, } from '../classes/CoreUObject/FGVehicleDescriptor'; +import {common_base__FGBuildableFrackingExtractor__type} from '../classes/CoreUObject/FGBuildableFrackingExtractor'; + +import {common_base__FGBuildableFrackingActivator__type} from '../classes/CoreUObject/FGBuildableFrackingActivator'; + +import {common_base__FGBuildableRailroadSignal__type} from '../classes/CoreUObject/FGBuildableRailroadSignal'; + +import {common_base__FGBuildableTrainPlatform__base__type} from '../classes/CoreUObject/FGBuildableTrainPlatform'; + +import { + common_base__FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type, + common_base__FGBuildableTrainPlatformCargo__type, +} from '../classes/CoreUObject/FGBuildableTrainPlatformCargo'; + +import {common_base__FGBuildableRailroadStation__type} from '../classes/CoreUObject/FGBuildableRailroadStation'; + import { FGSchematic__mUnlocks_mSchematics__mSchematics__type, common_base__FGSchematic__mUnlocks__type, @@ -500,6 +515,13 @@ export type faux_11__type = class__type & { FGVehicleDescriptor_powered_no_inventory?: common_base__FGVehicleDescriptor__powered_no_inventory__type; FGVehicleDescriptor_with_inventory?: common_base__FGVehicleDescriptor__with_inventory__type; FGVehicleDescriptor_fueled_with_inventory?: common_base__FGVehicleDescriptor__fueled_with_inventory__type; + FGBuildableFrackingExtractor?: common_base__FGBuildableFrackingExtractor__type; + FGBuildableFrackingActivator?: common_base__FGBuildableFrackingActivator__type; + FGBuildableRailroadSignal?: common_base__FGBuildableRailroadSignal__type; + FGBuildableTrainPlatform_base?: common_base__FGBuildableTrainPlatform__base__type; + FGBuildableTrainPlatformCargo_FGBuildableRailroadStation?: common_base__FGBuildableTrainPlatformCargo__FGBuildableRailroadStation__type; + FGBuildableTrainPlatformCargo?: common_base__FGBuildableTrainPlatformCargo__type; + FGBuildableRailroadStation?: common_base__FGBuildableRailroadStation__type; }; export type faux_12__type = class__type & { diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableFrackingActivator.ts b/generated-types/update8/classes/CoreUObject/FGBuildableFrackingActivator.ts index de20567..628b47c 100644 --- a/generated-types/update8/classes/CoreUObject/FGBuildableFrackingActivator.ts +++ b/generated-types/update8/classes/CoreUObject/FGBuildableFrackingActivator.ts @@ -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 & { diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableFrackingExtractor.ts b/generated-types/update8/classes/CoreUObject/FGBuildableFrackingExtractor.ts index 380b5e8..216e2fb 100644 --- a/generated-types/update8/classes/CoreUObject/FGBuildableFrackingExtractor.ts +++ b/generated-types/update8/classes/CoreUObject/FGBuildableFrackingExtractor.ts @@ -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 & { diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableRailroadSignal.ts b/generated-types/update8/classes/CoreUObject/FGBuildableRailroadSignal.ts index 8703e4f..171cd08 100644 --- a/generated-types/update8/classes/CoreUObject/FGBuildableRailroadSignal.ts +++ b/generated-types/update8/classes/CoreUObject/FGBuildableRailroadSignal.ts @@ -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 & { diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableRailroadStation.ts b/generated-types/update8/classes/CoreUObject/FGBuildableRailroadStation.ts index a122ff5..1b2884f 100644 --- a/generated-types/update8/classes/CoreUObject/FGBuildableRailroadStation.ts +++ b/generated-types/update8/classes/CoreUObject/FGBuildableRailroadStation.ts @@ -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 & { diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableTrainPlatform.ts b/generated-types/update8/classes/CoreUObject/FGBuildableTrainPlatform.ts index 90e4e1c..f4af03a 100644 --- a/generated-types/update8/classes/CoreUObject/FGBuildableTrainPlatform.ts +++ b/generated-types/update8/classes/CoreUObject/FGBuildableTrainPlatform.ts @@ -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; diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts b/generated-types/update8/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts index f7fb23e..41786ee 100644 --- a/generated-types/update8/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts +++ b/generated-types/update8/classes/CoreUObject/FGBuildableTrainPlatformCargo.ts @@ -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 & { diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json index ecb8851..6051f7e 100644 --- a/schema/1.0.schema.json +++ b/schema/1.0.schema.json @@ -4759,380 +4759,113 @@ "$ref": "#/$defs/FGVehicleDescriptor--fueled-with-inventory--merged", "unevaluatedProperties": false }, + "FGBuildableFrackingExtractor--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableFrackingExtractor" + }, + { + "$ref": "#/$defs/FGBuildable--extractor-base" + } + ] + }, "FGBuildableFrackingExtractor": { "type": "object", - "$ref": "#/$defs/FGBuildable--extractor-base", - "unevaluatedProperties": false, - "required": [ - "mAllowedResourceForms", - "mExtractorTypeName", - "mAllowedResources" - ], - "properties": { - "mAllowedResourceForms": { - "type": "string", - "minLength": 1, - "typed_string": { - "minItems": 1, - "items": { - "type": "string", - "enum": ["RF_LIQUID", "RF_GAS"] - } - } - }, - "mExtractorTypeName": { - "$ref": "common.schema.json#/$defs/None" + "$ref": "#/$defs/FGBuildableFrackingExtractor--merged", + "unevaluatedProperties": false + }, + "FGBuildableFrackingActivator--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableFrackingActivator" }, - "mAllowedResources": { - "$ref": "common.schema.json#/$defs/UnrealEngineString--array" + { + "$ref": "#/$defs/FGBuildable--extractor-base--shared" } - } + ] }, "FGBuildableFrackingActivator": { "type": "object", - "$ref": "#/$defs/FGBuildable--extractor-base--shared", - "unevaluatedProperties": false, - "required": [ - "CurrentPotentialChangedDelegate", - "ConnectedExtractorCountChangedDelegate", - "mActivationStartupTime", - "mActivationStartupTimer", - "mSatelliteActivationComplete", - "mSatelliteNodeCount", - "mConnectedExtractorCount", - "mDefaultPotentialExtractionPerMinute", - "mAllowedResources" - ], - "properties": { - "mExtractorTypeName": { - "$ref": "common.schema.json#/$defs/None" - }, - "CurrentPotentialChangedDelegate": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "ConnectedExtractorCountChangedDelegate": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mActivationStartupTime": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mActivationStartupTimer": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mSatelliteActivationComplete": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mSatelliteNodeCount": { - "$ref": "common.schema.json#/$defs/integer-string" - }, - "mConnectedExtractorCount": { - "$ref": "common.schema.json#/$defs/integer-string" - }, - "mDefaultPotentialExtractionPerMinute": { - "$ref": "common.schema.json#/$defs/decimal-string" + "$ref": "#/$defs/FGBuildableFrackingActivator--merged", + "unevaluatedProperties": false + }, + "FGBuildableRailroadSignal--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableRailroadSignal" }, - "mAllowedResources": { - "$ref": "common.schema.json#/$defs/UnrealEngineString--array" + { + "$ref": "#/$defs/FGBuildable--base" } - } + ] }, "FGBuildableRailroadSignal": { "type": "object", - "$ref": "#/$defs/FGBuildable--base", - "unevaluatedProperties": false, - "required": [ - "mOnAspectChangedDelegate", - "mOnBlockValidationChangedDelegate", - "mDrawDebugVisualState", - "mGuardedConnections", - "mObservedConnections", - "mAspect", - "mBlockValidation", - "mIsPathSignal", - "mIsBiDirectional", - "mVisualState", - "mSignificanceRange" - ], - "properties": { - "mPreviousAspect": { - "$ref": "common.schema.json#/$defs/mAspect" - }, - "mOnAspectChangedDelegate": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mOnBlockValidationChangedDelegate": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mDrawDebugVisualState": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mGuardedConnections": { - "type": "string", - "const": "" - }, - "mObservedConnections": { - "type": "string", - "const": "" - }, - "mAspect": { - "$ref": "common.schema.json#/$defs/mAspect" - }, - "mBlockValidation": { - "type": "string", - "const": "RBV_Unvalidated" - }, - "mIsPathSignal": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mIsBiDirectional": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mVisualState": { - "$ref": "common.schema.json#/$defs/integer-string" + "$ref": "#/$defs/FGBuildableRailroadSignal--merged", + "unevaluatedProperties": false + }, + "FGBuildableTrainPlatform--base--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableTrainPlatform--base" }, - "mSignificanceRange": { - "$ref": "common.schema.json#/$defs/decimal-string" + { + "$ref": "#/$defs/FGBuildable--consumes-power-base" } - } + ] }, "FGBuildableTrainPlatform--base": { "type": "object", - "$ref": "#/$defs/FGBuildable--consumes-power-base", - "required": [ - "mPlatformConnections", - "mIsOrientationReversed", - "mPlatformDockingStatus", - "mSavedDockingStatus", - "mDockingSequenceTimerHandle", - "mIdleUpdateTimerHandle", - "mDockWasCancelled" - ], - "properties": { - "mPlatformConnections": { - "type": "string", - "minLength": 1, - "typed_string": { - "minItems": 1, - "items": { - "type": "string", - "minLength": 1, - "UnrealEngineString": { - "left": "/Script/FactoryGame.FGTrainPlatformConnection", - "right": { - "starts_with": "/Game/FactoryGame/Buildable/Factory/Train/Station/" - } - } - } - } - }, - "mIsOrientationReversed": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mPlatformDockingStatus": { - "$ref": "common.schema.json#/$defs/mPlatformDockingStatus" - }, - "mSavedDockingStatus": { - "$ref": "common.schema.json#/$defs/mPlatformDockingStatus" - }, - "mDockingSequenceTimerHandle": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mIdleUpdateTimerHandle": { - "$ref": "common.schema.json#/$defs/empty-object" + "$ref": "#/$defs/FGBuildableTrainPlatform--base--merged" + }, + "FGBuildableTrainPlatformCargo--FGBuildableRailroadStation--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableTrainPlatformCargo--FGBuildableRailroadStation" }, - "mDockWasCancelled": { - "$ref": "common.schema.json#/$defs/boolean" + { + "$ref": "#/$defs/FGBuildableTrainPlatform--base" } - } + ] }, "FGBuildableTrainPlatformCargo--FGBuildableRailroadStation": { "type": "object", - "$ref": "#/$defs/FGBuildableTrainPlatform--base", - "required": ["mCurrentDockForDuration"], - "properties": { - "mCurrentDockForDuration": { - "$ref": "common.schema.json#/$defs/decimal-string" + "$ref": "#/$defs/FGBuildableTrainPlatformCargo--FGBuildableRailroadStation--merged" + }, + "FGBuildableTrainPlatformCargo--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableTrainPlatformCargo" + }, + { + "$ref": "#/$defs/FGBuildableTrainPlatformCargo--FGBuildableRailroadStation" } - } + ] }, "FGBuildableTrainPlatformCargo": { "type": "object", - "$ref": "#/$defs/FGBuildableTrainPlatformCargo--FGBuildableRailroadStation", - "unevaluatedProperties": false, - "required": [ - "mOnTransferRateUpdated", - "mFreightCargoType", - "mStorageSizeX", - "mStorageSizeY", - "mCanUnloadAny", - "mIsFullUnload", - "mCanLoadAny", - "mIsFullLoad", - "mTimeToCompleteLoad", - "mTimeToSwapLoadVisibility", - "mTimeToCompleteUnload", - "mTimeToSwapUnloadVisibility", - "mWaitForConditionUpdatePeriod", - "mStorageInputConnections", - "mPipeInputConnections", - "mPipeOutputConnections", - "mDockingRuleSet", - "mLoadItemFilter", - "mUnloadItemFilter", - "mHasFullyLoadUnloadRule", - "mDockForDuration", - "mMustDockForDuration", - "mHasAnyRelevantStacksToMove", - "mAllowDepartureNoValidItemsToTransfer", - "mShouldExecuteLoadOrUnload", - "mRanCompleteBeforeNone", - "mSwapCargoVisibilityTimerHandle", - "mTimeSinceLastLoadTransferUpdate", - "mTimeSinceLastUnloadTransferUpdate", - "mSmoothedLoadRate", - "mSmoothedUnloadRate", - "mReplicatedOutflowRate", - "mReplicatedInflowRate" - ], - "properties": { - "mStorageSizeX": { - "$ref": "common.schema.json#/$defs/integer-string" - }, - "mStorageSizeY": { - "$ref": "common.schema.json#/$defs/integer-string" - }, - "mOnTransferRateUpdated": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mFreightCargoType": { - "type": "string", - "enum": ["FCT_Standard", "FCT_Liquid"] - }, - "mCanUnloadAny": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mIsFullUnload": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mCanLoadAny": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mIsFullLoad": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mTimeToCompleteLoad": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mTimeToSwapLoadVisibility": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mTimeToCompleteUnload": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mTimeToSwapUnloadVisibility": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mWaitForConditionUpdatePeriod": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mStorageInputConnections": { - "type": "string", - "const": "" - }, - "mPipeInputConnections": { - "type": "string", - "const": "" - }, - "mPipeOutputConnections": { - "type": "string", - "const": "" - }, - "mDockingRuleSet": { - "$ref": "common.schema.json#/$defs/mDockingRuleSet" - }, - "mLoadItemFilter": { - "type": "string", - "const": "" - }, - "mUnloadItemFilter": { - "type": "string", - "const": "" - }, - "mHasFullyLoadUnloadRule": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mDockForDuration": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mMustDockForDuration": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mHasAnyRelevantStacksToMove": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mAllowDepartureNoValidItemsToTransfer": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mShouldExecuteLoadOrUnload": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mRanCompleteBeforeNone": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mSwapCargoVisibilityTimerHandle": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mTimeSinceLastLoadTransferUpdate": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mTimeSinceLastUnloadTransferUpdate": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mSmoothedLoadRate": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mSmoothedUnloadRate": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mReplicatedOutflowRate": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mReplicatedInflowRate": { - "$ref": "common.schema.json#/$defs/decimal-string" - } - } + "$ref": "#/$defs/FGBuildableTrainPlatformCargo--merged", + "unevaluatedProperties": false }, "FGBuildableTrainPlatformEmpty": { "type": "object", "$ref": "#/$defs/FGBuildableTrainPlatform--base", "unevaluatedProperties": false }, - "FGBuildableRailroadStation": { - "type": "object", - "$ref": "#/$defs/FGBuildableTrainPlatformCargo--FGBuildableRailroadStation", - "unevaluatedProperties": false, - "required": [ - "mMapText", - "mShouldTeleportHere", - "mDockedPlatformList", - "mCurrentDockedWithRuleSet" - ], - "properties": { - "mMapText": { - "type": "string", - "const": "Train Station" - }, - "mShouldTeleportHere": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mDockedPlatformList": { - "type": "string", - "const": "" + "FGBuildableRailroadStation--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableRailroadStation" }, - "mCurrentDockedWithRuleSet": { - "$ref": "common.schema.json#/$defs/mDockingRuleSet" + { + "$ref": "#/$defs/FGBuildableTrainPlatformCargo--FGBuildableRailroadStation" } - } + ] + }, + "FGBuildableRailroadStation": { + "type": "object", + "$ref": "#/$defs/FGBuildableRailroadStation--merged", + "unevaluatedProperties": false }, "FGBuildableStorage": { "type": "object", diff --git a/schema/common.schema.json b/schema/common.schema.json index d989830..358f115 100644 --- a/schema/common.schema.json +++ b/schema/common.schema.json @@ -4337,6 +4337,371 @@ } } }, + "common-base--FGBuildableFrackingExtractor": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--extractor-base", + "required": [ + "mAllowedResourceForms", + "mExtractorTypeName", + "mAllowedResources" + ], + "properties": { + "mAllowedResourceForms": { + "type": "string", + "minLength": 1, + "typed_string": { + "minItems": 1, + "items": { + "type": "string", + "enum": ["RF_LIQUID", "RF_GAS"] + } + } + }, + "mExtractorTypeName": { + "$ref": "common.schema.json#/$defs/None" + }, + "mAllowedResources": { + "$ref": "common.schema.json#/$defs/UnrealEngineString--array" + } + } + }, + "common-base--FGBuildableFrackingActivator": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--extractor-base--shared", + "required": [ + "CurrentPotentialChangedDelegate", + "ConnectedExtractorCountChangedDelegate", + "mActivationStartupTime", + "mActivationStartupTimer", + "mSatelliteActivationComplete", + "mSatelliteNodeCount", + "mConnectedExtractorCount", + "mDefaultPotentialExtractionPerMinute", + "mAllowedResources" + ], + "properties": { + "mExtractorTypeName": { + "$ref": "common.schema.json#/$defs/None" + }, + "CurrentPotentialChangedDelegate": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "ConnectedExtractorCountChangedDelegate": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mActivationStartupTime": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mActivationStartupTimer": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mSatelliteActivationComplete": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mSatelliteNodeCount": { + "$ref": "common.schema.json#/$defs/integer-string" + }, + "mConnectedExtractorCount": { + "$ref": "common.schema.json#/$defs/integer-string" + }, + "mDefaultPotentialExtractionPerMinute": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mAllowedResources": { + "$ref": "common.schema.json#/$defs/UnrealEngineString--array" + } + } + }, + "common-base--FGBuildableRailroadSignal": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--base", + "required": [ + "mOnAspectChangedDelegate", + "mOnBlockValidationChangedDelegate", + "mDrawDebugVisualState", + "mGuardedConnections", + "mObservedConnections", + "mAspect", + "mBlockValidation", + "mIsPathSignal", + "mIsBiDirectional", + "mVisualState", + "mSignificanceRange" + ], + "properties": { + "mPreviousAspect": { + "$ref": "common.schema.json#/$defs/mAspect" + }, + "mOnAspectChangedDelegate": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mOnBlockValidationChangedDelegate": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mDrawDebugVisualState": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mGuardedConnections": { + "type": "string", + "const": "" + }, + "mObservedConnections": { + "type": "string", + "const": "" + }, + "mAspect": { + "$ref": "common.schema.json#/$defs/mAspect" + }, + "mBlockValidation": { + "type": "string", + "const": "RBV_Unvalidated" + }, + "mIsPathSignal": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mIsBiDirectional": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mVisualState": { + "$ref": "common.schema.json#/$defs/integer-string" + }, + "mSignificanceRange": { + "$ref": "common.schema.json#/$defs/decimal-string" + } + } + }, + "common-base--FGBuildableTrainPlatform--base": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--consumes-power-base", + "required": [ + "mPlatformConnections", + "mIsOrientationReversed", + "mPlatformDockingStatus", + "mSavedDockingStatus", + "mDockingSequenceTimerHandle", + "mIdleUpdateTimerHandle", + "mDockWasCancelled" + ], + "properties": { + "mPlatformConnections": { + "type": "string", + "minLength": 1, + "typed_string": { + "minItems": 1, + "items": { + "type": "string", + "minLength": 1, + "UnrealEngineString": { + "left": "/Script/FactoryGame.FGTrainPlatformConnection", + "right": { + "starts_with": "/Game/FactoryGame/Buildable/Factory/Train/Station/" + } + } + } + } + }, + "mIsOrientationReversed": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mPlatformDockingStatus": { + "$ref": "common.schema.json#/$defs/mPlatformDockingStatus" + }, + "mSavedDockingStatus": { + "$ref": "common.schema.json#/$defs/mPlatformDockingStatus" + }, + "mDockingSequenceTimerHandle": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mIdleUpdateTimerHandle": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mDockWasCancelled": { + "$ref": "common.schema.json#/$defs/boolean" + } + } + }, + "common-base--FGBuildableTrainPlatformCargo--FGBuildableRailroadStation": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildableTrainPlatform--base", + "required": ["mCurrentDockForDuration"], + "properties": { + "mCurrentDockForDuration": { + "$ref": "common.schema.json#/$defs/decimal-string" + } + } + }, + "common-base--FGBuildableTrainPlatformCargo": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildableTrainPlatformCargo--FGBuildableRailroadStation", + "required": [ + "mOnTransferRateUpdated", + "mFreightCargoType", + "mStorageSizeX", + "mStorageSizeY", + "mCanUnloadAny", + "mIsFullUnload", + "mCanLoadAny", + "mIsFullLoad", + "mTimeToCompleteLoad", + "mTimeToSwapLoadVisibility", + "mTimeToCompleteUnload", + "mTimeToSwapUnloadVisibility", + "mWaitForConditionUpdatePeriod", + "mStorageInputConnections", + "mPipeInputConnections", + "mPipeOutputConnections", + "mDockingRuleSet", + "mLoadItemFilter", + "mUnloadItemFilter", + "mHasFullyLoadUnloadRule", + "mDockForDuration", + "mMustDockForDuration", + "mHasAnyRelevantStacksToMove", + "mAllowDepartureNoValidItemsToTransfer", + "mShouldExecuteLoadOrUnload", + "mRanCompleteBeforeNone", + "mSwapCargoVisibilityTimerHandle", + "mTimeSinceLastLoadTransferUpdate", + "mTimeSinceLastUnloadTransferUpdate", + "mSmoothedLoadRate", + "mSmoothedUnloadRate", + "mReplicatedOutflowRate", + "mReplicatedInflowRate" + ], + "properties": { + "mStorageSizeX": { + "$ref": "common.schema.json#/$defs/integer-string" + }, + "mStorageSizeY": { + "$ref": "common.schema.json#/$defs/integer-string" + }, + "mOnTransferRateUpdated": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mFreightCargoType": { + "type": "string", + "enum": ["FCT_Standard", "FCT_Liquid"] + }, + "mCanUnloadAny": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mIsFullUnload": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mCanLoadAny": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mIsFullLoad": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mTimeToCompleteLoad": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mTimeToSwapLoadVisibility": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mTimeToCompleteUnload": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mTimeToSwapUnloadVisibility": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mWaitForConditionUpdatePeriod": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mStorageInputConnections": { + "type": "string", + "const": "" + }, + "mPipeInputConnections": { + "type": "string", + "const": "" + }, + "mPipeOutputConnections": { + "type": "string", + "const": "" + }, + "mDockingRuleSet": { + "$ref": "common.schema.json#/$defs/mDockingRuleSet" + }, + "mLoadItemFilter": { + "type": "string", + "const": "" + }, + "mUnloadItemFilter": { + "type": "string", + "const": "" + }, + "mHasFullyLoadUnloadRule": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mDockForDuration": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mMustDockForDuration": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mHasAnyRelevantStacksToMove": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mAllowDepartureNoValidItemsToTransfer": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mShouldExecuteLoadOrUnload": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mRanCompleteBeforeNone": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mSwapCargoVisibilityTimerHandle": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mTimeSinceLastLoadTransferUpdate": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mTimeSinceLastUnloadTransferUpdate": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mSmoothedLoadRate": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mSmoothedUnloadRate": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mReplicatedOutflowRate": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mReplicatedInflowRate": { + "$ref": "common.schema.json#/$defs/decimal-string" + } + } + }, + "common-base--FGBuildableRailroadStation": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildableTrainPlatformCargo--FGBuildableRailroadStation", + "required": [ + "mMapText", + "mShouldTeleportHere", + "mDockedPlatformList", + "mCurrentDockedWithRuleSet" + ], + "properties": { + "mMapText": { + "type": "string", + "const": "Train Station" + }, + "mShouldTeleportHere": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mDockedPlatformList": { + "type": "string", + "const": "" + }, + "mCurrentDockedWithRuleSet": { + "$ref": "common.schema.json#/$defs/mDockingRuleSet" + } + } + }, "faux-1": { "type": "object", "$ref": "#/$defs/class", @@ -4741,6 +5106,27 @@ }, "FGVehicleDescriptor_fueled_with_inventory": { "$ref": "#/$defs/common-base--FGVehicleDescriptor--fueled-with-inventory" + }, + "FGBuildableFrackingExtractor": { + "$ref": "#/$defs/common-base--FGBuildableFrackingExtractor" + }, + "FGBuildableFrackingActivator": { + "$ref": "#/$defs/common-base--FGBuildableFrackingActivator" + }, + "FGBuildableRailroadSignal": { + "$ref": "#/$defs/common-base--FGBuildableRailroadSignal" + }, + "FGBuildableTrainPlatform_base": { + "$ref": "#/$defs/common-base--FGBuildableTrainPlatform--base" + }, + "FGBuildableTrainPlatformCargo_FGBuildableRailroadStation": { + "$ref": "#/$defs/common-base--FGBuildableTrainPlatformCargo--FGBuildableRailroadStation" + }, + "FGBuildableTrainPlatformCargo": { + "$ref": "#/$defs/common-base--FGBuildableTrainPlatformCargo" + }, + "FGBuildableRailroadStation": { + "$ref": "#/$defs/common-base--FGBuildableRailroadStation" } } }, diff --git a/schema/update8.schema.json b/schema/update8.schema.json index c0c0c43..dd76920 100644 --- a/schema/update8.schema.json +++ b/schema/update8.schema.json @@ -2304,380 +2304,113 @@ "$ref": "#/$defs/FGVehicleDescriptor--fueled-with-inventory--merged", "unevaluatedProperties": false }, + "FGBuildableFrackingExtractor--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableFrackingExtractor" + }, + { + "$ref": "#/$defs/FGBuildable--extractor-base" + } + ] + }, "FGBuildableFrackingExtractor": { "type": "object", - "$ref": "#/$defs/FGBuildable--extractor-base", - "unevaluatedProperties": false, - "required": [ - "mAllowedResourceForms", - "mExtractorTypeName", - "mAllowedResources" - ], - "properties": { - "mAllowedResourceForms": { - "type": "string", - "minLength": 1, - "typed_string": { - "minItems": 1, - "items": { - "type": "string", - "enum": ["RF_LIQUID", "RF_GAS"] - } - } - }, - "mExtractorTypeName": { - "$ref": "common.schema.json#/$defs/None" + "$ref": "#/$defs/FGBuildableFrackingExtractor--merged", + "unevaluatedProperties": false + }, + "FGBuildableFrackingActivator--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableFrackingActivator" }, - "mAllowedResources": { - "$ref": "common.schema.json#/$defs/UnrealEngineString--array" + { + "$ref": "#/$defs/FGBuildable--extractor-base--shared" } - } + ] }, "FGBuildableFrackingActivator": { "type": "object", - "$ref": "#/$defs/FGBuildable--extractor-base--shared", - "unevaluatedProperties": false, - "required": [ - "CurrentPotentialChangedDelegate", - "ConnectedExtractorCountChangedDelegate", - "mActivationStartupTime", - "mActivationStartupTimer", - "mSatelliteActivationComplete", - "mSatelliteNodeCount", - "mConnectedExtractorCount", - "mDefaultPotentialExtractionPerMinute", - "mAllowedResources" - ], - "properties": { - "mExtractorTypeName": { - "$ref": "common.schema.json#/$defs/None" - }, - "CurrentPotentialChangedDelegate": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "ConnectedExtractorCountChangedDelegate": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mActivationStartupTime": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mActivationStartupTimer": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mSatelliteActivationComplete": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mSatelliteNodeCount": { - "$ref": "common.schema.json#/$defs/integer-string" - }, - "mConnectedExtractorCount": { - "$ref": "common.schema.json#/$defs/integer-string" - }, - "mDefaultPotentialExtractionPerMinute": { - "$ref": "common.schema.json#/$defs/decimal-string" + "$ref": "#/$defs/FGBuildableFrackingActivator--merged", + "unevaluatedProperties": false + }, + "FGBuildableRailroadSignal--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableRailroadSignal" }, - "mAllowedResources": { - "$ref": "common.schema.json#/$defs/UnrealEngineString--array" + { + "$ref": "#/$defs/FGBuildable--base" } - } + ] }, "FGBuildableRailroadSignal": { "type": "object", - "$ref": "#/$defs/FGBuildable--base", - "unevaluatedProperties": false, - "required": [ - "mOnAspectChangedDelegate", - "mOnBlockValidationChangedDelegate", - "mDrawDebugVisualState", - "mGuardedConnections", - "mObservedConnections", - "mAspect", - "mBlockValidation", - "mIsPathSignal", - "mIsBiDirectional", - "mVisualState", - "mSignificanceRange" - ], - "properties": { - "mPreviousAspect": { - "$ref": "common.schema.json#/$defs/mAspect" - }, - "mOnAspectChangedDelegate": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mOnBlockValidationChangedDelegate": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mDrawDebugVisualState": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mGuardedConnections": { - "type": "string", - "const": "" - }, - "mObservedConnections": { - "type": "string", - "const": "" - }, - "mAspect": { - "$ref": "common.schema.json#/$defs/mAspect" - }, - "mBlockValidation": { - "type": "string", - "const": "RBV_Unvalidated" - }, - "mIsPathSignal": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mIsBiDirectional": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mVisualState": { - "$ref": "common.schema.json#/$defs/integer-string" + "$ref": "#/$defs/FGBuildableRailroadSignal--merged", + "unevaluatedProperties": false + }, + "FGBuildableTrainPlatform--base--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableTrainPlatform--base" }, - "mSignificanceRange": { - "$ref": "common.schema.json#/$defs/decimal-string" + { + "$ref": "#/$defs/FGBuildable--consumes-power-base" } - } + ] }, "FGBuildableTrainPlatform--base": { "type": "object", - "$ref": "#/$defs/FGBuildable--consumes-power-base", - "required": [ - "mPlatformConnections", - "mIsOrientationReversed", - "mPlatformDockingStatus", - "mSavedDockingStatus", - "mDockingSequenceTimerHandle", - "mIdleUpdateTimerHandle", - "mDockWasCancelled" - ], - "properties": { - "mPlatformConnections": { - "type": "string", - "minLength": 1, - "typed_string": { - "minItems": 1, - "items": { - "type": "string", - "minLength": 1, - "UnrealEngineString": { - "left": "/Script/FactoryGame.FGTrainPlatformConnection", - "right": { - "starts_with": "/Game/FactoryGame/Buildable/Factory/Train/Station/" - } - } - } - } - }, - "mIsOrientationReversed": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mPlatformDockingStatus": { - "$ref": "common.schema.json#/$defs/mPlatformDockingStatus" - }, - "mSavedDockingStatus": { - "$ref": "common.schema.json#/$defs/mPlatformDockingStatus" - }, - "mDockingSequenceTimerHandle": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mIdleUpdateTimerHandle": { - "$ref": "common.schema.json#/$defs/empty-object" + "$ref": "#/$defs/FGBuildableTrainPlatform--base--merged" + }, + "FGBuildableTrainPlatformCargo--FGBuildableRailroadStation--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableTrainPlatformCargo--FGBuildableRailroadStation" }, - "mDockWasCancelled": { - "$ref": "common.schema.json#/$defs/boolean" + { + "$ref": "#/$defs/FGBuildableTrainPlatform--base" } - } + ] }, "FGBuildableTrainPlatformCargo--FGBuildableRailroadStation": { "type": "object", - "$ref": "#/$defs/FGBuildableTrainPlatform--base", - "required": ["mCurrentDockForDuration"], - "properties": { - "mCurrentDockForDuration": { - "$ref": "common.schema.json#/$defs/decimal-string" + "$ref": "#/$defs/FGBuildableTrainPlatformCargo--FGBuildableRailroadStation--merged" + }, + "FGBuildableTrainPlatformCargo--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableTrainPlatformCargo" + }, + { + "$ref": "#/$defs/FGBuildableTrainPlatformCargo--FGBuildableRailroadStation" } - } + ] }, "FGBuildableTrainPlatformCargo": { "type": "object", - "$ref": "#/$defs/FGBuildableTrainPlatformCargo--FGBuildableRailroadStation", - "unevaluatedProperties": false, - "required": [ - "mOnTransferRateUpdated", - "mFreightCargoType", - "mStorageSizeX", - "mStorageSizeY", - "mCanUnloadAny", - "mIsFullUnload", - "mCanLoadAny", - "mIsFullLoad", - "mTimeToCompleteLoad", - "mTimeToSwapLoadVisibility", - "mTimeToCompleteUnload", - "mTimeToSwapUnloadVisibility", - "mWaitForConditionUpdatePeriod", - "mStorageInputConnections", - "mPipeInputConnections", - "mPipeOutputConnections", - "mDockingRuleSet", - "mLoadItemFilter", - "mUnloadItemFilter", - "mHasFullyLoadUnloadRule", - "mDockForDuration", - "mMustDockForDuration", - "mHasAnyRelevantStacksToMove", - "mAllowDepartureNoValidItemsToTransfer", - "mShouldExecuteLoadOrUnload", - "mRanCompleteBeforeNone", - "mSwapCargoVisibilityTimerHandle", - "mTimeSinceLastLoadTransferUpdate", - "mTimeSinceLastUnloadTransferUpdate", - "mSmoothedLoadRate", - "mSmoothedUnloadRate", - "mReplicatedOutflowRate", - "mReplicatedInflowRate" - ], - "properties": { - "mStorageSizeX": { - "$ref": "common.schema.json#/$defs/integer-string" - }, - "mStorageSizeY": { - "$ref": "common.schema.json#/$defs/integer-string" - }, - "mOnTransferRateUpdated": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mFreightCargoType": { - "type": "string", - "enum": ["FCT_Standard", "FCT_Liquid"] - }, - "mCanUnloadAny": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mIsFullUnload": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mCanLoadAny": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mIsFullLoad": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mTimeToCompleteLoad": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mTimeToSwapLoadVisibility": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mTimeToCompleteUnload": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mTimeToSwapUnloadVisibility": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mWaitForConditionUpdatePeriod": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mStorageInputConnections": { - "type": "string", - "const": "" - }, - "mPipeInputConnections": { - "type": "string", - "const": "" - }, - "mPipeOutputConnections": { - "type": "string", - "const": "" - }, - "mDockingRuleSet": { - "$ref": "common.schema.json#/$defs/mDockingRuleSet" - }, - "mLoadItemFilter": { - "type": "string", - "const": "" - }, - "mUnloadItemFilter": { - "type": "string", - "const": "" - }, - "mHasFullyLoadUnloadRule": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mDockForDuration": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mMustDockForDuration": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mHasAnyRelevantStacksToMove": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mAllowDepartureNoValidItemsToTransfer": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mShouldExecuteLoadOrUnload": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mRanCompleteBeforeNone": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mSwapCargoVisibilityTimerHandle": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mTimeSinceLastLoadTransferUpdate": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mTimeSinceLastUnloadTransferUpdate": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mSmoothedLoadRate": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mSmoothedUnloadRate": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mReplicatedOutflowRate": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mReplicatedInflowRate": { - "$ref": "common.schema.json#/$defs/decimal-string" - } - } + "$ref": "#/$defs/FGBuildableTrainPlatformCargo--merged", + "unevaluatedProperties": false }, "FGBuildableTrainPlatformEmpty": { "type": "object", "$ref": "#/$defs/FGBuildableTrainPlatform--base", "unevaluatedProperties": false }, - "FGBuildableRailroadStation": { - "type": "object", - "$ref": "#/$defs/FGBuildableTrainPlatformCargo--FGBuildableRailroadStation", - "unevaluatedProperties": false, - "required": [ - "mMapText", - "mShouldTeleportHere", - "mDockedPlatformList", - "mCurrentDockedWithRuleSet" - ], - "properties": { - "mMapText": { - "type": "string", - "const": "Train Station" - }, - "mShouldTeleportHere": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mDockedPlatformList": { - "type": "string", - "const": "" + "FGBuildableRailroadStation--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableRailroadStation" }, - "mCurrentDockedWithRuleSet": { - "$ref": "common.schema.json#/$defs/mDockingRuleSet" + { + "$ref": "#/$defs/FGBuildableTrainPlatformCargo--FGBuildableRailroadStation" } - } + ] + }, + "FGBuildableRailroadStation": { + "type": "object", + "$ref": "#/$defs/FGBuildableRailroadStation--merged", + "unevaluatedProperties": false }, "FGBuildableStorage": { "type": "object", diff --git a/types-progress--common.md b/types-progress--common.md index 93c2c2b..3b88180 100644 --- a/types-progress--common.md +++ b/types-progress--common.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (257 of 257) +100.00% Complete (269 of 269) ## Basic Types @@ -42,12 +42,12 @@ - [x] InfinityExtrap - [x] integer-string (common type) - [x] integer-string--signed (common type) -- [x] mAspect +- [x] mAspect (common type) - [x] mBatteryStatus - [x] mDamageTypes (common type) -- [x] mDockingRuleSet +- [x] mDockingRuleSet (common type) - [x] mForm (common type) -- [x] mPlatformDockingStatus +- [x] mPlatformDockingStatus (common type) - [x] NativeClass - [x] None (common type) - [x] SpecifiedColor @@ -81,6 +81,8 @@ - [x] common-base--FGBuildableFactory--generic - [x] common-base--FGBuildableFactory--jump-pad - [x] common-base--FGBuildableFactory--landing-pad +- [x] common-base--FGBuildableFrackingActivator +- [x] common-base--FGBuildableFrackingExtractor - [x] common-base--FGBuildableGenerator--base (common type) - [x] common-base--FGBuildableGeneratorFuel--base (common type) - [x] common-base--FGBuildableGeneratorFuel--biogen @@ -108,6 +110,8 @@ - [x] common-base--FGBuildablePipeReservoir - [x] common-base--FGBuildablePoleLightweight - [x] common-base--FGBuildablePowerPole +- [x] common-base--FGBuildableRailroadSignal +- [x] common-base--FGBuildableRailroadStation - [x] common-base--FGBuildableRailroadTrack - [x] common-base--FGBuildableResourceExtractor--miner - [x] common-base--FGBuildableResourceExtractor--miner--base (common type) @@ -116,6 +120,9 @@ - [x] common-base--FGBuildableResourceSink - [x] common-base--FGBuildableResourceSinkShop - [x] common-base--FGBuildableTradingPost +- [x] common-base--FGBuildableTrainPlatform--base (common type) +- [x] common-base--FGBuildableTrainPlatformCargo +- [x] common-base--FGBuildableTrainPlatformCargo--FGBuildableRailroadStation (common type) - [x] common-base--FGBuildableWalkway - [x] common-base--FGBuildableWalkway--base (common type) - [x] common-base--FGBuildableWalkwayLightweight diff --git a/types-progress--update8.md b/types-progress--update8.md index eed965d..88d4579 100644 --- a/types-progress--update8.md +++ b/types-progress--update8.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (409 of 409) +100.00% Complete (423 of 423) ## Basic Types @@ -64,6 +64,8 @@ - [x] common-base--FGBuildableFactory--generic (common type) - [x] common-base--FGBuildableFactory--jump-pad (common type) - [x] common-base--FGBuildableFactory--landing-pad (common type) +- [x] common-base--FGBuildableFrackingActivator (common type) +- [x] common-base--FGBuildableFrackingExtractor (common type) - [x] common-base--FGBuildableGenerator--base (common type) - [x] common-base--FGBuildableGeneratorFuel--base (common type) - [x] common-base--FGBuildableGeneratorFuel--biogen (common type) @@ -91,6 +93,8 @@ - [x] common-base--FGBuildablePipeReservoir (common type) - [x] common-base--FGBuildablePoleLightweight (common type) - [x] common-base--FGBuildablePowerPole (common type) +- [x] common-base--FGBuildableRailroadSignal (common type) +- [x] common-base--FGBuildableRailroadStation (common type) - [x] common-base--FGBuildableRailroadTrack (common type) - [x] common-base--FGBuildableResourceExtractor--miner (common type) - [x] common-base--FGBuildableResourceExtractor--miner--base (common type) @@ -99,6 +103,9 @@ - [x] common-base--FGBuildableResourceSink (common type) - [x] common-base--FGBuildableResourceSinkShop (common type) - [x] common-base--FGBuildableTradingPost (common type) +- [x] common-base--FGBuildableTrainPlatform--base (common type) +- [x] common-base--FGBuildableTrainPlatformCargo (common type) +- [x] common-base--FGBuildableTrainPlatformCargo--FGBuildableRailroadStation (common type) - [x] common-base--FGBuildableWalkway (common type) - [x] common-base--FGBuildableWalkway--base (common type) - [x] common-base--FGBuildableWalkwayLightweight (common type) @@ -289,6 +296,14 @@ - [x] FGBuildableFoundation--base +## FGBuildableFrackingActivator + +- [x] FGBuildableFrackingActivator--merged + +## FGBuildableFrackingExtractor + +- [x] FGBuildableFrackingExtractor--merged + ## FGBuildableGenerator - [x] FGBuildableGenerator--base @@ -371,6 +386,14 @@ - [x] FGBuildablePowerPole--merged +## FGBuildableRailroadSignal + +- [x] FGBuildableRailroadSignal--merged + +## FGBuildableRailroadStation + +- [x] FGBuildableRailroadStation--merged + ## FGBuildableRailroadTrack - [x] FGBuildableRailroadTrack--merged @@ -402,10 +425,13 @@ ## FGBuildableTrainPlatform - [x] FGBuildableTrainPlatform--base +- [x] FGBuildableTrainPlatform--base--merged ## FGBuildableTrainPlatformCargo - [x] FGBuildableTrainPlatformCargo--FGBuildableRailroadStation +- [x] FGBuildableTrainPlatformCargo--FGBuildableRailroadStation--merged +- [x] FGBuildableTrainPlatformCargo--merged ## FGBuildableWalkway diff --git a/types-progress--version_1_0_0_4.md b/types-progress--version_1_0_0_4.md index 403968b..4f944fb 100644 --- a/types-progress--version_1_0_0_4.md +++ b/types-progress--version_1_0_0_4.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (443 of 443) +100.00% Complete (457 of 457) ## Basic Types @@ -70,6 +70,8 @@ - [x] common-base--FGBuildableFactory--generic (common type) - [x] common-base--FGBuildableFactory--jump-pad (common type) - [x] common-base--FGBuildableFactory--landing-pad (common type) +- [x] common-base--FGBuildableFrackingActivator (common type) +- [x] common-base--FGBuildableFrackingExtractor (common type) - [x] common-base--FGBuildableGenerator--base (common type) - [x] common-base--FGBuildableGeneratorFuel--base (common type) - [x] common-base--FGBuildableGeneratorFuel--biogen (common type) @@ -97,6 +99,8 @@ - [x] common-base--FGBuildablePipeReservoir (common type) - [x] common-base--FGBuildablePoleLightweight (common type) - [x] common-base--FGBuildablePowerPole (common type) +- [x] common-base--FGBuildableRailroadSignal (common type) +- [x] common-base--FGBuildableRailroadStation (common type) - [x] common-base--FGBuildableRailroadTrack (common type) - [x] common-base--FGBuildableResourceExtractor--miner (common type) - [x] common-base--FGBuildableResourceExtractor--miner--base (common type) @@ -105,6 +109,9 @@ - [x] common-base--FGBuildableResourceSink (common type) - [x] common-base--FGBuildableResourceSinkShop (common type) - [x] common-base--FGBuildableTradingPost (common type) +- [x] common-base--FGBuildableTrainPlatform--base (common type) +- [x] common-base--FGBuildableTrainPlatformCargo (common type) +- [x] common-base--FGBuildableTrainPlatformCargo--FGBuildableRailroadStation (common type) - [x] common-base--FGBuildableWalkway (common type) - [x] common-base--FGBuildableWalkway--base (common type) - [x] common-base--FGBuildableWalkwayLightweight (common type) @@ -299,6 +306,14 @@ - [x] FGBuildableFoundation--base +## FGBuildableFrackingActivator + +- [x] FGBuildableFrackingActivator--merged + +## FGBuildableFrackingExtractor + +- [x] FGBuildableFrackingExtractor--merged + ## FGBuildableGenerator - [x] FGBuildableGenerator--base @@ -388,6 +403,14 @@ - [x] FGBuildablePowerPole--merged +## FGBuildableRailroadSignal + +- [x] FGBuildableRailroadSignal--merged + +## FGBuildableRailroadStation + +- [x] FGBuildableRailroadStation--merged + ## FGBuildableRailroadTrack - [x] FGBuildableRailroadTrack--merged @@ -424,10 +447,13 @@ ## FGBuildableTrainPlatform - [x] FGBuildableTrainPlatform--base +- [x] FGBuildableTrainPlatform--base--merged ## FGBuildableTrainPlatformCargo - [x] FGBuildableTrainPlatformCargo--FGBuildableRailroadStation +- [x] FGBuildableTrainPlatformCargo--FGBuildableRailroadStation--merged +- [x] FGBuildableTrainPlatformCargo--merged ## FGBuildableWalkway