Minor changes.
Added grand total to the output of "gamestats" command when no size is given. Changed camel case to '_' for a couple of variables. Added identification check for "player" command.
This commit is contained in:
parent
04d2702f36
commit
3d367f6bea
@ -2944,6 +2944,9 @@ def player_stats(cli, nick, chan, rest):
|
|||||||
# Find the player's account if possible.
|
# Find the player's account if possible.
|
||||||
if params[0] in var.USERS:
|
if params[0] in var.USERS:
|
||||||
acc = var.USERS[params[0]]["account"]
|
acc = var.USERS[params[0]]["account"]
|
||||||
|
if acc == "*":
|
||||||
|
cli.notice(nick, "{0} is not identified with NickServ.".format(params[0]))
|
||||||
|
return
|
||||||
else:
|
else:
|
||||||
acc = params[0]
|
acc = params[0]
|
||||||
|
|
||||||
|
@ -308,18 +308,18 @@ def get_player_stats(acc, role):
|
|||||||
return "No stats for {0} as {1}.".format(acc, role)
|
return "No stats for {0} as {1}.".format(acc, role)
|
||||||
|
|
||||||
def get_player_totals(acc):
|
def get_player_totals(acc):
|
||||||
roleTotals = []
|
role_totals = []
|
||||||
with conn:
|
with conn:
|
||||||
for role in ["villager"] + [v for k, v in ROLE_INDICES.items()]:
|
for role in ["villager"] + [v for k, v in ROLE_INDICES.items()]:
|
||||||
c.execute("SELECT totalgames FROM rolestats WHERE player=? AND role=?", (acc, role))
|
c.execute("SELECT totalgames FROM rolestats WHERE player=? AND role=?", (acc, role))
|
||||||
row = c.fetchone()
|
row = c.fetchone()
|
||||||
if row:
|
if row:
|
||||||
roleTotals.append("\u0002{0}\u0002: {1}".format(role, *row))
|
role_totals.append("\u0002{0}\u0002: {1}".format(role, *row))
|
||||||
|
|
||||||
if len(roleTotals) == 0:
|
if len(role_totals) == 0:
|
||||||
return "{0} has not played any games.".format(acc)
|
return "{0} has not played any games.".format(acc)
|
||||||
else:
|
else:
|
||||||
return "\u0002{0}\u0002's totals | {1}".format(acc, ", ".join(roleTotals))
|
return "\u0002{0}\u0002's totals | {1}".format(acc, ", ".join(role_totals))
|
||||||
|
|
||||||
def get_game_stats(size):
|
def get_game_stats(size):
|
||||||
with conn:
|
with conn:
|
||||||
@ -330,15 +330,17 @@ def get_game_stats(size):
|
|||||||
return "No stats for \u0002{0}\u0002 player games.".format(size)
|
return "No stats for \u0002{0}\u0002 player games.".format(size)
|
||||||
|
|
||||||
def get_game_totals():
|
def get_game_totals():
|
||||||
sizeList = []
|
size_totals = []
|
||||||
|
total = 0
|
||||||
with conn:
|
with conn:
|
||||||
for size in range(4, MAX_PLAYERS):
|
for size in range(4, MAX_PLAYERS):
|
||||||
c.execute("SELECT size, totalgames FROM gamestats WHERE size=?", (size,))
|
c.execute("SELECT size, totalgames FROM gamestats WHERE size=?", (size,))
|
||||||
row = c.fetchone()
|
row = c.fetchone()
|
||||||
if row:
|
if row:
|
||||||
sizeList.append("\u0002{0}p\u0002: {1}".format(*row))
|
size_totals.append("\u0002{0}p\u0002: {1}".format(*row))
|
||||||
|
total += row[1]
|
||||||
|
|
||||||
if len(sizeList) == 0:
|
if len(size_totals) == 0:
|
||||||
return "No games have been played."
|
return "No games have been played."
|
||||||
else:
|
else:
|
||||||
return "Game totals | %s" % ", ".join(sizeList)
|
return "Total games ({0}) | {1}".format(total, ", ".join(size_totals))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user