diff --git a/game/db.py b/game/db.py index 21b09b5a..ff6dca89 100644 --- a/game/db.py +++ b/game/db.py @@ -37,10 +37,10 @@ and prioritization for the enemy (i.e. less important bases will receive units w PRICES = { # fighter C_101CC: 8, - MiG_23MLD: 20, + MiG_23MLD: 18, Su_27: 24, Su_33: 25, - MiG_29A: 22, + MiG_29A: 24, MiG_29S: 26, F_5E_3: 6, @@ -137,6 +137,7 @@ UNIT_BY_TASK = { CAP: [ C_101CC, F_5E_3, + MiG_23MLD, Su_27, Su_33, MiG_21Bis, @@ -243,6 +244,7 @@ UNIT_BY_COUNTRY = { "Russia": [ C_101CC, AJS37, + MiG_23MLD, F_5E_3, Su_25, Su_27, diff --git a/theater/persiangulf.py b/theater/persiangulf.py index a61130bb..0cc3e06a 100644 --- a/theater/persiangulf.py +++ b/theater/persiangulf.py @@ -35,11 +35,11 @@ class PersianGulfTheater(ConflictTheater): tunb_kochak = ControlPoint.from_airport(persiangulf.Tunb_Kochak, [135, 180], SIZE_SMALL, 1.2, has_frontline=False) bandar_lengeh = ControlPoint.from_airport(persiangulf.Bandar_Lengeh, [270, 315, 0, 45], SIZE_SMALL, 1.1) - qeshm = ControlPoint.from_airport(persiangulf.Qeshm_Island, [270, 315, 0, 45, 90, 135, 180], SIZE_SMALL, 1.3, has_frontline=False) + qeshm = ControlPoint.from_airport(persiangulf.Qeshm_Island, [270, 315, 0, 45, 90, 135, 180], SIZE_SMALL, 1.2, has_frontline=False) - havadarya = ControlPoint.from_airport(persiangulf.Havadarya, COAST_DL_W, SIZE_REGULAR, 1.2) - bandar_abbas = ControlPoint.from_airport(persiangulf.Bandar_Abbas_Intl, LAND, SIZE_BIG, 1.3) - lar = ControlPoint.from_airport(persiangulf.Lar_Airbase, LAND, SIZE_REGULAR, 1.1) + havadarya = ControlPoint.from_airport(persiangulf.Havadarya, COAST_DL_W, SIZE_REGULAR, 1.1) + bandar_abbas = ControlPoint.from_airport(persiangulf.Bandar_Abbas_Intl, LAND, SIZE_BIG, 1.2) + lar = ControlPoint.from_airport(persiangulf.Lar_Airbase, LAND, SIZE_REGULAR, IMPORTANCE_LOW) shiraz = ControlPoint.from_airport(persiangulf.Shiraz_International_Airport, LAND, SIZE_BIG, IMPORTANCE_LOW) kerman = ControlPoint.from_airport(persiangulf.Kerman_Airport, LAND, SIZE_BIG, IMPORTANCE_LOW) @@ -48,6 +48,10 @@ class PersianGulfTheater(ConflictTheater): def __init__(self): super(PersianGulfTheater, self).__init__() + self.add_controlpoint(self.shiraz, connected_to=[self.lar, self.kerman]) + self.add_controlpoint(self.kerman, connected_to=[self.lar, self.shiraz]) + self.add_controlpoint(self.lar, connected_to=[self.bandar_lengeh, self.qeshm, self.havadarya, self.shiraz, self.kerman]) + self.add_controlpoint(self.al_dhafra, connected_to=[self.sir_abu_nuayr, self.al_maktoum]) self.add_controlpoint(self.al_maktoum, connected_to=[self.al_dhafra, self.al_minhad, self.sir_abu_nuayr]) self.add_controlpoint(self.al_minhad, connected_to=[self.al_maktoum, self.dubai]) @@ -66,9 +70,6 @@ class PersianGulfTheater(ConflictTheater): self.add_controlpoint(self.qeshm, connected_to=[self.bandar_lengeh, self.havadarya, self.tunb_island, self.lar]) self.add_controlpoint(self.havadarya, connected_to=[self.lar, self.qeshm, self.bandar_abbas]) self.add_controlpoint(self.bandar_abbas, connected_to=[self.havadarya]) - self.add_controlpoint(self.lar, connected_to=[self.bandar_lengeh, self.qeshm, self.havadarya, self.shiraz, self.kerman]) - self.add_controlpoint(self.shiraz, connected_to=[self.lar, self.kerman]) - self.add_controlpoint(self.kerman, connected_to=[self.lar, self.shiraz]) self.add_controlpoint(self.west_carrier) diff --git a/userdata/logging.py b/userdata/logging.py index b115f537..e0c22766 100644 --- a/userdata/logging.py +++ b/userdata/logging.py @@ -1,12 +1,16 @@ import logging import traceback +import sys from io import StringIO from tkinter import * from tkinter.scrolledtext import * -log_stream = StringIO() -logging.basicConfig(stream=log_stream, level=logging.INFO) +if "-stdout" in sys.argv: + logging.basicConfig(stream=sys.stdout, level=logging.INFO) +else: + log_stream = StringIO() + logging.basicConfig(stream=log_stream, level=logging.INFO) def _error_prompt():