From 179850cdb6011dc897227cf25ebebf32168443ba Mon Sep 17 00:00:00 2001 From: Pande4360 <114622967+Pande4360@users.noreply.github.com> Date: Thu, 11 May 2023 21:48:19 +0200 Subject: [PATCH] Support for SW v2.6 mod (#120) * Removed AI varients * Removed AI varients Logo/Banners * Removed AI varients Logo/Banners * Removed AI varients ai flgith planner * Removed AI varients SWPack Fix * Removed AI varients SWPack - SWWeapon fix --- game/ato/ai_flight_planner_db.py | 46 +- pydcs_extensions/SWPack/SWPack.py | 881 ++++-------------- resources/customized_payloads/AWING.lua | 24 +- resources/customized_payloads/AWINGA.lua | 67 -- resources/customized_payloads/CORVETTEA.lua | 83 -- resources/customized_payloads/FAUCON_AI.lua | 26 - resources/customized_payloads/HUNTER.lua | 20 +- resources/customized_payloads/HUNTERA.lua | 67 -- resources/customized_payloads/TIE.lua | 9 - resources/customized_payloads/TIEB.lua | 78 +- resources/customized_payloads/TIE_AI.lua | 30 - resources/customized_payloads/TIE_BA.lua | 192 ---- resources/customized_payloads/TIE_INTER.lua | 20 +- resources/customized_payloads/TIE_INTERA.lua | 67 -- resources/customized_payloads/XWING.lua | 52 +- resources/customized_payloads/XWINGAI.lua | 85 -- resources/customized_payloads/YWING.lua | 67 +- resources/customized_payloads/YWINGA.lua | 150 --- .../customized_payloads/naboo_starfighter.lua | 50 +- .../naboo_starfighter_AI.lua | 81 -- resources/factions/Rebel_Alliance_AI.json | 107 --- ...re_Player.json => SW_Galactic_Empire.json} | 5 - ...nce_Player.json => SW_Rebel_Alliance.json} | 5 - .../factions/russia_Galactic_Empire_AI.json | 106 --- .../ui/units/aircrafts/banners/AWINGA_24.jpg | Bin 46029 -> 0 bytes .../units/aircrafts/banners/CORVETTEA_24.jpg | Bin 58676 -> 0 bytes .../units/aircrafts/banners/FAUCON_AI_24.jpg | Bin 117848 -> 0 bytes .../ui/units/aircrafts/banners/HUNTERA_24.jpg | Bin 37104 -> 0 bytes .../ui/units/aircrafts/banners/TIE_AI_24.jpg | Bin 57938 -> 0 bytes .../ui/units/aircrafts/banners/TIE_BA_24.jpg | Bin 50411 -> 0 bytes .../units/aircrafts/banners/TIE_INTERA_24.jpg | Bin 73166 -> 0 bytes .../ui/units/aircrafts/banners/XWINGAI_24.jpg | Bin 84320 -> 0 bytes .../ui/units/aircrafts/banners/YWINGA_24.jpg | Bin 115802 -> 0 bytes .../banners/naboo_starfighter_AI_24.jpg | Bin 94411 -> 0 bytes .../ui/units/aircrafts/icons/AWINGA_24.jpg | Bin 5610 -> 0 bytes .../ui/units/aircrafts/icons/CORVETTEA_24.jpg | Bin 2116 -> 0 bytes .../ui/units/aircrafts/icons/FAUCON_AI_24.jpg | Bin 2184 -> 0 bytes .../ui/units/aircrafts/icons/HUNTERA_24.jpg | Bin 1778 -> 0 bytes .../ui/units/aircrafts/icons/TIE_AI_24.jpg | Bin 1921 -> 0 bytes .../ui/units/aircrafts/icons/TIE_BA_24.jpg | Bin 1655 -> 0 bytes .../units/aircrafts/icons/TIE_INTERA_24.jpg | Bin 2109 -> 0 bytes .../ui/units/aircrafts/icons/XWINGAI_24.jpg | Bin 2153 -> 0 bytes .../ui/units/aircrafts/icons/YWINGA_24.jpg | Bin 2172 -> 0 bytes .../icons/naboo_starfighter_AI_24.jpg | Bin 2276 -> 0 bytes resources/units/aircraft/AWINGA.yaml | 14 - resources/units/aircraft/CORVETTEA.yaml | 15 - resources/units/aircraft/FAUCON_AI.yaml | 14 - resources/units/aircraft/HUNTERA.yaml | 18 - resources/units/aircraft/TIE_AI.yaml | 18 - resources/units/aircraft/TIE_BA.yaml | 15 - resources/units/aircraft/TIE_INTERA.yaml | 14 - resources/units/aircraft/XWINGAI.yaml | 13 - resources/units/aircraft/YWINGA.yaml | 18 - .../units/aircraft/naboo_starfighter_AI.yaml | 15 - 54 files changed, 370 insertions(+), 2102 deletions(-) delete mode 100644 resources/customized_payloads/AWINGA.lua delete mode 100644 resources/customized_payloads/CORVETTEA.lua delete mode 100644 resources/customized_payloads/FAUCON_AI.lua delete mode 100644 resources/customized_payloads/HUNTERA.lua delete mode 100644 resources/customized_payloads/TIE_AI.lua delete mode 100644 resources/customized_payloads/TIE_BA.lua delete mode 100644 resources/customized_payloads/TIE_INTERA.lua delete mode 100644 resources/customized_payloads/XWINGAI.lua delete mode 100644 resources/customized_payloads/YWINGA.lua delete mode 100644 resources/customized_payloads/naboo_starfighter_AI.lua delete mode 100644 resources/factions/Rebel_Alliance_AI.json rename resources/factions/{russia_Galactic_Empire_Player.json => SW_Galactic_Empire.json} (96%) rename resources/factions/{Rebel_Alliance_Player.json => SW_Rebel_Alliance.json} (96%) delete mode 100644 resources/factions/russia_Galactic_Empire_AI.json delete mode 100644 resources/ui/units/aircrafts/banners/AWINGA_24.jpg delete mode 100644 resources/ui/units/aircrafts/banners/CORVETTEA_24.jpg delete mode 100644 resources/ui/units/aircrafts/banners/FAUCON_AI_24.jpg delete mode 100644 resources/ui/units/aircrafts/banners/HUNTERA_24.jpg delete mode 100644 resources/ui/units/aircrafts/banners/TIE_AI_24.jpg delete mode 100644 resources/ui/units/aircrafts/banners/TIE_BA_24.jpg delete mode 100644 resources/ui/units/aircrafts/banners/TIE_INTERA_24.jpg delete mode 100644 resources/ui/units/aircrafts/banners/XWINGAI_24.jpg delete mode 100644 resources/ui/units/aircrafts/banners/YWINGA_24.jpg delete mode 100644 resources/ui/units/aircrafts/banners/naboo_starfighter_AI_24.jpg delete mode 100644 resources/ui/units/aircrafts/icons/AWINGA_24.jpg delete mode 100644 resources/ui/units/aircrafts/icons/CORVETTEA_24.jpg delete mode 100644 resources/ui/units/aircrafts/icons/FAUCON_AI_24.jpg delete mode 100644 resources/ui/units/aircrafts/icons/HUNTERA_24.jpg delete mode 100644 resources/ui/units/aircrafts/icons/TIE_AI_24.jpg delete mode 100644 resources/ui/units/aircrafts/icons/TIE_BA_24.jpg delete mode 100644 resources/ui/units/aircrafts/icons/TIE_INTERA_24.jpg delete mode 100644 resources/ui/units/aircrafts/icons/XWINGAI_24.jpg delete mode 100644 resources/ui/units/aircrafts/icons/YWINGA_24.jpg delete mode 100644 resources/ui/units/aircrafts/icons/naboo_starfighter_AI_24.jpg delete mode 100644 resources/units/aircraft/AWINGA.yaml delete mode 100644 resources/units/aircraft/CORVETTEA.yaml delete mode 100644 resources/units/aircraft/FAUCON_AI.yaml delete mode 100644 resources/units/aircraft/HUNTERA.yaml delete mode 100644 resources/units/aircraft/TIE_AI.yaml delete mode 100644 resources/units/aircraft/TIE_BA.yaml delete mode 100644 resources/units/aircraft/TIE_INTERA.yaml delete mode 100644 resources/units/aircraft/XWINGAI.yaml delete mode 100644 resources/units/aircraft/YWINGA.yaml delete mode 100644 resources/units/aircraft/naboo_starfighter_AI.yaml diff --git a/game/ato/ai_flight_planner_db.py b/game/ato/ai_flight_planner_db.py index 905ea070..5eb888e7 100644 --- a/game/ato/ai_flight_planner_db.py +++ b/game/ato/ai_flight_planner_db.py @@ -128,16 +128,15 @@ from pydcs_extensions.a4ec.a4ec import A_4E_C from pydcs_extensions.a6a.a6a import VSN_A6A from pydcs_extensions.a7e.a7e import A_7E from pydcs_extensions.SWPack.SWPack import ( - TIE_AI, - HUNTERA, - TIE_INTERA, - AWINGA, - XWINGAI, - YWINGA, - CORVETTEA, - FAUCON_AI, - TIE_BA, - naboo_starfighter_AI, + TIE, + HUNTER, + TIE_INTER, + AWING, + XWING, + YWING, + CORVETTE, + tie_bomber_2, + naboo_starfighter, ) from pydcs_extensions.f100.f100 import VSN_F100 from pydcs_extensions.f104.f104 import VSN_F104C, VSN_F104G, VSN_F104S, VSN_F104S_AG @@ -172,14 +171,13 @@ from .flighttype import FlightType # Used for CAP, Escort, and intercept if there is not a specialised aircraft available ESCORT_CAPABLE = [ - TIE_AI, - HUNTERA, - XWINGAI, - AWINGA, - CORVETTEA, - FAUCON_AI, - TIE_INTERA, - naboo_starfighter_AI, + TIE, + HUNTER, + XWING, + AWING, + CORVETTE, + TIE_INTER, + naboo_starfighter, Su_57, F_22A, F_15C, @@ -266,8 +264,8 @@ CAP_CAPABLE = ESCORT_CAPABLE + [ # Used for CAS (Close air support) and BAI (Battlefield Interdiction) CAS_CAPABLE = [ - TIE_BA, - YWINGA, + tie_bomber_2, + YWING, A_10C_2, A_10C, Hercules, @@ -423,8 +421,8 @@ SEAD_CAPABLE = SEAD_ESCORT_CAPABLE + [ # Aircraft used for DEAD tasks. Must be capable of the CAS DCS task. DEAD_CAPABLE = SEAD_CAPABLE + [ - YWINGA, - TIE_BA, + YWING, + tie_bomber_2, AJS37, F_16A_MLU, F_16A, @@ -461,8 +459,8 @@ DEAD_CAPABLE = SEAD_CAPABLE + [ # Aircraft used for Strike mission STRIKE_CAPABLE = [ - YWINGA, - TIE_BA, + YWING, + tie_bomber_2, F_117A, B_1B, B_52H, diff --git a/pydcs_extensions/SWPack/SWPack.py b/pydcs_extensions/SWPack/SWPack.py index 7a60db7d..f9d15c79 100644 --- a/pydcs_extensions/SWPack/SWPack.py +++ b/pydcs_extensions/SWPack/SWPack.py @@ -76,6 +76,11 @@ class SWWeapons: "name": "ENERGY CELL", "weight": 2005, } + Lite_Jump_Core_Battery = { + "clsid": "{FHYPERCORE}", + "name": "Lite Jump Core Battery", + "weight": 50000, + } inject_weapons(SWWeapons) @@ -135,198 +140,6 @@ class XWING(PlaneType): task_default = task.CAP -@planemod -class XWINGAI(PlaneType): - id = "XWINGAI" - height = 5.63 - width = 6 - length = 19.43 - fuel_max = 10000 - max_speed = 1152.396 - chaff = 5000 - flare = 5000 - charge_total = 10000 - chaff_charge_size = 1 - flare_charge_size = 1 - category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 - - livery_name = "XWINGAI" # from type - Liveries = Liveries()[livery_name] - - class Pylon1: - PROTONM = (1, SWWeapons.PROTONM) - - class Pylon2: - PROTONM = (2, SWWeapons.PROTONM) - - ENERGY_CELL____ = (2, SWWeapons.ENERGY_CELL____) - - class Pylon3: - PROTONM = (3, SWWeapons.PROTONM) - - class Pylon4: - PROTONM = (4, SWWeapons.PROTONM) - - class Pylon5: - PROTONM = (5, SWWeapons.PROTONM) - - class Pylon6: - PROTONM = (6, SWWeapons.PROTONM) - - class Pylon10: - ENERGY_CELL____ = (10, SWWeapons.ENERGY_CELL____) - - pylons: Set[int] = {1, 2, 3, 4, 5, 6, 10} - - tasks = [ - task.CAP, - task.Escort, - task.FighterSweep, - task.Intercept, - task.Reconnaissance, - ] - task_default = task.CAP - - -@planemod -class YWINGA(PlaneType): - id = "YWINGA" - height = 5.63 - width = 20 - length = 19.43 - fuel_max = 10000 - max_speed = 1260.396 - chaff = 5000 - flare = 5000 - charge_total = 10000 - chaff_charge_size = 1 - flare_charge_size = 1 - category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 - - livery_name = "YWINGA" # from type - Liveries = Liveries()[livery_name] - - class Pylon1: - LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_ = ( - 1, - Weapons.LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_, - ) - PROTONMissile = ( - 1, - SWWeapons.PROTONMissile, - ) - Mk_84___2000lb_GP_Bomb_LD = ( - 1, - Weapons.Mk_84___2000lb_GP_Bomb_LD, - ) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 1, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - - class Pylon2: - LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_ = ( - 2, - Weapons.LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_, - ) - PROTONMissile = ( - 2, - SWWeapons.PROTONMissile, - ) - Mk_84___2000lb_GP_Bomb_LD = ( - 2, - Weapons.Mk_84___2000lb_GP_Bomb_LD, - ) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 2, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - - class Pylon3: - PROTONBGG = ( - 3, - SWWeapons.PROTONBGG, - ) - Mk_84___2000lb_GP_Bomb_LD = ( - 3, - Weapons.Mk_84___2000lb_GP_Bomb_LD, - ) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 3, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - - class Pylon4: - LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_ = ( - 4, - Weapons.LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_, - ) - PROTONMissile = ( - 4, - SWWeapons.PROTONMissile, - ) - Mk_84___2000lb_GP_Bomb_LD = ( - 4, - Weapons.Mk_84___2000lb_GP_Bomb_LD, - ) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 4, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - - class Pylon5: - LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_ = ( - 5, - Weapons.LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_, - ) - PROTONMissile = ( - 5, - SWWeapons.PROTONMissile, - ) - Mk_84___2000lb_GP_Bomb_LD = ( - 5, - Weapons.Mk_84___2000lb_GP_Bomb_LD, - ) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 5, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - - class Pylon6: - PROTONMissile = (6, SWWeapons.PROTONMissile) - LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_ = ( - 6, - Weapons.LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_, - ) - Mk_84___2000lb_GP_Bomb_LD = ( - 6, - Weapons.Mk_84___2000lb_GP_Bomb_LD, - ) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 6, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - - class Pylon7: - ENERGY_CELL___ = (7, SWWeapons.ENERGY_CELL___) - - class Pylon8: - ENERGY_CELL___ = (8, SWWeapons.ENERGY_CELL___) - - pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8} - - tasks = [ - task.CAS, - task.Escort, - task.FighterSweep, - task.Intercept, - task.Reconnaissance, - ] - task_default = task.CAS - - @planemod class YWING(PlaneType): id = "YWING" @@ -334,7 +147,7 @@ class YWING(PlaneType): height = 5.63 width = 10 length = 19.43 - fuel_max = 10000 + fuel_max = 7000 max_speed = 2649.996 chaff = 5000 flare = 5000 @@ -349,21 +162,66 @@ class YWING(PlaneType): class Pylon1: PROTONB = (1, SWWeapons.PROTONB) + Mk_84___2000lb_GP_Bomb_LD = (1, Weapons.Mk_84___2000lb_GP_Bomb_LD) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 1, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 1, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) class Pylon2: PROTONB = (2, SWWeapons.PROTONB) + Mk_84___2000lb_GP_Bomb_LD = (2, Weapons.Mk_84___2000lb_GP_Bomb_LD) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 2, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 2, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) class Pylon3: PROTONB = (3, SWWeapons.PROTONB) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 3, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 3, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) + Mk_84___2000lb_GP_Bomb_LD = (3, Weapons.Mk_84___2000lb_GP_Bomb_LD) class Pylon4: PROTONB = (4, SWWeapons.PROTONB) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 4, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 4, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) + Mk_84___2000lb_GP_Bomb_LD = (4, Weapons.Mk_84___2000lb_GP_Bomb_LD) class Pylon5: - PROTONB = (5, SWWeapons.PROTONB) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 5, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 5, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) + Mk_84___2000lb_GP_Bomb_LD = (5, Weapons.Mk_84___2000lb_GP_Bomb_LD) class Pylon6: - PROTONB = (6, SWWeapons.PROTONB) + Mk_84___2000lb_GP_Bomb_LD = (6, Weapons.Mk_84___2000lb_GP_Bomb_LD) + L_081_Fantasmagoria_ELINT_pod = (6, Weapons.L_081_Fantasmagoria_ELINT_pod) class Pylon7: ENERGY_CELL___ = (7, SWWeapons.ENERGY_CELL___) @@ -374,13 +232,68 @@ class YWING(PlaneType): pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8} tasks = [ + task.CAP, + task.Escort, + task.FighterSweep, + task.Intercept, + task.Reconnaissance, + task.GroundAttack, task.CAS, + task.AFAC, + task.RunwayAttack, + task.AntishipStrike, + ] + task_default = task.CAS + + +@planemod +class CORVETTE(PlaneType): + id = "CORVETTE" + flyable = True + height = 20.63 + width = 30 + length = 30.43 + fuel_max = 11000 + max_speed = 792.396 + chaff = 5000 + flare = 5000 + charge_total = 10000 + chaff_charge_size = 1 + flare_charge_size = 1 + category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} + radio_frequency = 127.5 + + livery_name = "CORVETTE" # from type + Liveries = Liveries()[livery_name] + + class Pylon3: + PROTONM3 = (3, SWWeapons.PROTONM3) + + class Pylon4: + PROTONM3 = (4, SWWeapons.PROTONM3) + + class Pylon5: + PROTONM3 = (5, SWWeapons.PROTONM3) + + class Pylon7: + PROTONM3 = (7, SWWeapons.PROTONM3) + + class Pylon8: + PROTONM3 = (8, SWWeapons.PROTONM3) + + class Pylon9: + PROTONM3 = (9, SWWeapons.PROTONM3) + + pylons: Set[int] = {3, 4, 5, 7, 8, 9} + + tasks = [ + task.CAP, task.Escort, task.FighterSweep, task.Intercept, task.Reconnaissance, ] - task_default = task.CAS + task_default = task.FighterSweep @planemod @@ -427,148 +340,6 @@ class AWING(PlaneType): task_default = task.CAP -@planemod -class AWINGA(PlaneType): - id = "AWINGA" - height = 5.63 - width = 10 - length = 19.43 - fuel_max = 10000 - max_speed = 1440.396 - chaff = 5000 - flare = 5000 - charge_total = 10000 - chaff_charge_size = 1 - flare_charge_size = 1 - category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 - - livery_name = "AWINGA" # from type - Liveries = Liveries()[livery_name] - - class Pylon1: - PROTONM1 = (1, SWWeapons.PROTONM1) - - class Pylon2: - ENERGY_CELL = (2, SWWeapons.ENERGY_CELL) - - class Pylon3: - PROTONM1 = (3, SWWeapons.PROTONM1) - - class Pylon10: - ENERGY_CELL = (10, SWWeapons.ENERGY_CELL) - - pylons: Set[int] = {1, 2, 3, 10} - - tasks = [ - task.CAP, - task.Escort, - task.FighterSweep, - task.Intercept, - task.Reconnaissance, - ] - task_default = task.CAP - - -@planemod -class CORVETTE(PlaneType): - id = "CORVETTE" - flyable = True - height = 5.63 - width = 30 - length = 19.43 - fuel_max = 11000 - max_speed = 792.396 - chaff = 5000 - flare = 5000 - charge_total = 10000 - chaff_charge_size = 1 - flare_charge_size = 1 - category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 - - livery_name = "CORVETTE" # from type - Liveries = Liveries()[livery_name] - - class Pylon3: - PROTONM3 = (3, SWWeapons.PROTONM3) - - class Pylon4: - PROTONM3 = (4, SWWeapons.PROTONM3) - - class Pylon5: - PROTONM3 = (5, SWWeapons.PROTONM3) - - class Pylon7: - PROTONM3 = (7, SWWeapons.PROTONM3) - - class Pylon8: - PROTONM3 = (8, SWWeapons.PROTONM3) - - class Pylon9: - PROTONM3 = (9, SWWeapons.PROTONM3) - - pylons: Set[int] = {3, 4, 5, 7, 8, 9} - - tasks = [ - task.CAP, - task.Escort, - task.FighterSweep, - task.Intercept, - task.Reconnaissance, - ] - task_default = task.CAP - - -@planemod -class CORVETTEA(PlaneType): - id = "CORVETTEA" - height = 5.63 - width = 30 - length = 19.43 - fuel_max = 11000 - max_speed = 648.396 - chaff = 5000 - flare = 5000 - charge_total = 10000 - chaff_charge_size = 1 - flare_charge_size = 1 - category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 - - livery_name = "CORVETTEA" # from type - Liveries = Liveries()[livery_name] - - class Pylon3: - PROTONM3 = (3, SWWeapons.PROTONM3) - - class Pylon4: - PROTONM3 = (4, SWWeapons.PROTONM3) - - class Pylon5: - PROTONM3 = (5, SWWeapons.PROTONM3) - - class Pylon7: - PROTONM3 = (7, SWWeapons.PROTONM3) - - class Pylon8: - PROTONM3 = (8, SWWeapons.PROTONM3) - - class Pylon9: - PROTONM3 = (9, SWWeapons.PROTONM3) - - pylons: Set[int] = {3, 4, 5, 7, 8, 9} - - tasks = [ - task.CAP, - task.Escort, - task.FighterSweep, - task.Intercept, - task.Reconnaissance, - ] - task_default = task.CAP - - @planemod class FAUCON(PlaneType): id = "FAUCON" @@ -576,8 +347,8 @@ class FAUCON(PlaneType): height = 5.63 width = 10 length = 19.43 - fuel_max = 10000 - max_speed = 2649.996 + fuel_max = 15000 + max_speed = 2304.396 chaff = 5000 flare = 5000 charge_total = 10000 @@ -592,41 +363,10 @@ class FAUCON(PlaneType): class Pylon1: PROTONF = (1, SWWeapons.PROTONF) - pylons: Set[int] = {1} + class Pylon2: + Lite_Jump_Core_Battery = (2, SWWeapons.Lite_Jump_Core_Battery) - tasks = [ - task.CAP, - task.Escort, - task.FighterSweep, - task.Intercept, - task.Reconnaissance, - ] - task_default = task.FighterSweep - - -@planemod -class FAUCON_AI(PlaneType): - id = "FAUCON_AI" - height = 5.63 - width = 20 - length = 19.43 - fuel_max = 10000 - max_speed = 2649.996 - chaff = 5000 - flare = 5000 - charge_total = 10000 - chaff_charge_size = 1 - flare_charge_size = 1 - category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 - - livery_name = "FAUCON_AI" # from type - Liveries = Liveries()[livery_name] - - class Pylon1: - PROTONF = (1, SWWeapons.PROTONF) - - pylons: Set[int] = {1} + pylons: Set[int] = {1, 2} tasks = [ task.CAP, @@ -676,43 +416,6 @@ class TIE(PlaneType): task_default = task.FighterSweep -@planemod -class TIE_AI(PlaneType): - id = "TIE_AI" - height = 5.63 - width = 5 - length = 19.43 - fuel_max = 8000 - max_speed = 1440 - chaff = 5000 - flare = 5000 - charge_total = 10000 - chaff_charge_size = 1 - flare_charge_size = 1 - category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 - - livery_name = "TIE_AI" # from type - Liveries = Liveries()[livery_name] - - class Pylon2: - ENERGY_CELL_ = (2, SWWeapons.ENERGY_CELL_) - - class Pylon10: - ENERGY_CELL_ = (10, SWWeapons.ENERGY_CELL_) - - pylons: Set[int] = {2, 10} - - tasks = [ - task.CAP, - task.Escort, - task.FighterSweep, - task.Intercept, - task.Reconnaissance, - ] - task_default = task.FighterSweep - - @planemod class HUNTER(PlaneType): id = "HUNTER" @@ -757,49 +460,6 @@ class HUNTER(PlaneType): task_default = task.CAP -@planemod -class HUNTERA(PlaneType): - id = "HUNTERA" - height = 5.63 - width = 5 - length = 19.43 - fuel_max = 10000 - max_speed = 1512.396 - chaff = 5000 - flare = 5000 - charge_total = 10000 - chaff_charge_size = 1 - flare_charge_size = 1 - category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 - - livery_name = "HUNTERA" # from type - Liveries = Liveries()[livery_name] - - class Pylon1: - PROTONM2 = (1, SWWeapons.PROTONM2) - - class Pylon2: - ENERGY_CELL__ = (2, SWWeapons.ENERGY_CELL__) - - class Pylon3: - PROTONM2 = (3, SWWeapons.PROTONM2) - - class Pylon10: - ENERGY_CELL__ = (10, SWWeapons.ENERGY_CELL__) - - pylons: Set[int] = {1, 2, 3, 10} - - tasks = [ - task.CAP, - task.Escort, - task.FighterSweep, - task.Intercept, - task.Reconnaissance, - ] - task_default = task.CAP - - @planemod class TIE_INTER(PlaneType): id = "TIE_INTER" @@ -844,49 +504,6 @@ class TIE_INTER(PlaneType): task_default = task.CAP -@planemod -class TIE_INTERA(PlaneType): - id = "TIE_INTERA" - height = 5.63 - width = 10 - length = 19.43 - fuel_max = 5000 - max_speed = 1548.396 - chaff = 5000 - flare = 5000 - charge_total = 10000 - chaff_charge_size = 1 - flare_charge_size = 1 - category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 - - livery_name = "TIE_INTERA" # from type - Liveries = Liveries()[livery_name] - - class Pylon1: - PROTONM1 = (1, SWWeapons.PROTONM1) - - class Pylon2: - ENERGY_CELL___ = (2, SWWeapons.ENERGY_CELL___) - - class Pylon3: - PROTONM1 = (3, SWWeapons.PROTONM1) - - class Pylon10: - ENERGY_CELL___ = (10, SWWeapons.ENERGY_CELL___) - - pylons: Set[int] = {1, 2, 3, 10} - - tasks = [ - task.CAP, - task.Escort, - task.FighterSweep, - task.Intercept, - task.Reconnaissance, - ] - task_default = task.CAP - - @planemod class naboo_starfighter(PlaneType): id = "naboo_starfighter" @@ -945,63 +562,6 @@ class naboo_starfighter(PlaneType): task_default = task.FighterSweep -@planemod -class naboo_starfighter_AI(PlaneType): - id = "naboo_starfighter_AI" - height = 5.63 - width = 6 - length = 19.43 - fuel_max = 10000 - max_speed = 1152.396 - chaff = 0 - flare = 500 - charge_total = 500 - chaff_charge_size = 1 - flare_charge_size = 1 - category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 - - livery_name = "NABOO_STARFIGHTER_AI" # from type - Liveries = Liveries()[livery_name] - - class Pylon1: - PROTONM = (1, SWWeapons.PROTONM) - - class Pylon2: - PROTONM = (2, SWWeapons.PROTONM) - ENERGY_CELL____ = (2, SWWeapons.ENERGY_CELL____) - - class Pylon3: - PROTONM = (3, SWWeapons.PROTONM) - - class Pylon4: - PROTONM = (4, SWWeapons.PROTONM) - - class Pylon5: - PROTONM = (5, SWWeapons.PROTONM) - - class Pylon6: - PROTONM = (6, SWWeapons.PROTONM) - - class Pylon10: - ENERGY_CELL____ = (10, SWWeapons.ENERGY_CELL____) - - pylons: Set[int] = {1, 2, 3, 4, 5, 6, 10} - - tasks = [ - task.CAP, - task.Escort, - task.FighterSweep, - task.Intercept, - task.Reconnaissance, - task.GroundAttack, - task.CAS, - task.AFAC, - task.RunwayAttack, - ] - task_default = task.FighterSweep - - @planemod class tie_bomber_2(PlaneType): id = "tie_bomber_2" @@ -1009,7 +569,7 @@ class tie_bomber_2(PlaneType): height = 5.63 width = 10 length = 19.43 - fuel_max = 10000 + fuel_max = 6000 max_speed = 2649.996 chaff = 5000 flare = 5000 @@ -1029,6 +589,14 @@ class tie_bomber_2(PlaneType): Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, ) Mk_84___2000lb_GP_Bomb_LD = (1, Weapons.Mk_84___2000lb_GP_Bomb_LD) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 1, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 1, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) class Pylon2: ENERGY_CELL___ = (2, SWWeapons.ENERGY_CELL___) @@ -1040,6 +608,14 @@ class tie_bomber_2(PlaneType): 3, Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, ) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 3, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 3, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) class Pylon4: TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( @@ -1048,6 +624,14 @@ class tie_bomber_2(PlaneType): ) PROTONM2 = (4, SWWeapons.PROTONM2) Mk_84___2000lb_GP_Bomb_LD = (4, Weapons.Mk_84___2000lb_GP_Bomb_LD) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 4, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 4, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) class Pylon5: TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( @@ -1056,14 +640,17 @@ class tie_bomber_2(PlaneType): ) PROTONM2 = (5, SWWeapons.PROTONM2) Mk_84___2000lb_GP_Bomb_LD = (5, Weapons.Mk_84___2000lb_GP_Bomb_LD) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 5, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 5, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) class Pylon6: - TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( - 6, - Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, - ) - PROTONM2 = (6, SWWeapons.PROTONM2) - Mk_84___2000lb_GP_Bomb_LD = (6, Weapons.Mk_84___2000lb_GP_Bomb_LD) + L_081_Fantasmagoria_ELINT_pod = (6, Weapons.L_081_Fantasmagoria_ELINT_pod) class Pylon7: TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( @@ -1071,6 +658,14 @@ class tie_bomber_2(PlaneType): Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, ) Mk_84___2000lb_GP_Bomb_LD = (7, Weapons.Mk_84___2000lb_GP_Bomb_LD) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 7, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 7, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) class Pylon8: TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( @@ -1079,6 +674,14 @@ class tie_bomber_2(PlaneType): ) PROTONM2 = (8, SWWeapons.PROTONM2) Mk_84___2000lb_GP_Bomb_LD = (8, Weapons.Mk_84___2000lb_GP_Bomb_LD) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 8, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 8, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) class Pylon9: TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( @@ -1086,6 +689,14 @@ class tie_bomber_2(PlaneType): Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, ) Mk_84___2000lb_GP_Bomb_LD = (9, Weapons.Mk_84___2000lb_GP_Bomb_LD) + Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__ = ( + 9, + Weapons.Kh_29T__AS_14_Kedge____670kg__ASM__TV_Guided__, + ) + Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr = ( + 9, + Weapons.Kh_58U__AS_11_Kilter____640kg__ARM__IN__Pas_Rdr, + ) class Pylon10: ENERGY_CELL___ = (10, SWWeapons.ENERGY_CELL___) @@ -1105,154 +716,6 @@ class tie_bomber_2(PlaneType): task_default = task.GroundAttack -@planemod -class TIE_BA(PlaneType): - id = "TIE_BA" - height = 5.63 - width = 10 - length = 19.43 - fuel_max = 5000 - max_speed = 1548.396 - chaff = 5000 - flare = 5000 - charge_total = 10000 - chaff_charge_size = 1 - flare_charge_size = 1 - category = "Interceptor" # {78EFB7A2-FD52-4b57-A6A6-3BF0E1D6555F} - radio_frequency = 127.5 - - livery_name = "TIE_BA" # from type - Liveries = Liveries()[livery_name] - - class Pylon1: - PROTONM1 = (1, SWWeapons.PROTONM1) - LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_ = ( - 1, - Weapons.LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_, - ) - Mk_84___2000lb_GP_Bomb_LD = (1, Weapons.Mk_84___2000lb_GP_Bomb_LD) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 1, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - - class Pylon2: - ENERGY_CELL___ = (2, SWWeapons.ENERGY_CELL___) - - class Pylon3: - PROTONM1 = (3, SWWeapons.PROTONM1) - LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_ = ( - 3, - Weapons.LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_, - ) - TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( - 3, - Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, - ) - Mk_84___2000lb_GP_Bomb_LD = (3, Weapons.Mk_84___2000lb_GP_Bomb_LD) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 3, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - - class Pylon4: - LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_ = ( - 4, - Weapons.LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_, - ) - TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( - 4, - Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, - ) - PROTONM2 = (4, SWWeapons.PROTONM2) - Mk_84___2000lb_GP_Bomb_LD = (4, Weapons.Mk_84___2000lb_GP_Bomb_LD) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 4, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - - class Pylon5: - LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_ = ( - 5, - Weapons.LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_, - ) - TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( - 5, - Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, - ) - PROTONM2 = (5, SWWeapons.PROTONM2) - Mk_84___2000lb_GP_Bomb_LD = (5, Weapons.Mk_84___2000lb_GP_Bomb_LD) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 5, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - - class Pylon6: - LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_ = ( - 6, - Weapons.LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_, - ) - TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( - 6, - Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, - ) - PROTONM2 = (6, SWWeapons.PROTONM2) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 6, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - Mk_84___2000lb_GP_Bomb_LD = (6, Weapons.Mk_84___2000lb_GP_Bomb_LD) - - class Pylon7: - LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_ = ( - 7, - Weapons.LAU_88_with_3_x_AGM_65D___Maverick_D__IIR_ASM_, - ) - TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( - 7, - Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, - ) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 7, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - Mk_84___2000lb_GP_Bomb_LD = (7, Weapons.Mk_84___2000lb_GP_Bomb_LD) - - class Pylon8: - TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( - 8, - Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, - ) - PROTONM2 = (8, SWWeapons.PROTONM2) - AGM_88C_HARM___High_Speed_Anti_Radiation_Missile = ( - 8, - Weapons.AGM_88C_HARM___High_Speed_Anti_Radiation_Missile, - ) - - class Pylon9: - TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD = ( - 9, - Weapons.TER_9A_with_3_x_Mk_82___500lb_GP_Bomb_LD, - ) - - class Pylon10: - ENERGY_CELL___ = (10, SWWeapons.ENERGY_CELL___) - - pylons: Set[int] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10} - - tasks = [ - task.CAP, - task.Escort, - task.FighterSweep, - task.Intercept, - task.Reconnaissance, - task.GroundAttack, - task.CAS, - task.RunwayAttack, - ] - task_default = task.CAS - - @vehiclemod class MBT9_EMPIRE(unittype.VehicleType): id = "MBT9_EMPIRE" diff --git a/resources/customized_payloads/AWING.lua b/resources/customized_payloads/AWING.lua index bbd6e546..8c6c9516 100644 --- a/resources/customized_payloads/AWING.lua +++ b/resources/customized_payloads/AWING.lua @@ -6,22 +6,14 @@ local unitPayloads = { ["name"] = "Liberation BARCAP", ["pylons"] = { [1] = { - ["CLSID"] = "{AFUEL}", - ["num"] = 10, - }, - [2] = { ["CLSID"] = "{PROTONM1}", ["num"] = 1, }, - [3] = { - ["CLSID"] = "{AFUEL}", - ["num"] = 2, - }, - [4] = { + [2] = { ["CLSID"] = "{PROTONM1}", ["num"] = 3, }, - }, + }, ["tasks"] = { [1] = 11, }, @@ -31,18 +23,10 @@ local unitPayloads = { ["name"] = "Liberation TARCAP", ["pylons"] = { [1] = { - ["CLSID"] = "{AFUEL}", - ["num"] = 10, - }, - [2] = { - ["CLSID"] = "{PROTONM1}", + "CLSID"] = "{PROTONM1}", ["num"] = 1, }, - [3] = { - ["CLSID"] = "{AFUEL}", - ["num"] = 2, - }, - [4] = { + [2] = { ["CLSID"] = "{PROTONM1}", ["num"] = 3, }, diff --git a/resources/customized_payloads/AWINGA.lua b/resources/customized_payloads/AWINGA.lua deleted file mode 100644 index 403fb9f2..00000000 --- a/resources/customized_payloads/AWINGA.lua +++ /dev/null @@ -1,67 +0,0 @@ -local unitPayloads = { - ["name"] = "AWINGA", - ["payloads"] = { - [1] = { - ["displayName"] = "Liberation TARCAP", - ["name"] = "Liberation TARCAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{AFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{AFUEL}", - ["num"] = 10, - }, - [3] = { - ["CLSID"] = "{PROTONM1}", - ["num"] = 3, - }, - [4] = { - ["CLSID"] = "{PROTONM1}", - ["num"] = 1, - }, - }, - ["tasks"] = { - [1] = 11, - [2] = 18, - [3] = 19, - [4] = 10, - [5] = 17, - }, - }, - [2] = { - ["displayName"] = "Liberation BARCAP", - ["name"] = "Liberation BARCAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{AFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{AFUEL}", - ["num"] = 10, - }, - [3] = { - ["CLSID"] = "{PROTONM1}", - ["num"] = 3, - }, - [4] = { - ["CLSID"] = "{PROTONM1}", - ["num"] = 1, - }, - }, - ["tasks"] = { - [1] = 11, - [2] = 18, - [3] = 19, - [4] = 10, - [5] = 17, - }, - }, - }, - ["tasks"] = { - }, - ["unitType"] = "AWINGA", -} -return unitPayloads diff --git a/resources/customized_payloads/CORVETTEA.lua b/resources/customized_payloads/CORVETTEA.lua deleted file mode 100644 index b785ca47..00000000 --- a/resources/customized_payloads/CORVETTEA.lua +++ /dev/null @@ -1,83 +0,0 @@ -local unitPayloads = { - ["name"] = "CORVETTEA", - ["payloads"] = { - [1] = { - ["displayName"] = "Liberation BARCAP", - ["name"] = "Liberation BARCAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 3, - }, - [2] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 4, - }, - [3] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 5, - }, - [4] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 7, - }, - [5] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 8, - }, - [6] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 9, - }, - }, - ["tasks"] = { - [1] = 11, - [2] = 18, - [3] = 19, - [4] = 10, - [5] = 17, - }, - }, - [2] = { - ["displayName"] = "Liberation TARCAP", - ["name"] = "Liberation TARCAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 3, - }, - [2] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 4, - }, - [3] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 5, - }, - [4] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 7, - }, - [5] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 8, - }, - [6] = { - ["CLSID"] = "{PROTONM3}", - ["num"] = 9, - }, - }, - ["tasks"] = { - [1] = 11, - [2] = 18, - [3] = 19, - [4] = 10, - [5] = 17, - }, - }, - }, - ["tasks"] = { - }, - ["unitType"] = "CORVETTEA", -} -return unitPayloads diff --git a/resources/customized_payloads/FAUCON_AI.lua b/resources/customized_payloads/FAUCON_AI.lua deleted file mode 100644 index cf30b06b..00000000 --- a/resources/customized_payloads/FAUCON_AI.lua +++ /dev/null @@ -1,26 +0,0 @@ -local unitPayloads = { - ["name"] = "FAUCON_AI", - ["payloads"] = { - [1] = { - ["displayName"] = "Liberation BARCAP", - ["name"] = "Liberation BARCAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{PROTONF}", - ["num"] = 1, - }, - }, - ["tasks"] = { - [1] = 11, - [2] = 18, - [3] = 19, - [4] = 10, - [5] = 17, - }, - }, - }, - ["tasks"] = { - }, - ["unitType"] = "FAUCON_AI", -} -return unitPayloads diff --git a/resources/customized_payloads/HUNTER.lua b/resources/customized_payloads/HUNTER.lua index 9f11e650..e525d2fb 100644 --- a/resources/customized_payloads/HUNTER.lua +++ b/resources/customized_payloads/HUNTER.lua @@ -6,18 +6,10 @@ local unitPayloads = { ["name"] = "Liberation BARCAP", ["pylons"] = { [1] = { - ["CLSID"] = "{HUNTFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{HUNTFUEL}", - ["num"] = 10, - }, - [3] = { ["CLSID"] = "{PROTONM2}", ["num"] = 1, }, - [4] = { + [2] = { ["CLSID"] = "{PROTONM2}", ["num"] = 3, }, @@ -35,18 +27,10 @@ local unitPayloads = { ["name"] = "Liberation TARCAP", ["pylons"] = { [1] = { - ["CLSID"] = "{HUNTFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{HUNTFUEL}", - ["num"] = 10, - }, - [3] = { ["CLSID"] = "{PROTONM2}", ["num"] = 1, }, - [4] = { + [2] = { ["CLSID"] = "{PROTONM2}", ["num"] = 3, }, diff --git a/resources/customized_payloads/HUNTERA.lua b/resources/customized_payloads/HUNTERA.lua deleted file mode 100644 index 737dfa1f..00000000 --- a/resources/customized_payloads/HUNTERA.lua +++ /dev/null @@ -1,67 +0,0 @@ -local unitPayloads = { - ["name"] = "HUNTERA", - ["payloads"] = { - [1] = { - ["displayName"] = "Liberation BARCAP", - ["name"] = "Liberation BARCAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{HUNTFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{HUNTFUEL}", - ["num"] = 10, - }, - [3] = { - ["CLSID"] = "{PROTONM2}", - ["num"] = 1, - }, - [4] = { - ["CLSID"] = "{PROTONM2}", - ["num"] = 3, - }, - }, - ["tasks"] = { - [1] = 11, - [2] = 18, - [3] = 19, - [4] = 10, - [5] = 17, - }, - }, - [2] = { - ["displayName"] = "Liberation TARCAP", - ["name"] = "Liberation TARCAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{HUNTFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{HUNTFUEL}", - ["num"] = 10, - }, - [3] = { - ["CLSID"] = "{PROTONM2}", - ["num"] = 1, - }, - [4] = { - ["CLSID"] = "{PROTONM2}", - ["num"] = 3, - }, - }, - ["tasks"] = { - [1] = 11, - [2] = 18, - [3] = 19, - [4] = 10, - [5] = 17, - }, - }, - }, - ["tasks"] = { - }, - ["unitType"] = "HUNTERA", -} -return unitPayloads diff --git a/resources/customized_payloads/TIE.lua b/resources/customized_payloads/TIE.lua index 5cc541dc..04fd4e89 100644 --- a/resources/customized_payloads/TIE.lua +++ b/resources/customized_payloads/TIE.lua @@ -4,15 +4,6 @@ local unitPayloads = { [1] = { ["name"] = "CAP", ["pylons"] = { - [1] = { - ["CLSID"] = "{TIEFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{TIEFUEL}", - ["num"] = 10, - }, - }, ["tasks"] = { [1] = CAP, diff --git a/resources/customized_payloads/TIEB.lua b/resources/customized_payloads/TIEB.lua index 38e5cda6..c951c245 100644 --- a/resources/customized_payloads/TIEB.lua +++ b/resources/customized_payloads/TIEB.lua @@ -57,43 +57,31 @@ local unitPayloads = { ["name"] = "Liberation CAS", ["pylons"] = { [1] = { - ["CLSID"] = "{TER_9A_3*MK-82}", - ["num"] = 10, - }, - [2] = { - ["CLSID"] = "{TER_9A_3*MK-82}", + ["CLSID"] = "{X-29T}", ["num"] = 9, }, - [3] = { - ["CLSID"] = "{TER_9A_3*MK-82}", + [2] = { + ["CLSID"] = "{X-29T}", ["num"] = 8, }, - [4] = { - ["CLSID"] = "{TER_9A_3*MK-82}", + [3] = { + ["CLSID"] = "{X-29T}", ["num"] = 7, }, - [5] = { - ["CLSID"] = "{TER_9A_3*MK-82}", - ["num"] = 6, - }, - [6] = { - ["CLSID"] = "{TER_9A_3*MK-82}", + [4] = { + ["CLSID"] = "{X-29T}", ["num"] = 5, }, - [7] = { - ["CLSID"] = "{TER_9A_3*MK-82}", + [5] = { + ["CLSID"] = "{X-29T}", ["num"] = 4, }, - [8] = { - ["CLSID"] = "{TER_9A_3*MK-82}", + [6] = { + ["CLSID"] = "{X-29T}", ["num"] = 3, }, - [9] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 2, - }, - [10] = { - ["CLSID"] = "{TER_9A_3*MK-82}", + [7] = { + ["CLSID"] = "{X-29T}", ["num"] = 1, }, }, @@ -101,6 +89,46 @@ local unitPayloads = { [1] = 32, }, }, + [3] = { + ["name"] = "Liberation SEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{0519A264-0AB6-11d6-9193-00A0249B6F00}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "{FE382A68-8620-4AC0-BDF5-709BFE3977D7}", + ["num"] = 5, + }, + [3] = { + ["CLSID"] = "{FE382A68-8620-4AC0-BDF5-709BFE3977D7}", + ["num"] = 4, + }, + [4] = { + ["CLSID"] = "{FE382A68-8620-4AC0-BDF5-709BFE3977D7}", + ["num"] = 3, + }, + [5] = { + ["CLSID"] = "{FE382A68-8620-4AC0-BDF5-709BFE3977D7}", + ["num"] = 1, + }, + [6] = { + ["CLSID"] = "{FE382A68-8620-4AC0-BDF5-709BFE3977D7}", + ["num"] = 8, + }, + [7] = { + ["CLSID"] = "{FE382A68-8620-4AC0-BDF5-709BFE3977D7}", + ["num"] = 9, + }, + [8] = { + ["CLSID"] = "{FE382A68-8620-4AC0-BDF5-709BFE3977D7}", + ["num"] = 7, + }, + }, + ["tasks"] = { + [1] = 32, + }, + }, }, ["tasks"] = { }, diff --git a/resources/customized_payloads/TIE_AI.lua b/resources/customized_payloads/TIE_AI.lua deleted file mode 100644 index 712074c1..00000000 --- a/resources/customized_payloads/TIE_AI.lua +++ /dev/null @@ -1,30 +0,0 @@ -local unitPayloads = { - ["name"] = "TIE_AI", - ["payloads"] = { - [1] = { - ["displayName"] = "CAP", - ["name"] = "Liberation CAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{TIEFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{TIEFUEL}", - ["num"] = 10, - }, - }, - ["tasks"] = { - [1] = 11, - [2] = 18, - [3] = 19, - [4] = 10, - [5] = 17, - }, - }, - }, - ["tasks"] = { - }, - ["unitType"] = "TIE_AI", -} -return unitPayloads diff --git a/resources/customized_payloads/TIE_BA.lua b/resources/customized_payloads/TIE_BA.lua deleted file mode 100644 index 89d7c54f..00000000 --- a/resources/customized_payloads/TIE_BA.lua +++ /dev/null @@ -1,192 +0,0 @@ -local unitPayloads = { - ["name"] = "TIE_BA", - ["payloads"] = { - [1] = { - ["displayName"] = "CAS", - ["name"] = "Liberation CAS", - ["pylons"] = { - [1] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 10, - }, - [2] = { - ["CLSID"] = "{PROTONM2}", - ["num"] = 8, - }, - [3] = { - ["CLSID"] = "{TER_9A_3*MK-82}", - ["num"] = 7, - }, - [4] = { - ["CLSID"] = "{TER_9A_3*MK-82}", - ["num"] = 6, - }, - [5] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 4, - }, - [6] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 3, - }, - [7] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 2, - }, - [8] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 1, - }, - [9] = { - ["CLSID"] = "{TER_9A_3*MK-82}", - ["num"] = 9, - }, - }, - ["tasks"] = { - [1] = 32, - }, - }, - [2] = { - ["name"] = "Liberation SEAD", - ["pylons"] = { - [1] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 7, - }, - [2] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 6, - }, - [3] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 5, - }, - [4] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 4, - }, - [5] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 3, - }, - [6] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 2, - }, - [7] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 1, - }, - [8] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 8, - }, - [9] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 10, - }, - }, - ["tasks"] = { - [1] = 31, - }, - }, - [3] = { - ["displayName"] = "Liberation DEAD", - ["name"] = "Liberation DEAD", - ["pylons"] = { - [1] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 7, - }, - [2] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 6, - }, - [3] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 5, - }, - [4] = { - ["CLSID"] = "{PROTONM2}", - ["num"] = 4, - }, - [5] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 3, - }, - [6] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 2, - }, - [7] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 10, - }, - [8] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 1, - }, - [9] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 8, - }, - }, - ["tasks"] = { - [1] = 31, - }, - }, - [4] = { - ["displayName"] = "Liberation CAS", - ["name"] = "Liberation CAS", - ["pylons"] = { - [1] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 1, - }, - [2] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 2, - }, - [3] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 3, - }, - [4] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 4, - }, - [5] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 5, - }, - [6] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 6, - }, - [7] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 7, - }, - [8] = { - ["CLSID"] = "{PROTONM2}", - ["num"] = 8, - }, - [9] = { - ["CLSID"] = "{TER_9A_3*MK-82}", - ["num"] = 9, - }, - [10] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 10, - }, - }, - ["tasks"] = { - [1] = 31, - }, - }, - }, - ["tasks"] = { - }, - ["unitType"] = "TIE_BA", -} -return unitPayloads diff --git a/resources/customized_payloads/TIE_INTER.lua b/resources/customized_payloads/TIE_INTER.lua index 4518d135..42725368 100644 --- a/resources/customized_payloads/TIE_INTER.lua +++ b/resources/customized_payloads/TIE_INTER.lua @@ -6,18 +6,10 @@ local unitPayloads = { ["name"] = "Liberation BARCAP", ["pylons"] = { [1] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 10, - }, - [3] = { ["CLSID"] = "{PROTONM1}", ["num"] = 1, }, - [4] = { + [2] = { ["CLSID"] = "{PROTONM1}", ["num"] = 3, }, @@ -35,18 +27,10 @@ local unitPayloads = { ["name"] = "Liberation TARCAP", ["pylons"] = { [1] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 10, - }, - [3] = { ["CLSID"] = "{PROTONM1}", ["num"] = 1, }, - [4] = { + [2] = { ["CLSID"] = "{PROTONM1}", ["num"] = 3, }, diff --git a/resources/customized_payloads/TIE_INTERA.lua b/resources/customized_payloads/TIE_INTERA.lua deleted file mode 100644 index 196349a7..00000000 --- a/resources/customized_payloads/TIE_INTERA.lua +++ /dev/null @@ -1,67 +0,0 @@ -local unitPayloads = { - ["name"] = "TIE_INTERA", - ["payloads"] = { - [1] = { - ["displayName"] = "Liberation TARCAP", - ["name"] = "Liberation TARCAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 10, - }, - [3] = { - ["CLSID"] = "{PROTONM1}", - ["num"] = 1, - }, - [4] = { - ["CLSID"] = "{PROTONM1}", - ["num"] = 3, - }, - }, - ["tasks"] = { - [1] = 11, - [2] = 18, - [3] = 19, - [4] = 10, - [5] = 17, - }, - }, - [2] = { - ["displayName"] = "Liberation BARCAP", - ["name"] = "Liberation BARCAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 2, - }, - [2] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 10, - }, - [3] = { - ["CLSID"] = "{PROTONM1}", - ["num"] = 1, - }, - [4] = { - ["CLSID"] = "{PROTONM1}", - ["num"] = 3, - }, - }, - ["tasks"] = { - [1] = 11, - [2] = 18, - [3] = 19, - [4] = 10, - [5] = 17, - }, - }, - }, - ["tasks"] = { - }, - ["unitType"] = "TIE_INTERA", -} -return unitPayloads diff --git a/resources/customized_payloads/XWING.lua b/resources/customized_payloads/XWING.lua index 79fbdf1b..053144ff 100644 --- a/resources/customized_payloads/XWING.lua +++ b/resources/customized_payloads/XWING.lua @@ -10,8 +10,8 @@ local unitPayloads = { ["num"] = 1, }, [2] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 2, + ["CLSID"] = "{PROTONM}", + ["num"] = 6, }, [3] = { ["CLSID"] = "{PROTONM}", @@ -25,14 +25,6 @@ local unitPayloads = { ["CLSID"] = "{PROTONM}", ["num"] = 5, }, - [6] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 10, - }, - [7] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 6, - }, }, ["tasks"] = { [1] = 11, @@ -51,8 +43,8 @@ local unitPayloads = { ["num"] = 1, }, [2] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 2, + ["CLSID"] = "{PROTONM}", + ["num"] = 6, }, [3] = { ["CLSID"] = "{PROTONM}", @@ -66,14 +58,6 @@ local unitPayloads = { ["CLSID"] = "{PROTONM}", ["num"] = 5, }, - [6] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 10, - }, - [7] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 6, - }, }, ["tasks"] = { [1] = 11, @@ -83,6 +67,34 @@ local unitPayloads = { [5] = 17, }, }, + [1] = { + ["name"] = "Liberation CAS", + ["pylons"] = { + [1] = { + ["CLSID"] = "{X-29T}", + ["num"] = 2, + }, + [2] = { + ["CLSID"] = "{X-29T}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{X-29T}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{X-29T}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{X-29T}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 31, + }, + }, }, ["tasks"] = { }, diff --git a/resources/customized_payloads/XWINGAI.lua b/resources/customized_payloads/XWINGAI.lua deleted file mode 100644 index 5a6c8382..00000000 --- a/resources/customized_payloads/XWINGAI.lua +++ /dev/null @@ -1,85 +0,0 @@ -local unitPayloads = { - ["name"] = "XWINGAI", - ["payloads"] = { - [1] = { - ["displayName"] = "Liberation TARCAP", - ["name"] = "Liberation TARCAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 10, - }, - [2] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 6, - }, - [3] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 5, - }, - [4] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 4, - }, - [5] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 3, - }, - [6] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 2, - }, - [7] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 1, - }, - }, - ["tasks"] = { - [1] = 19, - [2] = 11, - }, - }, - [2] = { - ["displayName"] = "Liberation BARCAP", - ["name"] = "Liberation BARCAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 10, - }, - [2] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 6, - }, - [3] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 5, - }, - [4] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 4, - }, - [5] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 3, - }, - [6] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 2, - }, - [7] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 1, - }, - }, - ["tasks"] = { - [1] = 19, - [2] = 11, - }, - }, - }, - ["tasks"] = { - }, - ["unitType"] = "XWINGAI", -} -return unitPayloads diff --git a/resources/customized_payloads/YWING.lua b/resources/customized_payloads/YWING.lua index 27411dbe..afb8b0d3 100644 --- a/resources/customized_payloads/YWING.lua +++ b/resources/customized_payloads/YWING.lua @@ -2,7 +2,7 @@ local unitPayloads = { ["name"] = "YWING", ["payloads"] = { [1] = { - ["name"] = "Liberation CAS", + ["name"] = "Liberation CAS Player", ["pylons"] = { [1] = { ["CLSID"] = "{PROTONB}", @@ -17,6 +17,71 @@ local unitPayloads = { [1] = 31, }, }, + [2] = { + ["name"] = "Liberation CAS", + ["pylons"] = { + [1] = { + ["CLSID"] = "{X-29T}", + ["num"] = 2, + }, + [2] = { + ["CLSID"] = "{X-29T}", + ["num"] = 1, + }, + [3] = { + ["CLSID"] = "{X-29T}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{X-29T}", + ["num"] = 4, + }, + [5] = { + ["CLSID"] = "{X-29T}", + ["num"] = 5, + }, + }, + ["tasks"] = { + [1] = 31, + }, + }, + [3] = { + ["displayName"] = "SEAD", + ["name"] = "SEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{B5CA9846-776E-4230-B4FD-8BCC9BFB1676}", + ["num"] = 6, + }, + [2] = { + ["CLSID"] = "{B5CA9846-776E-4230-B4FD-8BCC9BFB1676}", + ["num"] = 5, + }, + [3] = { + ["CLSID"] = "{B5CA9846-776E-4230-B4FD-8BCC9BFB1676}", + ["num"] = 4, + }, + [4] = { + ["CLSID"] = "{B5CA9846-776E-4230-B4FD-8BCC9BFB1676}", + ["num"] = 3, + }, + [5] = { + ["CLSID"] = "{B5CA9846-776E-4230-B4FD-8BCC9BFB1676}", + ["num"] = 2, + }, + [6] = { + ["CLSID"] = "{B5CA9846-776E-4230-B4FD-8BCC9BFB1676}", + ["num"] = 1, + }, + [7] = { + ["CLSID"] = "{0519A264-0AB6-11d6-9193-00A0249B6F00}", + ["num"] = 7, + }, + }, + ["tasks"] = { + [1] = 31, + }, + }, }, ["tasks"] = { }, diff --git a/resources/customized_payloads/YWINGA.lua b/resources/customized_payloads/YWINGA.lua deleted file mode 100644 index c3a7ef0f..00000000 --- a/resources/customized_payloads/YWINGA.lua +++ /dev/null @@ -1,150 +0,0 @@ -local unitPayloads = { - ["name"] = "YWINGA", - ["payloads"] = { - [1] = { - ["displayName"] = "Liberation DEAD", - ["name"] = "A/G", - ["pylons"] = { - [1] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 1, - }, - [2] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 2, - }, - [3] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 4, - }, - [4] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 5, - }, - }, - ["tasks"] = { - [1] = 32, - [2] = 31, - [3] = 16, - [4] = 34, - [5] = 17, - [6] = 30, - }, - }, - [2] = { - ["name"] = "Liberation CAS", - ["pylons"] = { - [1] = { - ["CLSID"] = "{PROTONBGG}", - ["num"] = 3, - }, - [2] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 4, - }, - [3] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 1, - }, - [4] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 2, - }, - [5] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 5, - }, - [6] = { - ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", - ["num"] = 6, - }, - [7] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 7, - }, - [8] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 8, - }, - }, - ["tasks"] = { - [1] = 31, - }, - }, - [3] = { - ["displayName"] = "Liberation CAP", - ["name"] = "Liberation CAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{PROTONMissile}", - ["num"] = 4, - }, - [2] = { - ["CLSID"] = "{PROTONMissile}", - ["num"] = 5, - }, - [3] = { - ["CLSID"] = "{PROTONMissile}", - ["num"] = 2, - }, - [4] = { - ["CLSID"] = "{PROTONMissile}", - ["num"] = 1, - }, - }, - ["tasks"] = { - [1] = 31, - }, - }, - [4] = { - ["displayName"] = "Liberation SEAD", - ["name"] = "Liberation SEAD", - ["pylons"] = { - [1] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 5, - }, - [2] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 4, - }, - [3] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 2, - }, - [4] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 1, - }, - [5] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 6, - }, - [6] = { - ["CLSID"] = "{B06DD79A-F21E-4EB9-BD9D-AB3844618C9C}", - ["num"] = 3, - }, - [7] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 7, - }, - [8] = { - ["CLSID"] = "{TIRFUEL}", - ["num"] = 8, - }, - }, - ["tasks"] = { - [1] = 32, - [2] = 31, - [3] = 16, - [4] = 34, - [5] = 17, - [6] = 30, - }, - }, - }, - ["tasks"] = { - }, - ["unitType"] = "YWINGA", -} -return unitPayloads diff --git a/resources/customized_payloads/naboo_starfighter.lua b/resources/customized_payloads/naboo_starfighter.lua index 3a0bcbc4..702163a5 100644 --- a/resources/customized_payloads/naboo_starfighter.lua +++ b/resources/customized_payloads/naboo_starfighter.lua @@ -5,8 +5,8 @@ local unitPayloads = { ["name"] = "Liberation CAP", ["pylons"] = { [1] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 10, + ["CLSID"] = "{PROTONM}", + ["num"] = 5, }, [2] = { ["CLSID"] = "{PROTONM}", @@ -17,21 +17,13 @@ local unitPayloads = { ["num"] = 3, }, [4] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 2, + ["CLSID"] = "{PROTONM}", + ["num"] = 6, }, [5] = { ["CLSID"] = "{PROTONM}", ["num"] = 1, }, - [6] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 5, - }, - [7] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 6, - }, }, ["tasks"] = { [1] = 11, @@ -41,30 +33,22 @@ local unitPayloads = { ["name"] = "Liberation ESCORT", ["pylons"] = { [1] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 10, - }, - [2] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 3, - }, - [3] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 4, - }, - [4] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 2, - }, - [5] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 6, - }, - [6] = { ["CLSID"] = "{PROTONM}", ["num"] = 5, }, - [7] = { + [2] = { + ["CLSID"] = "{PROTONM}", + ["num"] = 4, + }, + [3] = { + ["CLSID"] = "{PROTONM}", + ["num"] = 3, + }, + [4] = { + ["CLSID"] = "{PROTONM}", + ["num"] = 6, + }, + [5] = { ["CLSID"] = "{PROTONM}", ["num"] = 1, }, diff --git a/resources/customized_payloads/naboo_starfighter_AI.lua b/resources/customized_payloads/naboo_starfighter_AI.lua deleted file mode 100644 index 15989d83..00000000 --- a/resources/customized_payloads/naboo_starfighter_AI.lua +++ /dev/null @@ -1,81 +0,0 @@ -local unitPayloads = { - ["name"] = "naboo_starfighter_AI", - ["payloads"] = { - [1] = { - ["name"] = "Liberation CAP", - ["pylons"] = { - [1] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 10, - }, - [2] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 4, - }, - [3] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 3, - }, - [4] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 2, - }, - [5] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 1, - }, - [6] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 5, - }, - [7] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 6, - }, - }, - ["tasks"] = { - [1] = 11, - }, - }, - [2] = { - ["name"] = "Liberation ESCORT", - ["pylons"] = { - [1] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 10, - }, - [2] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 3, - }, - [3] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 4, - }, - [4] = { - ["CLSID"] = "{XFUELTANK}", - ["num"] = 2, - }, - [5] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 6, - }, - [6] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 5, - }, - [7] = { - ["CLSID"] = "{PROTONM}", - ["num"] = 1, - }, - }, - ["tasks"] = { - [1] = 19, - }, - }, - }, - ["tasks"] = { - }, - ["unitType"] = "naboo_starfighter_AI", -} -return unitPayloads diff --git a/resources/factions/Rebel_Alliance_AI.json b/resources/factions/Rebel_Alliance_AI.json deleted file mode 100644 index b57bb935..00000000 --- a/resources/factions/Rebel_Alliance_AI.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "country": "Combined Joint Task Forces Blue", - "name": "Rebel Alliance_AI", - "authors": "Fuzzle", - "description": "
A more modern NATO mixed faction reflecting the units involved in Operation Iraqi Freedom.
", - "aircrafts": [ - "A-10C Thunderbolt II (Suite 3)", - "AH-64D Apache Longbow", - "AH-64D Apache Longbow (AI)", - "AV-8B Harrier II Night Attack", - "B-1B Lancer", - "B-52H Stratofortress", - "C-130", - "C-130J-30 Super Hercules", - "F-117A Nighthawk", - "F-14A Tomcat (Block 135-GR Late)", - "F-14B Tomcat", - "F-15C Eagle", - "F-15E Strike Eagle", - "F-16CM Fighting Falcon (Block 50)", - "F-22A Raptor", - "F/A-18C Hornet (Lot 20)", - "Mirage 2000C", - "OH-58D Kiowa Warrior", - "S-3B Viking", - "SA 342L Gazelle", - "SA 342M Gazelle", - "SA 342M Gazelle Mistral", - "Tornado GR4", - "UH-1H Iroquois", - "UH-60A", - "UH-60L", - "XWINGAI", - "AWINGA", - "YWINGA", - "FAUCON_AI", - "naboo_starfighter_AI" - ], - "awacs": [ - "E-2C Hawkeye", - "E-3A" - ], - "tankers": [ - "KC-130", - "KC-130J", - "KC-135 Stratotanker", - "S-3B Tanker" - ], - "frontline_units": [ - "FV4034 Challenger 2", - "FV510 Warrior", - "LAV-25", - "M1043 HMMWV (M2 HMG)", - "M1045 HMMWV (BGM-71 TOW)", - "M1097 Heavy HMMWV Avenger", - "M1134 Stryker ATGM (BGM-71 TOW)", - "M1A2 Abrams", - "M2A2 Bradley", - "VAB Mephisto", - "MBT9_REBEL", - "MBT9_AAA REBEL" - ], - "artillery_units": [ - "M109A6 Paladin", - "M270 Multiple Launch Rocket System" - ], - "logistics_units": [ - "Truck M818 6x6" - ], - "infantry_units": [ - "Infantry M249", - "Infantry M4", - "MANPADS Stinger" - ], - "preset_groups": [ - "Hawk", - "Rapier", - "Roland", - "Patriot" - ], - "naval_units": [ - "FFG Oliver Hazard Perry", - "DDG Arleigh Burke IIa", - "CG Ticonderoga", - "LHA-1 Tarawa", - "CVN-74 John C. Stennis" - ], - "missiles": [], - "air_defense_units": [ - "SAM Patriot STR", - "M163 Vulcan Air Defense System", - "M1097 Heavy HMMWV Avenger", - "M48 Chaparral", - "MBT9_AAA REBEL" - ], - "requirements": {}, - "carrier_names": [ - "CVN-71 Theodore Roosevelt" - ], - "helicopter_carrier_names": [ - "LHA-1 Tarawa", - "LHA-4 Nassau" - ], - "has_jtac": true, - "jtac_unit": "MQ-9 Reaper", - "unrestricted_satnav": true -} \ No newline at end of file diff --git a/resources/factions/russia_Galactic_Empire_Player.json b/resources/factions/SW_Galactic_Empire.json similarity index 96% rename from resources/factions/russia_Galactic_Empire_Player.json rename to resources/factions/SW_Galactic_Empire.json index 416a1619..912d1713 100644 --- a/resources/factions/russia_Galactic_Empire_Player.json +++ b/resources/factions/SW_Galactic_Empire.json @@ -32,11 +32,6 @@ "HUNTER", "TIE_INTER", "CORVETTE", - "TIE_AI", - "HUNTERA", - "TIE_INTERA", - "CORVETTEA", - "TIE_BA", "tie_bomber_2" ], "awacs": [ diff --git a/resources/factions/Rebel_Alliance_Player.json b/resources/factions/SW_Rebel_Alliance.json similarity index 96% rename from resources/factions/Rebel_Alliance_Player.json rename to resources/factions/SW_Rebel_Alliance.json index be1464e5..f4fea34a 100644 --- a/resources/factions/Rebel_Alliance_Player.json +++ b/resources/factions/SW_Rebel_Alliance.json @@ -34,11 +34,6 @@ "YWING", "FAUCON", "AWING", - "XWINGAI", - "AWINGA", - "YWINGA", - "FAUCON_AI", - "naboo_starfighter_AI", "naboo_starfighter" ], "awacs": [ diff --git a/resources/factions/russia_Galactic_Empire_AI.json b/resources/factions/russia_Galactic_Empire_AI.json deleted file mode 100644 index 15940555..00000000 --- a/resources/factions/russia_Galactic_Empire_AI.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "country": "Russia", - "name": "russia Galactic Empire AI", - "authors": "Pan_de", - "description": "Empire strikes back
", - "locales": [ - "ru_RU" - ], - - "aircrafts": [ - "IL-76MD", - "Ka-50 Hokum", - "Ka-50 Hokum (Blackshark 3)", - "L-39ZA Albatros", - "Mi-24V Hind-E", - "Mi-24P Hind-F", - "Mi-28N Havoc", - "Mi-8MTV2 Hip", - "MiG-29S Fulcrum-C", - "MiG-31 Foxhound", - "Su-24M Fencer-D", - "Su-25 Frogfoot", - "Su-25T Frogfoot", - "Su-33 Flanker-D", - "Su-34 Fullback", - "Su-57 Felon", - "Tu-142 Bear-F", - "Tu-160 Blackjack", - "Tu-22M3 Backfire-C", - "Tu-95MS Bear-H", - "TIE_AI", - "HUNTERA", - "TIE_INTERA", - "CORVETTEA", - "TIE_BA" - ], - "awacs": [ - "A-50" - ], - "tankers": [ - "IL-78M" - ], - "frontline_units": [ - "SA-19 Grison (2K22 Tunguska)", - "T-72B with Kontakt-1 ERA", - "SW - TR_TT", - "MBT9_EMPIRE", - "MBT9_AAA EMPIRE", - "TB_TT", - "Jugger" - ], - "artillery_units": [ - "2S19 Msta-S", - "BM-27 Uragan" - ], - "logistics_units": [ - "LUV UAZ-469 Jeep", - "Truck Ural-375", - "Gozanti" - - ], - "infantry_units": [ - "Infantry AK-74 Rus", - "MANPADS SA-18 Igla-S \"Grouse\"", - "Paratrooper AKS", - "Paratrooper RPG-16" - ], - "missiles": [], - "preset_groups": [ - "SA-11", - "SA-10/S-300PS", - "SA-10B/S-300PS", - "SA-17", - "SA-12/S-300V", - "SA-20/S-300PMU-1", - "SA-20B/S-300PMU-2", - "SA-23/S-300VM", - "Russian Navy" - ], - "naval_units": [ - "Destroyer_carrier", - "Corvette 1241.1 Molniya", - "CV 1143.5 Admiral Kuznetsov" - ], - "air_defense_units": [ - "EWR 1L13", - "EWR 55G6", - "SAM SA-8 Osa \"Gecko\" TEL", - "SA-9 Strela", - "SA-13 Gopher (9K35 Strela-10M3)", - "SA-15 Tor", - "SA-19 Grison (2K22 Tunguska)", - "ZU-23 on Ural-375", - "ZSU-23-4 Shilka", - "MBT9_AAA EMPIRE" - ], - "helicopter_carrier_names": [], - "requirements": { - "SU-57 Felon By CubanAce Simulations": "https://www.digitalcombatsimulator.com/fr/files/2539621/" - }, - "carrier_names": [ - "Admiral Kuznetsov" - ], - "has_jtac": true, - "jtac_unit": "MQ-9 Reaper" -} \ No newline at end of file diff --git a/resources/ui/units/aircrafts/banners/AWINGA_24.jpg b/resources/ui/units/aircrafts/banners/AWINGA_24.jpg deleted file mode 100644 index 700856653b8690a08a76cbb63bb13a51c80b34d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 46029 zcmeFYcU)85vM?M)MMXqFdX*wd?;RpaM?gS&iS!a6bV7}afYKr$AYG(Mjg)}WLPwfN z?=AG6Py+<`;`5y6+;iXGx$k$+{e9p4>#StKUTe?HnwhoM?3ukL7h@N5fII5SYRZ61 zmo5QR2_L}4JU~kc>SzZ5Xlequ0RX^tz~xI603yQGCBg>~?g+T@$29kh}*?YzLlfWu+=;NYl<`sBlwW*|1n7!#heVzrv{GqXn^5OH5_8wq9?mbs?T#
zn%NZV+cuiQL&UVyj^y!5=QtY|n*-iK&XOw?RZk!T3P>BLSfkRv+T&n1kKQ$quTz*D
z$BjGI Tjnz
zx(sQr93V#e=wMB`ne>&X# 1vy)s%jtUGFs%!2o 4p!cZt%&&GE2&3{Re{^VYaL-?OgwL1BF0JYO*;Y0pHQLhdb-j`<
zIE5XDwWNDQ@m#X!narO-P$Jr;uv7%jPT-Txxs&%UTed36b PJDtWk`cZiPVi}zDkV{
z!U@Y65N9aYXBe}z$5s27N2|I@z7;!TGEp#5RaG#763vhf|L$m66xovZq}0FjsI;IF
z@=l;aDs48@qT3v499nxgR4$mWAv9b>EjGIz6#hr)(oa@j92wVxYWG}m!YrY9!M%*_
z>prCW4d!CNzausiU8y2_z;`pgI-1wlz$aRQh5)-ATkXtcg(JXF fZqc`n38nO4OYi_l}W&y
z-CC_Uq8-LdwuM@!0j3|X%lrAzQH^t7jq_qWoA1bwVtf?DS@C73v7_7P%BD2qn!Su?
z2Q#WI5U=31DSn_FFf3_#k|`b8dcr{|&m>)~%n1 ed@{7h5R>DlM^T;pa<;_IR3vR_t);lQck;$XC)^>DOYTvSzXe2S#Y}N}Go<{;H@j6I;`9I^mZg%t)||%5vN0PHId=j{
zdS?kON7aPwkL3lpM2(;u^NIn3;)1Rg)xI{rHy=#0@rC9qQ35xxD4&M*2bR%6$-}kV
zfOFysv?CEVlwGZ60r9H`J~T%teuv$@yV9tmq6Ot?5+Xu;j0OokNfJCaPcwU-J2t0t
z-rDA~-zU5NN@^@JBnYDnIvTgb;ug08i2QYV&XI0*&f%1M6;p5v`Gf%1>Tx}t%d10~
zWDC}^Rr{MlMhQX6dR6SGL+bwY=8aUtMYa8r4QsFt6wn|8n`C!Z+kIoR6LsKz0I@%?
zxV7gawyA~*R~1?AExn6i(Q0|u?-=3e-m>m9fzop4iY>pZEFTeeq^7T9oYlPy$=fYrBi2Au2gFtP;S=@enck$zU
zz58_uKVcdI_tdb|ok#qYuz1yHcehMnTOP!@#xkgU4s>panX+Yh{eHUA7;py>Ug&@L
zIn%gDcQCt9h_7^mWEK;ATdZWmK6$4gAw9H?tuzQxB!=lFZC_SSmFa)Hbyyz9Hr);7
z)KjupuZ4^8!WOpEptj?4f#3B>85I`6j(D_elPrP-CzWp7)0(u#=jJnTR6)OHdLn*S
zeHa5el|m+T7klzaQzGR)k21Av$Hkkze$(6bT#5mJ?Xk-~oAOZ;rG(eZ8$Z1mNQl+X
z^kSJ;tLxK25+-Vsa%Dd5_My;Z>72J=L-CF0(ij8<(B%~nK>=Lkt
}s)6{f^kZr$(E$z;EA^jrp9x?lSX9ZppFHee9cI
z3x}U8Doc3Mh;?e6qg$6TILcmwcqOj~k_%0UdFLW@L$i;2;0J^cwXAH-B0N)K?0sk0
zK$BK$G$xrQX0|~#Dx}Tw8w{IXT!}vXLbb1bNhWhn$_HRK{rt`alD^@XKUUSK9}l6J
zSr#?=-usXk1DtS;&LnA=bp}YEr1ohmdY@)qrI6u;rrRcYhQubFIX^gL8JDV=Tt7i<
zD^m
(ZI$CibC?^=jQV`8uU40TcxvIoNOajfi3cf_cQ
zyDFHhR!BH{>wV-wCcA|KBXupK3^Tv+xv6!VWtt}Yrw$foC7QgX*_X-sP}K>VXG
zeYWgF(}{ZoKY
Wna$@~-b>0R3hji396mBLw;ATxe=0`C5cb!CK2$E8pPvvo+KE7!+B)kne&YC-`-
z8IkFwXaM5!6W;IN)s