From 747ccae02322161629239cee0c9f6e9224f2c243 Mon Sep 17 00:00:00 2001 From: Starfire13 <72491792+Starfire13@users.noreply.github.com> Date: Mon, 12 Feb 2024 00:54:03 +1100 Subject: [PATCH] S3B tasks update (#249) * Add files via upload * Add files via upload * Adjust Strike & Remove OCA/Runway Strike ->10xMk82 for better effect OCA/Runway removed because S-3B doesn't support Runway Attack. As long as we don't implement some system to use the carpet bombing task as an alternative (note that this would need markers for representing the ends of runways), Ground Attack is no good to us... --------- Co-authored-by: Raffson --- resources/customized_payloads/S-3B.lua | 342 +++++++++++++------------ resources/units/aircraft/S-3B.yaml | 51 ++-- 2 files changed, 201 insertions(+), 192 deletions(-) diff --git a/resources/customized_payloads/S-3B.lua b/resources/customized_payloads/S-3B.lua index bdbdd472..08e6f1e6 100644 --- a/resources/customized_payloads/S-3B.lua +++ b/resources/customized_payloads/S-3B.lua @@ -1,168 +1,174 @@ -local unitPayloads = { - ["name"] = "S-3B", - ["payloads"] = { - [1] = { - ["name"] = "SEAD", - ["pylons"] = { - [1] = { - ["CLSID"] = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}", - ["num"] = 1, - }, - [2] = { - ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", - ["num"] = 2, - }, - [3] = { - ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", - ["num"] = 3, - }, - [4] = { - ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", - ["num"] = 4, - }, - [5] = { - ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", - ["num"] = 5, - }, - [6] = { - ["CLSID"] = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}", - ["num"] = 6, - }, - }, - ["tasks"] = { - [1] = 29, - }, - }, - [2] = { - ["name"] = "ANTISHIP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{8B7CADF9-4954-46B3-8CFB-93F2F5B90B03}", - ["num"] = 1, - }, - [2] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 2, - }, - [3] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 3, - }, - [4] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 4, - }, - [5] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 5, - }, - [6] = { - ["CLSID"] = "{8B7CADF9-4954-46B3-8CFB-93F2F5B90B03}", - ["num"] = 6, - }, - }, - ["tasks"] = { - [1] = 30, - }, - }, - [3] = { - ["name"] = "STRIKE", - ["pylons"] = { - [1] = { - ["CLSID"] = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}", - ["num"] = 1, - }, - [2] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 2, - }, - [3] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 3, - }, - [4] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 4, - }, - [5] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 5, - }, - [6] = { - ["CLSID"] = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}", - ["num"] = 6, - }, - }, - ["tasks"] = { - [1] = 32, - [1] = 33, - }, - }, - [4] = { - ["name"] = "CAS", - ["pylons"] = { - [1] = { - ["CLSID"] = "{A76344EB-32D2-4532-8FA2-0C1BDC00747E}", - ["num"] = 1, - }, - [2] = { - ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", - ["num"] = 2, - }, - [3] = { - ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", - ["num"] = 3, - }, - [4] = { - ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", - ["num"] = 4, - }, - [5] = { - ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", - ["num"] = 5, - }, - [6] = { - ["CLSID"] = "{A76344EB-32D2-4532-8FA2-0C1BDC00747E}", - ["num"] = 6, - }, - }, - ["tasks"] = { - [1] = 31, - }, - }, - }, - [5] = { - ["name"] = "RUNWAY_ATTACK", - ["pylons"] = { - [1] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 1, - }, - [2] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 2, - }, - [3] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 3, - }, - [4] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 4, - }, - [5] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 5, - }, - [6] = { - ["CLSID"] = "{AB8B8299-F1CC-4359-89B5-2172E0CF4A5A}", - ["num"] = 6, - }, - }, - ["tasks"] = { - [1] = 34, - }, - }, - ["unitType"] = "S-3B", -} -return unitPayloads +local unitPayloads = { + ["name"] = "S-3B", + ["payloads"] = { + [1] = { + ["displayName"] = "Retribution OCA/Aircraft", + ["name"] = "Retribution OCA/Aircraft", + ["pylons"] = { + [1] = { + ["CLSID"] = "{B83CB620-5BBE-4BEA-910C-EB605A327EF9}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "{B83CB620-5BBE-4BEA-910C-EB605A327EF9}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 2, + }, + [4] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 3, + }, + [5] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 4, + }, + [6] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 30, + }, + }, + [2] = { + ["displayName"] = "Retribution DEAD", + ["name"] = "Retribution DEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "{AF42E6DF-9A60-46D8-A9A0-1708B241AADB}", + ["num"] = 1, + }, + }, + ["tasks"] = { + [1] = 30, + }, + }, + [3] = { + ["displayName"] = "Retribution Anti-ship", + ["name"] = "Retribution Anti-ship", + ["pylons"] = { + [1] = { + ["CLSID"] = "{8B7CADF9-4954-46B3-8CFB-93F2F5B90B03}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "{8B7CADF9-4954-46B3-8CFB-93F2F5B90B03}", + ["num"] = 1, + }, + }, + ["tasks"] = { + [1] = 30, + }, + }, + [4] = { + ["name"] = "Retribution CAS", + ["pylons"] = { + [1] = { + ["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "{444BA8AE-82A7-4345-842E-76154EFCCA46}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 2, + }, + [4] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 3, + }, + [5] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 4, + }, + [6] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 30, + }, + }, + [5] = { + ["displayName"] = "Retribution BAI", + ["name"] = "Retribution BAI", + ["pylons"] = { + [1] = { + ["CLSID"] = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "{69DC8AE7-8F77-427B-B8AA-B19D3F478B66}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 5, + }, + [4] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 3, + }, + [6] = { + ["CLSID"] = "{ADD3FAE1-EBF6-4EF9-8EFC-B36B5DDF1E6B}", + ["num"] = 2, + }, + }, + ["tasks"] = { + [1] = 30, + }, + }, + [6] = { + ["displayName"] = "Retribution Strike", + ["name"] = "Retribution Strike", + ["pylons"] = { + [1] = { + ["CLSID"] = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "{60CC734F-0AFA-4E2E-82B8-93B941AB11CF}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + ["num"] = 5, + }, + [4] = { + ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + ["num"] = 3, + }, + [6] = { + ["CLSID"] = "{BCE4E030-38E9-423E-98ED-24BE3DA87C32}", + ["num"] = 2, + }, + }, + ["tasks"] = { + [1] = 30, + }, + }, + }, + ["tasks"] = { + }, + ["unitType"] = "S-3B", +} +return unitPayloads diff --git a/resources/units/aircraft/S-3B.yaml b/resources/units/aircraft/S-3B.yaml index 4f6e4e8b..0730b317 100644 --- a/resources/units/aircraft/S-3B.yaml +++ b/resources/units/aircraft/S-3B.yaml @@ -1,24 +1,27 @@ -carrier_capable: true -description: - The Lockheed S-3 Viking is a 4-crew, twin-engine turbofan-powered jet - aircraft that was used by the U.S. Navy (USN) primarily for anti-submarine warfare. - In the late 1990s, the S-3B's mission focus shifted to surface warfare and aerial - refueling. The Viking also provided electronic warfare and surface surveillance - capabilities to a carrier battle group. A carrier-based, subsonic, all-weather, - long-range, multi-mission aircraft, it carried automated weapon systems and was - capable of extended missions with in-flight refueling. Because of its characteristic - sound, it was nicknamed the "War Hoover" after the vacuum cleaner brand. The S-3 - was phased out from front-line fleet service aboard aircraft carriers in January - 2009, with its missions taken over by aircraft like the P-3C Orion, P-8 Poseidon, - Sikorsky SH-60 Seahawk and Boeing F/A-18E/F Super Hornet -introduced: 1984 -manufacturer: Lockheed -origin: USA -price: 10 -role: Carrier-based Attack -variants: - S-3B Viking: {} -tasks: - Anti-ship: 350 - OCA/Aircraft: 330 - Strike: 370 +carrier_capable: true +description: + The Lockheed S-3 Viking is a 4-crew, twin-engine turbofan-powered jet + aircraft that was used by the U.S. Navy (USN) primarily for anti-submarine warfare. + In the late 1990s, the S-3B's mission focus shifted to surface warfare and aerial + refueling. The Viking also provided electronic warfare and surface surveillance + capabilities to a carrier battle group. A carrier-based, subsonic, all-weather, + long-range, multi-mission aircraft, it carried automated weapon systems and was + capable of extended missions with in-flight refueling. Because of its characteristic + sound, it was nicknamed the "War Hoover" after the vacuum cleaner brand. The S-3 + was phased out from front-line fleet service aboard aircraft carriers in January + 2009, with its missions taken over by aircraft like the P-3C Orion, P-8 Poseidon, + Sikorsky SH-60 Seahawk and Boeing F/A-18E/F Super Hornet +introduced: 1984 +manufacturer: Lockheed +origin: USA +price: 10 +role: Carrier-based Attack +variants: + S-3B Viking: {} +tasks: + Anti-ship: 350 + BAI: 570 + CAS: 570 + DEAD: 200 + OCA/Aircraft: 330 + Strike: 370