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

backout revision 297

Browse Source
This commit is contained in:
Jimmy Cao 2012-02-26 18:29:25 -06:00
parent 04b29cb428
commit a294fd3fca
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modules/wolfgame.py
View File

@ -77,7 +77,6 @@ def connect_callback(cli):
var.LAST_STATS = None var.LAST_STATS = None
var.LAST_VOTES = None var.LAST_VOTES = None
var.LAST_ADMINS = None var.LAST_ADMINS = None
var.LAST_PLAYERS = None
var.USERS = {} var.USERS = {}
@ -351,7 +350,6 @@ def join(cli, nick, chan, rest):
cli.msg(chan, '\u0002{0}\u0002 has joined the game.'.format(nick)) cli.msg(chan, '\u0002{0}\u0002 has joined the game.'.format(nick))
var.LAST_STATS = None # reset var.LAST_STATS = None # reset
var.LAST_PLAYERS = None # re/set
@cmd("fjoin", admin_only=True) @cmd("fjoin", admin_only=True)
@ -427,7 +425,7 @@ def on_account(cli, nick, acc):
@cmd("stats") @cmd("stats")
def stats(cli, nick, chan, rest): def stats(cli, nick, chan, rest):
"""Display the game statistics""" """Display the player statistics"""
if var.PHASE == "none": if var.PHASE == "none":
cli.notice(nick, "No game is currently running.") cli.notice(nick, "No game is currently running.")
return return
@ -445,12 +443,10 @@ def stats(cli, nick, chan, rest):
pl.sort(key=lambda x: x.lower()) pl.sort(key=lambda x: x.lower())
if len(pl) > 1: if len(pl) > 1:
msg = '{0}: \u0002{1}\u0002 players'.format(nick, len(pl)) msg = '{0}: \u0002{1}\u0002 players: {2}'.format(nick,
len(pl), ", ".join(pl))
else: else:
msg = '{0}: \u00021\u0002 player'.format(nick) msg = '{0}: \u00021\u0002 player: {1}'.format(nick, pl[0])
if var.PHASE == "join":
msg = msg + ". The game has not started yet."
if nick in pl or var.PHASE == "join": if nick in pl or var.PHASE == "join":
cli.msg(chan, msg) cli.msg(chan, msg)
@ -503,29 +499,6 @@ def stats(cli, nick, chan, rest):
cli.notice(nick, stats_mssg) cli.notice(nick, stats_mssg)
@cmd("players")
def players(cli, nick, chan, rest):
"""Display the player statistics"""
if var.PHASE == "none":
cli.notice(nick, "No players have joined.")
return
if (var.LAST_PLAYERS and
var.LAST_PLAYERS + timedelta(seconds=var.PLAYERS_RATE_LIMIT) > datetime.now()):
cli.msg(chan, nick+": This command is rate-limited.")
return
var.LAST_PLAYERS = datetime.now()
pl = var.list_players()
pl.sort(key=lambda x: x.lower())
if len(pl) > 1:
cli.msg(chan, '{0}: \u0002{1}\u0002 players: {2}'.format(nick,
len(pl), ", ".join(pl)))
else:
cli.msg(chan, '{0}: \u00021\u0002 player: {1}'.format(nick, pl[0]))
def hurry_up(cli, gameid, change): def hurry_up(cli, gameid, change):
if var.PHASE != "day": return if var.PHASE != "day": return

1
settings/wolfgame.py
View File

@ -5,7 +5,6 @@ EXTRA_WAIT = 20
MAXIMUM_WAITED = 2 # limit for amount of !wait's MAXIMUM_WAITED = 2 # limit for amount of !wait's
STATS_RATE_LIMIT = 15 STATS_RATE_LIMIT = 15
VOTES_RATE_LIMIT = 15 VOTES_RATE_LIMIT = 15
PLAYERS_RATE_LIMIT = 45
ADMINS_RATE_LIMIT = 300 ADMINS_RATE_LIMIT = 300
SHOTS_MULTIPLIER = .12 # ceil(shots_multiplier * len_players) = bullets given SHOTS_MULTIPLIER = .12 # ceil(shots_multiplier * len_players) = bullets given
MAX_PLAYERS = 30 MAX_PLAYERS = 30