Skip to content

Commit 7ace98d

Browse files
committed
tweaking to be more update 8-friendly
1 parent c2cc51b commit 7ace98d

File tree

4 files changed

+31
-17
lines changed

4 files changed

+31
-17
lines changed

generated-types/0.3.7.7/classes/Base.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,9 @@ type FGJetPack_base_base = FGJetPack_base_base_base & {
12331233
mJumpTimeStamp: Exclude<string, ''>,
12341234
};
12351235

1236-
type FGJetPack_base_base_base = FGEquipment_base & {
1236+
type FGJetPack_base_base_base = FGEquipment_base & FGJetPack_version_specific;
1237+
1238+
type FGJetPack_version_specific = {
12371239
mCurrentFuel: docs_json_ts_common_types_decimal_string,
12381240
mThrustCooldown: docs_json_ts_common_types_decimal_string,
12391241
mDefaultAirControl: docs_json_ts_common_types_decimal_string,
@@ -1854,6 +1856,7 @@ export type {
18541856
FGJetPack_base,
18551857
FGJetPack_base_base,
18561858
FGJetPack_base_base_base,
1859+
FGJetPack_version_specific,
18571860
FGJumpingStilts,
18581861
FGJumpingStilts_base,
18591862
FGNobeliskDetonator,

generated-types/0.7.1.1/classes/Base.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,14 +347,14 @@ type FGBuildableWire_version_specific = {
347347
mCachedRelativeLocations: docs_json_ts_common_types_XYZ_decimal_string,
348348
};
349349

350-
type FGJetPack = FGJetPack_base & {
350+
type FGJetPack = docs_json_ts_0_3_7_7_classes_base_FGJetPack_base_base_base & docs_json_ts_0_6_1_5_classes_base_FGEquipment & FGJetPack_version_specific;
351+
352+
type FGJetPack_version_specific = {
351353
mFuelTypes: docs_json_ts_0_3_7_7_properties_DocsDotJson_BlueprintGeneratedClass_quoted_list,
352354
mSelectedFuelType: docs_json_ts_common_types_integer_string,
353355
mCurrentFuelType: docs_json_ts_common_types_integer_string,
354356
};
355357

356-
type FGJetPack_base = docs_json_ts_0_3_7_7_classes_base_FGJetPack_base_base_base & docs_json_ts_0_6_1_5_classes_base_FGEquipment;
357-
358358
type FGPipeHyperStart = docs_json_ts_0_3_7_7_classes_base_FGPipeHyperStart_base_base & docs_json_ts_0_3_7_7_classes_base_FGBuildable_pole_with_length_and_power_base_base & FGBuildable_powered;
359359

360360
export type {
@@ -450,6 +450,6 @@ export type {
450450
FGBuildableWire_base,
451451
FGBuildableWire_version_specific,
452452
FGJetPack,
453-
FGJetPack_base,
453+
FGJetPack_version_specific,
454454
FGPipeHyperStart,
455455
};

schema/0.3.7.7/base-classes.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4680,8 +4680,17 @@
46804680
}
46814681
},
46824682
"FGJetPack--base--base--base": {
4683+
"allOf": [
4684+
{
4685+
"$ref": "#/$defs/FGEquipment--base"
4686+
},
4687+
{
4688+
"$ref": "#/$defs/FGJetPack--version-specific"
4689+
}
4690+
]
4691+
},
4692+
"FGJetPack--version-specific": {
46834693
"type": "object",
4684-
"$ref": "#/$defs/FGEquipment--base",
46854694
"required": [
46864695
"mCurrentFuel",
46874696
"mThrustCooldown",

schema/0.7.1.1/base-classes.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,8 +1144,20 @@
11441144
}
11451145
},
11461146
"FGJetPack": {
1147+
"allOf": [
1148+
{
1149+
"$ref": "docs.json.ts--0.3.7.7--classes--base#/$defs/FGJetPack--base--base--base"
1150+
},
1151+
{
1152+
"$ref": "docs.json.ts--0.6.1.5--classes--base#/$defs/FGEquipment"
1153+
},
1154+
{
1155+
"$ref": "#/$defs/FGJetPack--version-specific"
1156+
}
1157+
]
1158+
},
1159+
"FGJetPack--version-specific": {
11471160
"type": "object",
1148-
"$ref": "#/$defs/FGJetPack--base",
11491161
"required": [
11501162
"mFuelTypes",
11511163
"mSelectedFuelType",
@@ -1163,16 +1175,6 @@
11631175
}
11641176
}
11651177
},
1166-
"FGJetPack--base": {
1167-
"allOf": [
1168-
{
1169-
"$ref": "docs.json.ts--0.3.7.7--classes--base#/$defs/FGJetPack--base--base--base"
1170-
},
1171-
{
1172-
"$ref": "docs.json.ts--0.6.1.5--classes--base#/$defs/FGEquipment"
1173-
}
1174-
]
1175-
},
11761178
"FGPipeHyperStart": {
11771179
"allOf": [
11781180
{

0 commit comments

Comments
 (0)