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

ping villagers in end of game list + some bugfixes

Browse Source
This commit is contained in:
jacob1 2014-12-17 21:49:34 -05:00
parent 44a10b206e
commit 4bced1cf2a
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/wolfgame.py
View File

@ -1481,30 +1481,27 @@ def stop_game(cli, winner = ""):
if role in var.TEMPLATE_RESTRICTIONS.keys(): if role in var.TEMPLATE_RESTRICTIONS.keys():
continue continue
for p in playerlist: for p in playerlist:
if p.startswith("(dced)"): # don't care about it here player = p #with (dced) still in
rolelist[role].remove(p) if p.startswith("(dced)"):
p = p[6:] p = p[6:]
rolelist[role].append(p)
if p in var.FINAL_ROLES and var.FINAL_ROLES[p] != role and (role != "amnesiac" or p in var.AMNESIACS): if p in var.FINAL_ROLES and var.FINAL_ROLES[p] != role and (role != "amnesiac" or p in var.AMNESIACS):
origroles[p] = role origroles[p] = role
rolelist[role].remove(p) rolelist[role].remove(player)
rolelist[var.FINAL_ROLES[p]].append(p) rolelist[var.FINAL_ROLES[p]].append(p)
prev = False prev = False
for role in var.role_order(): for role in var.role_order():
if not rolelist[role]: if len(rolelist[role]) == 0:
continue continue
playersformatted = [] playersformatted = []
for i in range(0, len(rolelist[role])): for p in rolelist[role]:
p = rolelist[role][i] if p.startswith("(dced)"):
#don't print default role, but if someone exchanged into villager, print what they were anyway p = p[6:]
if role == var.DEFAULT_ROLE and p not in origroles:
continue
playersformatted.append("\u0002{0}\u0002".format(p))
if p in origroles: if p in origroles:
playersformatted[-1] += " ({0}{1})".format("" if prev else "was ", origroles[p]) playersformatted.append("\u0002{0}\u0002 ({1}{2})".format(p,
"" if prev else "was ", origroles[p]))
prev = True prev = True
if not playersformatted: else:
continue playersformatted.append("\u0002{0}\u0002".format(p))
if len(rolelist[role]) == 2: if len(rolelist[role]) == 2:
msg = "The {1} were {0[0]} and {0[1]}." msg = "The {1} were {0[0]} and {0[1]}."
roles_msg.append(msg.format(playersformatted, var.plural(role))) roles_msg.append(msg.format(playersformatted, var.plural(role)))