diff --git a/common-imports.json b/common-imports.json index 95f88f05..1e0722aa 100644 --- a/common-imports.json +++ b/common-imports.json @@ -103,6 +103,7 @@ "common_type__FGSchematic__mUnlocks_mSchematics__mSchematics__type": "classes/CoreUObject/FGSchematic", "common_type__FGSchematic__mUnlocks_mTapeUnlocks__type": "classes/CoreUObject/FGSchematic", "common_type__FGSchematic__mUnlocks_resources_to_scan__type": "classes/CoreUObject/FGSchematic", + "common_type__common_base__FGSuitBase__type": "classes/CoreUObject/FGSuitBase", "common_type__UnrealEngineString": "utils/validators", "common_type__StringStartsWith": "utils/validators", "common_type__StringPassedRegExp": "utils/validators" diff --git a/generated-types/1.0/classes/CoreUObject/FGSuitBase.ts b/generated-types/1.0/classes/CoreUObject/FGSuitBase.ts index 0c3041cd..b9630bd4 100644 --- a/generated-types/1.0/classes/CoreUObject/FGSuitBase.ts +++ b/generated-types/1.0/classes/CoreUObject/FGSuitBase.ts @@ -2,25 +2,14 @@ import {UnrealEngineString, StringStartsWith} from '../../utils/validators'; import {FGEquipment__base__type} from './FGEquipment'; -import { - decimal_string__type, - boolean__type, -} from '../../../common/common/scalar'; - import { empty_object__type, NativeClass__type, } from '../../../common/common/unassigned'; -export type FGSuitBase__type = FGEquipment__base__type & { - mImmunity: decimal_string__type; - mIsWorking: boolean__type; - mHasNegatedDamage: boolean__type; - mDamageNegated: decimal_string__type; - mFilterDuration: decimal_string__type; - mCountdown: decimal_string__type; - mDisableEffectTimer: decimal_string__type; - mIsBurningFuel: boolean__type; +import {common_base__FGSuitBase__type} from '../../../common/classes/CoreUObject/FGSuitBase'; + +export type FGSuitBase__type = FGSuitBase__merged__type & { mSuitMeshMaterials: [ { SlotName: 'Pioneer_torso' | 'Pioneer_Legs'; @@ -64,6 +53,9 @@ export type FGSuitBase__type = FGEquipment__base__type & { }; }; +export type FGSuitBase__merged__type = + common_base__FGSuitBase__type & FGEquipment__base__type; + export type FGSuitBase__NativeClass = NativeClass__type & { Classes: [FGSuitBase__type]; }; diff --git a/generated-types/common/classes/CoreUObject/FGSuitBase.ts b/generated-types/common/classes/CoreUObject/FGSuitBase.ts new file mode 100644 index 00000000..f6cbd962 --- /dev/null +++ b/generated-types/common/classes/CoreUObject/FGSuitBase.ts @@ -0,0 +1,15 @@ +import {decimal_string__type, boolean__type} from '../../common/scalar'; + +import {common_base__FGEquipment__base__type} from './FGEquipment'; + +export type common_base__FGSuitBase__type = + common_base__FGEquipment__base__type & { + mImmunity: decimal_string__type; + mIsWorking: boolean__type; + mHasNegatedDamage: boolean__type; + mDamageNegated: decimal_string__type; + mFilterDuration: decimal_string__type; + mCountdown: decimal_string__type; + mDisableEffectTimer: decimal_string__type; + mIsBurningFuel: boolean__type; + }; diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts index 74f7e183..7632172c 100644 --- a/generated-types/common/common/unassigned.ts +++ b/generated-types/common/common/unassigned.ts @@ -51,6 +51,8 @@ import {common_base__FGHoverPack__type} from '../classes/CoreUObject/FGHoverPack import {common_base__FGJetPack__type} from '../classes/CoreUObject/FGJetPack'; +import {common_base__FGSuitBase__type} from '../classes/CoreUObject/FGSuitBase'; + import {common_base__FGBuildableDroneStation__type} from '../classes/CoreUObject/FGBuildableDroneStation'; import { @@ -227,6 +229,7 @@ export type faux_15__type = class__type & { FGEquipmentStunSpear_xeno_zapper?: common_base__FGEquipmentStunSpear__xeno_zapper__type; hoverpack?: common_base__FGHoverPack__type; jetpack?: common_base__FGJetPack__type; + suit?: common_base__FGSuitBase__type; }; export type faux_16__type = class__type & { diff --git a/generated-types/update8/classes/CoreUObject/FGSuitBase.ts b/generated-types/update8/classes/CoreUObject/FGSuitBase.ts index aceb6941..9450154b 100644 --- a/generated-types/update8/classes/CoreUObject/FGSuitBase.ts +++ b/generated-types/update8/classes/CoreUObject/FGSuitBase.ts @@ -2,22 +2,11 @@ import {UnrealEngineString, StringStartsWith} from '../../utils/validators'; import {FGEquipment__base__type} from './FGEquipment'; -import { - decimal_string__type, - boolean__type, -} from '../../../common/common/scalar'; +import {common_base__FGSuitBase__type} from '../../../common/classes/CoreUObject/FGSuitBase'; import {NativeClass__type} from '../../../common/common/unassigned'; -export type FGSuitBase__type = FGEquipment__base__type & { - mImmunity: decimal_string__type; - mIsWorking: boolean__type; - mHasNegatedDamage: boolean__type; - mDamageNegated: decimal_string__type; - mFilterDuration: decimal_string__type; - mCountdown: decimal_string__type; - mDisableEffectTimer: decimal_string__type; - mIsBurningFuel: boolean__type; +export type FGSuitBase__type = FGSuitBase__merged__type & { mSuit1PMeshMaterials: [ { SlotName: @@ -46,6 +35,9 @@ export type FGSuitBase__type = FGEquipment__base__type & { ]; }; +export type FGSuitBase__merged__type = + common_base__FGSuitBase__type & FGEquipment__base__type; + export type FGSuitBase__NativeClass = NativeClass__type & { Classes: [FGSuitBase__type]; }; diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json index 5e336933..d95f5c40 100644 --- a/schema/1.0.schema.json +++ b/schema/1.0.schema.json @@ -2212,46 +2212,24 @@ } } }, + "FGSuitBase--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGSuitBase" + }, + { + "$ref": "#/$defs/FGEquipment--base" + } + ] + }, "FGSuitBase": { "type": "object", - "$ref": "#/$defs/FGEquipment--base", + "$ref": "#/$defs/FGSuitBase--merged", "unevaluatedProperties": false, "required": [ - "mImmunity", - "mIsWorking", - "mHasNegatedDamage", - "mDamageNegated", - "mFilterDuration", - "mCountdown", - "mDisableEffectTimer", - "mIsBurningFuel", "mSuitMeshMaterials" ], "properties": { - "mImmunity": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mIsWorking": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mHasNegatedDamage": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mDamageNegated": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mFilterDuration": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mCountdown": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mDisableEffectTimer": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mIsBurningFuel": { - "$ref": "common.schema.json#/$defs/boolean" - }, "mSuitMeshMaterials": { "type": "string", "minLength": 1, diff --git a/schema/common.schema.json b/schema/common.schema.json index bd636b10..81844bd6 100644 --- a/schema/common.schema.json +++ b/schema/common.schema.json @@ -2822,6 +2822,46 @@ } } }, + "common-base--FGSuitBase": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGEquipment--base", + "required": [ + "mImmunity", + "mIsWorking", + "mHasNegatedDamage", + "mDamageNegated", + "mFilterDuration", + "mCountdown", + "mDisableEffectTimer", + "mIsBurningFuel" + ], + "properties": { + "mImmunity": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mIsWorking": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mHasNegatedDamage": { + "$ref": "common.schema.json#/$defs/boolean" + }, + "mDamageNegated": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mFilterDuration": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mCountdown": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mDisableEffectTimer": { + "$ref": "common.schema.json#/$defs/decimal-string" + }, + "mIsBurningFuel": { + "$ref": "common.schema.json#/$defs/boolean" + } + } + }, "faux-1": { "type": "object", "$ref": "#/$defs/class", @@ -3158,6 +3198,9 @@ }, "jetpack": { "$ref": "#/$defs/common-base--FGJetPack" + }, + "suit": { + "$ref": "#/$defs/common-base--FGSuitBase" } } }, diff --git a/schema/update8.schema.json b/schema/update8.schema.json index 20ca37ca..c4d4b740 100644 --- a/schema/update8.schema.json +++ b/schema/update8.schema.json @@ -1109,46 +1109,24 @@ } } }, + "FGSuitBase--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGSuitBase" + }, + { + "$ref": "#/$defs/FGEquipment--base" + } + ] + }, "FGSuitBase": { "type": "object", - "$ref": "#/$defs/FGEquipment--base", + "$ref": "#/$defs/FGSuitBase--merged", "unevaluatedProperties": false, "required": [ - "mImmunity", - "mIsWorking", - "mHasNegatedDamage", - "mDamageNegated", - "mFilterDuration", - "mCountdown", - "mDisableEffectTimer", - "mIsBurningFuel", "mSuit1PMeshMaterials" ], "properties": { - "mImmunity": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mIsWorking": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mHasNegatedDamage": { - "$ref": "common.schema.json#/$defs/boolean" - }, - "mDamageNegated": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mFilterDuration": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mCountdown": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mDisableEffectTimer": { - "$ref": "common.schema.json#/$defs/decimal-string" - }, - "mIsBurningFuel": { - "$ref": "common.schema.json#/$defs/boolean" - }, "mSuit1PMeshMaterials": { "type": "string", "minLength": 1, diff --git a/types-progress--common.md b/types-progress--common.md index f3779e06..6d4e1f04 100644 --- a/types-progress--common.md +++ b/types-progress--common.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (197 of 197) +100.00% Complete (198 of 198) ## Basic Types @@ -126,6 +126,7 @@ - [x] common-base--FGSchematic--mUnlocks - [x] common-base--FGSchematic--mUnlocks_Class - [x] common-base--FGSchematic--with-unlocks +- [x] common-base--FGSuitBase - [x] common-base--mSnappedPassthroughs (common type) ## FGSchematic diff --git a/types-progress--update8.md b/types-progress--update8.md index ed3bc573..4f0e0818 100644 --- a/types-progress--update8.md +++ b/types-progress--update8.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (303 of 303) +100.00% Complete (305 of 305) ## Basic Types @@ -25,7 +25,6 @@ - [x] FGParachute - [x] FGPipeHyperStart - [x] FGPortableMinerDispenser -- [x] FGSuitBase - [x] integer-string (common type) - [x] integer-string--signed (common type) - [x] mAspect (common type) @@ -105,6 +104,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--FGSuitBase (common type) - [x] common-base--mSnappedPassthroughs (common type) ## FGAmmoType @@ -402,6 +402,11 @@ - [x] FGSchematic--with-unlocks - [x] FGSchematic--with-unlocks--merged +## FGSuitBase + +- [x] FGSuitBase +- [x] FGSuitBase--merged + ## FGVehicleDescriptor - [x] FGVehicleDescriptor--fueled-with-inventory diff --git a/types-progress--version_1_0_0_4.md b/types-progress--version_1_0_0_4.md index cdd325b5..04f954a1 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 (342 of 342) +100.00% Complete (344 of 344) ## Basic Types @@ -24,7 +24,6 @@ - [x] FGPipeHyperStart - [x] FGPortableMinerDispenser - [x] FGPowerShardDescriptor -- [x] FGSuitBase - [x] integer-string (common type) - [x] integer-string--signed (common type) - [x] mAspect (common type) @@ -107,6 +106,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--FGSuitBase (common type) - [x] common-base--mSnappedPassthroughs (common type) ## FGAmmoType @@ -465,6 +465,11 @@ - [x] FGSchematic--with-unlocks - [x] FGSchematic--with-unlocks--merged +## FGSuitBase + +- [x] FGSuitBase +- [x] FGSuitBase--merged + ## FGVehicleDescriptor - [x] FGVehicleDescriptor--fueled-with-inventory