diff --git a/common-imports.json b/common-imports.json index a0c208e..d2b063c 100644 --- a/common-imports.json +++ b/common-imports.json @@ -72,6 +72,7 @@ "common_type__common_base__FGBuildableGeneratorNuclear__mFuel__PlutoniumFuelRod__type": "classes/CoreUObject/FGBuildableGeneratorNuclear", "common_type__common_base__FGBuildableMAM__type": "classes/CoreUObject/FGBuildableMAM", "common_type__common_base__FGBuildablePillarLightweight__type": "classes/CoreUObject/FGBuildablePillarLightweight", + "common_type__common_base__FGBuildablePipeline__type": "classes/CoreUObject/FGBuildablePipeline", "common_type__common_base__FGBuildablePipelineJunction__type": "classes/CoreUObject/FGBuildablePipelineJunction", "common_type__common_base__FGBuildablePipelinePump__type": "classes/CoreUObject/FGBuildablePipelinePump", "common_type__common_base__FGBuildablePipelinePump__valve__type": "classes/CoreUObject/FGBuildablePipelinePump", diff --git a/generated-types/1.0/classes/CoreUObject/FGBuildablePipeline.ts b/generated-types/1.0/classes/CoreUObject/FGBuildablePipeline.ts index b25a5d6..db47108 100644 --- a/generated-types/1.0/classes/CoreUObject/FGBuildablePipeline.ts +++ b/generated-types/1.0/classes/CoreUObject/FGBuildablePipeline.ts @@ -1,52 +1,22 @@ -import {StringPassedRegExp} from '../../utils/validators'; - import {FGBuildable__base__type} from './FGBuildable'; -import { - decimal_string__type, - boolean__type, -} from '../../../common/common/scalar'; +import {decimal_string__type} from '../../../common/common/scalar'; + +import {common_base__FGBuildablePipeline__type} from '../../../common/classes/CoreUObject/FGBuildablePipeline'; -import { - empty_object__type, - common_base__mSnappedPassthroughs__type, - NativeClass__type, -} from '../../../common/common/unassigned'; +import {NativeClass__type} from '../../../common/common/unassigned'; -export type FGBuildablePipeline__type = FGBuildable__base__type & { - mMeshLength: decimal_string__type; - mSplineData: ''; - mRadius: decimal_string__type; - mFlowLimit: decimal_string__type; - mFlowIndicatorMinimumPipeLength: decimal_string__type; +export type FGBuildablePipeline__type = FGBuildablePipeline__merged__type & { mSoundSplineComponentEmitterInterval: decimal_string__type; - mPipeConnections: ''; - mFluidBox: empty_object__type; - mIndicatorData: empty_object__type; - mMaxIndicatorTurnAngle: decimal_string__type; - mIgnoreActorsForIndicator: ''; - mFluidNames: [ - { - WwiseSafeName: StringPassedRegExp<'^[A-Z][A-Za-z]+(_[A-Z][A-Za-z]+)*$'>; - ActualName?: StringPassedRegExp<'^[A-Z][A-Za-z]+( [A-Z][A-Za-z]+)*$'>; - }, - ...{ - WwiseSafeName: StringPassedRegExp<'^[A-Z][A-Za-z]+(_[A-Z][A-Za-z]+)*$'>; - ActualName?: StringPassedRegExp<'^[A-Z][A-Za-z]+( [A-Z][A-Za-z]+)*$'>; - }[], - ]; - mCurrentFluid: ''; - mLastContentForSound: decimal_string__type; - mLastFlowForSound: decimal_string__type; mLastElapsedTime: decimal_string__type; mLastFlowForSoundUpdateThreshold: decimal_string__type; - mRattleLimit: decimal_string__type; - mIsRattling: boolean__type; - mUpdateSoundsHandle: empty_object__type; mUpdateSoundsTimerInterval: decimal_string__type; - mSnappedPassthroughs: common_base__mSnappedPassthroughs__type; }; +export type FGBuildablePipeline__merged__type = + common_base__FGBuildablePipeline__type & + FGBuildable__base__type; + export type FGBuildablePipeline__NativeClass = NativeClass__type & { Classes: [FGBuildablePipeline__type, ...FGBuildablePipeline__type[]]; diff --git a/generated-types/common/classes/CoreUObject/FGBuildablePipeline.ts b/generated-types/common/classes/CoreUObject/FGBuildablePipeline.ts new file mode 100644 index 0000000..6897429 --- /dev/null +++ b/generated-types/common/classes/CoreUObject/FGBuildablePipeline.ts @@ -0,0 +1,41 @@ +import {StringPassedRegExp} from '../../utils/validators'; + +import {decimal_string__type, boolean__type} from '../../common/scalar'; + +import { + empty_object__type, + common_base__mSnappedPassthroughs__type, +} from '../../common/unassigned'; + +import {common_base__FGBuildable__base__type} from './FGBuildable'; + +export type common_base__FGBuildablePipeline__type = + common_base__FGBuildable__base__type & { + mMeshLength: decimal_string__type; + mSplineData: ''; + mRadius: decimal_string__type; + mFlowLimit: decimal_string__type; + mFlowIndicatorMinimumPipeLength: decimal_string__type; + mPipeConnections: ''; + mFluidBox: empty_object__type; + mIndicatorData: empty_object__type; + mMaxIndicatorTurnAngle: decimal_string__type; + mIgnoreActorsForIndicator: ''; + mFluidNames: [ + { + WwiseSafeName: StringPassedRegExp<'^[A-Z][A-Za-z]+(_[A-Z][A-Za-z]+)*$'>; + ActualName?: StringPassedRegExp<'^[A-Z][A-Za-z]+( [A-Z][A-Za-z]+)*$'>; + }, + ...{ + WwiseSafeName: StringPassedRegExp<'^[A-Z][A-Za-z]+(_[A-Z][A-Za-z]+)*$'>; + ActualName?: StringPassedRegExp<'^[A-Z][A-Za-z]+( [A-Z][A-Za-z]+)*$'>; + }[], + ]; + mCurrentFluid: ''; + mLastContentForSound: decimal_string__type; + mLastFlowForSound: decimal_string__type; + mRattleLimit: decimal_string__type; + mIsRattling: boolean__type; + mUpdateSoundsHandle: empty_object__type; + mSnappedPassthroughs: common_base__mSnappedPassthroughs__type; + }; diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts index 4b7927f..370921f 100644 --- a/generated-types/common/common/unassigned.ts +++ b/generated-types/common/common/unassigned.ts @@ -67,6 +67,8 @@ import { common_base__FGBuildableGeneratorNuclear__type, } from '../classes/CoreUObject/FGBuildableGeneratorNuclear'; +import {common_base__FGBuildablePipeline__type} from '../classes/CoreUObject/FGBuildablePipeline'; + import { FGSchematic__mUnlocks_mSchematics__mSchematics__type, common_base__FGSchematic__mUnlocks__type, @@ -418,6 +420,7 @@ export type faux_11__type = class__type & { FGBuildableGeneratorNuclear_mFuel_NuclearFuelRod?: common_base__FGBuildableGeneratorNuclear__mFuel__NuclearFuelRod__type; FGBuildableGeneratorNuclear_mFuel_PlutoniumFuelRod?: common_base__FGBuildableGeneratorNuclear__mFuel__PlutoniumFuelRod__type; FGBuildableGeneratorNuclear?: common_base__FGBuildableGeneratorNuclear__type; + FGBuildablePipeline?: common_base__FGBuildablePipeline__type; }; export type faux_12__type = class__type & { diff --git a/generated-types/update8/classes/CoreUObject/FGBuildablePipeline.ts b/generated-types/update8/classes/CoreUObject/FGBuildablePipeline.ts index fd1ce01..d735f1f 100644 --- a/generated-types/update8/classes/CoreUObject/FGBuildablePipeline.ts +++ b/generated-types/update8/classes/CoreUObject/FGBuildablePipeline.ts @@ -1,47 +1,14 @@ -import {StringPassedRegExp} from '../../utils/validators'; - import {FGBuildable__base__type} from './FGBuildable'; -import { - decimal_string__type, - boolean__type, -} from '../../../common/common/scalar'; +import {common_base__FGBuildablePipeline__type} from '../../../common/classes/CoreUObject/FGBuildablePipeline'; + +import {NativeClass__type} from '../../../common/common/unassigned'; -import { - empty_object__type, - common_base__mSnappedPassthroughs__type, - NativeClass__type, -} from '../../../common/common/unassigned'; +export type FGBuildablePipeline__type = FGBuildablePipeline__merged__type; -export type FGBuildablePipeline__type = FGBuildable__base__type & { - mMeshLength: decimal_string__type; - mSplineData: ''; - mRadius: decimal_string__type; - mFlowLimit: decimal_string__type; - mFlowIndicatorMinimumPipeLength: decimal_string__type; - mPipeConnections: ''; - mFluidBox: empty_object__type; - mIndicatorData: empty_object__type; - mMaxIndicatorTurnAngle: decimal_string__type; - mIgnoreActorsForIndicator: ''; - mFluidNames: [ - { - WwiseSafeName: StringPassedRegExp<'^[A-Z][A-Za-z]+(_[A-Z][A-Za-z]+)*$'>; - ActualName?: StringPassedRegExp<'^[A-Z][A-Za-z]+( [A-Z][A-Za-z]+)*$'>; - }, - ...{ - WwiseSafeName: StringPassedRegExp<'^[A-Z][A-Za-z]+(_[A-Z][A-Za-z]+)*$'>; - ActualName?: StringPassedRegExp<'^[A-Z][A-Za-z]+( [A-Z][A-Za-z]+)*$'>; - }[], - ]; - mCurrentFluid: ''; - mLastContentForSound: decimal_string__type; - mLastFlowForSound: decimal_string__type; - mRattleLimit: decimal_string__type; - mIsRattling: boolean__type; - mUpdateSoundsHandle: empty_object__type; - mSnappedPassthroughs: common_base__mSnappedPassthroughs__type; -}; +export type FGBuildablePipeline__merged__type = + common_base__FGBuildablePipeline__type & + FGBuildable__base__type; export type FGBuildablePipeline__NativeClass = NativeClass__type & { diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json index 23e3e03..790dbdd 100644 --- a/schema/1.0.schema.json +++ b/schema/1.0.schema.json @@ -4045,125 +4045,38 @@ } } }, + "FGBuildablePipeline--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildablePipeline" + }, + { + "$ref": "#/$defs/FGBuildable--base" + } + ] + }, "FGBuildablePipeline": { "type": "object", - "$ref": "#/$defs/FGBuildable--base", + "$ref": "#/$defs/FGBuildablePipeline--merged", "unevaluatedProperties": false, "required": [ - "mRadius", - "mFlowLimit", - "mFlowIndicatorMinimumPipeLength", "mSoundSplineComponentEmitterInterval", - "mPipeConnections", - "mFluidBox", - "mIndicatorData", - "mMaxIndicatorTurnAngle", - "mIgnoreActorsForIndicator", - "mFluidNames", - "mCurrentFluid", - "mLastContentForSound", - "mLastFlowForSound", "mLastElapsedTime", "mLastFlowForSoundUpdateThreshold", - "mRattleLimit", - "mIsRattling", - "mUpdateSoundsHandle", - "mUpdateSoundsTimerInterval", - "mMeshLength", - "mSplineData", - "mSnappedPassthroughs" + "mUpdateSoundsTimerInterval" ], "properties": { - "mMeshLength": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mSplineData": { - "type": "string", - "const": "" - }, - "mRadius": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mFlowLimit": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mFlowIndicatorMinimumPipeLength": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, "mSoundSplineComponentEmitterInterval": { "$ref": "common.schema.json#/$defs/decimal-string" }, - "mPipeConnections": { - "type": "string", - "const": "" - }, - "mFluidBox": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mIndicatorData": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mMaxIndicatorTurnAngle": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mIgnoreActorsForIndicator": { - "type": "string", - "const": "" - }, - "mFluidNames": { - "type": "string", - "minLength": 1, - "typed_string": { - "minItems": 1, - "items": { - "type": "string", - "minLength": 1, - "typed_string": { - "required": ["WwiseSafeName"], - "properties": { - "WwiseSafeName": { - "type": "string", - "pattern": "^[A-Z][A-Za-z]+(_[A-Z][A-Za-z]+)*$" - }, - "ActualName": { - "type": "string", - "pattern": "^[A-Z][A-Za-z]+( [A-Z][A-Za-z]+)*$" - } - } - } - } - } - }, - "mCurrentFluid": { - "type": "string", - "const": "" - }, - "mLastContentForSound": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mLastFlowForSound": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, "mLastElapsedTime": { "$ref": "common.schema.json#/$defs/decimal-string" }, "mLastFlowForSoundUpdateThreshold": { "$ref": "common.schema.json#/$defs/decimal-string" }, - "mRattleLimit": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mIsRattling": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mUpdateSoundsHandle": { - "$ref": "common.schema.json#/$defs/empty-object" - }, "mUpdateSoundsTimerInterval": { "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mSnappedPassthroughs": { - "$ref": "common.schema.json#/$defs/common-base--mSnappedPassthroughs" } } }, diff --git a/schema/common.schema.json b/schema/common.schema.json index 3568c33..d84d990 100644 --- a/schema/common.schema.json +++ b/schema/common.schema.json @@ -3430,6 +3430,111 @@ } } }, + "common-base--FGBuildablePipeline": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGBuildable--base", + "required": [ + "mRadius", + "mFlowLimit", + "mFlowIndicatorMinimumPipeLength", + "mPipeConnections", + "mFluidBox", + "mIndicatorData", + "mMaxIndicatorTurnAngle", + "mIgnoreActorsForIndicator", + "mFluidNames", + "mCurrentFluid", + "mLastContentForSound", + "mLastFlowForSound", + "mRattleLimit", + "mIsRattling", + "mUpdateSoundsHandle", + "mMeshLength", + "mSplineData", + "mSnappedPassthroughs" + ], + "properties": { + "mMeshLength": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mSplineData": { + "type": "string", + "const": "" + }, + "mRadius": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mFlowLimit": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mFlowIndicatorMinimumPipeLength": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mPipeConnections": { + "type": "string", + "const": "" + }, + "mFluidBox": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mIndicatorData": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mMaxIndicatorTurnAngle": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mIgnoreActorsForIndicator": { + "type": "string", + "const": "" + }, + "mFluidNames": { + "type": "string", + "minLength": 1, + "typed_string": { + "minItems": 1, + "items": { + "type": "string", + "minLength": 1, + "typed_string": { + "required": ["WwiseSafeName"], + "properties": { + "WwiseSafeName": { + "type": "string", + "pattern": "^[A-Z][A-Za-z]+(_[A-Z][A-Za-z]+)*$" + }, + "ActualName": { + "type": "string", + "pattern": "^[A-Z][A-Za-z]+( [A-Z][A-Za-z]+)*$" + } + } + } + } + } + }, + "mCurrentFluid": { + "type": "string", + "const": "" + }, + "mLastContentForSound": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mLastFlowForSound": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mRattleLimit": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mIsRattling": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mUpdateSoundsHandle": { + "$ref": "common.schema.json#/$defs/empty-object" + }, + "mSnappedPassthroughs": { + "$ref": "common.schema.json#/$defs/common-base--mSnappedPassthroughs" + } + } + }, "common-base--FGBuildable--pipeline-accessory--base": { "type": "object", "$ref": "common.schema.json#/$defs/common-base--FGBuildable--consumes-power-base", @@ -3898,6 +4003,9 @@ }, "FGBuildableGeneratorNuclear": { "$ref": "#/$defs/common-base--FGBuildableGeneratorNuclear" + }, + "FGBuildablePipeline": { + "$ref": "#/$defs/common-base--FGBuildablePipeline" } } }, diff --git a/schema/update8.schema.json b/schema/update8.schema.json index 1a4988b..6c7e773 100644 --- a/schema/update8.schema.json +++ b/schema/update8.schema.json @@ -1818,111 +1818,20 @@ } } }, - "FGBuildablePipeline": { - "type": "object", - "$ref": "#/$defs/FGBuildable--base", - "unevaluatedProperties": false, - "required": [ - "mRadius", - "mFlowLimit", - "mFlowIndicatorMinimumPipeLength", - "mPipeConnections", - "mFluidBox", - "mIndicatorData", - "mMaxIndicatorTurnAngle", - "mIgnoreActorsForIndicator", - "mFluidNames", - "mCurrentFluid", - "mLastContentForSound", - "mLastFlowForSound", - "mRattleLimit", - "mIsRattling", - "mUpdateSoundsHandle", - "mMeshLength", - "mSplineData", - "mSnappedPassthroughs" - ], - "properties": { - "mMeshLength": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mSplineData": { - "type": "string", - "const": "" - }, - "mRadius": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mFlowLimit": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mFlowIndicatorMinimumPipeLength": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mPipeConnections": { - "type": "string", - "const": "" - }, - "mFluidBox": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mIndicatorData": { - "$ref": "common.schema.json#/$defs/empty-object" - }, - "mMaxIndicatorTurnAngle": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mIgnoreActorsForIndicator": { - "type": "string", - "const": "" - }, - "mFluidNames": { - "type": "string", - "minLength": 1, - "typed_string": { - "minItems": 1, - "items": { - "type": "string", - "minLength": 1, - "typed_string": { - "required": ["WwiseSafeName"], - "properties": { - "WwiseSafeName": { - "type": "string", - "pattern": "^[A-Z][A-Za-z]+(_[A-Z][A-Za-z]+)*$" - }, - "ActualName": { - "type": "string", - "pattern": "^[A-Z][A-Za-z]+( [A-Z][A-Za-z]+)*$" - } - } - } - } - } - }, - "mCurrentFluid": { - "type": "string", - "const": "" - }, - "mLastContentForSound": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mLastFlowForSound": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mRattleLimit": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mIsRattling": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mUpdateSoundsHandle": { - "$ref": "common.schema.json#/$defs/empty-object" + "FGBuildablePipeline--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGBuildablePipeline" }, - "mSnappedPassthroughs": { - "$ref": "common.schema.json#/$defs/common-base--mSnappedPassthroughs" + { + "$ref": "#/$defs/FGBuildable--base" } - } + ] + }, + "FGBuildablePipeline": { + "type": "object", + "$ref": "#/$defs/FGBuildablePipeline--merged", + "unevaluatedProperties": false }, "FGBuildable--pipeline-accessory--base": { "allOf": [ diff --git a/types-progress--common.md b/types-progress--common.md index ba7705c..82c497f 100644 --- a/types-progress--common.md +++ b/types-progress--common.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (223 of 223) +100.00% Complete (224 of 224) ## Basic Types @@ -91,6 +91,7 @@ - [x] common-base--FGBuildableGeneratorNuclear--mFuel--PlutoniumFuelRod - [x] common-base--FGBuildableMAM - [x] common-base--FGBuildablePillarLightweight +- [x] common-base--FGBuildablePipeline - [x] common-base--FGBuildablePipelineJunction - [x] common-base--FGBuildablePipelinePump - [x] common-base--FGBuildablePipelinePump--valve diff --git a/types-progress--update8.md b/types-progress--update8.md index 64ed350..d401381 100644 --- a/types-progress--update8.md +++ b/types-progress--update8.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (356 of 356) +100.00% Complete (358 of 358) ## Basic Types @@ -75,6 +75,7 @@ - [x] common-base--FGBuildableGeneratorNuclear--mFuel--PlutoniumFuelRod (common type) - [x] common-base--FGBuildableMAM (common type) - [x] common-base--FGBuildablePillarLightweight (common type) +- [x] common-base--FGBuildablePipeline (common type) - [x] common-base--FGBuildablePipelineJunction (common type) - [x] common-base--FGBuildablePipelinePump (common type) - [x] common-base--FGBuildablePipelinePump--valve (common type) @@ -306,6 +307,10 @@ - [x] FGBuildablePillarLightweight--merged +## FGBuildablePipeline + +- [x] FGBuildablePipeline--merged + ## FGBuildablePipelineJunction - [x] FGBuildablePipelineJunction--merged diff --git a/types-progress--version_1_0_0_4.md b/types-progress--version_1_0_0_4.md index 320c765..5708cf0 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 (391 of 391) +100.00% Complete (393 of 393) ## Basic Types @@ -81,6 +81,7 @@ - [x] common-base--FGBuildableGeneratorNuclear--mFuel--PlutoniumFuelRod (common type) - [x] common-base--FGBuildableMAM (common type) - [x] common-base--FGBuildablePillarLightweight (common type) +- [x] common-base--FGBuildablePipeline (common type) - [x] common-base--FGBuildablePipelineJunction (common type) - [x] common-base--FGBuildablePipelinePump (common type) - [x] common-base--FGBuildablePipelinePump--valve (common type) @@ -323,6 +324,10 @@ - [x] FGBuildablePillarLightweight--merged +## FGBuildablePipeline + +- [x] FGBuildablePipeline--merged + ## FGBuildablePipelineJunction - [x] FGBuildablePipelineJunction--merged