From e4fbaf84803370b73eb52c43a21ed014168b3b70 Mon Sep 17 00:00:00 2001 From: Pande4360 <114622967+Pande4360@users.noreply.github.com> Date: Sun, 11 Jun 2023 23:49:17 +0200 Subject: [PATCH] Sw patch (#140) * Fixed some tasks * Fixed some tasks * slimmed down faction * slimmed down faction * Fixed Tasks * test size fix * -test size fix +tasks * tasks * Loadout: added BAI and strike --- pydcs_extensions/SWPack/SWPack.py | 18 +-- resources/customized_payloads/TIEB.lua | 148 ++++++++++++++++++ resources/customized_payloads/YWING.lua | 88 +++++++++++ resources/factions/SW_Empire.json | 34 +--- resources/factions/SW_Rebel_Alliance.json | 42 ----- resources/units/aircraft/HUNTER.yaml | 1 + resources/units/aircraft/TIE.yaml | 1 + resources/units/aircraft/TIE_INTER.yaml | 1 + resources/units/aircraft/XWING.yaml | 1 + resources/units/aircraft/YWING.yaml | 7 +- .../units/aircraft/naboo_starfighter.yaml | 7 +- resources/units/aircraft/tie_bomber_2.yaml | 7 +- 12 files changed, 250 insertions(+), 105 deletions(-) diff --git a/pydcs_extensions/SWPack/SWPack.py b/pydcs_extensions/SWPack/SWPack.py index cb1d6945..03bff975 100644 --- a/pydcs_extensions/SWPack/SWPack.py +++ b/pydcs_extensions/SWPack/SWPack.py @@ -229,16 +229,12 @@ 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.SEAD, ] task_default = task.CAS @@ -544,10 +540,6 @@ class naboo_starfighter(PlaneType): task.FighterSweep, task.Intercept, task.Reconnaissance, - task.GroundAttack, - task.CAS, - task.AFAC, - task.RunwayAttack, ] task_default = task.FighterSweep @@ -693,16 +685,12 @@ class tie_bomber_2(PlaneType): 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.SEAD, task.GroundAttack, task.CAS, task.RunwayAttack, ] - task_default = task.GroundAttack + task_default = task.CAS @vehiclemod diff --git a/resources/customized_payloads/TIEB.lua b/resources/customized_payloads/TIEB.lua index c951c245..9258f618 100644 --- a/resources/customized_payloads/TIEB.lua +++ b/resources/customized_payloads/TIEB.lua @@ -129,6 +129,154 @@ local unitPayloads = { [1] = 32, }, }, + [4] = { + ["displayName"] = "Retribution BAI", + ["name"] = "Retribution BAI", + ["pylons"] = { + [1] = { + ["CLSID"] = "{TIRFUEL}", + ["num"] = 2, + }, + [2] = { + ["CLSID"] = "{TIRFUEL}", + ["num"] = 10, + }, + [3] = { + ["CLSID"] = "{PROTONM1}", + ["num"] = 1, + }, + [4] = { + ["CLSID"] = "{PROTONM1}", + ["num"] = 3, + }, + [5] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 5, + }, + [6] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 4, + }, + [7] = { + ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", + ["num"] = 6, + }, + [8] = { + ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", + ["num"] = 7, + }, + [9] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 8, + }, + [10] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 9, + }, + }, + ["tasks"] = { + [1] = 31, + }, + }, + [4] = { + ["displayName"] = "Retribution Strike", + ["name"] = "Retribution Strike", + ["pylons"] = { + [1] = { + ["CLSID"] = "{TIRFUEL}", + ["num"] = 2, + }, + [2] = { + ["CLSID"] = "{TIRFUEL}", + ["num"] = 10, + }, + [3] = { + ["CLSID"] = "{PROTONM1}", + ["num"] = 1, + }, + [4] = { + ["CLSID"] = "{PROTONM1}", + ["num"] = 3, + }, + [5] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 5, + }, + [6] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 4, + }, + [7] = { + ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", + ["num"] = 6, + }, + [8] = { + ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", + ["num"] = 7, + }, + [9] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 8, + }, + [10] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 9, + }, + }, + ["tasks"] = { + [1] = 33, + [2] = 32, + }, + }, + [4] = { + ["displayName"] = "Retribution DEAD", + ["name"] = "Retribution DEAD", + ["pylons"] = { + [1] = { + ["CLSID"] = "{TIRFUEL}", + ["num"] = 2, + }, + [2] = { + ["CLSID"] = "{TIRFUEL}", + ["num"] = 10, + }, + [3] = { + ["CLSID"] = "{PROTONM1}", + ["num"] = 1, + }, + [4] = { + ["CLSID"] = "{PROTONM1}", + ["num"] = 3, + }, + [5] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 5, + }, + [6] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 4, + }, + [7] = { + ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", + ["num"] = 6, + }, + [8] = { + ["CLSID"] = "{DAC53A2F-79CA-42FF-A77A-F5649B601308}", + ["num"] = 7, + }, + [9] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 8, + }, + [10] = { + ["CLSID"] = "{TER_9A_3*MK-82}", + ["num"] = 9, + }, + }, + ["tasks"] = { + [1] = 31, + }, + }, }, ["tasks"] = { }, diff --git a/resources/customized_payloads/YWING.lua b/resources/customized_payloads/YWING.lua index 691b9b21..f9328494 100644 --- a/resources/customized_payloads/YWING.lua +++ b/resources/customized_payloads/YWING.lua @@ -78,6 +78,94 @@ local unitPayloads = { [1] = 31, }, }, + [4] = { + ["displayName"] = "Retribution BAI", + ["name"] = "Retribution BAI", + ["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, + }, + }, + [5] = { + ["displayName"] = "Retribution Strike", + ["name"] = "Retribution Strike", + ["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] = 33, + [2] = 32, + }, + }, + [6] = { + ["displayName"] = "Retribution DEAD", + ["name"] = "Retribution DEAD", + ["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/factions/SW_Empire.json b/resources/factions/SW_Empire.json index 42e67844..0dbffc52 100644 --- a/resources/factions/SW_Empire.json +++ b/resources/factions/SW_Empire.json @@ -11,28 +11,7 @@ "HUNTER", "TIE_INTER", "CORVETTE", - "tie_bomber_2", - "IL-76MD", - "Ka-50 Hokum", - "Ka-50 Hokum III", - "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-27 Flanker-B", - "Su-30 Flanker-C", - "Su-33 Flanker-D", - "Su-34 Fullback", - "Tu-142 Bear-F", - "Tu-160 Blackjack", - "Tu-22M3 Backfire-C", - "Tu-95MS Bear-H" + "tie_bomber_2" ], "awacs": [ "A-50" @@ -45,16 +24,7 @@ "MBT9_EMPIRE", "MBT9_AAA EMPIRE", "TB_TT", - "Jugger", - "BMP-1", - "BMP-2", - "BMP-3", - "BTR-80", - "BTR-82A", - "SA-19 Grison (2K22 Tunguska)", - "T-72B3 model 2011", - "T-80UD", - "T-90A" + "Jugger" ], "artillery_units": [ "2S19 Msta-S", diff --git a/resources/factions/SW_Rebel_Alliance.json b/resources/factions/SW_Rebel_Alliance.json index f9c54c49..ab9ffb68 100644 --- a/resources/factions/SW_Rebel_Alliance.json +++ b/resources/factions/SW_Rebel_Alliance.json @@ -4,32 +4,6 @@ "authors": "Pan_de", "description": "

Rebel Alliance and EDF.

", "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", "XWING", "YWING", "FAUCON", @@ -41,27 +15,14 @@ "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": [ @@ -88,9 +49,6 @@ "missiles": [], "air_defense_units": [ "SAM Patriot STR", - "M163 Vulcan Air Defense System", - "M1097 Heavy HMMWV Avenger", - "M48 Chaparral", "MBT9_AAA REBEL" ], "requirements": {}, diff --git a/resources/units/aircraft/HUNTER.yaml b/resources/units/aircraft/HUNTER.yaml index 1c43c21f..d45ee2c9 100644 --- a/resources/units/aircraft/HUNTER.yaml +++ b/resources/units/aircraft/HUNTER.yaml @@ -21,3 +21,4 @@ tasks: Fighter sweep: 540 Intercept: 540 TARCAP: 540 + SEAD Escort: 450 diff --git a/resources/units/aircraft/TIE.yaml b/resources/units/aircraft/TIE.yaml index c48fde8d..5a294682 100644 --- a/resources/units/aircraft/TIE.yaml +++ b/resources/units/aircraft/TIE.yaml @@ -20,3 +20,4 @@ tasks: Fighter sweep: 540 Intercept: 540 TARCAP: 540 + SEAD Escort: 450 diff --git a/resources/units/aircraft/TIE_INTER.yaml b/resources/units/aircraft/TIE_INTER.yaml index e2d2524e..6d102a40 100644 --- a/resources/units/aircraft/TIE_INTER.yaml +++ b/resources/units/aircraft/TIE_INTER.yaml @@ -17,3 +17,4 @@ tasks: Fighter sweep: 540 Intercept: 540 TARCAP: 540 + SEAD Escort: 450 diff --git a/resources/units/aircraft/XWING.yaml b/resources/units/aircraft/XWING.yaml index 7e7a407a..13f57e28 100644 --- a/resources/units/aircraft/XWING.yaml +++ b/resources/units/aircraft/XWING.yaml @@ -16,3 +16,4 @@ tasks: Fighter sweep: 540 Intercept: 540 TARCAP: 540 + SEAD Escort: 450 diff --git a/resources/units/aircraft/YWING.yaml b/resources/units/aircraft/YWING.yaml index 3001ebc4..f0005297 100644 --- a/resources/units/aircraft/YWING.yaml +++ b/resources/units/aircraft/YWING.yaml @@ -17,13 +17,10 @@ variants: kneeboard_units: "metric" tasks: BAI: 750 - BARCAP: 460 CAS: 750 + SEAD: 750 DEAD: 450 - Escort: 460 - Fighter sweep: 460 - Intercept: 460 OCA/Aircraft: 750 OCA/Runway: 610 Strike: 610 - TARCAP: 460 + diff --git a/resources/units/aircraft/naboo_starfighter.yaml b/resources/units/aircraft/naboo_starfighter.yaml index d8085a7a..4aab4fab 100644 --- a/resources/units/aircraft/naboo_starfighter.yaml +++ b/resources/units/aircraft/naboo_starfighter.yaml @@ -14,14 +14,9 @@ variants: naboo_starfighter: {} kneeboard_units: "metric" tasks: - BAI: 750 BARCAP: 460 - CAS: 750 - DEAD: 450 Escort: 460 Fighter sweep: 460 Intercept: 460 - OCA/Aircraft: 750 - OCA/Runway: 610 - Strike: 610 TARCAP: 460 + SEAD Escort: 450 diff --git a/resources/units/aircraft/tie_bomber_2.yaml b/resources/units/aircraft/tie_bomber_2.yaml index 51de9784..444b47dc 100644 --- a/resources/units/aircraft/tie_bomber_2.yaml +++ b/resources/units/aircraft/tie_bomber_2.yaml @@ -15,13 +15,10 @@ variants: kneeboard_units: "metric" tasks: BAI: 750 - BARCAP: 460 CAS: 750 DEAD: 450 - Escort: 460 - Fighter sweep: 460 - Intercept: 460 + SEAD: 750 OCA/Aircraft: 750 OCA/Runway: 610 Strike: 610 - TARCAP: 460 +