Skip to content

Commit 5dab5d7

Browse files
SignpostMarvSignpostMarv
committed
tweaking to be more update 8-friendly
1 parent 93e3886 commit 5dab5d7

File tree

10 files changed

+87
-90
lines changed

10 files changed

+87
-90
lines changed

‎generated-types/0.3.7.7/classes/Base.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,9 @@ type FGBuildableAttachment_splitter_base = FGBuildableAttachment_splitter_base_b
255255

256256
type FGBuildableAttachment_splitter_base_base = FGBuildableAttachment_splitter_base_base_base & FGBuildableAttachment_base_base;
257257

258-
type FGBuildableAttachment_splitter_base_base_base = FGBuildableAttachment_splitter_base_base_base_with_mCurrentOutputIndex & FGBuildableAttachment_splitter_base_base_base_with_mDistributionTable & FGBuildableAttachment_base_base_base;
258+
type FGBuildableAttachment_splitter_base_base_base = FGBuildableAttachment_splitter_pre_update7 & FGBuildableAttachment_splitter_base_base_base_with_mDistributionTable & FGBuildableAttachment_base_base_base;
259259

260-
type FGBuildableAttachment_splitter_base_base_base_with_mCurrentOutputIndex = FGBuildable_base & {
260+
type FGBuildableAttachment_splitter_pre_update7 = {
261261
mCurrentOutputIndex: docs_json_ts_common_types_integer_string_signed,
262262
};
263263

@@ -271,9 +271,9 @@ type FGBuildableAttachmentMerger_base = FGBuildableAttachmentMerger_base_base &
271271

272272
type FGBuildableAttachmentMerger_base_base = FGBuildableAttachmentMerger_base_base_base & FGBuildableAttachment_base_base;
273273

274-
type FGBuildableAttachmentMerger_base_base_base = FGBuildableAttachmentMerger_base_base_base_base & FGBuildableAttachment_base_base_base;
274+
type FGBuildableAttachmentMerger_base_base_base = FGBuildableAttachmentMerger_pre_update7 & FGBuildableAttachment_base_base_base;
275275

276-
type FGBuildableAttachmentMerger_base_base_base_base = FGBuildable_base & {
276+
type FGBuildableAttachmentMerger_pre_update7 = {
277277
mCurrentInputIndex: docs_json_ts_common_types_integer_string_signed,
278278
};
279279

@@ -1610,13 +1610,13 @@ export type {
16101610
FGBuildableAttachment_splitter_base,
16111611
FGBuildableAttachment_splitter_base_base,
16121612
FGBuildableAttachment_splitter_base_base_base,
1613-
FGBuildableAttachment_splitter_base_base_base_with_mCurrentOutputIndex,
1613+
FGBuildableAttachment_splitter_pre_update7,
16141614
FGBuildableAttachment_splitter_base_base_base_with_mDistributionTable,
16151615
FGBuildableAttachmentMerger,
16161616
FGBuildableAttachmentMerger_base,
16171617
FGBuildableAttachmentMerger_base_base,
16181618
FGBuildableAttachmentMerger_base_base_base,
1619-
FGBuildableAttachmentMerger_base_base_base_base,
1619+
FGBuildableAttachmentMerger_pre_update7,
16201620
FGBuildableConveyorBelt_base,
16211621
FGBuildableConveyorBelt_base_base,
16221622
FGBuildableConveyorBelt_spline,

‎generated-types/0.4.2.11/classes/Base.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -386,11 +386,9 @@ type FGBuildableLightSource_base = {
386386
mPowerConsumption: docs_json_ts_common_types_decimal_string,
387387
};
388388

389-
type FGBuildableMAM = FGBuildable_occupied & FGBuildableMAM_base;
389+
type FGBuildableMAM = FGBuildable_occupied & FGBuildableMAM_version_specific & docs_json_ts_0_3_7_7_classes_base_FGBuildable;
390390

391-
type FGBuildableMAM_base = FGBuildableMAM_base_base & docs_json_ts_0_3_7_7_classes_base_FGBuildable;
392-
393-
type FGBuildableMAM_base_base = docs_json_ts_0_3_7_7_classes_base_FGBuildable_base & {
391+
type FGBuildableMAM_version_specific = {
394392
mSignificanceRange: docs_json_ts_common_types_decimal_string,
395393
mCurrentResearchState: 'ERS_NotResearching',
396394
};
@@ -883,8 +881,7 @@ export type {
883881
FGBuildableLightSource,
884882
FGBuildableLightSource_base,
885883
FGBuildableMAM,
886-
FGBuildableMAM_base,
887-
FGBuildableMAM_base_base,
884+
FGBuildableMAM_version_specific,
888885
FGBuildableManufacturer_base_blender,
889886
FGBuildableManufacturer_base_blender_base,
890887
FGBuildableManufacturer_base_blender_base_base,

‎generated-types/0.5.2.1/classes/Base.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import type {
2020
FGBuildableGeneratorNuclear_base as docs_json_ts_0_4_2_11_classes_base_FGBuildableGeneratorNuclear_base,
2121
FGBuildableLightsControlPanel_base as docs_json_ts_0_4_2_11_classes_base_FGBuildableLightsControlPanel_base,
2222
FGBuildableLightSource_base as docs_json_ts_0_4_2_11_classes_base_FGBuildableLightSource_base,
23-
FGBuildableMAM_base_base as docs_json_ts_0_4_2_11_classes_base_FGBuildableMAM_base_base,
23+
FGBuildableMAM_version_specific as docs_json_ts_0_4_2_11_classes_base_FGBuildableMAM_version_specific,
2424
FGBuildableManufacturer_base_blender_base as docs_json_ts_0_4_2_11_classes_base_FGBuildableManufacturer_base_blender_base,
2525
FGBuildableManufacturer_base_constructor_base as docs_json_ts_0_4_2_11_classes_base_FGBuildableManufacturer_base_constructor_base,
2626
FGBuildableManufacturer_Build_HadronCollider_C_base as docs_json_ts_0_4_2_11_classes_base_FGBuildableManufacturer_Build_HadronCollider_C_base,
@@ -180,7 +180,7 @@ type FGBuildable_is_wallish = {
180180
mAngledVariants: null | docs_json_ts_0_3_7_7_properties_DocsDotJson_BlueprintGeneratedClass_quoted_list,
181181
};
182182

183-
type FGBuildable_isFrame = FGBuildable_base & {
183+
type FGBuildable_isFrame = {
184184
mIsFrame: docs_json_ts_common_types_bool_string,
185185
};
186186

@@ -316,7 +316,7 @@ type FGBuildableFoundation_base = FGBuildableFoundation_base_base & {
316316
mDisableSnapOn: docs_json_ts_common_types_empty_object | docs_json_ts_0_3_7_7_properties_mDisableSnapOn_front_bottom | docs_json_ts_0_5_2_1_properties_mDisableSnapOn_top | docs_json_ts_0_5_2_1_properties_mDisableSnapOn_bottom,
317317
};
318318

319-
type FGBuildableFoundation_base_base = docs_json_ts_0_3_7_7_classes_base_FGBuildable_with_height_base & FGBuildable_foundation_DisableAttachmentSnapOn & FGBuildable_isFrame & FGBuildable_foundation_mDisableSnapOn;
319+
type FGBuildableFoundation_base_base = docs_json_ts_0_3_7_7_classes_base_FGBuildable_with_height_base & FGBuildable_foundation_DisableAttachmentSnapOn & FGBuildable_base & FGBuildable_isFrame & FGBuildable_foundation_mDisableSnapOn;
320320

321321
type FGBuildableFrackingActivator = docs_json_ts_0_4_2_11_classes_base_FGBuildableFrackingActivator_base & docs_json_ts_0_4_2_11_classes_base_FGBuildable_powered_has_mAllowedResourceForms_with_resources_base & FGBuildable_powered_base & FGBuildable_base;
322322

@@ -359,7 +359,7 @@ type FGBuildableLightSource_Build_StreetLight_C = FGBuildableLightSource & {
359359
},
360360
};
361361

362-
type FGBuildableMAM = FGBuildable_occupied & docs_json_ts_0_4_2_11_classes_base_FGBuildableMAM_base_base;
362+
type FGBuildableMAM = FGBuildable_occupied & docs_json_ts_0_4_2_11_classes_base_FGBuildableMAM_version_specific;
363363

364364
type FGBuildableManufacturer_Build_AssemblerMk1_C = docs_json_ts_0_3_7_7_classes_base_FGBuildableManufacturer_base_base & docs_json_ts_0_3_7_7_classes_base_FGBuildableManufacturer_base_IsPowered_base & FGBuildable_powered;
365365

‎generated-types/0.6.1.5/classes/Base.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ type FGBuildable_base_version_specific = {
336336
],
337337
};
338338

339-
type FGBuildable_foundation_mDisableSnapOn = FGBuildable_base & {
339+
type FGBuildable_foundation_mDisableSnapOn = {
340340
mDisableSnapOn: docs_json_ts_common_types_empty_object | docs_json_ts_0_3_7_7_properties_mDisableSnapOn_front_bottom | docs_json_ts_0_5_2_1_properties_mDisableSnapOn_top | docs_json_ts_0_5_2_1_properties_mDisableSnapOn_bottom | docs_json_ts_0_3_7_7_properties_mDisableSnapOn_top_bottom,
341341
};
342342

@@ -348,7 +348,7 @@ type FGBuildable_powered_base = docs_json_ts_0_5_2_1_classes_base_FGBuildable_po
348348

349349
type FGBuildable_tiered = docs_json_ts_0_5_2_1_classes_base_FGBuildable_tiered & FGBuildable_base;
350350

351-
type FGBuildable_with_depth = FGBuildable_base & {
351+
type FGBuildable_with_depth = {
352352
mDepth: docs_json_ts_common_types_decimal_string,
353353
};
354354

@@ -390,11 +390,11 @@ type FGBuildableFactorySimpleProducer = docs_json_ts_0_5_2_1_classes_base_FGBuil
390390

391391
type FGBuildableFloodlight = docs_json_ts_0_5_2_1_classes_base_FGBuildableFloodlight & FGBuildable_base;
392392

393-
type FGBuildableFoundation = FGBuildableFoundation_base & {
394-
mDisableAttachmentSnapOn: docs_json_ts_common_types_empty_object | docs_json_ts_0_6_1_5_properties_mDisableSnapOn_front_right | docs_json_ts_0_5_2_1_properties_mDisableSnapOn_top | docs_json_ts_0_5_2_1_properties_mDisableSnapOn_bottom,
395-
};
393+
type FGBuildableFoundation = docs_json_ts_0_3_7_7_classes_base_FGBuildable_with_height_base & docs_json_ts_0_5_2_1_classes_base_FGBuildable_isFrame & FGBuildable_foundation_mDisableSnapOn & docs_json_ts_0_5_2_1_classes_base_FGBuildable_with_elevation & docs_json_ts_0_3_7_7_classes_base_FGBuildable_with_width_base & FGBuildable_with_depth & FGBuildableFoundation_version_specific & FGBuildable_base_pre_update8 & FGBuildable_base_version_specific & FGBuildable_base;
396394

397-
type FGBuildableFoundation_base = docs_json_ts_0_3_7_7_classes_base_FGBuildable_with_height_base & docs_json_ts_0_5_2_1_classes_base_FGBuildable_isFrame & FGBuildable_foundation_mDisableSnapOn & docs_json_ts_0_5_2_1_classes_base_FGBuildable_with_elevation & docs_json_ts_0_3_7_7_classes_base_FGBuildable_with_width_base & FGBuildable_with_depth;
395+
type FGBuildableFoundation_version_specific = {
396+
mDisableAttachmentSnapOn: docs_json_ts_common_types_empty_object | docs_json_ts_0_3_7_7_properties_mDisableSnapOn_top_bottom | docs_json_ts_0_6_1_5_properties_mDisableSnapOn_front_right | docs_json_ts_0_5_2_1_properties_mDisableSnapOn_top | docs_json_ts_0_5_2_1_properties_mDisableSnapOn_bottom,
397+
};
398398

399399
type FGBuildableFrackingActivator = docs_json_ts_0_4_2_11_classes_base_FGBuildableFrackingActivator_base & FGBuildableResourceExtractor_base_version_specific;
400400

@@ -492,12 +492,12 @@ type FGBuildableRailroadStation = docs_json_ts_0_5_2_1_classes_base_FGBuildableR
492492

493493
type FGBuildableRailroadTrack = docs_json_ts_0_5_2_1_classes_base_FGBuildableRailroadTrack & FGBuildable_base;
494494

495-
type FGBuildableRamp = FGBuildableRamp_base & {
495+
type FGBuildableRamp = FGBuildableFoundation & docs_json_ts_0_5_2_1_classes_base_FGBuildableRamp_base;
496+
497+
type FGBuildableRamp_version_specific = {
496498
mDisableAttachmentSnapOn: docs_json_ts_common_types_empty_object | docs_json_ts_0_5_2_1_properties_mDisableSnapOn_top | docs_json_ts_0_3_7_7_properties_mDisableSnapOn_top_bottom | docs_json_ts_0_5_2_1_properties_mDisableSnapOn_bottom,
497499
};
498500

499-
type FGBuildableRamp_base = FGBuildableFoundation_base & docs_json_ts_0_5_2_1_classes_base_FGBuildableRamp_base & FGBuildable_base;
500-
501501
type FGBuildableResourceExtractor_base = FGBuildableResourceExtractor_base_version_specific & FGBuildableResourceExtractor_base_base;
502502

503503
type FGBuildableResourceExtractor_base_base = docs_json_ts_0_3_7_7_classes_base_FGBuildableResourceExtractor_base_base_base & docs_json_ts_0_3_7_7_classes_base_FGBuildable_powered_base_resources_base & FGBuildable_powered;
@@ -822,7 +822,7 @@ export type {
822822
FGBuildableFactorySimpleProducer,
823823
FGBuildableFloodlight,
824824
FGBuildableFoundation,
825-
FGBuildableFoundation_base,
825+
FGBuildableFoundation_version_specific,
826826
FGBuildableFrackingActivator,
827827
FGBuildableFrackingExtractor,
828828
FGBuildableGeneratorFuel_biomass,
@@ -867,7 +867,7 @@ export type {
867867
FGBuildableRailroadStation,
868868
FGBuildableRailroadTrack,
869869
FGBuildableRamp,
870-
FGBuildableRamp_base,
870+
FGBuildableRamp_version_specific,
871871
FGBuildableResourceExtractor_base,
872872
FGBuildableResourceExtractor_base_base,
873873
FGBuildableResourceExtractor_base_untimed,

‎generated-types/0.7.1.1/classes/Base.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import type {
3737
FGBuildable_powered_base_base_base as docs_json_ts_0_3_7_7_classes_base_FGBuildable_powered_base_base_base,
3838
FGBuildable_powered_base_resources_base_base as docs_json_ts_0_3_7_7_classes_base_FGBuildable_powered_base_resources_base_base,
3939
FGBuildable_powered_storage_base_base_base as docs_json_ts_0_3_7_7_classes_base_FGBuildable_powered_storage_base_base_base,
40-
FGBuildableAttachment_splitter_base_base_base_with_mCurrentOutputIndex as docs_json_ts_0_3_7_7_classes_base_FGBuildableAttachment_splitter_base_base_base_with_mCurrentOutputIndex,
41-
FGBuildableAttachmentMerger_base_base_base_base as docs_json_ts_0_3_7_7_classes_base_FGBuildableAttachmentMerger_base_base_base_base,
40+
FGBuildableAttachment_splitter_pre_update7 as docs_json_ts_0_3_7_7_classes_base_FGBuildableAttachment_splitter_pre_update7,
41+
FGBuildableAttachmentMerger_pre_update7 as docs_json_ts_0_3_7_7_classes_base_FGBuildableAttachmentMerger_pre_update7,
4242
FGBuildableDockingStation_with_mFuelTransferSpeed_base as docs_json_ts_0_3_7_7_classes_base_FGBuildableDockingStation_with_mFuelTransferSpeed_base,
4343
FGBuildableFactory_jump_pad_base_base_base as docs_json_ts_0_3_7_7_classes_base_FGBuildableFactory_jump_pad_base_base_base,
4444
FGBuildableFactory_landing_pad_base_base_base as docs_json_ts_0_3_7_7_classes_base_FGBuildableFactory_landing_pad_base_base_base,
@@ -164,9 +164,9 @@ type FGBuildable_powered_storage = docs_json_ts_0_3_7_7_classes_base_FGBuildable
164164

165165
type FGBuildable_tiered = docs_json_ts_0_5_2_1_classes_base_FGBuildable_tiered & FGBuildable_base;
166166

167-
type FGBuildableAttachmentMerger = docs_json_ts_0_3_7_7_classes_base_FGBuildableAttachmentMerger_base_base_base_base & FGBuildable_base;
167+
type FGBuildableAttachmentMerger = docs_json_ts_0_3_7_7_classes_base_FGBuildableAttachmentMerger_pre_update7 & FGBuildable_base;
168168

169-
type FGBuildableAttachmentSplitter = docs_json_ts_0_3_7_7_classes_base_FGBuildableAttachment_splitter_base_base_base_with_mCurrentOutputIndex & FGBuildable_base;
169+
type FGBuildableAttachmentSplitter = docs_json_ts_0_3_7_7_classes_base_FGBuildableAttachment_splitter_pre_update7 & FGBuildable_base;
170170

171171
type FGBuildableBeamLightweight = docs_json_ts_0_6_1_5_classes_base_FGBuildableBeam & FGBuildable_base;
172172

‎schema/0.3.7.7/base-classes.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@
755755
"FGBuildableAttachment--splitter--base--base--base": {
756756
"allOf": [
757757
{
758-
"$ref": "#/$defs/FGBuildableAttachment--splitter--base--base--base--with-mCurrentOutputIndex"
758+
"$ref": "#/$defs/FGBuildableAttachment--splitter--pre-update7"
759759
},
760760
{
761761
"$ref": "#/$defs/FGBuildableAttachment--splitter--base--base--base--with-mDistributionTable"
@@ -765,9 +765,8 @@
765765
}
766766
]
767767
},
768-
"FGBuildableAttachment--splitter--base--base--base--with-mCurrentOutputIndex": {
768+
"FGBuildableAttachment--splitter--pre-update7": {
769769
"type": "object",
770-
"$ref": "#/$defs/FGBuildable--base",
771770
"required": ["mCurrentOutputIndex"],
772771
"properties": {
773772
"mCurrentOutputIndex": {
@@ -819,16 +818,15 @@
819818
"FGBuildableAttachmentMerger--base--base--base": {
820819
"allOf": [
821820
{
822-
"$ref": "#/$defs/FGBuildableAttachmentMerger--base--base--base--base"
821+
"$ref": "#/$defs/FGBuildableAttachmentMerger--pre-update7"
823822
},
824823
{
825824
"$ref": "#/$defs/FGBuildableAttachment--base--base--base"
826825
}
827826
]
828827
},
829-
"FGBuildableAttachmentMerger--base--base--base--base": {
828+
"FGBuildableAttachmentMerger--pre-update7": {
830829
"type": "object",
831-
"$ref": "#/$defs/FGBuildable--base",
832830
"required": ["mCurrentInputIndex"],
833831
"properties": {
834832
"mCurrentInputIndex": {

‎schema/0.4.2.11/base-classes.json‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,23 +1033,15 @@
10331033
"$ref": "#/$defs/FGBuildable--occupied"
10341034
},
10351035
{
1036-
"$ref": "#/$defs/FGBuildableMAM--base"
1037-
}
1038-
]
1039-
},
1040-
"FGBuildableMAM--base": {
1041-
"allOf": [
1042-
{
1043-
"$ref": "#/$defs/FGBuildableMAM--base--base"
1036+
"$ref": "#/$defs/FGBuildableMAM--version-specific"
10441037
},
10451038
{
10461039
"$ref": "docs.json.ts--0.3.7.7--classes--base#/$defs/FGBuildable"
10471040
}
10481041
]
10491042
},
1050-
"FGBuildableMAM--base--base": {
1043+
"FGBuildableMAM--version-specific": {
10511044
"type": "object",
1052-
"$ref": "docs.json.ts--0.3.7.7--classes--base#/$defs/FGBuildable--base",
10531045
"required": ["mSignificanceRange", "mCurrentResearchState"],
10541046
"properties": {
10551047
"mSignificanceRange": {

‎schema/0.5.2.1/base-classes.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
},
122122
"FGBuildable--isFrame": {
123123
"type": "object",
124-
"$ref": "#/$defs/FGBuildable--base",
125124
"required": ["mIsFrame"],
126125
"properties": {
127126
"mIsFrame": {
@@ -715,6 +714,9 @@
715714
{
716715
"$ref": "#/$defs/FGBuildable--foundation--DisableAttachmentSnapOn"
717716
},
717+
{
718+
"$ref": "#/$defs/FGBuildable--base"
719+
},
718720
{
719721
"$ref": "#/$defs/FGBuildable--isFrame"
720722
},
@@ -937,7 +939,7 @@
937939
"$ref": "#/$defs/FGBuildable--occupied"
938940
},
939941
{
940-
"$ref": "docs.json.ts--0.4.2.11--classes--base#/$defs/FGBuildableMAM--base--base"
942+
"$ref": "docs.json.ts--0.4.2.11--classes--base#/$defs/FGBuildableMAM--version-specific"
941943
}
942944
]
943945
},

0 commit comments

Comments
 (0)