diff --git a/game/db.py b/game/db.py index 51dc6c19..c919b1ed 100644 --- a/game/db.py +++ b/game/db.py @@ -46,10 +46,11 @@ from game.factions.spain_1990 import Spain_1990 from game.factions.sweden_1990 import Sweden_1990 from game.factions.turkey_2005 import Turkey_2005 from game.factions.uae_2005 import UAE_2005 +from game.factions.uk_1944 import UK_1944 from game.factions.uk_1990 import UnitedKingdom_1990 from game.factions.ukraine_2010 import Ukraine_2010 from game.factions.us_aggressors import US_Aggressors -from game.factions.usa_1944 import USA_1944 +from game.factions.usa_1944 import USA_1944, ALLIES_1944 from game.factions.usa_1955 import USA_1955 from game.factions.usa_1960 import USA_1960 from game.factions.usa_1965 import USA_1965 @@ -789,6 +790,8 @@ FACTIONS = { "Insurgent (Modded)": Insurgent_modded, "Allies 1944 (WW2 Pack)": USA_1944, + "USA 1944 (WW2 Pack)": ALLIES_1944, + "UK 1944 (WW2 Pack)": UK_1944, "Germany 1944 (WW2 Pack)": Germany_1944, "Germany 1944 Easy (WW2 Pack)": Germany_1944_Easy, diff --git a/game/factions/germany_1944.py b/game/factions/germany_1944.py index df48c434..f5f95669 100644 --- a/game/factions/germany_1944.py +++ b/game/factions/germany_1944.py @@ -39,7 +39,7 @@ Germany_1944 = { "objects": WW2_GERMANY_BUILDINGS, "doctrine": WWII_DOCTRINE, "boat": ["UBoatGroupGenerator", "SchnellbootGroupGenerator"], - "boat_count": 4, + "boat_count": 2, "missiles": ["V1GroupGenerator"], "missiles_count": 1 } \ No newline at end of file diff --git a/game/factions/germany_1944_easy.py b/game/factions/germany_1944_easy.py index ca929c13..6e4474bb 100644 --- a/game/factions/germany_1944_easy.py +++ b/game/factions/germany_1944_easy.py @@ -32,7 +32,7 @@ Germany_1944_Easy = { "objects": WW2_GERMANY_BUILDINGS, "doctrine": WWII_DOCTRINE, "boat": ["UBoatGroupGenerator", "SchnellbootGroupGenerator"], - "boat_count": 4, + "boat_count": 1, "missiles": ["V1GroupGenerator"], "missiles_count": 1 } \ No newline at end of file diff --git a/game/factions/uk_1944.py b/game/factions/uk_1944.py new file mode 100644 index 00000000..f71ae039 --- /dev/null +++ b/game/factions/uk_1944.py @@ -0,0 +1,41 @@ +from dcs.planes import * +from dcs.ships import * +from dcs.vehicles import * + +from game.data.building_data import WW2_ALLIES_BUILDINGS +from game.data.doctrine import WWII_DOCTRINE + +UK_1944 = { + "country": "UK", + "side": "blue", + "units": [ + P_51D, + P_51D_30_NA, + P_47D_30, + SpitfireLFMkIX, + SpitfireLFMkIXCW, + A_20G, + B_17G, + + Armor.MT_M4_Sherman, + Armor.APC_M2A1, + Armor.CT_Cromwell_IV, + Armor.ST_Centaur_IV, + Armor.HIT_Churchill_VII, + + Infantry.Infantry_SMLE_No_4_Mk_1, + + LS_Samuel_Chase, + LST_Mk_II, + LCVP__Higgins_boat, + + Unarmed.CCKW_353, + AirDefence.AAA_Bofors_40mm, + ], "shorad":[ + AirDefence.AAA_Bofors_40mm, + ], + "objects": WW2_ALLIES_BUILDINGS, + "doctrine": WWII_DOCTRINE, + "boat": ["WW2LSTGroupGenerator"], + "boat_count": 1 +} \ No newline at end of file diff --git a/game/factions/usa_1944.py b/game/factions/usa_1944.py index 385d6c7d..680ce714 100644 --- a/game/factions/usa_1944.py +++ b/game/factions/usa_1944.py @@ -6,6 +6,41 @@ from game.data.building_data import WW2_ALLIES_BUILDINGS from game.data.doctrine import WWII_DOCTRINE USA_1944 = { + "country": "USA", + "side": "blue", + "units": [ + P_51D, + P_51D_30_NA, + P_47D_30, + A_20G, + B_17G, + + Armor.MT_M4_Sherman, + Armor.MT_M4A4_Sherman_Firefly, + Armor.M30_Cargo_Carrier, + Armor.APC_M2A1, + Armor.LAC_M8_Greyhound, + Armor.TD_M10_GMC, + Artillery.M12_GMC, + + Infantry.Infantry_M1_Garand, + + LS_Samuel_Chase, + LST_Mk_II, + LCVP__Higgins_boat, + + Unarmed.CCKW_353, + AirDefence.AAA_Bofors_40mm, + ], "shorad":[ + AirDefence.AAA_Bofors_40mm, + ], + "objects": WW2_ALLIES_BUILDINGS, + "doctrine": WWII_DOCTRINE, + "boat": ["WW2LSTGroupGenerator"], + "boat_count": 2 +} + +ALLIES_1944 = { "country": "USA", "side": "blue", "units": [