backout revision 297

modules/wolfgame.py

@@ -77,7 +77,6 @@ def connect_callback(cli):
     var.LAST_STATS = None
     var.LAST_VOTES = None
     var.LAST_ADMINS = None
-    var.LAST_PLAYERS = None
     
     var.USERS = {}
     
@@ -351,7 +350,6 @@ def join(cli, nick, chan, rest):
         cli.msg(chan, '\u0002{0}\u0002 has joined the game.'.format(nick))
         
         var.LAST_STATS = None # reset
-        var.LAST_PLAYERS = None # re/set
 
 
 @cmd("fjoin", admin_only=True)
@@ -427,7 +425,7 @@ def on_account(cli, nick, acc):
 
 @cmd("stats")
 def stats(cli, nick, chan, rest):
-    """Display the game statistics"""
+    """Display the player statistics"""
     if var.PHASE == "none":
         cli.notice(nick, "No game is currently running.")
         return
@@ -445,12 +443,10 @@ def stats(cli, nick, chan, rest):
     
     pl.sort(key=lambda x: x.lower())
     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:
-        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":
         cli.msg(chan, msg)
@@ -503,29 +499,6 @@ def stats(cli, nick, chan, rest):
         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):
     if var.PHASE != "day": return

settings/wolfgame.py

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