diff --git a/common-imports.json b/common-imports.json index 1e0722aa..b2cc784b 100644 --- a/common-imports.json +++ b/common-imports.json @@ -78,6 +78,7 @@ "common_type__common_base__FGEquipmentStunSpear__type": "classes/CoreUObject/FGEquipmentStunSpear", "common_type__common_base__FGEquipmentStunSpear__base__type": "classes/CoreUObject/FGEquipmentStunSpear", "common_type__common_base__FGEquipmentStunSpear__xeno_zapper__type": "classes/CoreUObject/FGEquipmentStunSpear", + "common_type__common_base__FGGasMask__type": "classes/CoreUObject/FGGasMask", "common_type__common_base__FGHoverPack__type": "classes/CoreUObject/FGHoverPack", "common_type__common_base__FGItemDescriptor__FGBuildingDescriptor__FGResourceDescriptor__type": "classes/CoreUObject/FGItemDescriptor", "common_type__common_base__FGItemDescriptor__FGResourceDescriptor__type": "classes/CoreUObject/FGItemDescriptor", diff --git a/generated-types/1.0/classes/CoreUObject/FGGasMask.ts b/generated-types/1.0/classes/CoreUObject/FGGasMask.ts index fc4e6992..4ab02a08 100644 --- a/generated-types/1.0/classes/CoreUObject/FGGasMask.ts +++ b/generated-types/1.0/classes/CoreUObject/FGGasMask.ts @@ -8,24 +8,17 @@ import { import {FGEquipment__base__type} from './FGEquipment'; -import { - boolean__type, - decimal_string__type, -} from '../../../common/common/scalar'; +import {boolean__type} from '../../../common/common/scalar'; import { - mDamageTypes__type, empty_object__type, NativeClass__type, } from '../../../common/common/unassigned'; -export type FGGasMask__type = FGEquipment__base__type & { - mDamageTypesToProtectAgainst: mDamageTypes__type; - mPostProcessEnabled: boolean__type; - mFilterCountdown: decimal_string__type; - mFilterDuration: decimal_string__type; - mIsInPoisonGas: boolean__type; - mEquipMontage?: { +import {common_base__FGGasMask__type} from '../../../common/classes/CoreUObject/FGGasMask'; + +export type FGGasMask__type = FGGasMask__merged__type & { + mEquipMontage: { Montages: [ { Montage_1P: Montage_1P__type; @@ -43,10 +36,13 @@ export type FGGasMask__type = FGEquipment__base__type & { }, ]; }; - mStingerMontage?: empty_object__type; - mUnEquipMontage?: FGGasMask__mUnEquipMontage__type; + mStingerMontage: empty_object__type; + mUnEquipMontage: FGGasMask__mUnEquipMontage__type; }; +export type FGGasMask__merged__type = + common_base__FGGasMask__type & FGEquipment__base__type; + export type FGGasMask__mUnEquipMontage__type = { AudioEvent: UnrealEngineString< '/Script/AkAudio.AkAudioEvent', diff --git a/generated-types/common/classes/CoreUObject/FGGasMask.ts b/generated-types/common/classes/CoreUObject/FGGasMask.ts new file mode 100644 index 00000000..d429d50f --- /dev/null +++ b/generated-types/common/classes/CoreUObject/FGGasMask.ts @@ -0,0 +1,14 @@ +import {common_base__FGEquipment__base__type} from './FGEquipment'; + +import {mDamageTypes__type} from '../../common/unassigned'; + +import {boolean__type, decimal_string__type} from '../../common/scalar'; + +export type common_base__FGGasMask__type = + common_base__FGEquipment__base__type & { + mDamageTypesToProtectAgainst: mDamageTypes__type; + mPostProcessEnabled: boolean__type; + mFilterCountdown: decimal_string__type; + mFilterDuration: decimal_string__type; + mIsInPoisonGas: boolean__type; + }; diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts index 7632172c..ee5cd78b 100644 --- a/generated-types/common/common/unassigned.ts +++ b/generated-types/common/common/unassigned.ts @@ -53,6 +53,8 @@ import {common_base__FGJetPack__type} from '../classes/CoreUObject/FGJetPack'; import {common_base__FGSuitBase__type} from '../classes/CoreUObject/FGSuitBase'; +import {common_base__FGGasMask__type} from '../classes/CoreUObject/FGGasMask'; + import {common_base__FGBuildableDroneStation__type} from '../classes/CoreUObject/FGBuildableDroneStation'; import { @@ -230,6 +232,7 @@ export type faux_15__type = class__type & { hoverpack?: common_base__FGHoverPack__type; jetpack?: common_base__FGJetPack__type; suit?: common_base__FGSuitBase__type; + mask?: common_base__FGGasMask__type; }; export type faux_16__type = class__type & { diff --git a/generated-types/update8/classes/CoreUObject/FGGasMask.ts b/generated-types/update8/classes/CoreUObject/FGGasMask.ts index bc7a629d..3aae820e 100644 --- a/generated-types/update8/classes/CoreUObject/FGGasMask.ts +++ b/generated-types/update8/classes/CoreUObject/FGGasMask.ts @@ -1,22 +1,13 @@ import {FGEquipment__base__type} from './FGEquipment'; -import { - mDamageTypes__type, - NativeClass__type, -} from '../../../common/common/unassigned'; +import {common_base__FGGasMask__type} from '../../../common/classes/CoreUObject/FGGasMask'; -import { - boolean__type, - decimal_string__type, -} from '../../../common/common/scalar'; +import {NativeClass__type} from '../../../common/common/unassigned'; -export type FGGasMask__type = FGEquipment__base__type & { - mDamageTypesToProtectAgainst: mDamageTypes__type; - mPostProcessEnabled: boolean__type; - mFilterCountdown: decimal_string__type; - mFilterDuration: decimal_string__type; - mIsInPoisonGas: boolean__type; -}; +export type FGGasMask__type = FGGasMask__merged__type; + +export type FGGasMask__merged__type = + common_base__FGGasMask__type & FGEquipment__base__type; export type FGGasMask__NativeClass = NativeClass__type & { Classes: [FGGasMask__type]; diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json index d95f5c40..c27f1641 100644 --- a/schema/1.0.schema.json +++ b/schema/1.0.schema.json @@ -2356,33 +2356,26 @@ } } }, + "FGGasMask--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGGasMask" + }, + { + "$ref": "#/$defs/FGEquipment--base" + } + ] + }, "FGGasMask": { "type": "object", - "$ref": "#/$defs/FGEquipment--base", + "$ref": "#/$defs/FGGasMask--merged", "unevaluatedProperties": false, "required": [ - "mDamageTypesToProtectAgainst", - "mPostProcessEnabled", - "mFilterCountdown", - "mFilterDuration", - "mIsInPoisonGas" + "mEquipMontage", + "mStingerMontage", + "mUnEquipMontage" ], "properties": { - "mDamageTypesToProtectAgainst": { - "$ref": "common.schema.json#/$defs/mDamageTypes" - }, - "mPostProcessEnabled": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mFilterCountdown": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mFilterDuration": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mIsInPoisonGas": { - "$ref": "common.schema.json#/$defs/boolean" - }, "mEquipMontage": { "type": "string", "minLength": 1, diff --git a/schema/common.schema.json b/schema/common.schema.json index 81844bd6..2623ca04 100644 --- a/schema/common.schema.json +++ b/schema/common.schema.json @@ -2862,6 +2862,34 @@ } } }, + "common-base--FGGasMask": { + "type": "object", + "$ref": "#/$defs/common-base--FGEquipment--base", + "required": [ + "mDamageTypesToProtectAgainst", + "mPostProcessEnabled", + "mFilterCountdown", + "mFilterDuration", + "mIsInPoisonGas" + ], + "properties": { + "mDamageTypesToProtectAgainst": { + "$ref": "common.schema.json#/$defs/mDamageTypes" + }, + "mPostProcessEnabled": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mFilterCountdown": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mFilterDuration": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mIsInPoisonGas": { + "$ref": "common.schema.json#/$defs/boolean" + } + } + }, "faux-1": { "type": "object", "$ref": "#/$defs/class", @@ -3201,6 +3229,9 @@ }, "suit": { "$ref": "#/$defs/common-base--FGSuitBase" + }, + "mask": { + "$ref": "#/$defs/common-base--FGGasMask" } } }, diff --git a/schema/update8.schema.json b/schema/update8.schema.json index c4d4b740..e9796f44 100644 --- a/schema/update8.schema.json +++ b/schema/update8.schema.json @@ -1165,34 +1165,20 @@ } } }, - "FGGasMask": { - "type": "object", - "$ref": "#/$defs/FGEquipment--base", - "unevaluatedProperties": false, - "required": [ - "mDamageTypesToProtectAgainst", - "mPostProcessEnabled", - "mFilterCountdown", - "mFilterDuration", - "mIsInPoisonGas" - ], - "properties": { - "mDamageTypesToProtectAgainst": { - "$ref": "common.schema.json#/$defs/mDamageTypes" - }, - "mPostProcessEnabled": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mFilterCountdown": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mFilterDuration": { - "$ref": "common.schema.json#/$defs/decimal-string" + "FGGasMask--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGGasMask" }, - "mIsInPoisonGas": { - "$ref": "common.schema.json#/$defs/boolean" + { + "$ref": "#/$defs/FGEquipment--base" } - } + ] + }, + "FGGasMask": { + "type": "object", + "$ref": "#/$defs/FGGasMask--merged", + "unevaluatedProperties": false }, "mChainsawState": { "$ref": "common.schema.json#/$defs/None" diff --git a/types-progress--common.md b/types-progress--common.md index 6d4e1f04..1aa7940c 100644 --- a/types-progress--common.md +++ b/types-progress--common.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (198 of 198) +100.00% Complete (199 of 199) ## Basic Types @@ -111,6 +111,7 @@ - [x] common-base--FGEquipmentStunSpear - [x] common-base--FGEquipmentStunSpear--base (common type) - [x] common-base--FGEquipmentStunSpear--xeno-zapper +- [x] common-base--FGGasMask - [x] common-base--FGHoverPack - [x] common-base--FGItemDescriptor--FGBuildingDescriptor--FGResourceDescriptor (common type) - [x] common-base--FGItemDescriptor--FGResourceDescriptor (common type) diff --git a/types-progress--update8.md b/types-progress--update8.md index 4f0e0818..68325267 100644 --- a/types-progress--update8.md +++ b/types-progress--update8.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (305 of 305) +100.00% Complete (308 of 308) ## Basic Types @@ -18,7 +18,6 @@ - [x] FGBuildingDescriptor - [x] FGChainsaw - [x] FGChargedWeapon -- [x] FGGasMask - [x] FGGolfCartDispenser - [x] FGJumpingStilts - [x] FGObjectScanner @@ -89,6 +88,7 @@ - [x] common-base--FGEquipmentStunSpear (common type) - [x] common-base--FGEquipmentStunSpear--base (common type) - [x] common-base--FGEquipmentStunSpear--xeno-zapper (common type) +- [x] common-base--FGGasMask (common type) - [x] common-base--FGHoverPack (common type) - [x] common-base--FGItemDescriptor--FGBuildingDescriptor--FGResourceDescriptor (common type) - [x] common-base--FGItemDescriptor--FGResourceDescriptor (common type) @@ -352,6 +352,11 @@ - [x] FGEquipmentStunSpear--xeno-zapper - [x] FGEquipmentStunSpear--xeno-zapper--merged +## FGGasMask + +- [x] FGGasMask +- [x] FGGasMask--merged + ## FGHoverPack - [x] FGHoverPack diff --git a/types-progress--version_1_0_0_4.md b/types-progress--version_1_0_0_4.md index 04f954a1..0f20a1e4 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 (344 of 344) +100.00% Complete (347 of 347) ## Basic Types @@ -91,6 +91,7 @@ - [x] common-base--FGEquipmentStunSpear (common type) - [x] common-base--FGEquipmentStunSpear--base (common type) - [x] common-base--FGEquipmentStunSpear--xeno-zapper (common type) +- [x] common-base--FGGasMask (common type) - [x] common-base--FGHoverPack (common type) - [x] common-base--FGItemDescriptor--FGBuildingDescriptor--FGResourceDescriptor (common type) - [x] common-base--FGItemDescriptor--FGResourceDescriptor (common type) @@ -394,6 +395,7 @@ ## FGGasMask - [x] FGGasMask +- [x] FGGasMask--merged - [x] FGGasMask--mUnEquipMontage ## FGHoverPack