fixes for selectable departure; generate statics for used units; raised RTB alt

This commit is contained in:
Vasyl Horbachenko
2018-11-05 03:17:06 +02:00
parent 355cd3e0e4
commit 9d0997624b
17 changed files with 57 additions and 26 deletions

View File

@@ -195,7 +195,7 @@ class EventMenu(Menu):
return
if isinstance(self.event, FrontlineAttackEvent) or isinstance(self.event, FrontlinePatrolEvent):
if self.base.total_armor == 0:
if self.event.from_cp.base.total_armor == 0:
self.error_label["text"] = "No ground vehicles available to attack!"
return

View File

@@ -164,7 +164,8 @@ class OverviewCanvas:
InsurgentAttackEvent: "insurgent_attack",
InterceptEvent: "air_intercept",
NavalInterceptEvent: "naval_intercept",
StrikeEvent: "strike"}.items():
StrikeEvent: "strike",
UnitsDeliveryEvent: "delivery"}.items():
self.event_icons[category] = pygame.image.load(os.path.join("resources", "ui", "events", image + ".png"))
@@ -473,7 +474,7 @@ class OverviewCanvas:
return rect
def _events_priority_key(event: Event) -> int:
priority_list = [InfantryTransportEvent, StrikeEvent, BaseAttackEvent]
priority_list = [InfantryTransportEvent, StrikeEvent, BaseAttackEvent, UnitsDeliveryEvent]
if type(event) not in priority_list:
return 0
else:
@@ -481,7 +482,6 @@ class OverviewCanvas:
events = self.game.events
events.sort(key=_events_priority_key, reverse=True)
print(events)
label_to_draw = None
for event in self.game.events: