notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent winners duplication in stop_game

Browse Source
This commit is contained in:
Vgr E.Barry 2016-08-03 14:09:38 -04:00
parent 5db2a5d0f2
commit 5b22bdd18a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wolfgame.py
View File

@ -2477,10 +2477,10 @@ def stop_game(cli, winner="", abort=False, additional_winners=None, log=True):
if winner != "" or log: if winner != "" or log:
plrl = {} plrl = {}
pltp = defaultdict(list) pltp = defaultdict(list)
winners = [] winners = set()
player_list = [] player_list = []
if additional_winners is not None: if additional_winners is not None:
winners.extend(additional_winners) winners.update(additional_winners)
for role,ppl in var.ORIGINAL_ROLES.items(): for role,ppl in var.ORIGINAL_ROLES.items():
if role in var.TEMPLATE_RESTRICTIONS.keys(): if role in var.TEMPLATE_RESTRICTIONS.keys():
for x in ppl: for x in ppl:
@ -2640,14 +2640,14 @@ def stop_game(cli, winner="", abort=False, additional_winners=None, log=True):
pentry["won"] = won pentry["won"] = won
pentry["iwon"] = iwon pentry["iwon"] = iwon
if won or iwon: if won or iwon:
winners.append(splr) winners.add(splr)
if pentry["nick"] is not None: if pentry["nick"] is not None:
# don't record fjoined fakes # don't record fjoined fakes
player_list.append(pentry) player_list.append(pentry)
if winner == "": if winner == "":
winners = [] winners = set()
if log: if log:
game_options = {"role reveal": var.ROLE_REVEAL, game_options = {"role reveal": var.ROLE_REVEAL,
@ -2672,7 +2672,7 @@ def stop_game(cli, winner="", abort=False, additional_winners=None, log=True):
game_options) game_options)
# spit out the list of winners # spit out the list of winners
winners.sort() winners = sorted(winners)
if len(winners) == 1: if len(winners) == 1:
cli.msg(chan, messages["single_winner"].format(winners[0])) cli.msg(chan, messages["single_winner"].format(winners[0]))
elif len(winners) == 2: elif len(winners) == 2: