diff --git a/common-imports.json b/common-imports.json index 88dfee0d..ab913b48 100644 --- a/common-imports.json +++ b/common-imports.json @@ -10,6 +10,7 @@ "common_type__class__no_description_or_display_name__type": "common/unassigned", "common_type__color__type": "common/unassigned", "common_type__color_decimal__type": "common/unassigned", + "common_type__common_base__mSnappedPassthroughs__type": "common/unassigned", "common_type__empty_object__type": "common/unassigned", "common_type__InfinityExtrap__type": "common/unassigned", "common_type__ItemClass__type": "common/unassigned", @@ -46,6 +47,9 @@ "common_type__common_base__FGBuildable__pole__base__with_static__type": "classes/CoreUObject/FGBuildable", "common_type__common_base__FGBuildable__tiered__type": "classes/CoreUObject/FGBuildable", "common_type__common_base__FGBuildableBlueprintDesigner__type": "classes/CoreUObject/FGBuildableBlueprintDesigner", + "common_type__common_base__FGBuildableConveyorBelt__type": "classes/CoreUObject/FGBuildableConveyorBelt", + "common_type__common_base__FGBuildableConveyorBelt__base__type": "classes/CoreUObject/FGBuildableConveyorBelt", + "common_type__common_base__FGBuildableConveyorLift__type": "classes/CoreUObject/FGBuildableConveyorLift", "common_type__common_base__FGBuildableCornerWall__type": "classes/CoreUObject/FGBuildableCornerWall", "common_type__common_base__FGBuildableDoor__type": "classes/CoreUObject/FGBuildableDoor", "common_type__common_base__FGBuildableDoor__automated__type": "classes/CoreUObject/FGBuildableDoor", diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorBelt.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorBelt.ts index 2313b844..93f6c07e 100644 --- a/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorBelt.ts +++ b/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorBelt.ts @@ -1,35 +1,32 @@ import {FGBuildable__base__type} from './FGBuildable'; -import { - integer_string__signed__type, - decimal_string__type, - integer_string__type, -} from '../../../common/common/scalar'; +import {integer_string__signed__type} from '../../../common/common/scalar'; import { - empty_object__type, - NativeClass__type, -} from '../../../common/common/unassigned'; + common_base__FGBuildableConveyorBelt__base__type, + common_base__FGBuildableConveyorBelt__type, +} from '../../../common/classes/CoreUObject/FGBuildableConveyorBelt'; + +import {NativeClass__type} from '../../../common/common/unassigned'; export type FGBuildableConveyorBelt__type = - FGBuildableConveyorBelt__base__type & { - mMeshLength: decimal_string__type; - mSplineData: ''; - mCustomSkins: [ - '/Game/FactoryGame/Buildable/-Shared/Customization/Skins/SkinDesc_Test1.SkinDesc_Test1_C', - ...'/Game/FactoryGame/Buildable/-Shared/Customization/Skins/SkinDesc_Test1.SkinDesc_Test1_C'[], - ]; - }; + FGBuildableConveyorBelt__merged__type; -export type FGBuildableConveyorBelt__base__type = FGBuildable__base__type & { - mItemMeshMap: empty_object__type; - mSpeed: decimal_string__type; - mItems: { - ArrayReplicationKey: integer_string__signed__type; +export type FGBuildableConveyorBelt__base__type = + FGBuildableConveyorBelt__base__merged__type & { + mItems: { + ArrayReplicationKey: integer_string__signed__type; + }; + mChainSegmentIndex: integer_string__signed__type; }; - mConveyorChainFlags: integer_string__type; - mChainSegmentIndex: integer_string__signed__type; -}; + +export type FGBuildableConveyorBelt__base__merged__type = + common_base__FGBuildableConveyorBelt__base__type & + FGBuildable__base__type; + +export type FGBuildableConveyorBelt__merged__type = + common_base__FGBuildableConveyorBelt__type & + FGBuildableConveyorBelt__base__type; export type FGBuildableConveyorBelt__NativeClass = NativeClass__type & { diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorLift.ts b/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorLift.ts index 11b29828..efc67a32 100644 --- a/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorLift.ts +++ b/generated-types/1.0/classes/CoreUObject/FGBuildableConveyorLift.ts @@ -1,27 +1,24 @@ -import {mSnappedPassthroughs__type} from '../../common/unassigned'; - import {FGBuildableConveyorBelt__base__type} from './FGBuildableConveyorBelt'; import { - decimal_string__type, boolean__type, + decimal_string__type, } from '../../../common/common/scalar'; -import { - transformation__type, - NativeClass__type, -} from '../../../common/common/unassigned'; +import {common_base__FGBuildableConveyorLift__type} from '../../../common/classes/CoreUObject/FGBuildableConveyorLift'; + +import {NativeClass__type} from '../../../common/common/unassigned'; export type FGBuildableConveyorLift__type = - FGBuildableConveyorBelt__base__type & { - mMeshHeight: decimal_string__type; - mIsReversed: boolean__type; + FGBuildableConveyorLift__merged__type & { mFlipMeshOnReverse: boolean__type; - mTopTransform: transformation__type; - mSnappedPassthroughs: mSnappedPassthroughs__type; mOpposingConnectionClearance: decimal_string__type; }; +export type FGBuildableConveyorLift__merged__type = + common_base__FGBuildableConveyorLift__type & + FGBuildableConveyorBelt__base__type; + export type FGBuildableConveyorLift__NativeClass = NativeClass__type & { Classes: [ diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildablePipeline.ts b/generated-types/1.0/classes/CoreUObject/FGBuildablePipeline.ts index 44aa6359..b25a5d64 100644 --- a/generated-types/1.0/classes/CoreUObject/FGBuildablePipeline.ts +++ b/generated-types/1.0/classes/CoreUObject/FGBuildablePipeline.ts @@ -1,7 +1,5 @@ import {StringPassedRegExp} from '../../utils/validators'; -import {mSnappedPassthroughs__type} from '../../common/unassigned'; - import {FGBuildable__base__type} from './FGBuildable'; import { @@ -11,6 +9,7 @@ import { import { empty_object__type, + common_base__mSnappedPassthroughs__type, NativeClass__type, } from '../../../common/common/unassigned'; @@ -45,7 +44,7 @@ export type FGBuildablePipeline__type = FGBuildable__base__type & { mIsRattling: boolean__type; mUpdateSoundsHandle: empty_object__type; mUpdateSoundsTimerInterval: decimal_string__type; - mSnappedPassthroughs: mSnappedPassthroughs__type; + mSnappedPassthroughs: common_base__mSnappedPassthroughs__type; }; export type FGBuildablePipeline__NativeClass = diff --git a/generated-types/1.0/common/unassigned.ts b/generated-types/1.0/common/unassigned.ts index 567adef1..ac64cd83 100644 --- a/generated-types/1.0/common/unassigned.ts +++ b/generated-types/1.0/common/unassigned.ts @@ -417,6 +417,4 @@ export type Montage_3P__type = UnrealEngineString< StringStartsWith<'/Game/FactoryGame/Character/Player/Animation/ThirdPerson/'> >; -export type mSnappedPassthroughs__type = ''; - export type weaponState__type = 'EWS_Unequipped'; diff --git a/generated-types/common/classes/CoreUObject/FGFauxEntry.ts b/generated-types/common/classes/CoreUObject/FGFauxEntry.ts index ec931c7a..5b448370 100644 --- a/generated-types/common/classes/CoreUObject/FGFauxEntry.ts +++ b/generated-types/common/classes/CoreUObject/FGFauxEntry.ts @@ -34,6 +34,7 @@ import { faux_31__type, faux_32__type, faux_33__type, + faux_34__type, NativeClass__type, } from '../../common/unassigned'; @@ -81,6 +82,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & { | faux_31__type | faux_32__type | faux_33__type + | faux_34__type ), ...( | faux_1__type @@ -120,6 +122,7 @@ export type FGFauxEntry__NativeClass = NativeClass__type & { | faux_31__type | faux_32__type | faux_33__type + | faux_34__type )[], ]; }; diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts index 62b19d8c..169b9dbc 100644 --- a/generated-types/common/common/unassigned.ts +++ b/generated-types/common/common/unassigned.ts @@ -99,6 +99,13 @@ import { import {common_base__FGBuildableRailroadTrack__type} from '../classes/CoreUObject/FGBuildableRailroadTrack'; +import { + common_base__FGBuildableConveyorBelt__base__type, + common_base__FGBuildableConveyorBelt__type, +} from '../classes/CoreUObject/FGBuildableConveyorBelt'; + +import {common_base__FGBuildableConveyorLift__type} from '../classes/CoreUObject/FGBuildableConveyorLift'; + import {common_base__FGPoleDescriptor__type} from '../classes/CoreUObject/FGPoleDescriptor'; export type class__type = class__no_description__type & { @@ -128,6 +135,8 @@ export type color_decimal__type = { A: decimal_string__type; }; +export type common_base__mSnappedPassthroughs__type = ''; + export type empty_object__type = '()'; export type faux_1__type = class__type & { @@ -319,6 +328,13 @@ export type faux_33__type = class__type & { ref?: common_base__FGBuildableRailroadTrack__type; }; +export type faux_34__type = class__type & { + faux?: 'FGBuildableConveyorBelt'; + base: common_base__FGBuildableConveyorBelt__base__type; + belt?: common_base__FGBuildableConveyorBelt__type; + lift?: common_base__FGBuildableConveyorLift__type; +}; + export type faux_4__type = class__type & { faux_texture: Texture2D__type; }; diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableConveyorBelt.ts b/generated-types/update8/classes/CoreUObject/FGBuildableConveyorBelt.ts index 0c7447ed..db59b97d 100644 --- a/generated-types/update8/classes/CoreUObject/FGBuildableConveyorBelt.ts +++ b/generated-types/update8/classes/CoreUObject/FGBuildableConveyorBelt.ts @@ -1,31 +1,30 @@ import {FGBuildable__base__type} from './FGBuildable'; -import { - decimal_string__type, - integer_string__type, -} from '../../../common/common/scalar'; - import { empty_object__type, NativeClass__type, } from '../../../common/common/unassigned'; +import { + common_base__FGBuildableConveyorBelt__base__type, + common_base__FGBuildableConveyorBelt__type, +} from '../../../common/classes/CoreUObject/FGBuildableConveyorBelt'; + export type FGBuildableConveyorBelt__type = - FGBuildableConveyorBelt__base__type & { - mMeshLength: decimal_string__type; - mSplineData: ''; - mCustomSkins: [ - '/Game/FactoryGame/Buildable/-Shared/Customization/Skins/SkinDesc_Test1.SkinDesc_Test1_C', - ...'/Game/FactoryGame/Buildable/-Shared/Customization/Skins/SkinDesc_Test1.SkinDesc_Test1_C'[], - ]; + FGBuildableConveyorBelt__merged__type; + +export type FGBuildableConveyorBelt__base__type = + FGBuildableConveyorBelt__base__merged__type & { + mItems: empty_object__type; }; -export type FGBuildableConveyorBelt__base__type = FGBuildable__base__type & { - mItemMeshMap: empty_object__type; - mSpeed: decimal_string__type; - mItems: empty_object__type; - mConveyorChainFlags: integer_string__type; -}; +export type FGBuildableConveyorBelt__base__merged__type = + common_base__FGBuildableConveyorBelt__base__type & + FGBuildable__base__type; + +export type FGBuildableConveyorBelt__merged__type = + common_base__FGBuildableConveyorBelt__type & + FGBuildableConveyorBelt__base__type; export type FGBuildableConveyorBelt__NativeClass = NativeClass__type & { diff --git a/generated-types/update8/classes/CoreUObject/FGBuildableConveyorLift.ts b/generated-types/update8/classes/CoreUObject/FGBuildableConveyorLift.ts index b2dfd806..8aa3e4d8 100644 --- a/generated-types/update8/classes/CoreUObject/FGBuildableConveyorLift.ts +++ b/generated-types/update8/classes/CoreUObject/FGBuildableConveyorLift.ts @@ -1,24 +1,15 @@ -import {mSnappedPassthroughs__type} from '../../common/unassigned'; - import {FGBuildableConveyorBelt__base__type} from './FGBuildableConveyorBelt'; -import { - decimal_string__type, - boolean__type, -} from '../../../common/common/scalar'; +import {common_base__FGBuildableConveyorLift__type} from '../../../common/classes/CoreUObject/FGBuildableConveyorLift'; -import { - transformation__type, - NativeClass__type, -} from '../../../common/common/unassigned'; +import {NativeClass__type} from '../../../common/common/unassigned'; export type FGBuildableConveyorLift__type = - FGBuildableConveyorBelt__base__type & { - mMeshHeight: decimal_string__type; - mIsReversed: boolean__type; - mTopTransform: transformation__type; - mSnappedPassthroughs: mSnappedPassthroughs__type; - }; + FGBuildableConveyorLift__merged__type; + +export type FGBuildableConveyorLift__merged__type = + common_base__FGBuildableConveyorLift__type & + FGBuildableConveyorBelt__base__type; export type FGBuildableConveyorLift__NativeClass = NativeClass__type & { diff --git a/generated-types/update8/classes/CoreUObject/FGBuildablePipeline.ts b/generated-types/update8/classes/CoreUObject/FGBuildablePipeline.ts index baa39ba7..fd1ce01f 100644 --- a/generated-types/update8/classes/CoreUObject/FGBuildablePipeline.ts +++ b/generated-types/update8/classes/CoreUObject/FGBuildablePipeline.ts @@ -1,7 +1,5 @@ import {StringPassedRegExp} from '../../utils/validators'; -import {mSnappedPassthroughs__type} from '../../common/unassigned'; - import {FGBuildable__base__type} from './FGBuildable'; import { @@ -11,6 +9,7 @@ import { import { empty_object__type, + common_base__mSnappedPassthroughs__type, NativeClass__type, } from '../../../common/common/unassigned'; @@ -41,7 +40,7 @@ export type FGBuildablePipeline__type = FGBuildable__base__type & { mRattleLimit: decimal_string__type; mIsRattling: boolean__type; mUpdateSoundsHandle: empty_object__type; - mSnappedPassthroughs: mSnappedPassthroughs__type; + mSnappedPassthroughs: common_base__mSnappedPassthroughs__type; }; export type FGBuildablePipeline__NativeClass = diff --git a/generated-types/update8/common/unassigned.ts b/generated-types/update8/common/unassigned.ts index a5cb7857..a05f2861 100644 --- a/generated-types/update8/common/unassigned.ts +++ b/generated-types/update8/common/unassigned.ts @@ -309,6 +309,4 @@ export type mLightControlData__type = { export type mOutputInventoryHandlerData__type = empty_object__type; -export type mSnappedPassthroughs__type = ''; - export type weaponState__type = 'EWS_Unequipped'; diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json index 8bc8a6d3..7f11212c 100644 --- a/schema/1.0.schema.json +++ b/schema/1.0.schema.json @@ -1000,23 +1000,24 @@ "$ref": "#/$defs/FGPoleDescriptor--merged", "unevaluatedProperties": false }, + "FGBuildableConveyorBelt--base--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableConveyorBelt--base" + }, + { + "$ref": "#/$defs/FGBuildable--base" + } + ] + }, "FGBuildableConveyorBelt--base": { "type": "object", - "$ref": "#/$defs/FGBuildable--base", + "$ref": "#/$defs/FGBuildableConveyorBelt--base--merged", "required": [ - "mItemMeshMap", - "mSpeed", "mItems", - "mConveyorChainFlags", "mChainSegmentIndex" ], "properties": { - "mItemMeshMap": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mSpeed": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, "mItems": { "type": "string", "minLength": 1, @@ -1029,70 +1030,49 @@ } } }, - "mConveyorChainFlags": { - "$ref": "common.schema.json#/$defs/integer-string" - }, "mChainSegmentIndex": { "$ref": "common.schema.json#/$defs/integer-string--signed" } } }, + "FGBuildableConveyorBelt--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableConveyorBelt" + }, + { + "$ref": "#/$defs/FGBuildableConveyorBelt--base" + } + ] + }, "FGBuildableConveyorBelt": { "type": "object", - "$ref": "#/$defs/FGBuildableConveyorBelt--base", + "$ref": "#/$defs/FGBuildableConveyorBelt--merged", "unevaluatedProperties": false, - "required": ["mMeshLength", "mSplineData", "mCustomSkins"], - "properties": { - "mMeshLength": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mSplineData": { - "type": "string", - "const": "" + "required": ["mMeshLength", "mSplineData", "mCustomSkins"] + }, + "FGBuildableConveyorLift--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableConveyorLift" }, - "mCustomSkins": { - "type": "string", - "minLength": 1, - "typed_string": { - "minItems": 1, - "items": { - "type": "string", - "enum": [ - "/Game/FactoryGame/Buildable/-Shared/Customization/Skins/SkinDesc_Test1.SkinDesc_Test1_C" - ] - } - } + { + "$ref": "#/$defs/FGBuildableConveyorBelt--base" } - } + ] }, "FGBuildableConveyorLift": { "type": "object", - "$ref": "#/$defs/FGBuildableConveyorBelt--base", + "$ref": "#/$defs/FGBuildableConveyorLift--merged", "unevaluatedProperties": false, "required": [ - "mMeshHeight", - "mIsReversed", "mFlipMeshOnReverse", - "mTopTransform", - "mSnappedPassthroughs", "mOpposingConnectionClearance" ], "properties": { - "mMeshHeight": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mIsReversed": { - "$ref": "common.schema.json#/$defs/boolean" - }, "mFlipMeshOnReverse": { "$ref": "common.schema.json#/$defs/boolean" }, - "mTopTransform": { - "$ref": "common.schema.json#/$defs/transformation" - }, - "mSnappedPassthroughs": { - "$ref": "#/$defs/mSnappedPassthroughs" - }, "mOpposingConnectionClearance": { "$ref": "common.schema.json#/$defs/decimal-string" } @@ -4505,10 +4485,6 @@ } } }, - "mSnappedPassthroughs": { - "type": "string", - "const": "" - }, "FGBuildablePipeline": { "type": "object", "$ref": "#/$defs/FGBuildable--base", @@ -4627,7 +4603,7 @@ "$ref": "common.schema.json#/$defs/decimal-string" }, "mSnappedPassthroughs": { - "$ref": "#/$defs/mSnappedPassthroughs" + "$ref": "common.schema.json#/$defs/common-base--mSnappedPassthroughs" } } }, diff --git a/schema/common.schema.json b/schema/common.schema.json index e087aef1..14e9acf4 100644 --- a/schema/common.schema.json +++ b/schema/common.schema.json @@ -1273,6 +1273,81 @@ } } }, + "common-base--FGBuildableConveyorBelt--base": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--base", + "required": [ + "mItemMeshMap", + "mSpeed", + "mConveyorChainFlags" + ], + "properties": { + "mItemMeshMap": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mSpeed": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mConveyorChainFlags": { + "$ref": "common.schema.json#/$defs/integer-string" + } + } + }, + "common-base--FGBuildableConveyorBelt": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildableConveyorBelt--base", + "required": ["mMeshLength", "mSplineData", "mCustomSkins"], + "properties": { + "mMeshLength": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mSplineData": { + "type": "string", + "const": "" + }, + "mCustomSkins": { + "type": "string", + "minLength": 1, + "typed_string": { + "minItems": 1, + "items": { + "type": "string", + "enum": [ + "/Game/FactoryGame/Buildable/-Shared/Customization/Skins/SkinDesc_Test1.SkinDesc_Test1_C" + ] + } + } + } + } + }, + "common-base--FGBuildableConveyorLift": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildableConveyorBelt--base", + "required": [ + "mMeshHeight", + "mIsReversed", + "mTopTransform", + "mSnappedPassthroughs" + ], + "properties": { + "mMeshHeight": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mIsReversed": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mTopTransform": { + "$ref": "common.schema.json#/$defs/transformation" + }, + "mSnappedPassthroughs": { + "$ref": "common.schema.json#/$defs/common-base--mSnappedPassthroughs" + } + } + }, + "common-base--mSnappedPassthroughs": { + "type": "string", + "const": "" + }, "common-base--FGBuildable--pipeline-accessory--base": { "type": "object", "$ref": "common.schema.json#/$defs/common-base--FGBuildable--consumes-power-base", @@ -3114,6 +3189,26 @@ "$ref": "#/$defs/common-base--FGBuildableRailroadTrack" } } + }, + "faux-34": { + "type": "object", + "$ref": "#/$defs/class", + "required": ["base"], + "properties": { + "faux": { + "type": "string", + "const": "FGBuildableConveyorBelt" + }, + "base": { + "$ref": "#/$defs/common-base--FGBuildableConveyorBelt--base" + }, + "belt": { + "$ref": "#/$defs/common-base--FGBuildableConveyorBelt" + }, + "lift": { + "$ref": "#/$defs/common-base--FGBuildableConveyorLift" + } + } } }, "items": false, @@ -3315,6 +3410,11 @@ "type": "object", "$ref": "#/$defs/faux-33", "unevaluatedProperties": false + }, + { + "type": "object", + "$ref": "#/$defs/faux-34", + "unevaluatedProperties": false } ] } diff --git a/schema/update8.schema.json b/schema/update8.schema.json index 35708407..9e40b689 100644 --- a/schema/update8.schema.json +++ b/schema/update8.schema.json @@ -691,82 +691,58 @@ "$ref": "#/$defs/FGPoleDescriptor--merged", "unevaluatedProperties": false }, + "FGBuildableConveyorBelt--base--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableConveyorBelt--base" + }, + { + "$ref": "#/$defs/FGBuildable--base" + } + ] + }, "FGBuildableConveyorBelt--base": { "type": "object", - "$ref": "#/$defs/FGBuildable--base", + "$ref": "#/$defs/FGBuildableConveyorBelt--base--merged", "required": [ - "mItemMeshMap", - "mSpeed", - "mItems", - "mConveyorChainFlags" + "mItems" ], "properties": { - "mItemMeshMap": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mSpeed": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, "mItems": { "$ref": "common.schema.json#/$defs/empty-object" - }, - "mConveyorChainFlags": { - "$ref": "common.schema.json#/$defs/integer-string" } } }, + "FGBuildableConveyorBelt--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableConveyorBelt" + }, + { + "$ref": "#/$defs/FGBuildableConveyorBelt--base" + } + ] + }, "FGBuildableConveyorBelt": { "type": "object", - "$ref": "#/$defs/FGBuildableConveyorBelt--base", + "$ref": "#/$defs/FGBuildableConveyorBelt--merged", "unevaluatedProperties": false, - "required": ["mMeshLength", "mSplineData", "mCustomSkins"], - "properties": { - "mMeshLength": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mSplineData": { - "type": "string", - "const": "" + "required": ["mMeshLength", "mSplineData", "mCustomSkins"] + }, + "FGBuildableConveyorLift--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildableConveyorLift" }, - "mCustomSkins": { - "type": "string", - "minLength": 1, - "typed_string": { - "minItems": 1, - "items": { - "type": "string", - "enum": [ - "/Game/FactoryGame/Buildable/-Shared/Customization/Skins/SkinDesc_Test1.SkinDesc_Test1_C" - ] - } - } + { + "$ref": "#/$defs/FGBuildableConveyorBelt--base" } - } + ] }, "FGBuildableConveyorLift": { "type": "object", - "$ref": "#/$defs/FGBuildableConveyorBelt--base", - "unevaluatedProperties": false, - "required": [ - "mMeshHeight", - "mIsReversed", - "mTopTransform", - "mSnappedPassthroughs" - ], - "properties": { - "mMeshHeight": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mIsReversed": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mTopTransform": { - "$ref": "common.schema.json#/$defs/transformation" - }, - "mSnappedPassthroughs": { - "$ref": "#/$defs/mSnappedPassthroughs" - } - } + "$ref": "#/$defs/FGBuildableConveyorLift--merged", + "unevaluatedProperties": false }, "FGBuildableWire": { "type": "object", @@ -2276,10 +2252,6 @@ } } }, - "mSnappedPassthroughs": { - "type": "string", - "const": "" - }, "FGBuildablePipeline": { "type": "object", "$ref": "#/$defs/FGBuildable--base", @@ -2382,7 +2354,7 @@ "$ref": "common.schema.json#/$defs/empty-object" }, "mSnappedPassthroughs": { - "$ref": "#/$defs/mSnappedPassthroughs" + "$ref": "common.schema.json#/$defs/common-base--mSnappedPassthroughs" } } }, diff --git a/types-progress--common.md b/types-progress--common.md index 0ed6c3ea..7c3c9254 100644 --- a/types-progress--common.md +++ b/types-progress--common.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (178 of 178) +100.00% Complete (186 of 186) ## Basic Types @@ -42,6 +42,7 @@ - [x] faux-31 - [x] faux-32 - [x] faux-33 +- [x] faux-34 - [x] faux-4 - [x] faux-5 - [x] faux-6 @@ -62,7 +63,7 @@ - [x] None (common type) - [x] SpecifiedColor - [x] Texture2D (common type) -- [x] transformation +- [x] transformation (common type) - [x] xyz-array ## common-base @@ -78,6 +79,9 @@ - [x] common-base--FGBuildable--pole--base--with-static (common type) - [x] common-base--FGBuildable--tiered - [x] common-base--FGBuildableBlueprintDesigner +- [x] common-base--FGBuildableConveyorBelt +- [x] common-base--FGBuildableConveyorBelt--base (common type) +- [x] common-base--FGBuildableConveyorLift - [x] common-base--FGBuildableCornerWall - [x] common-base--FGBuildableDoor - [x] common-base--FGBuildableDoor--automated @@ -114,6 +118,7 @@ - [x] common-base--FGSchematic--mUnlocks - [x] common-base--FGSchematic--mUnlocks_Class - [x] common-base--FGSchematic--with-unlocks +- [x] common-base--mSnappedPassthroughs (common type) ## FGSchematic diff --git a/types-progress--update8.md b/types-progress--update8.md index f8070a3c..1c051feb 100644 --- a/types-progress--update8.md +++ b/types-progress--update8.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (283 of 283) +100.00% Complete (289 of 289) ## Basic Types @@ -41,7 +41,6 @@ - [x] mLightControlData - [x] mOutputInventoryHandlerData - [x] mPlatformDockingStatus (common type) -- [x] mSnappedPassthroughs - [x] NativeClass (common type) - [x] None (common type) - [x] Texture2D (common type) @@ -62,6 +61,9 @@ - [x] common-base--FGBuildable--pole--base--with-static (common type) - [x] common-base--FGBuildable--tiered (common type) - [x] common-base--FGBuildableBlueprintDesigner (common type) +- [x] common-base--FGBuildableConveyorBelt (common type) +- [x] common-base--FGBuildableConveyorBelt--base (common type) +- [x] common-base--FGBuildableConveyorLift (common type) - [x] common-base--FGBuildableCornerWall (common type) - [x] common-base--FGBuildableDoor (common type) - [x] common-base--FGBuildableDoor--automated (common type) @@ -98,6 +100,7 @@ - [x] common-base--FGSchematic--mUnlocks (common type) - [x] common-base--FGSchematic--mUnlocks_Class (common type) - [x] common-base--FGSchematic--with-unlocks (common type) +- [x] common-base--mSnappedPassthroughs (common type) ## FGAmmoType @@ -196,6 +199,12 @@ ## FGBuildableConveyorBelt - [x] FGBuildableConveyorBelt--base +- [x] FGBuildableConveyorBelt--base--merged +- [x] FGBuildableConveyorBelt--merged + +## FGBuildableConveyorLift + +- [x] FGBuildableConveyorLift--merged ## FGBuildableCornerWall diff --git a/types-progress--version_1_0_0_4.md b/types-progress--version_1_0_0_4.md index f954f687..1e3ba2b0 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 (322 of 322) +100.00% Complete (328 of 328) ## Basic Types @@ -42,7 +42,6 @@ - [x] Montage_1P - [x] Montage_3P - [x] mPlatformDockingStatus (common type) -- [x] mSnappedPassthroughs - [x] NativeClass (common type) - [x] None (common type) - [x] Texture2D (common type) @@ -63,6 +62,9 @@ - [x] common-base--FGBuildable--pole--base--with-static (common type) - [x] common-base--FGBuildable--tiered (common type) - [x] common-base--FGBuildableBlueprintDesigner (common type) +- [x] common-base--FGBuildableConveyorBelt (common type) +- [x] common-base--FGBuildableConveyorBelt--base (common type) +- [x] common-base--FGBuildableConveyorLift (common type) - [x] common-base--FGBuildableCornerWall (common type) - [x] common-base--FGBuildableDoor (common type) - [x] common-base--FGBuildableDoor--automated (common type) @@ -99,6 +101,7 @@ - [x] common-base--FGSchematic--mUnlocks (common type) - [x] common-base--FGSchematic--mUnlocks_Class (common type) - [x] common-base--FGSchematic--with-unlocks (common type) +- [x] common-base--mSnappedPassthroughs (common type) ## FGAmmoType @@ -202,6 +205,12 @@ ## FGBuildableConveyorBelt - [x] FGBuildableConveyorBelt--base +- [x] FGBuildableConveyorBelt--base--merged +- [x] FGBuildableConveyorBelt--merged + +## FGBuildableConveyorLift + +- [x] FGBuildableConveyorLift--merged ## FGBuildableCornerWall