From 2e727d30dcabf1b7e14fe04e72dc2b000b3f4c03 Mon Sep 17 00:00:00 2001 From: Dharma Bellamkonda Date: Sat, 11 Jul 2026 22:23:04 -0600 Subject: [PATCH] Add missing encyclopedia aircraft and dedupe C-130 variants Adds F-100D, C-130J-30, Mirage-F1AD/AZ, and the F-14A early export variant, and fixes the F-16C block 52D suffix (previously registered under a non-existent "bl.52" key). Also collapses the duplicated C-130/C-130J-30 struct literals into a shared c130Data/c130Variants pair, matching the pattern used for other aircraft families. --- pkg/encyclopedia/aircraft.go | 49 ++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/pkg/encyclopedia/aircraft.go b/pkg/encyclopedia/aircraft.go index 113ee68f..6796305a 100644 --- a/pkg/encyclopedia/aircraft.go +++ b/pkg/encyclopedia/aircraft.go @@ -226,6 +226,24 @@ func ch47Variants() []Aircraft { ) } +var c130Data = Aircraft{ + tags: sets.Of(FixedWing, Unarmed), + PlatformDesignation: "C-130", + TypeDesignation: "C-130", + OfficialName: "Hercules", + Nickname: "Herc", +} + +func c130Variants() []Aircraft { + return variants( + c130Data, + map[string]string{ + "": "", + "J-30": "J-30", + }, + ) +} + var f86Data = Aircraft{ tags: sets.Of(FixedWing, Fighter), PlatformDesignation: "F-86", @@ -292,6 +310,7 @@ func f14Variants() []Aircraft { map[string]string{ "A-135-GR-Early": "A", "A-135-GR": "A", + "A-95-GR": "A", "A": "A", "B": "B", }, @@ -330,11 +349,11 @@ func f16Variants() []Aircraft { return variants( f16Data, map[string]string{ - "A": "A", - "A MLU": "A", - "C_50": "C", - "C bl.50": "C", - "C bl.52": "C", + "A": "A", + "A MLU": "A", + "C_50": "C", + "C bl.50": "C", + "C bl.52d": "C", }, ) } @@ -403,6 +422,8 @@ func mirageF1Variants() []Aircraft { return variants( mirageF1Data, map[string]string{ + "AD": "AD", + "AZ": "AZ", "B": "B", "BD": "BD", "BE": "BE", @@ -770,14 +791,6 @@ var aircraftData = []Aircraft{ PlatformDesignation: "C-47", OfficialName: "Skytrain", }, - { - ACMIShortName: "C-130", - tags: sets.Of(FixedWing, Unarmed), - PlatformDesignation: "C-130", - TypeDesignation: "C-130", - OfficialName: "Hercules", - Nickname: "Herc", - }, { ACMIShortName: "CH-53E", tags: sets.Of(RotaryWing, Unarmed), @@ -799,6 +812,15 @@ var aircraftData = []Aircraft{ TypeDesignation: "E-3A", OfficialName: "Sentry", }, + { + ACMIShortName: "F-100D", + tags: sets.Of(FixedWing, Fighter), + PlatformDesignation: "F-100", + TypeDesignation: "F-100D", + OfficialName: "Super Sabre", + Nickname: "Hun", + threatRadius: SAR1IRThreat, + }, { ACMIShortName: "F-117A", tags: sets.Of(FixedWing, Unarmed), @@ -1087,6 +1109,7 @@ func init() { a10Variants(), ah64Variants(), c101Variants(), + c130Variants(), ch47Variants(), f86Variants(), f4Variants(),