fix choice tiebreak loop and cancel tiebreak lost tokens
This commit is contained in:
parent
a3b9f5a943
commit
42ad708e77
13 changed files with 333 additions and 129 deletions
|
|
@ -167,7 +167,7 @@ class CampaignController:
|
|||
|
||||
def resolve_ties(
|
||||
self, war: War, contexts: List[TieContext]
|
||||
) -> Dict[tuple[str, str, int | None], Dict[str, bool]]:
|
||||
) -> Dict[tuple[str, str, int | None, str | None, str | None], Dict[str, bool]]:
|
||||
bids_map = {}
|
||||
for ctx in contexts:
|
||||
active = TieResolver.get_active_participants(war, ctx, ctx.participants)
|
||||
|
|
@ -180,7 +180,7 @@ class CampaignController:
|
|||
parent=self.app.view,
|
||||
players=players,
|
||||
counters=counters,
|
||||
context_type=ContextType.CAMPAIGN,
|
||||
context_type=ctx.context_type,
|
||||
context_id=ctx.context_id,
|
||||
context_name=None,
|
||||
)
|
||||
|
|
@ -192,7 +192,7 @@ class CampaignController:
|
|||
counters=counters,
|
||||
context_type=ctx.context_type,
|
||||
context_id=ctx.context_id,
|
||||
context_name=objective.name,
|
||||
context_name=f"Objective tie: {objective.name}",
|
||||
)
|
||||
if not dialog.exec():
|
||||
TieResolver.cancel_tie_break(war, ctx)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue