diff --git a/game/db.py b/game/db.py index 81193426..f07193e7 100644 --- a/game/db.py +++ b/game/db.py @@ -27,6 +27,8 @@ from game.factions.germany_1990 import Germany_1990 from game.factions.insurgent import Insurgent from game.factions.insurgent_modded import Insurgent_modded from game.factions.iran_2015 import Iran_2015 +from game.factions.israel_1948 import Israel_1948 +from game.factions.israel_1973 import Israel_1973, Israel_1973_NO_WW2_UNITS from game.factions.israel_2000 import Israel_2000 from game.factions.italy_1990 import Italy_1990 from game.factions.italy_1990_mb339 import Italy_1990_MB339 @@ -45,6 +47,7 @@ from game.factions.russia_1990 import Russia_1990 from game.factions.russia_2010 import Russia_2010 from game.factions.spain_1990 import Spain_1990 from game.factions.sweden_1990 import Sweden_1990 +from game.factions.syria import Syria_2011, Syria_1967, Syria_1967_WW2_Weapons, Syria_1973, Arab_Armies_1948 from game.factions.turkey_2005 import Turkey_2005 from game.factions.uae_2005 import UAE_2005 from game.factions.uk_1944 import UK_1944 @@ -767,6 +770,14 @@ FACTIONS = { "Italy 1990 (With MB339)": Italy_1990_MB339, "Israel 2000": Israel_2000, + "Israel 1973 (WW2 Pack)": Israel_1973, + "Israel 1973": Israel_1973_NO_WW2_UNITS, + "Israel 1948": Israel_1948, + + "Arab Armies 1973": Syria_1973, + "Arab Armies 1967 (WW2 Pack)": Syria_1967, + "Arab Armies 1967": Syria_1967_WW2_Weapons, + "Arab League 1948": Arab_Armies_1948, "China 2010": China_2010, @@ -788,6 +799,9 @@ FACTIONS = { "Libya 2011": Libya_2011, + "Syria 2011": Syria_2011, + + "Pakistan 2015": Pakistan_2015, "Iran 2015": Iran_2015, diff --git a/game/factions/germany_1944.py b/game/factions/germany_1944.py index f5f95669..9123b350 100644 --- a/game/factions/germany_1944.py +++ b/game/factions/germany_1944.py @@ -32,7 +32,9 @@ Germany_1944 = { Infantry.Infantry_Mauser_98, AirDefence.AAA_8_8cm_Flak_36, - ], + ],"requirements":{ + "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/", + }, "shorad": [ AirDefence.AAA_8_8cm_Flak_36, ], diff --git a/game/factions/germany_1944_easy.py b/game/factions/germany_1944_easy.py index 6e4474bb..b79d45f0 100644 --- a/game/factions/germany_1944_easy.py +++ b/game/factions/germany_1944_easy.py @@ -25,7 +25,9 @@ Germany_1944_Easy = { Infantry.Infantry_Mauser_98, AirDefence.AAA_8_8cm_Flak_36, - ], + ],"requirements":{ + "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/", + }, "shorad":[ AirDefence.AAA_8_8cm_Flak_36, ], diff --git a/game/factions/israel_1948.py b/game/factions/israel_1948.py new file mode 100644 index 00000000..ffa57fcb --- /dev/null +++ b/game/factions/israel_1948.py @@ -0,0 +1,33 @@ +from dcs.planes import * +from dcs.ships import * +from dcs.vehicles import * + +Israel_1948 = { + "country": "Israel", + "side": "blue", + "units":[ + SpitfireLFMkIXCW, + SpitfireLFMkIX, + P_51D, + P_51D_30_NA, + Bf_109K_4, # Standing as Avia S-199 + B_17G, + + Armor.MT_M4A4_Sherman_Firefly, + Armor.APC_M2A1, + Armor.MT_M4_Sherman, + Armor.LAC_M8_Greyhound, + + Unarmed.Transport_M818, + Infantry.Infantry_SMLE_No_4_Mk_1, + + AirDefence.AAA_Bofors_40mm, + Armed_speedboat, + ],"requirements":{ + "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/", + }, + "shorad": [ + AirDefence.AAA_Bofors_40mm + ], "boat": [ + ], "has_jtac": False +} \ No newline at end of file diff --git a/game/factions/israel_1973.py b/game/factions/israel_1973.py new file mode 100644 index 00000000..7becb868 --- /dev/null +++ b/game/factions/israel_1973.py @@ -0,0 +1,73 @@ +from dcs.helicopters import * +from dcs.planes import * +from dcs.ships import * +from dcs.vehicles import * + +from pydcs_extensions.a4ec.a4ec import A_4E_C + +Israel_1973 = { + "country": "Israel", + "side": "blue", + "units":[ + F_4E, + A_4E_C, + + KC_135, + KC130, + C_130, + E_3A, + + UH_1H, + + Armor.MT_M4A4_Sherman_Firefly, + Armor.APC_M2A1, + Armor.MBT_M60A3_Patton, + + Unarmed.Transport_M818, + Infantry.Infantry_M4, + + AirDefence.SAM_Hawk_PCP, + AirDefence.AAA_Bofors_40mm, + AirDefence.SAM_Chaparral_M48, + + Armed_speedboat, + ], "requirements": { + "Community A-4E": "https://heclak.github.io/community-a4e-c/", + "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/", + }, "shorad": [ + AirDefence.SAM_Chaparral_M48, + AirDefence.AAA_Bofors_40mm + ], "boat": [ + ], "has_jtac": True +} + +Israel_1973_NO_WW2_UNITS = { + "country": "Israel", + "side": "blue", + "units":[ + F_4E, + A_4E_C, + + KC_135, + KC130, + C_130, + E_3A, + + UH_1H, + + Armor.MBT_M60A3_Patton, + + Unarmed.Transport_M818, + Infantry.Infantry_M4, + + AirDefence.SAM_Hawk_PCP, + AirDefence.SAM_Chaparral_M48, + + Armed_speedboat, + ], "requirements": { + "Community A-4E": "https://heclak.github.io/community-a4e-c/", + }, "shorad": [ + AirDefence.SAM_Chaparral_M48, + ], "boat": [ + ], "has_jtac": True +} \ No newline at end of file diff --git a/game/factions/syria.py b/game/factions/syria.py new file mode 100644 index 00000000..f512d0cb --- /dev/null +++ b/game/factions/syria.py @@ -0,0 +1,215 @@ +from dcs.helicopters import * +from dcs.planes import * +from dcs.vehicles import * + +Syria_2011 = { + "country": "Syria", + "side": "red", + "units": [ + + MiG_29S, + MiG_25PD, + Su_24M, + Su_17M4, + Mi_24V, + SA342M, + Mi_8MT, + + IL_76MD, + IL_78M, + An_26B, + An_30M, + Yak_40, + A_50, + + AirDefence.SAM_SA_6_Kub_LN_2P25, + AirDefence.SAM_SA_3_S_125_LN_5P73, + AirDefence.SAM_SA_2_LN_SM_90, + AirDefence.SAM_SA_8_Osa_9A33, + AirDefence.SAM_SA_11_Buk_LN_9A310M1, + AirDefence.SAM_SA_10_S_300PS_LN_5P85C, + + Armor.IFV_BMP_1, + Armor.IFV_BMP_2, + Armor.APC_BTR_80, + Armor.ARV_BRDM_2, + Armor.APC_MTLB, + Armor.APC_Cobra, + Armor.MBT_T_55, + Armor.MBT_T_72B, + Armor.MBT_T_90, + Artillery.MLRS_BM_21_Grad, + Artillery.MLRS_9K57_Uragan_BM_27, + Artillery.SPH_2S1_Gvozdika, + Artillery.SPH_2S9_Nona, + + Unarmed.Transport_Ural_375, + Unarmed.Transport_UAZ_469, + + Infantry.Paratrooper_RPG_16, + Infantry.Soldier_AK + + ], + "shorad": [ + AirDefence.SAM_SA_8_Osa_9A33, + AirDefence.SAM_SA_13_Strela_10M3_9A35M3, + AirDefence.SAM_SA_9_Strela_1_9P31, + AirDefence.SAM_SA_19_Tunguska_2S6, + AirDefence.AAA_ZU_23_on_Ural_375, + ], "boat": [ + "GrishaGroupGenerator", "MolniyaGroupGenerator" + ] +} + +Syria_1973 = { + "country": "Syria", + "side": "red", + "units": [ + + MiG_21Bis, + MiG_19P, + MiG_15bis, # Standing as Mig-17 + + Su_17M4, # Standing as Su-7 + Mi_8MT, + + IL_76MD, + IL_78M, + An_26B, + An_30M, + Yak_40, + + AirDefence.SAM_SA_6_Kub_LN_2P25, + AirDefence.SAM_SA_3_S_125_LN_5P73, + AirDefence.SAM_SA_2_LN_SM_90, + + Armor.IFV_BMP_1, + Armor.APC_MTLB, + Armor.MBT_T_55, + Artillery.MLRS_BM_21_Grad, + + Unarmed.Transport_Ural_375, + Unarmed.Transport_UAZ_469, + + Infantry.Paratrooper_RPG_16, + Infantry.Soldier_AK + + ], + "shorad": [ + AirDefence.AAA_ZU_23_on_Ural_375, + ], "boat": [ + "GrishaGroupGenerator" + ] +} + +Syria_1967 = { + "country": "Syria", + "side": "red", + "units": [ + + MiG_21Bis, + MiG_19P, + MiG_15bis, # Standing as Mig-17 + + Su_17M4, # Standing as Su-7 + Mi_8MT, + + IL_76MD, + IL_78M, + An_26B, + An_30M, + Yak_40, + + AirDefence.SAM_SA_2_LN_SM_90, + + Armor.ARV_BRDM_2, + Armor.MBT_T_55, + Artillery.MLRS_BM_21_Grad, + + Unarmed.Transport_Ural_375, + Unarmed.Transport_UAZ_469, + + Infantry.Paratrooper_RPG_16, + Infantry.Soldier_AK + + ], + "shorad": [ + AirDefence.AAA_ZU_23_on_Ural_375, + ], "boat": [ + "GrishaGroupGenerator" + ] +} + +Syria_1967_WW2_Weapons = { + "country": "Syria", + "side": "red", + "units": [ + + MiG_21Bis, + MiG_19P, + MiG_15bis, # Standing as Mig-17 + + Su_17M4, # Standing as Su-7 + Mi_8MT, + + IL_76MD, + IL_78M, + An_26B, + An_30M, + Yak_40, + + AirDefence.SAM_SA_2_LN_SM_90, + + Armor.ARV_BRDM_2, + Armor.MBT_T_55, + Armor.MT_Pz_Kpfw_IV_Ausf_H, + Armor.StuG_III_Ausf__G, + Armor.TD_Jagdpanzer_IV, + Artillery.MLRS_BM_21_Grad, + + Unarmed.Transport_Ural_375, + Unarmed.Transport_UAZ_469, + + Infantry.Soldier_RPG, + Infantry.Soldier_AK + + ], "requirements": { + "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/", + }, + "shorad": [ + AirDefence.AAA_ZU_23_on_Ural_375, + ], "boat": [ + "GrishaGroupGenerator" + ] +} + +Arab_Armies_1948 = { + "country": "Syria", + "side": "red", + "units": [ + SpitfireLFMkIX, + SpitfireLFMkIXCW, + + AirDefence.SAM_SA_2_LN_SM_90, + + Armor.MT_M4_Sherman, + Armor.MT_Pz_Kpfw_IV_Ausf_H, + Armor.APC_Sd_Kfz_251, + Armor.IFV_Sd_Kfz_234_2_Puma, + + Unarmed.Transport_Ural_375, + Unarmed.Transport_UAZ_469, + + Infantry.Infantry_SMLE_No_4_Mk_1, + + AirDefence.AAA_8_8cm_Flak_36, + + ], "requirements": { + "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/", + }, + "shorad": [ + AirDefence.AAA_8_8cm_Flak_36, + ], "boat": [ + "GrishaGroupGenerator" + ] +} diff --git a/game/factions/uk_1944.py b/game/factions/uk_1944.py index abfaac59..7798d714 100644 --- a/game/factions/uk_1944.py +++ b/game/factions/uk_1944.py @@ -34,7 +34,9 @@ UK_1944 = { AirDefence.AAA_Bofors_40mm, ], "shorad":[ AirDefence.AAA_Bofors_40mm, - ], + ],"requirements":{ + "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/", + }, "objects": WW2_ALLIES_BUILDINGS, "doctrine": WWII_DOCTRINE, "boat": ["WW2LSTGroupGenerator"], diff --git a/game/factions/usa_1944.py b/game/factions/usa_1944.py index 5ba73237..29e07372 100644 --- a/game/factions/usa_1944.py +++ b/game/factions/usa_1944.py @@ -32,7 +32,9 @@ USA_1944 = { AirDefence.AAA_Bofors_40mm, ], "shorad":[ AirDefence.AAA_Bofors_40mm, - ], + ],"requirements":{ + "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/", + }, "objects": WW2_ALLIES_BUILDINGS, "doctrine": WWII_DOCTRINE, "boat": ["WW2LSTGroupGenerator"], @@ -74,7 +76,9 @@ ALLIES_1944 = { AirDefence.AAA_Bofors_40mm, ], "shorad":[ AirDefence.AAA_Bofors_40mm, - ], + ],"requirements":{ + "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/", + }, "objects": WW2_ALLIES_BUILDINGS, "doctrine": WWII_DOCTRINE, "boat": ["WW2LSTGroupGenerator"], diff --git a/resources/tools/generate_landmap.py b/resources/tools/generate_landmap.py index 816747c5..57630821 100644 --- a/resources/tools/generate_landmap.py +++ b/resources/tools/generate_landmap.py @@ -3,7 +3,7 @@ import pickle from dcs.mission import Mission from dcs.planes import A_10C -for terrain in ["cau"]: +for terrain in ["nev"]: print("Terrain " + terrain) m = Mission() m.load_file("./{}_terrain.miz".format(terrain))