Improved WW2 support.

game/db.py

@@ -84,11 +84,14 @@ PRICES = {
     J_11A: 26,
     JF_17: 20,
     Su_30: 24,
-    SpitfireLFMkIX:3,
-    SpitfireLFMkIXCW:3,
-    Bf_109K_4:3,
-    FW_190D9:3,
-    FW_190A8:3,
+
+    SpitfireLFMkIX: 8,
+    SpitfireLFMkIXCW: 8,
+    Bf_109K_4: 8,
+    FW_190D9: 8,
+    FW_190A8: 8,
+    A_20G: 12,
+    Ju_88A4: 12,
 
     F_5E_3: 8,
     MiG_15bis: 4,
@@ -153,8 +156,8 @@ PRICES = {
     C_130: 8,
 
     # WW2
-    P_51D_30_NA: 3,
-    P_51D: 3,
+    P_51D_30_NA: 6,
+    P_51D: 6,
 
     # armor
     Armor.APC_MTLB: 4,
@@ -228,22 +231,31 @@ PRICES = {
     AirDefence.SAM_Chaparral_M48: 10,
 
     # WW2
-    Armor.MT_Pz_Kpfw_V_Panther_Ausf_G:7,
-    Armor.MT_Pz_Kpfw_IV_Ausf_H:4,
-    Armor.HT_Pz_Kpfw_VI_Tiger_I:10,
-    Armor.HT_Pz_Kpfw_VI_Ausf__B__Tiger_II:12,
-    Armor.APC_Sd_Kfz_251:3,
-    Armor.IFV_Sd_Kfz_234_2_Puma:4,
-    Armor.MT_M4_Sherman:4,
-    Armor.MT_M4A4_Sherman_Firefly:6,
+    Armor.MT_Pz_Kpfw_V_Panther_Ausf_G:18,
+    Armor.MT_Pz_Kpfw_IV_Ausf_H:8,
+    Armor.HT_Pz_Kpfw_VI_Tiger_I:22,
+    Armor.HT_Pz_Kpfw_VI_Ausf__B__Tiger_II:26,
+    Armor.TD_Jagdpanther_G1: 16,
+    Armor.TD_Jagdpanzer_IV: 10,
+    Armor.Sd_Kfz_184_Elefant: 18,
+    Armor.APC_Sd_Kfz_251:2,
+    Armor.IFV_Sd_Kfz_234_2_Puma:6,
+    Armor.MT_M4_Sherman:5,
+    Armor.MT_M4A4_Sherman_Firefly:8,
     Armor.CT_Cromwell_IV:8,
     Armor.M30_Cargo_Carrier:2,
     Armor.APC_M2A1:2,
-    AirDefence.AAA_Bofors_40mm:4,
-    AirDefence.AAA_8_8cm_Flak_36:6,
-    AirDefence.AAA_8_8cm_Flak_18:4,
-    Artillery.M12_GMC:2,
-    Artillery.Sturmpanzer_IV_Brummbär:2,
+    Armor.ST_Centaur_IV: 8,
+    Armor.HIT_Churchill_VII: 12,
+    Armor.LAC_M8_Greyhound: 4,
+    Armor.TD_M10_GMC: 8,
+    Armor.StuG_III_Ausf__G: 6,
+    AirDefence.AAA_Bofors_40mm: 4,
+    AirDefence.AAA_8_8cm_Flak_36: 6,
+    AirDefence.AAA_8_8cm_Flak_18: 4,
+    Artillery.M12_GMC: 2,
+    Artillery.Sturmpanzer_IV_Brummbär: 2,
+
 
     # ship
     CV_1143_5_Admiral_Kuznetsov: 100,
@@ -300,7 +312,7 @@ UNIT_BY_TASK = {
         FW_190D9,
         FW_190A8,
         SpitfireLFMkIXCW,
-        SpitfireLFMkIX
+        SpitfireLFMkIX,
     ],
     CAS: [
         F_86F_Sabre,
@@ -331,6 +343,8 @@ UNIT_BY_TASK = {
         Mi_28N,
         Mi_24V,
         MiG_27K,
+        A_20G,
+        Ju_88A4,
     ],
     Transport: [
         IL_76MD,
@@ -451,6 +465,33 @@ UNIT_BY_TASK = {
         Armor.APC_M2A1,
         Armor.APC_M2A1,
         Armor.APC_M2A1,
+        Armor.MT_Pz_Kpfw_V_Panther_Ausf_G,
+        Armor.MT_Pz_Kpfw_IV_Ausf_H,
+        Armor.HT_Pz_Kpfw_VI_Tiger_I,
+        Armor.HT_Pz_Kpfw_VI_Ausf__B__Tiger_II,
+        Armor.TD_Jagdpanther_G1,
+        Armor.TD_Jagdpanzer_IV,
+        Armor.Sd_Kfz_184_Elefant,
+        Armor.APC_Sd_Kfz_251,
+        Armor.IFV_Sd_Kfz_234_2_Puma,
+        Armor.MT_M4_Sherman,
+        Armor.MT_M4A4_Sherman_Firefly,
+        Armor.CT_Cromwell_IV,
+        Armor.M30_Cargo_Carrier,
+        Armor.M30_Cargo_Carrier,
+        Armor.M30_Cargo_Carrier,
+        Armor.APC_M2A1,
+        Armor.APC_M2A1,
+        Armor.ST_Centaur_IV,
+        Armor.ST_Centaur_IV,
+        Armor.HIT_Churchill_VII,
+        Armor.LAC_M8_Greyhound,
+        Armor.LAC_M8_Greyhound,
+        Armor.TD_M10_GMC,
+        Armor.TD_M10_GMC,
+        Armor.StuG_III_Ausf__G,
+        Artillery.M12_GMC,
+        Artillery.Sturmpanzer_IV_Brummbär,
 
         Artillery.MLRS_M270,
         Artillery.SPH_M109_Paladin,
@@ -570,7 +611,7 @@ FACTIONS = {
     "USA 1965": USA_1965,
     "USA 1960": USA_1960,
     "USA 1955 (Require WW2 Pack)": USA_1955,
-    "USA 1944 (Require WW2 Pack)": USA_1944,
+    "Allies 1944 (Require WW2 Pack)": USA_1944,
     "Bluefor Modern": BLUEFOR_MODERN,
     "France 2005": France_2005,
     "France 1995": France_1995,
@@ -1000,4 +1041,5 @@ class DefaultLiveries:
 
 OH_58D.Liveries = DefaultLiveries
 F_16C_50.Liveries = DefaultLiveries
-P_51D_30_NA.Liveries = DefaultLiveries
+P_51D_30_NA.Liveries = DefaultLiveries
+Ju_88A4.Liveries = DefaultLiveries

game/factions/germany_1944.py

@@ -9,6 +9,7 @@ Germany_1944 = {
         FW_190A8,
         FW_190D9,
         Bf_109K_4,
+        Ju_88A4,
 
         Armor.MT_Pz_Kpfw_V_Panther_Ausf_G,
         Armor.MT_Pz_Kpfw_IV_Ausf_H,
@@ -16,13 +17,20 @@ Germany_1944 = {
         Armor.HT_Pz_Kpfw_VI_Ausf__B__Tiger_II,
         Armor.APC_Sd_Kfz_251,
         Armor.IFV_Sd_Kfz_234_2_Puma,
+        Armor.Sd_Kfz_184_Elefant,
+        Armor.TD_Jagdpanther_G1,
+        Armor.TD_Jagdpanzer_IV,
+
+        Artillery.Sturmpanzer_IV_Brummbär,
 
         Unarmed.Sd_Kfz_2,
         Unarmed.Sd_Kfz_7,
         Unarmed.Kübelwagen_82,
 
         Infantry.Infantry_Mauser_98,
-
+        AirDefence.AAA_8_8cm_Flak_36,
+    ],
+    "shorad":[
         AirDefence.AAA_8_8cm_Flak_36,
     ]
 }

game/factions/usa_1944.py

@@ -10,15 +10,22 @@ USA_1944 = {
         P_51D_30_NA,
         SpitfireLFMkIX,
         SpitfireLFMkIXCW,
+        A_20G,
 
         Armor.MT_M4_Sherman,
         Armor.MT_M4A4_Sherman_Firefly,
+        Armor.CT_Cromwell_IV,
         Armor.M30_Cargo_Carrier,
         Armor.APC_M2A1,
         Armor.CT_Cromwell_IV,
+        Armor.ST_Centaur_IV,
+        Armor.HIT_Churchill_VII,
+        Armor.LAC_M8_Greyhound,
+        Armor.TD_M10_GMC,
         Artillery.M12_GMC,
 
         Infantry.Infantry_M1_Garand,
+        Infantry.Infantry_SMLE_No_4_Mk_1,
 
         LS_Samuel_Chase,
         LST_Mk_II,
@@ -26,5 +33,7 @@ USA_1944 = {
 
         Unarmed.CCKW_353,
         AirDefence.AAA_Bofors_40mm,
+    ], "shorad":[
+        AirDefence.AAA_Bofors_40mm,
     ]
 }