From 0518abdedcce574472b300d264f34a963cd3400a Mon Sep 17 00:00:00 2001
From: Khopa <clemguip@gmail.com>
Date: Sat, 20 Jun 2020 15:28:42 +0200
Subject: [PATCH] Balance for WW2 aircraft. WW2 B_17 bombing mode is now much
 more effective.

---
 game/db.py      | 66 ++++++++++++++++++++++++-------------------------
 gen/aircraft.py | 34 +++++++++++++++++++------
 2 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/game/db.py b/game/db.py
index 9abfbd6e..8b4d16f6 100644
--- a/game/db.py
+++ b/game/db.py
@@ -87,13 +87,13 @@ PRICES = {
     JF_17: 20,
     Su_30: 24,
 
-    SpitfireLFMkIX: 8,
-    SpitfireLFMkIXCW: 8,
-    Bf_109K_4: 8,
-    FW_190D9: 8,
-    FW_190A8: 8,
-    A_20G: 12,
-    Ju_88A4: 12,
+    SpitfireLFMkIX: 14,
+    SpitfireLFMkIXCW: 14,
+    Bf_109K_4: 14,
+    FW_190D9: 16,
+    FW_190A8: 14,
+    A_20G: 22,
+    Ju_88A4: 24,
 
     F_5E_3: 8,
     MiG_15bis: 4,
@@ -141,7 +141,7 @@ PRICES = {
     OH_58D: 6,
 
     # Bombers
-    B_52H: 25,
+    B_52H: 35,
     B_1B: 50,
 
     # special
@@ -159,10 +159,10 @@ PRICES = {
     C_130: 8,
 
     # WW2
-    P_51D_30_NA: 6,
-    P_51D: 6,
-    P_47D_30: 6,
-    B_17G: 18,
+    P_51D_30_NA: 18,
+    P_51D: 16,
+    P_47D_30: 18,
+    B_17G: 30,
 
     # armor
     Armor.APC_MTLB: 4,
@@ -236,30 +236,30 @@ PRICES = {
     AirDefence.SAM_Chaparral_M48: 10,
 
     # WW2
-    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.MT_Pz_Kpfw_V_Panther_Ausf_G:24,
+    Armor.MT_Pz_Kpfw_IV_Ausf_H:16,
+    Armor.HT_Pz_Kpfw_VI_Tiger_I:24,
     Armor.HT_Pz_Kpfw_VI_Ausf__B__Tiger_II:26,
-    Armor.TD_Jagdpanther_G1: 16,
-    Armor.TD_Jagdpanzer_IV: 10,
+    Armor.TD_Jagdpanther_G1: 18,
+    Armor.TD_Jagdpanzer_IV: 11,
     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.APC_Sd_Kfz_251:4,
+    Armor.IFV_Sd_Kfz_234_2_Puma:8,
+    Armor.MT_M4_Sherman:12,
+    Armor.MT_M4A4_Sherman_Firefly:16,
+    Armor.CT_Cromwell_IV:12,
     Armor.M30_Cargo_Carrier:2,
-    Armor.APC_M2A1: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,
+    Armor.APC_M2A1:4,
+    Armor.ST_Centaur_IV: 10,
+    Armor.HIT_Churchill_VII: 16,
+    Armor.LAC_M8_Greyhound: 8,
+    Armor.TD_M10_GMC: 14,
+    Armor.StuG_III_Ausf__G: 12,
+    AirDefence.AAA_Bofors_40mm: 8,
+    AirDefence.AAA_8_8cm_Flak_36: 8,
+    AirDefence.AAA_8_8cm_Flak_18: 12,
+    Artillery.M12_GMC: 10,
+    Artillery.Sturmpanzer_IV_Brummbär: 10,
 
     # ship
     CV_1143_5_Admiral_Kuznetsov: 100,
diff --git a/gen/aircraft.py b/gen/aircraft.py
index 21597750..2f2142e1 100644
--- a/gen/aircraft.py
+++ b/gen/aircraft.py
@@ -395,13 +395,33 @@ class AircraftConflictGenerator:
                 elif point.waypoint_type == FlightWaypointType.LANDING_POINT:
                     pt.type = "Land"
                 elif point.waypoint_type == FlightWaypointType.INGRESS_STRIKE:
-                    for j, t in enumerate(point.targets):
-                        print(t.position)
-                        pt.tasks.append(Bombing(t.position))
-                        if group.units[0].unit_type == JF_17 and j < 4:
-                            group.add_nav_target_point(t.position, "PP" + str(j + 1))
-                        if group.units[0].unit_type == F_14B and j == 0:
-                            group.add_nav_target_point(t.position, "ST")
+
+                    if group.units[0].unit_type == B_17G:
+                        if len(point.targets) > 0:
+                            bcenter = Point(0,0)
+                            for j, t in enumerate(point.targets):
+                                bcenter.x += t.position.x
+                                bcenter.y += t.position.y
+                            bcenter.x = bcenter.x / len(point.targets)
+                            bcenter.y = bcenter.y / len(point.targets)
+                            bombing = Bombing(bcenter)
+                            bombing.params["expend"] = "All"
+                            bombing.params["attackQtyLimit"] = False
+                            bombing.params["attackQty"] = 1
+                            bombing.params["expend"] = "All"
+                            bombing.params["directionEnabled"] = False
+                            bombing.params["altitudeEnabled"] = False
+                            bombing.params["weaponType"] = 2032
+                            bombing.params["groupAttack"] = True
+                            pt.tasks.append(bombing)
+                    else:
+                        for j, t in enumerate(point.targets):
+                            print(t.position)
+                            pt.tasks.append(Bombing(t.position))
+                            if group.units[0].unit_type == JF_17 and j < 4:
+                                group.add_nav_target_point(t.position, "PP" + str(j + 1))
+                            if group.units[0].unit_type == F_14B and j == 0:
+                                group.add_nav_target_point(t.position, "ST")
                 elif point.waypoint_type == FlightWaypointType.INGRESS_SEAD:
                     for j, t in enumerate(point.targets):
                         if group.units[0].unit_type == JF_17 and j < 4: