diff --git a/game/db.py b/game/db.py index a9bf7051..67eccd5a 100644 --- a/game/db.py +++ b/game/db.py @@ -2,7 +2,9 @@ from datetime import datetime from enum import Enum from typing import Dict, List, Optional, Tuple, Type, Union +from dcs import Mission from dcs.countries import country_dict +from dcs.country import Country from dcs.helicopters import ( AH_1W, AH_64A, @@ -1388,6 +1390,7 @@ class DefaultLiveries: class Default(Enum): af_standard = "" + OH_58D.Liveries = DefaultLiveries F_16C_50.Liveries = DefaultLiveries P_51D_30_NA.Liveries = DefaultLiveries diff --git a/gen/sam/cold_war_flak.py b/gen/sam/cold_war_flak.py index e35bd01a..c0b7e81d 100644 --- a/gen/sam/cold_war_flak.py +++ b/gen/sam/cold_war_flak.py @@ -35,8 +35,8 @@ class EarlyColdWarFlakGenerator(GroupGenerator): self.add_unit(AirDefence.AAA_Bofors_40mm, "SHO#1", self.position.x + spacing * 2 + 40, self.position.y + spacing + 40, self.heading), - # Add a Kamaz truck - self.add_unit(Unarmed.Transport_KAMAZ_43101, "Kamaz#", self.position.x - 60, self.position.y - 20, self.heading) + # Add a truck + self.add_unit(Unarmed.Transport_KAMAZ_43101, "Truck#", self.position.x - 60, self.position.y - 20, self.heading) class ColdWarFlakGenerator(GroupGenerator): @@ -46,7 +46,7 @@ class ColdWarFlakGenerator(GroupGenerator): The site is also fitted with a P-19 radar for early detection. """ - name = "Early Cold War Flak Site" + name = "Cold War Flak Site" price = 72 def generate(self): diff --git a/resources/factions/bluefor_coldwar.json b/resources/factions/bluefor_coldwar.json index 73265ae3..511df4ff 100644 --- a/resources/factions/bluefor_coldwar.json +++ b/resources/factions/bluefor_coldwar.json @@ -37,6 +37,7 @@ "Soldier_M249" ], "shorads": [ + "EarlyColdWarFlakGenerator", "VulcanGenerator" ], "sams": [ diff --git a/resources/factions/bluefor_coldwar_a4.json b/resources/factions/bluefor_coldwar_a4.json index 7a2fd90d..89a674c6 100644 --- a/resources/factions/bluefor_coldwar_a4.json +++ b/resources/factions/bluefor_coldwar_a4.json @@ -38,6 +38,7 @@ "Soldier_M249" ], "shorads": [ + "EarlyColdWarFlakGenerator", "VulcanGenerator" ], "sams": [ diff --git a/resources/factions/bluefor_coldwar_a4_mb339.json b/resources/factions/bluefor_coldwar_a4_mb339.json index 880f505f..f525c4c3 100644 --- a/resources/factions/bluefor_coldwar_a4_mb339.json +++ b/resources/factions/bluefor_coldwar_a4_mb339.json @@ -39,6 +39,7 @@ "Soldier_M249" ], "shorads": [ + "EarlyColdWarFlakGenerator", "VulcanGenerator" ], "sams": [ diff --git a/resources/factions/israel_1948.json b/resources/factions/israel_1948.json index cd723e9f..74b2132b 100644 --- a/resources/factions/israel_1948.json +++ b/resources/factions/israel_1948.json @@ -29,6 +29,7 @@ "BoforsGenerator" ], "sams": [ + "EarlyColdWarFlakGenerator", "BoforsGenerator" ], "aircraft_carrier": [ diff --git a/resources/factions/israel_1973.json b/resources/factions/israel_1973.json index 071833c3..7b475f35 100644 --- a/resources/factions/israel_1973.json +++ b/resources/factions/israel_1973.json @@ -16,7 +16,7 @@ "KC130" ], "frontline_units": [ - "MT_M4A4_Sherman_Firefly", + "MT_M4_Sherman", "APC_M2A1", "MBT_M60A3_Patton", "APC_M113" @@ -46,8 +46,7 @@ "cruisers": [ ], "requirements": { - "Community A-4E": "https://heclak.github.io/community-a4e-c/", - "WW2 Asset Pack": "https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/" + "Community A-4E": "https://heclak.github.io/community-a4e-c/" }, "carrier_names": [ ], diff --git a/resources/factions/russia_1955.json b/resources/factions/russia_1955.json index f621238f..bb56df67 100644 --- a/resources/factions/russia_1955.json +++ b/resources/factions/russia_1955.json @@ -31,14 +31,10 @@ "Soldier_RPG" ], "shorads": [ - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "EarlyColdWarFlakGenerator" ], "sams": [ - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "EarlyColdWarFlakGenerator" ], "aircraft_carrier": [ ], diff --git a/resources/factions/russia_1965.json b/resources/factions/russia_1965.json index fd34c39c..b747b204 100644 --- a/resources/factions/russia_1965.json +++ b/resources/factions/russia_1965.json @@ -36,8 +36,8 @@ ], "shorads": [ "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "EarlyColdWarFlakGenerator", + "ZU23Generator" ], "sams": [ "SA2Generator", diff --git a/resources/factions/russia_1975.json b/resources/factions/russia_1975.json index ac73f830..27232275 100644 --- a/resources/factions/russia_1975.json +++ b/resources/factions/russia_1975.json @@ -41,9 +41,9 @@ "Soldier_RPG" ], "shorads": [ + "ColdWarFlakGenerator", "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "ZU23Generator" ], "sams": [ "SA3Generator", diff --git a/resources/factions/syria_1967.json b/resources/factions/syria_1967.json index 0a2eda52..6830a420 100644 --- a/resources/factions/syria_1967.json +++ b/resources/factions/syria_1967.json @@ -18,6 +18,7 @@ ], "frontline_units": [ "ARV_BRDM_2", + "MT_Pz_Kpfw_IV_Ausf_H", "MBT_T_55" ], "artillery_units": [ diff --git a/resources/factions/syria_1967_with_ww2_weapons.json b/resources/factions/syria_1967_with_ww2_weapons.json index 1a37b8c0..1217d370 100644 --- a/resources/factions/syria_1967_with_ww2_weapons.json +++ b/resources/factions/syria_1967_with_ww2_weapons.json @@ -38,9 +38,11 @@ ], "shorads": [ "ZU23Generator", + "EarlyColdWarFlakGenerator", "ZU23UralGenerator" ], "sams": [ + "EarlyColdWarFlakGenerator", "SA2Generator" ], "aircraft_carrier": [ diff --git a/resources/factions/syria_1973.json b/resources/factions/syria_1973.json index 7d04ab52..cc74b6ac 100644 --- a/resources/factions/syria_1973.json +++ b/resources/factions/syria_1973.json @@ -34,9 +34,8 @@ "Soldier_RPG" ], "shorads": [ - "ZSU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "EarlyColdWarFlakGenerator", + "ZU23Generator" ], "sams": [ "SA2Generator", diff --git a/resources/factions/syria_1982.json b/resources/factions/syria_1982.json index 30f53661..03a7666b 100644 --- a/resources/factions/syria_1982.json +++ b/resources/factions/syria_1982.json @@ -36,10 +36,9 @@ "Paratrooper_RPG_16" ], "shorads": [ - "ZSU23Generator", "ZU23Generator", - "ZU23Generator", - "ZU23UralGenerator" + "EarlyColdWarFlakGenerator", + "ColdWarFlakGenerator" ], "sams": [ "SA2Generator", diff --git a/resources/factions/syria_2011.json b/resources/factions/syria_2011.json index a96f843c..e39c72dd 100644 --- a/resources/factions/syria_2011.json +++ b/resources/factions/syria_2011.json @@ -53,7 +53,8 @@ "SA9Generator", "SA13Generator", "SA19Generator", - "ZSU23Generator" + "ZSU23Generator", + "ColdWarFlakGenerator" ], "sams": [ "SA2Generator", diff --git a/resources/factions/usa_1955.json b/resources/factions/usa_1955.json index 3c5de408..fa7609f3 100644 --- a/resources/factions/usa_1955.json +++ b/resources/factions/usa_1955.json @@ -10,7 +10,6 @@ "B_52H" ], "frontline_units": [ - "MT_M4A4_Sherman_Firefly", "MT_M4_Sherman", "MBT_M60A3_Patton", "APC_M2A1" @@ -22,13 +21,13 @@ "Transport_M818" ], "infantry_units": [ - "Infantry_M1_Garand" + "Infantry_M4" ], "shorads": [ "BoforsGenerator" ], "sams": [ - "BoforsGenerator" + "EarlyColdWarFlakGenerator" ], "doctrine": "ww2", "building_set": "ww2ally", diff --git a/resources/factions/usa_1960.json b/resources/factions/usa_1960.json index 7c2d762d..1ef741fd 100644 --- a/resources/factions/usa_1960.json +++ b/resources/factions/usa_1960.json @@ -23,6 +23,7 @@ "Infantry_M4" ], "shorads": [ + "EarlyColdWarFlakGenerator", "VulcanGenerator" ], "sams": [ diff --git a/resources/factions/usa_1965.json b/resources/factions/usa_1965.json index 74171172..b2b5b1dd 100644 --- a/resources/factions/usa_1965.json +++ b/resources/factions/usa_1965.json @@ -25,7 +25,8 @@ ], "shorads": [ "VulcanGenerator", - "ChaparralGenerator" + "ChaparralGenerator", + "EarlyColdWarFlakGenerator" ], "sams": [ "HawkGenerator", diff --git a/resources/factions/usa_1975.json b/resources/factions/usa_1975.json index 5c999a9e..a30330a6 100644 --- a/resources/factions/usa_1975.json +++ b/resources/factions/usa_1975.json @@ -25,6 +25,7 @@ "Soldier_M249" ], "shorads": [ + "EarlyColdWarFlakGenerator", "VulcanGenerator", "ChaparralGenerator" ],