EZPPFarm/pep.py
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.ADD. .BANCHO. Add mania pp to !last

Browse Source
This commit is contained in:
russelg 2016-07-20 21:20:23 +08:00 committed by Nyo
parent a6bd08e928
commit 4dfd8d63bf
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
constants/fokabotCommands.py
View File

@ -543,15 +543,20 @@ def tillerinoLast(fro, chan, message):
data["300_count"], data["100_count"], data["50_count"], data["misses_count"]) data["300_count"], data["100_count"], data["50_count"], data["misses_count"])
ifPlayer = "{0} | ".format(fro) if chan != "FokaBot" else "" ifPlayer = "{0} | ".format(fro) if chan != "FokaBot" else ""
ifFc = " (FC)" if data["max_combo"] == data["fc"] else " {0}x/{1}x".format(data["max_combo"], data["fc"])
beatmapLink = "[http://osu.ppy.sh/b/{1} {0}]".format(data["sn"], data["bid"]) beatmapLink = "[http://osu.ppy.sh/b/{1} {0}]".format(data["sn"], data["bid"])
ifFc = " (FC)" if data["max_combo"] == data["fc"] else " {0}x/{1}x".format(data["max_combo"], data["fc"]) hasPP = data["play_mode"] == gameModes.std or data["play_mode"] == gameModes.mania
msg = ifPlayer
msg += beatmapLink
if data["play_mode"] != gameModes.std: if data["play_mode"] != gameModes.std:
msg = ifPlayer msg += " <{0}>".format(gameModes.getGameModeForPrinting(data["play_mode"]))
msg += beatmapLink
if data["mods"]: if data["mods"]:
msg += ' +' + generalFunctions.readableMods(data["mods"]) msg += ' +' + generalFunctions.readableMods(data["mods"])
if not hasPP:
msg += " | {0:,}".format(data["score"]) msg += " | {0:,}".format(data["score"])
msg += ifFc msg += ifFc
msg += " | {0:.2f}%, {1}".format(data["accuracy"], rank.upper()) msg += " | {0:.2f}%, {1}".format(data["accuracy"], rank.upper())
@ -559,16 +564,12 @@ def tillerinoLast(fro, chan, message):
msg += " | {0:.2f} stars".format(data[diffString]) msg += " | {0:.2f} stars".format(data[diffString])
return msg return msg
msg = ifPlayer
msg += beatmapLink
if data["mods"]:
msg += ' +' + generalFunctions.readableMods(data["mods"])
msg += " ({0:.2f}%, {1})".format(data["accuracy"], rank.upper()) msg += " ({0:.2f}%, {1})".format(data["accuracy"], rank.upper())
msg += ifFc msg += ifFc
msg += " | {0:.2f}pp".format(data["pp"]) msg += " | {0:.2f}pp".format(data["pp"])
stars = data[diffString] stars = data[diffString]
if data["mods"] and data["play_mode"] == gameModes.std: if data["mods"]:
token = glob.tokens.getTokenFromUsername(fro) token = glob.tokens.getTokenFromUsername(fro)
if token == None: if token == None:
return False return False

18
constants/gameModes.py
View File

@ -21,3 +21,21 @@ def getGameModeForDB(gameMode):
return "ctb" return "ctb"
else: else:
return "mania" return "mania"
def getGameModeForPrinting(gameMode):
"""
Convert a gamemode number to string for showing to a user (e.g. !last)
gameMode -- gameMode int or variable (ex: gameMode.std)
return -- game mode readable string for a human
"""
if gameMode == std:
return "osu!"
elif gameMode == taiko:
return "Taiko"
elif gameMode == ctb:
return "CatchTheBeat"
else:
return "osu!mania"