simplify unused objectives display and tie-break
This commit is contained in:
parent
9b28e85557
commit
0c6014e946
5 changed files with 31 additions and 11 deletions
|
|
@ -60,8 +60,7 @@ class CampaignController:
|
|||
vp_icon_map = RankingIcon.compute_icons(
|
||||
war, ContextType.CAMPAIGN, campaign_id, scores
|
||||
)
|
||||
# TODO get only objectives used in major/minor (ignore token only)
|
||||
for obj in war.get_all_objectives():
|
||||
for obj in war.get_objectives_used_as_maj_or_min():
|
||||
objective_icon_maps[obj.id] = RankingIcon.compute_icons(
|
||||
war,
|
||||
ContextType.CAMPAIGN,
|
||||
|
|
@ -94,7 +93,8 @@ class CampaignController:
|
|||
)
|
||||
)
|
||||
objectives = [
|
||||
ObjectiveDTO(o.id, o.name, o.description) for o in war.get_all_objectives()
|
||||
ObjectiveDTO(o.id, o.name, o.description)
|
||||
for o in war.get_objectives_used_as_maj_or_min()
|
||||
]
|
||||
self.app.view.display_campaign_participants(rows, objectives)
|
||||
self.app.view.endCampaignBtn.setEnabled(not camp.is_over)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue