diff --git a/game/db.py b/game/db.py index ecfbea3f..9b0a65a3 100644 --- a/game/db.py +++ b/game/db.py @@ -85,16 +85,15 @@ PRICES = { C_130: 8, # armor - Armor.MBT_T_55: 4, + Armor.APC_BTR_80: 4, + Armor.MBT_T_55: 6, Armor.MBT_T_80U: 8, Armor.MBT_T_90: 10, + Armor.ATGM_M1134_Stryker: 4, Armor.MBT_M60A3_Patton: 6, Armor.MBT_M1A2_Abrams: 9, - Armor.ATGM_M1134_Stryker: 6, - Armor.APC_BTR_80: 6, - Unarmed.Transport_UAZ_469: 3, Unarmed.Transport_Ural_375: 3, Infantry.Infantry_M4: 1, @@ -181,7 +180,24 @@ UNIT_BY_TASK = { AWACS: [E_3A, A_50, ], - PinpointStrike: [Armor.MBT_T_90, Armor.MBT_T_80U, Armor.MBT_T_55, Armor.MBT_M1A2_Abrams, Armor.MBT_M60A3_Patton, Armor.ATGM_M1134_Stryker, Armor.APC_BTR_80, ], + PinpointStrike: [ + Armor.APC_BTR_80, + Armor.APC_BTR_80, + Armor.APC_BTR_80, + Armor.MBT_T_55, + Armor.MBT_T_55, + Armor.MBT_T_55, + Armor.MBT_T_80U, + Armor.MBT_T_80U, + Armor.MBT_T_90, + + Armor.ATGM_M1134_Stryker, + Armor.ATGM_M1134_Stryker, + Armor.MBT_M60A3_Patton, + Armor.MBT_M60A3_Patton, + Armor.MBT_M60A3_Patton, + Armor.MBT_M1A2_Abrams, + ], AirDefence: [ # those are listed multiple times here to balance prioritization more into lower tier AAs AirDefence.AAA_Vulcan_M163, diff --git a/gen/triggergen.py b/gen/triggergen.py index d22b0fa1..1c4ecc9b 100644 --- a/gen/triggergen.py +++ b/gen/triggergen.py @@ -81,9 +81,6 @@ class TriggersGenerator: if group.task == AWACS.name or group.task == Refueling.name: continue - if player_cp.position.distance_to_point(group.position) > PUSH_TRIGGER_SIZE * 3: - continue - push_by_trigger.append(group) if not group.units[0].is_human():