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

Merge pull request #25 from brrr2/stasis-fix-2

Browse Source
This commit is contained in:
nyuszika7h 2014-04-30 18:49:10 +02:00
commit 25d80216a8
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/wolfgame.py
View File

@ -391,8 +391,7 @@ def fpinger(cli, nick, chan, rest):
pinger(cli, nick, chan, rest) pinger(cli, nick, chan, rest)
@cmd("j", raw_nick=True) @cmd("join", "j", raw_nick=True)
@cmd("join", raw_nick=True)
def join(cli, nick, chann_, rest): def join(cli, nick, chann_, rest):
"""Either starts a new game of Werewolf or joins an existing game that has not started yet.""" """Either starts a new game of Werewolf or joins an existing game that has not started yet."""
pl = var.list_players() pl = var.list_players()
@ -1558,7 +1557,7 @@ def chk_nightdone(cli):
@cmd("lynch", "vote","v") @cmd("lynch", "vote", "v")
def vote(cli, nick, chann_, rest): def vote(cli, nick, chann_, rest):
"""Use this to vote for a candidate to be lynched""" """Use this to vote for a candidate to be lynched"""
chan = botconfig.CHANNEL chan = botconfig.CHANNEL
@ -2581,19 +2580,20 @@ def on_error(cli, pfx, msg):
raise SystemExit raise SystemExit
@cmd("fstasis", admin_only=True) @pmcmd("fstasis", admin_only=True)
def fstasis(cli, nick, chan, rest): def fstasis(cli, nick, rest):
"""Admin command for removing or setting stasis penalties."""
data = rest.split() data = rest.split()
msg = None msg = None
if data: if data:
lusers = {k.lower(): v for k, v in var.USERS.items()} lusers = {k.lower(): v for k, v in var.USERS.items()}
user = data[0].lower() user = data[0].lower()
if user in lusers:
cloak = lusers[user]['cloak'] if user not in lusers:
else: cli.msg(nick, "Sorry, {0} cannot be found.".format(data[0]))
cloak = None
pm(cli, nick, "Sorry, that user cannot be found.")
return return
cloak = lusers[user]['cloak']
if len(data) == 1: if len(data) == 1:
if cloak in var.STASISED: if cloak in var.STASISED: