fixes & updates

This commit is contained in:
Vasyl Horbachenko
2018-06-17 03:32:43 +03:00
parent e54e548bdd
commit 45dbb37d50
36 changed files with 8926 additions and 83 deletions

View File

@@ -42,6 +42,9 @@ class BaseMenu(Menu):
for task_type, units in units.items():
Label(self.frame, text="{}".format(db.task_name(task_type))).grid(row=row, columnspan=5); row += 1
units = list(set(units))
units.sort(key=lambda x: db.PRICES[x])
for unit_type in units:
purchase_row(unit_type, db.PRICES[unit_type])

View File

@@ -62,12 +62,14 @@ class EventMenu(Menu):
row += 1
Label(self.frame, text="{}. {}".format(self.event, self.event.threat_description)).grid(row=row, column=0, columnspan=3)
row += 1
Button(self.frame, text="Commit", command=self.start).grid(column=1, row=row, sticky=E)
Button(self.frame, text="Back", command=self.dismiss).grid(column=2, row=row, sticky=E)
awacs_enabled = self.game.budget >= AWACS_BUDGET_COST and NORMAL or DISABLED
Checkbutton(self.frame, text="AWACS ({}m)".format(AWACS_BUDGET_COST), var=self.awacs, state=awacs_enabled).grid(row=row, column=0, sticky=W)
row += 1
label("Aircraft")

View File

@@ -52,6 +52,9 @@ class EventResultsMenu(Menu):
Separator(self.frame, orient='horizontal').grid(row=row, columnspan=1, sticky=NE); row += 1
Label(self.frame, text="Enemy losses").grid(columnspan=1, row=row); row += 1
for unit_type, count in self.enemy_losses.items():
if count == 0:
continue
Label(self.frame, text=db.unit_type_name(unit_type)).grid(row=row)
Label(self.frame, text="{}".format(count)).grid(column=1, row=row)
row += 1

View File

@@ -43,8 +43,8 @@ class MainMenu(Menu):
Separator(self.frame, orient='horizontal').grid(row=row, sticky=EW); row += 1
Button(self.frame, text="Configuration", command=self.configuration_menu).grid(column=0, row=0, sticky=NE)
Button(self.frame, text="Pass turn", command=self.pass_turn).grid(column=0, row=0, sticky=N)
Label(self.frame, text="Budget: {}m (+{}m)".format(self.game.budget, self.game.budget_reward_amount)).grid(column=0, row=0, sticky=NW)
Button(self.frame, text="Pass turn", command=self.pass_turn).grid(column=0, row=0, sticky=NW)
Label(self.frame, text="Budget: {}m (+{}m)".format(self.game.budget, self.game.budget_reward_amount)).grid(column=0, row=0, sticky=N)
Separator(self.frame, orient='horizontal').grid(row=row, sticky=EW); row += 1
events = self.game.events