From 738b0dffc5af09783c00ed127f825289255e619d Mon Sep 17 00:00:00 2001 From: Starfire13 <72491792+Starfire13@users.noreply.github.com> Date: Sun, 18 Feb 2024 20:31:22 +1100 Subject: [PATCH] Add DEAD mission type to Blackshark and Blackshark III choppers and update loadouts (#253) --- resources/customized_payloads/Ka-50.lua | 86 +++++++++++------------ resources/customized_payloads/Ka-50_3.lua | 86 ++++++++++++++++++++--- resources/units/aircraft/Ka-50.yaml | 63 +++++++++-------- resources/units/aircraft/Ka-50_3.yaml | 65 ++++++++--------- 4 files changed, 181 insertions(+), 119 deletions(-) diff --git a/resources/customized_payloads/Ka-50.lua b/resources/customized_payloads/Ka-50.lua index eb80a8b7..b860a320 100644 --- a/resources/customized_payloads/Ka-50.lua +++ b/resources/customized_payloads/Ka-50.lua @@ -2,133 +2,127 @@ local unitPayloads = { ["name"] = "Ka-50", ["payloads"] = { [1] = { - ["name"] = "CAS", + ["name"] = "Retribution CAS", ["pylons"] = { [1] = { ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", - ["num"] = 1, + ["num"] = 4, }, [2] = { - ["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", - ["num"] = 2, + ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", + ["num"] = 1, }, [3] = { - ["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", + ["CLSID"] = "B_8V20A_OFP2", ["num"] = 3, }, [4] = { - ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", - ["num"] = 4, + ["CLSID"] = "B_8V20A_OFP2", + ["num"] = 2, }, }, ["tasks"] = { [1] = 31, - [2] = 32, - [3] = 18, }, }, [2] = { - ["name"] = "CAP", + ["displayName"] = "Retribution BAI", + ["name"] = "Retribution BAI", ["pylons"] = { [1] = { - ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", - ["num"] = 1, + ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", + ["num"] = 4, }, [2] = { - ["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", - ["num"] = 2, + ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", + ["num"] = 1, }, [3] = { - ["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", + ["CLSID"] = "B_8V20A_OFP2", ["num"] = 3, }, [4] = { - ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", - ["num"] = 4, + ["CLSID"] = "B_8V20A_OFP2", + ["num"] = 2, }, }, ["tasks"] = { [1] = 31, - [2] = 32, - [3] = 18, }, }, [3] = { - ["name"] = "SEAD", + ["displayName"] = "Retribution DEAD", + ["name"] = "Retribution DEAD", ["pylons"] = { [1] = { ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", - ["num"] = 1, + ["num"] = 4, }, [2] = { - ["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", - ["num"] = 2, + ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", + ["num"] = 1, }, [3] = { - ["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", + ["CLSID"] = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}", ["num"] = 3, }, [4] = { - ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", - ["num"] = 4, + ["CLSID"] = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}", + ["num"] = 2, }, }, ["tasks"] = { [1] = 31, - [2] = 32, - [3] = 18, }, }, [4] = { - ["name"] = "ANTISHIP", + ["displayName"] = "Retribution OCA/Aircraft", + ["name"] = "Retribution OCA/Aircraft", ["pylons"] = { [1] = { - ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", - ["num"] = 1, + ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", + ["num"] = 4, }, [2] = { - ["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", - ["num"] = 2, + ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", + ["num"] = 1, }, [3] = { ["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", ["num"] = 3, }, [4] = { - ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", - ["num"] = 4, + ["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", + ["num"] = 2, }, }, ["tasks"] = { [1] = 31, - [2] = 32, - [3] = 18, }, }, [5] = { - ["name"] = "STRIKE", + ["displayName"] = "Retribution Escort", + ["name"] = "Retribution Escort", ["pylons"] = { [1] = { - ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", - ["num"] = 1, + ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", + ["num"] = 4, }, [2] = { - ["CLSID"] = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}", - ["num"] = 2, + ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", + ["num"] = 1, }, [3] = { ["CLSID"] = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}", ["num"] = 3, }, [4] = { - ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", - ["num"] = 4, + ["CLSID"] = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}", + ["num"] = 2, }, }, ["tasks"] = { [1] = 31, - [2] = 32, - [3] = 18, }, }, }, diff --git a/resources/customized_payloads/Ka-50_3.lua b/resources/customized_payloads/Ka-50_3.lua index 943afe2d..992f5b6e 100644 --- a/resources/customized_payloads/Ka-50_3.lua +++ b/resources/customized_payloads/Ka-50_3.lua @@ -2,7 +2,7 @@ local unitPayloads = { ["name"] = "Ka-50_3", ["payloads"] = { [1] = { - ["name"] = "CAS", + ["name"] = "Retribution CAS", ["pylons"] = { [1] = { ["CLSID"] = "{9S846_2xIGLA}", @@ -34,8 +34,8 @@ local unitPayloads = { }, }, [2] = { - ["displayName"] = "STRIKE", - ["name"] = "STRIKE", + ["displayName"] = "Retribution BAI", + ["name"] = "Retribution BAI", ["pylons"] = { [1] = { ["CLSID"] = "{9S846_2xIGLA}", @@ -54,20 +54,86 @@ local unitPayloads = { ["num"] = 1, }, [5] = { - ["CLSID"] = "{37DCC01E-9E02-432F-B61D-10C166CA2798}", + ["CLSID"] = "B_8V20A_OFP2", ["num"] = 3, }, [6] = { - ["CLSID"] = "{37DCC01E-9E02-432F-B61D-10C166CA2798}", + ["CLSID"] = "B_8V20A_OFP2", ["num"] = 2, }, }, ["tasks"] = { [1] = 31, - [2] = 32, }, }, [3] = { + ["displayName"] = "Retribution OCA/Aircraft", + ["name"] = "Retribution OCA/Aircraft", + ["pylons"] = { + [1] = { + ["CLSID"] = "{9S846_2xIGLA}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "{9S846_2xIGLA}", + ["num"] = 5, + }, + [3] = { + ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", + ["num"] = 4, + }, + [4] = { + ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", + ["num"] = 1, + }, + [5] = { + ["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", + ["num"] = 3, + }, + [6] = { + ["CLSID"] = "{6A4B9E69-64FE-439a-9163-3A87FB6A4D81}", + ["num"] = 2, + }, + }, + ["tasks"] = { + [1] = 31, + }, + }, + [4] = { + ["displayName"] = "Retribution DEAD", + ["name"] = "Retribution DEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{9S846_2xIGLA}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "{9S846_2xIGLA}", + ["num"] = 5, + }, + [3] = { + ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", + ["num"] = 4, + }, + [4] = { + ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", + ["num"] = 1, + }, + [5] = { + ["CLSID"] = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}", + ["num"] = 3, + }, + [6] = { + ["CLSID"] = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}", + ["num"] = 2, + }, + }, + ["tasks"] = { + [1] = 31, + }, + }, + [5] = { + ["displayName"] = "Retribution Escort", ["name"] = "Retribution Escort", ["pylons"] = { [1] = { @@ -79,19 +145,19 @@ local unitPayloads = { ["num"] = 5, }, [3] = { - ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", + ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", ["num"] = 4, }, [4] = { - ["CLSID"] = "{A6FD14D3-6D30-4C85-88A7-8D17BEE120E2}", + ["CLSID"] = "{6DADF342-D4BA-4D8A-B081-BA928C4AF86D}", ["num"] = 1, }, [5] = { - ["CLSID"] = "B_8V20A_OFP2", + ["CLSID"] = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}", ["num"] = 3, }, [6] = { - ["CLSID"] = "B_8V20A_OFP2", + ["CLSID"] = "{FC56DF80-9B09-44C5-8976-DCFAFF219062}", ["num"] = 2, }, }, diff --git a/resources/units/aircraft/Ka-50.yaml b/resources/units/aircraft/Ka-50.yaml index 163371c2..f4cec968 100644 --- a/resources/units/aircraft/Ka-50.yaml +++ b/resources/units/aircraft/Ka-50.yaml @@ -1,31 +1,32 @@ -class: Helicopter -always_keeps_gun: true -carrier_capable: true -description: - "The Ka-50 Black Shark (NATO reporting name: Hokum) is a unique and deadly - single-seat, Russian attack helicopter that has seen combat in the Northern Caucasus. - It combines a high performance dual rotor system with a deadly weapons payload of - guided missiles, rockets, bombs, and a 30mm cannon. The Ka-50 is also unique in - that it has an ejection seat." -introduced: 1995 -lha_capable: true -cabin_size: 0 # Can not transport troops -can_carry_crates: true -manufacturer: Kamov -origin: USSR/Russia -price: 20 -role: Attack -variants: - Ka-50 Hokum: {} -radios: - intra_flight: R-800L1 - inter_flight: R-800L1 - # The R-800L1 doesn't have preset channels, and the other radio is for - # communications with FAC and ground units, which don't currently have - # radios assigned, so no channels to configure. -kneeboard_units: "metric" -tasks: - BAI: 430 - CAS: 430 - Escort: 90 - OCA/Aircraft: 430 +class: Helicopter +always_keeps_gun: true +carrier_capable: true +description: + "The Ka-50 Black Shark (NATO reporting name: Hokum) is a unique and deadly + single-seat, Russian attack helicopter that has seen combat in the Northern Caucasus. + It combines a high performance dual rotor system with a deadly weapons payload of + guided missiles, rockets, bombs, and a 30mm cannon. The Ka-50 is also unique in + that it has an ejection seat." +introduced: 1995 +lha_capable: true +cabin_size: 0 # Can not transport troops +can_carry_crates: true +manufacturer: Kamov +origin: USSR/Russia +price: 20 +role: Attack +variants: + Ka-50 Hokum: {} +radios: + intra_flight: R-800L1 + inter_flight: R-800L1 + # The R-800L1 doesn't have preset channels, and the other radio is for + # communications with FAC and ground units, which don't currently have + # radios assigned, so no channels to configure. +kneeboard_units: "metric" +tasks: + BAI: 430 + CAS: 430 + DEAD: 113 + Escort: 90 + OCA/Aircraft: 430 diff --git a/resources/units/aircraft/Ka-50_3.yaml b/resources/units/aircraft/Ka-50_3.yaml index 2a1752cb..1926c8f4 100644 --- a/resources/units/aircraft/Ka-50_3.yaml +++ b/resources/units/aircraft/Ka-50_3.yaml @@ -1,32 +1,33 @@ -class: Helicopter -always_keeps_gun: true -carrier_capable: true -description: - "The Ka-50 Black Shark (NATO reporting name: Hokum) is a unique and deadly - single-seat, Russian attack helicopter that has seen combat in the Northern Caucasus. - It combines a high performance dual rotor system with a deadly weapons payload of - guided missiles, rockets, bombs, and a 30mm cannon. The Ka-50 is also unique in - that it has an ejection seat. The Black Shark III can also carry A-A Igla missiles." -introduced: 1995 -lha_capable: true -cabin_size: 0 # Can not transport troops -can_carry_crates: true -manufacturer: Kamov -origin: USSR/Russia -price: 20 -role: Attack -variants: - Ka-50 Hokum III: {} - Ka-50 Hokum (Blackshark 3): {} # for compatibility with Liberation -radios: - intra_flight: R-800L1 - inter_flight: R-800L1 - # The R-800L1 doesn't have preset channels, and the other radio is for - # communications with FAC and ground units, which don't currently have - # radios assigned, so no channels to configure. -kneeboard_units: "metric" -tasks: - BAI: 440 - CAS: 440 - Escort: 100 - OCA/Aircraft: 440 +class: Helicopter +always_keeps_gun: true +carrier_capable: true +description: + "The Ka-50 Black Shark (NATO reporting name: Hokum) is a unique and deadly + single-seat, Russian attack helicopter that has seen combat in the Northern Caucasus. + It combines a high performance dual rotor system with a deadly weapons payload of + guided missiles, rockets, bombs, and a 30mm cannon. The Ka-50 is also unique in + that it has an ejection seat. The Black Shark III can also carry A-A Igla missiles." +introduced: 1995 +lha_capable: true +cabin_size: 0 # Can not transport troops +can_carry_crates: true +manufacturer: Kamov +origin: USSR/Russia +price: 20 +role: Attack +variants: + Ka-50 Hokum III: {} + Ka-50 Hokum (Blackshark 3): {} # for compatibility with Liberation +radios: + intra_flight: R-800L1 + inter_flight: R-800L1 + # The R-800L1 doesn't have preset channels, and the other radio is for + # communications with FAC and ground units, which don't currently have + # radios assigned, so no channels to configure. +kneeboard_units: "metric" +tasks: + BAI: 440 + CAS: 440 + DEAD: 113 + Escort: 100 + OCA/Aircraft: 440