Generate CAP on whole map, for 2 hours. Added China.

This commit is contained in:
Khopa
2019-10-07 01:57:36 +02:00
parent 2167953b87
commit 7a14376765
17 changed files with 132 additions and 1802 deletions

View File

@@ -81,14 +81,14 @@ class QMapControlPoint(QGraphicsRectItem):
@property
def brush_color(self)->QColor:
if self.parent.game.player_country == "USA":
if self.parent.game.player_country in ["USA", "France", "Germany", "UK"]:
return self.model.captured and CONST.COLORS["blue"] or CONST.COLORS["red"]
else:
return self.model.captured and CONST.COLORS["red"] or CONST.COLORS["blue"]
@property
def pen_color(self) -> QColor:
if self.parent.game.player_country == "USA":
if self.parent.game.player_country in ["USA", "France", "Germany", "UK"]:
return self.model.captured and CONST.COLORS["dark_blue"] or CONST.COLORS["bright_red"]
else:
return self.model.captured and CONST.COLORS["bright_red"] or CONST.COLORS["dark_blue"]

View File

@@ -25,7 +25,7 @@ class QMapGroundObject(QGraphicsRectItem):
tooltip = ""
for unit in units.keys():
tooltip = tooltip + str(unit) + "x" + str(units[unit]) + "\n"
self.setToolTip(tooltip + str(model.groups[0].id) + str(model.groups[0].name))
self.setToolTip(tooltip[:-1])
else:
self.setToolTip(cp.name + "'s " + self.model.category)