From b4c819e49b09c200e054a0beab6d0c63ace946b2 Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Sun, 10 Nov 2024 16:20:56 +0000 Subject: [PATCH] adding equipment descriptors to common types - re: satisfactory-dev/Docs.json.ts#5 --- common-imports.json | 2 ++ .../CoreUObject/FGEquipmentDescriptor.ts | 19 +++++++++---- .../CoreUObject/FGEquipmentDescriptor.ts | 11 ++++++++ generated-types/common/common/unassigned.ts | 7 +++++ .../CoreUObject/FGEquipmentDescriptor.ts | 19 +++++++++---- schema/1.0.schema.json | 28 ++++++++++++++----- schema/common.schema.json | 20 +++++++++++++ schema/update8.schema.json | 28 ++++++++++++++----- types-progress--common.md | 4 ++- types-progress--update8.md | 9 +++++- types-progress--version_1_0_0_4.md | 9 +++++- 11 files changed, 129 insertions(+), 27 deletions(-) create mode 100644 generated-types/common/classes/CoreUObject/FGEquipmentDescriptor.ts diff --git a/common-imports.json b/common-imports.json index 74e104e8..b85dfede 100644 --- a/common-imports.json +++ b/common-imports.json @@ -77,6 +77,8 @@ "common_type__common_base__FGChainsaw__type": "classes/CoreUObject/FGChainsaw", "common_type__common_base__FGCustomizationRecipe__FGRecipe__type": "classes/CoreUObject/FGCustomizationRecipe", "common_type__common_base__FGEquipment__base__type": "classes/CoreUObject/FGEquipment", + "common_type__common_base__FGEquipmentDescriptor__type": "classes/CoreUObject/FGEquipmentDescriptor", + "common_type__common_base__FGEquipmentDescriptor__base__type": "classes/CoreUObject/FGEquipmentDescriptor", "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", diff --git a/generated-types/1.0/classes/CoreUObject/FGEquipmentDescriptor.ts b/generated-types/1.0/classes/CoreUObject/FGEquipmentDescriptor.ts index a465e5d0..d54c1c09 100644 --- a/generated-types/1.0/classes/CoreUObject/FGEquipmentDescriptor.ts +++ b/generated-types/1.0/classes/CoreUObject/FGEquipmentDescriptor.ts @@ -3,16 +3,25 @@ import { FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type, } from './FGItemDescriptor'; -import {integer_string__type} from '../../../common/common/scalar'; +import { + common_base__FGEquipmentDescriptor__base__type, + common_base__FGEquipmentDescriptor__type, +} from '../../../common/classes/CoreUObject/FGEquipmentDescriptor'; import {NativeClass__type} from '../../../common/common/unassigned'; -export type FGEquipmentDescriptor__type = FGEquipmentDescriptor__base__type; +export type FGEquipmentDescriptor__type = FGEquipmentDescriptor__merged__type; export type FGEquipmentDescriptor__base__type = - FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & { - mResourceSinkPoints: integer_string__type; - }; + FGEquipmentDescriptor__base__merged__type; + +export type FGEquipmentDescriptor__base__merged__type = + common_base__FGEquipmentDescriptor__base__type & + FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type; + +export type FGEquipmentDescriptor__merged__type = + common_base__FGEquipmentDescriptor__type & + FGEquipmentDescriptor__base__type; export type FGEquipmentDescriptor__NativeClass = NativeClass__type & { diff --git a/generated-types/common/classes/CoreUObject/FGEquipmentDescriptor.ts b/generated-types/common/classes/CoreUObject/FGEquipmentDescriptor.ts new file mode 100644 index 00000000..bd682725 --- /dev/null +++ b/generated-types/common/classes/CoreUObject/FGEquipmentDescriptor.ts @@ -0,0 +1,11 @@ +import {integer_string__type} from '../../common/scalar'; + +import {common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type} from './FGItemDescriptor'; + +export type common_base__FGEquipmentDescriptor__type = + common_base__FGEquipmentDescriptor__base__type; + +export type common_base__FGEquipmentDescriptor__base__type = + common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & { + mResourceSinkPoints: integer_string__type; + }; diff --git a/generated-types/common/common/unassigned.ts b/generated-types/common/common/unassigned.ts index 5a2647d6..d0632c46 100644 --- a/generated-types/common/common/unassigned.ts +++ b/generated-types/common/common/unassigned.ts @@ -136,6 +136,11 @@ import {common_base__FGBuildablePowerPole__type} from '../classes/CoreUObject/FG import {common_base__FGPoleDescriptor__type} from '../classes/CoreUObject/FGPoleDescriptor'; +import { + common_base__FGEquipmentDescriptor__base__type, + common_base__FGEquipmentDescriptor__type, +} from '../classes/CoreUObject/FGEquipmentDescriptor'; + export type class__type = class__no_description__type & { mDescription: string; }; @@ -413,6 +418,8 @@ export type faux_9b__type = class__type & { faux: 'stashing all the remaining descriptors here'; FGItemDescriptor_FGResourceDescriptor_FGPoleDescriptor?: common_base__FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type; FGPoleDescriptor?: common_base__FGPoleDescriptor__type; + FGEquipmentDescriptor_base?: common_base__FGEquipmentDescriptor__base__type; + FGEquipmentDescriptor?: common_base__FGEquipmentDescriptor__type; }; export type InfinityExtrap__type = 'RCCE_Constant'; diff --git a/generated-types/update8/classes/CoreUObject/FGEquipmentDescriptor.ts b/generated-types/update8/classes/CoreUObject/FGEquipmentDescriptor.ts index a465e5d0..d54c1c09 100644 --- a/generated-types/update8/classes/CoreUObject/FGEquipmentDescriptor.ts +++ b/generated-types/update8/classes/CoreUObject/FGEquipmentDescriptor.ts @@ -3,16 +3,25 @@ import { FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type, } from './FGItemDescriptor'; -import {integer_string__type} from '../../../common/common/scalar'; +import { + common_base__FGEquipmentDescriptor__base__type, + common_base__FGEquipmentDescriptor__type, +} from '../../../common/classes/CoreUObject/FGEquipmentDescriptor'; import {NativeClass__type} from '../../../common/common/unassigned'; -export type FGEquipmentDescriptor__type = FGEquipmentDescriptor__base__type; +export type FGEquipmentDescriptor__type = FGEquipmentDescriptor__merged__type; export type FGEquipmentDescriptor__base__type = - FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type & { - mResourceSinkPoints: integer_string__type; - }; + FGEquipmentDescriptor__base__merged__type; + +export type FGEquipmentDescriptor__base__merged__type = + common_base__FGEquipmentDescriptor__base__type & + FGItemDescriptor__FGResourceDescriptor__FGPoleDescriptor__type; + +export type FGEquipmentDescriptor__merged__type = + common_base__FGEquipmentDescriptor__type & + FGEquipmentDescriptor__base__type; export type FGEquipmentDescriptor__NativeClass = NativeClass__type & { diff --git a/schema/1.0.schema.json b/schema/1.0.schema.json index 6881c134..5a1afc50 100644 --- a/schema/1.0.schema.json +++ b/schema/1.0.schema.json @@ -3554,19 +3554,33 @@ } } }, + "FGEquipmentDescriptor--base--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGEquipmentDescriptor--base" + }, + { + "$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor" + } + ] + }, "FGEquipmentDescriptor--base": { "type": "object", - "$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor", - "required": ["mResourceSinkPoints"], - "properties": { - "mResourceSinkPoints": { - "$ref": "common.schema.json#/$defs/integer-string" + "$ref": "#/$defs/FGEquipmentDescriptor--base--merged" + }, + "FGEquipmentDescriptor--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGEquipmentDescriptor" + }, + { + "$ref": "#/$defs/FGEquipmentDescriptor--base" } - } + ] }, "FGEquipmentDescriptor": { "type": "object", - "$ref": "#/$defs/FGEquipmentDescriptor--base", + "$ref": "#/$defs/FGEquipmentDescriptor--merged", "unevaluatedProperties": false }, "FGConsumableDescriptor--base": { diff --git a/schema/common.schema.json b/schema/common.schema.json index c50e6539..c20822c4 100644 --- a/schema/common.schema.json +++ b/schema/common.schema.json @@ -3051,6 +3051,20 @@ } } }, + "common-base--FGEquipmentDescriptor--base": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor", + "required": ["mResourceSinkPoints"], + "properties": { + "mResourceSinkPoints": { + "$ref": "common.schema.json#/$defs/integer-string" + } + } + }, + "common-base--FGEquipmentDescriptor": { + "type": "object", + "$ref": "common.schema.json#/$defs/common-base--FGEquipmentDescriptor--base" + }, "faux-1": { "type": "object", "$ref": "#/$defs/class", @@ -3224,6 +3238,12 @@ }, "FGPoleDescriptor": { "$ref": "#/$defs/common-base--FGPoleDescriptor" + }, + "FGEquipmentDescriptor_base": { + "$ref": "#/$defs/common-base--FGEquipmentDescriptor--base" + }, + "FGEquipmentDescriptor": { + "$ref": "#/$defs/common-base--FGEquipmentDescriptor" } } }, diff --git a/schema/update8.schema.json b/schema/update8.schema.json index 5b53b7c5..d6ad4bba 100644 --- a/schema/update8.schema.json +++ b/schema/update8.schema.json @@ -1327,19 +1327,33 @@ } } }, + "FGEquipmentDescriptor--base--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGEquipmentDescriptor--base" + }, + { + "$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor" + } + ] + }, "FGEquipmentDescriptor--base": { "type": "object", - "$ref": "#/$defs/FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor", - "required": ["mResourceSinkPoints"], - "properties": { - "mResourceSinkPoints": { - "$ref": "common.schema.json#/$defs/integer-string" + "$ref": "#/$defs/FGEquipmentDescriptor--base--merged" + }, + "FGEquipmentDescriptor--merged": { + "allOf": [ + { + "$ref": "common.schema.json#/$defs/common-base--FGEquipmentDescriptor" + }, + { + "$ref": "#/$defs/FGEquipmentDescriptor--base" } - } + ] }, "FGEquipmentDescriptor": { "type": "object", - "$ref": "#/$defs/FGEquipmentDescriptor--base", + "$ref": "#/$defs/FGEquipmentDescriptor--merged", "unevaluatedProperties": false }, "FGConsumableDescriptor--base": { diff --git a/types-progress--common.md b/types-progress--common.md index 55f10a1b..e43283c6 100644 --- a/types-progress--common.md +++ b/types-progress--common.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (206 of 206) +100.00% Complete (209 of 209) ## Basic Types @@ -109,6 +109,8 @@ - [x] common-base--FGChainsaw - [x] common-base--FGCustomizationRecipe--FGRecipe (common type) - [x] common-base--FGEquipment--base (common type) +- [x] common-base--FGEquipmentDescriptor +- [x] common-base--FGEquipmentDescriptor--base (common type) - [x] common-base--FGEquipmentStunSpear - [x] common-base--FGEquipmentStunSpear--base (common type) - [x] common-base--FGEquipmentStunSpear--xeno-zapper diff --git a/types-progress--update8.md b/types-progress--update8.md index 8dd0a3ce..5346abfb 100644 --- a/types-progress--update8.md +++ b/types-progress--update8.md @@ -1,6 +1,6 @@ # Types Progress -100.00% Complete (318 of 318) +100.00% Complete (322 of 322) ## Basic Types @@ -81,6 +81,8 @@ - [x] common-base--FGChainsaw (common type) - [x] common-base--FGCustomizationRecipe--FGRecipe (common type) - [x] common-base--FGEquipment--base (common type) +- [x] common-base--FGEquipmentDescriptor (common type) +- [x] common-base--FGEquipmentDescriptor--base (common type) - [x] common-base--FGEquipmentStunSpear (common type) - [x] common-base--FGEquipmentStunSpear--base (common type) - [x] common-base--FGEquipmentStunSpear--xeno-zapper (common type) @@ -350,6 +352,11 @@ - [x] FGEquipment--placeable - [x] FGEquipmentDescriptor--base +## FGEquipmentDescriptor + +- [x] FGEquipmentDescriptor--base--merged +- [x] FGEquipmentDescriptor--merged + ## FGEquipmentStunSpear - [x] FGEquipmentStunSpear--base diff --git a/types-progress--version_1_0_0_4.md b/types-progress--version_1_0_0_4.md index dd17a917..df678a45 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 (357 of 357) +100.00% Complete (361 of 361) ## Basic Types @@ -87,6 +87,8 @@ - [x] common-base--FGChainsaw (common type) - [x] common-base--FGCustomizationRecipe--FGRecipe (common type) - [x] common-base--FGEquipment--base (common type) +- [x] common-base--FGEquipmentDescriptor (common type) +- [x] common-base--FGEquipmentDescriptor--base (common type) - [x] common-base--FGEquipmentStunSpear (common type) - [x] common-base--FGEquipmentStunSpear--base (common type) - [x] common-base--FGEquipmentStunSpear--xeno-zapper (common type) @@ -389,6 +391,11 @@ - [x] FGEquipment--placeable - [x] FGEquipmentDescriptor--base +## FGEquipmentDescriptor + +- [x] FGEquipmentDescriptor--base--merged +- [x] FGEquipmentDescriptor--merged + ## FGEquipmentStunSpear - [x] FGEquipmentStunSpear--base