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

Attempt to actually fix !stats in PM

Browse Source
This commit is contained in:
nyuszika7h 2014-03-02 21:45:39 +01:00
parent 37606dde4f
commit a9cb639378
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/wolfgame.py
View File

@ -528,7 +528,6 @@ def on_account(cli, nick, acc):
var.USERS[nick]["account"] = acc var.USERS[nick]["account"] = acc
@cmd("stats") @cmd("stats")
@pmcmd("stats")
def stats(cli, nick, chan, rest): def stats(cli, nick, chan, rest):
"""Display the player statistics""" """Display the player statistics"""
if var.PHASE == "none": if var.PHASE == "none":
@ -537,7 +536,7 @@ def stats(cli, nick, chan, rest):
pl = var.list_players() pl = var.list_players()
if nick in pl or var.PHASE == "join": if nick != chan and (nick in pl or var.PHASE == "join"):
# only do this rate-limiting stuff if the person is in game # only do this rate-limiting stuff if the person is in game
if (var.LAST_STATS and if (var.LAST_STATS and
var.LAST_STATS + timedelta(seconds=var.STATS_RATE_LIMIT) > datetime.now()): var.LAST_STATS + timedelta(seconds=var.STATS_RATE_LIMIT) > datetime.now()):
@ -554,12 +553,14 @@ def stats(cli, nick, chan, rest):
else: else:
msg = '{0}: \u00021\u0002 player: {1}'.format(nick, pl[0]) msg = '{0}: \u00021\u0002 player: {1}'.format(nick, pl[0])
if nick in pl or var.PHASE == "join": if nick == chan:
cli.msg(chan, msg) pm(cli, nick, msg)
var.LOGGER.logMessage(msg.replace("\02", ""))
else: else:
if nick in pl or var.PHASE == "join":
cli.notice(nick, msg) cli.msg(chan, msg)
var.LOGGER.logMessage(msg.replace("\02", ""))
else:
cli.notice(nick, msg)
if var.PHASE == "join": if var.PHASE == "join":
return return
@ -605,11 +606,18 @@ def stats(cli, nick, chan, rest):
message[-1], message[-1],
vb, vb,
var.PHASE) var.PHASE)
if nick in pl or var.PHASE == "join": if nick == chan:
cli.msg(chan, stats_mssg) pm(cli, nick, stats_mssg)
var.LOGGER.logMessage(stats_mssg.replace("\02", ""))
else: else:
cli.notice(nick, stats_mssg) if nick in pl or var.PHASE == "join":
cli.msg(chan, stats_mssg)
var.LOGGER.logMessage(stats_mssg.replace("\02", ""))
else:
cli.notice(nick, stats_mssg)
@pmcmd("stats")
def stats_pm(cli, nick, rest):
stats(cli, nick, nick, rest)