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

make gamemode votes by nick and not by cloak, fix deleting votes when a player quits

Browse Source
This commit is contained in:
jacob1 2015-03-09 01:55:55 -04:00
parent cf4458142a
commit 7be5bc50e1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/wolfgame.py
View File

@ -2426,6 +2426,8 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True,
if devoice: if devoice:
cmode.append(("-v", nick)) cmode.append(("-v", nick))
if var.PHASE == "join": if var.PHASE == "join":
if nick in var.GAMEMODE_VOTES:
del var.GAMEMODE_VOTES[nick]
# Died during the joining process as a person # Died during the joining process as a person
if var.AUTO_TOGGLE_MODES and nick in var.USERS and var.USERS[nick]["moded"]: if var.AUTO_TOGGLE_MODES and nick in var.USERS and var.USERS[nick]["moded"]:
for newmode in var.USERS[nick]["moded"]: for newmode in var.USERS[nick]["moded"]:
@ -2482,11 +2484,6 @@ def del_player(cli, nick, forced_death = False, devoice = True, end_game = True,
var.WOUNDED.remove(nick) var.WOUNDED.remove(nick)
if nick in var.ASLEEP: if nick in var.ASLEEP:
var.ASLEEP.remove(nick) var.ASLEEP.remove(nick)
if nick in var.PLAYERS:
cloak = var.PLAYERS[nick]["cloak"]
if cloak in var.GAMEMODE_VOTES
:
del var.GAMEMODE_VOTES[cloak]
chk_decision(cli) chk_decision(cli)
elif var.PHASE == "night" and ret: elif var.PHASE == "night" and ret:
chk_nightdone(cli) chk_nightdone(cli)
@ -2892,6 +2889,11 @@ def on_nick(cli, oldnick, nick):
v.remove(prefix) v.remove(prefix)
v.append(nick) v.append(nick)
if var.PHASE == "join":
if prefix in var.GAMEMODE_VOTES:
var.GAMEMODE_VOTES[nick] = var.GAMEMODE_VOTES[prefix]
del var.GAMEMODE_VOTES[prefix]
# Check if he was DC'ed # Check if he was DC'ed
if var.PHASE in ("night", "day"): if var.PHASE in ("night", "day"):
with var.GRAVEYARD_LOCK: with var.GRAVEYARD_LOCK:
@ -6968,7 +6970,7 @@ def game(cli, nick, chan, rest):
gamemode = match gamemode = match
if gamemode != "roles": if gamemode != "roles":
var.GAMEMODE_VOTES[cloak] = gamemode var.GAMEMODE_VOTES[nick] = gamemode
cli.msg(chan, "\002{0}\002 votes for the \002{1}\002 game mode.".format(nick, gamemode)) cli.msg(chan, "\002{0}\002 votes for the \002{1}\002 game mode.".format(nick, gamemode))
else: else:
cli.notice(nick, "You can't vote for that game mode.") cli.notice(nick, "You can't vote for that game mode.")