diff --git a/cogs/compare.py b/cogs/compare.py deleted file mode 100644 index deaf941..0000000 --- a/cogs/compare.py +++ /dev/null @@ -1,134 +0,0 @@ -import discord -from discord.ext import commands -import requests - -class Compare(commands.Cog): - def __init__(self, client): - self.client = client - - @commands.Cog.listener() - async def on_ready(self): - print("compare.py is ready") - - @commands.command() - async def compare(self, ctx, *message): - listofpnameid = {} - for i in range(len(message)): - playername = message[i].replace(",", "") - playerid = self.getplayerid(playername) - listofpnameid[playername] = playerid - - weaponid = "" - weaponname = "" - listofplayerids = [] - for w in listofpnameid: - if(listofpnameid[w] == 'None'): - weaponid = self.getweaponid(w) - weaponname = w - listofpnameid[w] = weaponid - else: - listofplayerids.append(listofpnameid[w]) - - botmessage = "" - listofstats = [] - for p in listofplayerids: - stats = self.getstats(p, weaponid, weaponname) - listofstats.append(stats) - if ("".join(listofstats) != ""): - divider = str("\n --------------- \n") - botmessage = divider.join(listofstats) - await ctx.send(f'```{botmessage}```') - else: - botmessage = "No existing player found in the given list" - await ctx.send(f'```{botmessage}```') - - def getplayerid(self, playername): - playerid = "None" - payload = str("username=") + playername - response = requests.get('https://northstar.tf/accounts/lookup_uid', params=payload).json() - if (response['matches'] != None): - playerid = response['matches'][0] - return str(playerid) - - def getweaponid(self, weaponname): - response = requests.get('https://tone.sleepycat.date/v2/client/weapons').json() - r = response.keys() - - weapon_dict = {'execution': 'human_execution', - 'mp_weapon_car': 'car', - 'mp_weapon_defender': 'charge_rifle', - 'mp_weapon_doubletake': 'double_take', - 'mp_weapon_epg': 'epg', - 'mp_weapon_hemlok_smg': 'volt', - 'mp_weapon_lstar': 'lstar', - 'mp_weapon_r97':'r97', - 'mp_weapon_rspn101': 'r-201', - 'mp_weapon_smart_pistol': 'smart_pistol', - 'mp_weapon_sniper': 'kraber', - 'mp_weapon_vinson': 'flatline', - 'mp_weapon_autopistol': 're-45_auto', - 'mp_weapon_alternator_smg': 'alternator', - 'mp_weapon_frag_grenade': 'frag_grenade', - 'mp_weapon_g2': 'g2', - 'mp_weapon_lmg': 'spitfire', - 'mp_weapon_smr': 'smr', - 'mp_weapon_softball': 'softball', - 'mp_weapon_thermite_grenade': 'firestar', - 'pilot_emptyhanded': 'melee', - 'mp_weapon_mastiff': 'masstiff', - 'mp_weapon_mgl': 'mgl', - 'mp_weapon_rspn101_og': 'r-101', - 'mp_weapon_wingman': 'wingman', - 'invalid': 'invalid', - 'mp_weapon_arc_launcher': 'thunderbolt', - 'mp_weapon_dmr': 'dmr', - 'mp_weapon_grenade_electric_smoke': 'electric_smoke', - 'mp_weapon_pulse_lmg': 'cold_war', - 'mp_weapon_satchel': 'satchel', - 'mp_weapon_shotgun': 'eva-8_auto', - 'mp_weapon_shotgun_pistol': 'mozambique', - 'mp_weapon_wingman_n': 'wingman_elite', - 'mp_weapon_grenade_gravity': 'gravity_star', - 'mp_weapon_grenade_sonar': 'pulse_blade', - 'mp_weapon_rocket_launcher': 'archer', - 'outOfBounds': 'outOfBounds', - 'mind_crime': 'mind_crime', - 'mp_weapon_esaw': 'devotion', - 'fall': 'fall', - 'mp_weapon_semipistol': 'p2016', - 'mp_weapon_grenade_emp': 'arc_grenade', - 'mp_weapon_hemlok': 'hemlok', - 'melee_pilot_emptyhanded': 'melee', - 'phase_shift': 'phase_shift' - } - weaponid = "" - for i in r: - if(i in weapon_dict.keys()): - if (weaponname.lower() == weapon_dict[i]): - weaponid = i - break - - return weaponid - - def getstats(self, playerid, weaponid = "", weaponname = ""): - payload = {'player': playerid, 'weapon': weaponid} - response = requests.get('https://tone.sleepycat.date/v2/client/players', params=payload).json() - killstats = response[playerid] - botmessage = str("Playername: " + killstats['username'] + '\n' + "Kills : " + str(killstats['kills']) + '\n' ) - - if(weaponid != ""): - deaths=killstats['deaths_while_equipped'] - if(deaths == 0): - deaths = 1; - botmessage += str("Deaths : " + str(killstats['deaths_while_equipped'])) + '\n' + str("Weapon : " + weaponname) + '\n' + str(str("weapon KD : " + str("{:0.2f}".format(killstats['kills']/deaths)))) - else: - deaths=killstats['deaths'] - if(deaths == 0): - deaths = 1; - botmessage = botmessage + str("Deaths : " + str(killstats['deaths'])) + '\n' + str("KD : " + str("{:0.2f}".format(killstats['kills']/deaths))) - - return botmessage - -async def setup(client): - await client.add_cog(Compare(client)) - diff --git a/cogs/stats.py b/cogs/stats.py index 338f25f..32810fd 100644 --- a/cogs/stats.py +++ b/cogs/stats.py @@ -11,114 +11,147 @@ class Stats(commands.Cog): async def on_ready(self): print("stats.py is ready") - @commands.command() - async def stats(self, ctx, message="any player", message2="any weapon", *message3): - if(message != "any player"): - weaponid = "" + @commands.command(aliases=["compare"]) + async def stats(self, ctx, *message): + players = [] + servers = [] + server = "" + weaponid= "" + weaponname= "" + + if(message == ()): + await ctx.send("```No player given```") - if(message3 != ()): - server = self.getserver(" ".join(message3)) - servermessage = server - else: - server = "" - servermessage = "all servers" - - if(message2 != "any weapon"): - message = message[:-1] - weaponid = self.getweaponid(message2) - playerid = "" - playerid = self.getplayerid(message); - if (playerid != ""): - payload = {'player': playerid, 'weapon': weaponid, 'server': server} - response = requests.get('https://tone.sleepycat.date/v2/client/players', params=payload).json() - killstats = response[playerid] + for i in message: + item = i.replace(",", "") + function_dict = self.message_handler(item) + if(function_dict['player'] != None): + players.append(function_dict['player']) + if(function_dict['weapon'] != None): + weaponname = function_dict["weapon"][1] + weaponid= function_dict['weapon'][0] + if(function_dict['server'] != None): + servers.append(function_dict['server']) - botmessage = str("Stats for " + servermessage + "\n" + "---------------------" + "\n") + str("Playername: " + killstats['username'] + '\n' + "Kills : " + str(killstats['kills']) + '\n' ) - - if(weaponid != ""): - deaths=killstats['deaths_while_equipped'] - if(deaths == 0): - deaths = 1; - botmessage += str("Deaths : " + str(killstats['deaths_while_equipped'])) + '\n' + str("Weapon : " + message2) + '\n' + str(str("weapon KD : " + str("{:0.2f}".format(killstats['kills']/deaths)))) - else: - deaths=killstats['deaths'] - if(deaths == 0): - deaths = 1; - botmessage = botmessage + str("Deaths : " + str(killstats['deaths'])) + '\n' + str("KD : " + str("{:0.2f}".format(killstats['kills']/deaths))) + if(len(servers) != 0): + if(len(servers) > 1): + for i in servers: + if(i in " ".join(message)): + server = i + break else: - botmessage = "This player doesnt exist" - else: - botmessage = "No name given" + server = servers[0] + if(len(players) == 0): + await ctx.send("```No existing player found, check if the name is correct or has changed```") + + list_of_stats = [] + for i in players: + stats = self.getstats(playerid=i,weaponid=weaponid, weaponname=weaponname, server=server) + list_of_stats.append(stats) + + if ("".join(list_of_stats) != ""): + if(server != ""): + botmessage = str("Stats for " + server + "\n" + "---------------------" + "\n") + else: + botmessage = str("Stats for all servers\n" + "---------------------" + "\n") + divider = str("\n --------------------- \n") + botmessage = botmessage + divider.join(list_of_stats) + await ctx.send(f'```{botmessage}```') + def message_handler(self, message): + player = False + weapon = False + server = False + return_message = {"player": None, "weapon": None, "server": None} + + playerid = self.getplayerid(message) + if(playerid != ""): + player = True + + weaponid, weaponname = self.getweaponid(message) + if(weaponid != ""): + weapon = True + + servername = self.getserver(message) + if(servername != ""): + server = True + + if(server): + return_message["server"] = servername + if(player): + return_message["player"] = playerid + if(weapon): + return_message["weapon"] = [weaponid, weaponname] + + return return_message + def getplayerid(self, playername): playerid = "" payload = str("username=") + playername response = requests.get('https://northstar.tf/accounts/lookup_uid', params=payload).json() if (response['matches'] != None): playerid = response['matches'][0] - return str(playerid) + return str(playerid) def getweaponid(self, weaponname): - response = requests.get('https://tone.sleepycat.date/v2/client/weapons').json() - r = response.keys() - - weapon_dict = {'execution': 'human_execution', - 'mp_weapon_car': 'car', - 'mp_weapon_defender': 'charge_rifle', - 'mp_weapon_doubletake': 'double_take', - 'mp_weapon_epg': 'epg', - 'mp_weapon_hemlok_smg': 'volt', - 'mp_weapon_lstar': 'lstar', - 'mp_weapon_r97':'r97', - 'mp_weapon_rspn101': 'r-201', - 'mp_weapon_smart_pistol': 'smart_pistol', - 'mp_weapon_sniper': 'kraber', - 'mp_weapon_vinson': 'flatline', - 'mp_weapon_autopistol': 're-45_auto', - 'mp_weapon_alternator_smg': 'alternator', - 'mp_weapon_frag_grenade': 'frag_grenade', - 'mp_weapon_g2': 'g2', - 'mp_weapon_lmg': 'spitfire', - 'mp_weapon_smr': 'smr', - 'mp_weapon_softball': 'softball', - 'mp_weapon_thermite_grenade': 'firestar', - 'pilot_emptyhanded': 'melee', - 'mp_weapon_mastiff': 'masstiff', - 'mp_weapon_mgl': 'mgl', - 'mp_weapon_rspn101_og': 'r-101', - 'mp_weapon_wingman': 'wingman', - 'invalid': 'invalid', - 'mp_weapon_arc_launcher': 'thunderbolt', - 'mp_weapon_dmr': 'dmr', - 'mp_weapon_grenade_electric_smoke': 'electric_smoke', - 'mp_weapon_pulse_lmg': 'cold_war', - 'mp_weapon_satchel': 'satchel', - 'mp_weapon_shotgun': 'eva-8_auto', - 'mp_weapon_shotgun_pistol': 'mozambique', - 'mp_weapon_wingman_n': 'wingman_elite', - 'mp_weapon_grenade_gravity': 'gravity_star', - 'mp_weapon_grenade_sonar': 'pulse_blade', - 'mp_weapon_rocket_launcher': 'archer', - 'outOfBounds': 'outOfBounds', - 'mind_crime': 'mind_crime', - 'mp_weapon_esaw': 'devotion', - 'fall': 'fall', - 'mp_weapon_semipistol': 'p2016', - 'mp_weapon_grenade_emp': 'arc_grenade', - 'mp_weapon_hemlok': 'hemlok', - 'melee_pilot_emptyhanded': 'melee', - 'phase_shift': 'phase_shift' - } + weapons ={ + "execution": "human_execution", + "car": "mp_weapon_car", + "charge rifle": "mp_weapon_defender", + "double take": "mp_weapon_doubletake", + "epg": "mp_weapon_epg", + "volt": "mp_weapon_hemlok_smg", + "lstar": "mp_weapon_lstar", + "r97": "mp_weapon_r97", + "r-201": "mp_weapon_rspn101", + "smart pistol": "mp_weapon_smart_pistol", + "kraber": "mp_weapon_sniper", + "flatline": "mp_weapon_vinson", + "re-45 auto": "mp_weapon_autopistol", + "alternator": "mp_weapon_alternator_smg", + "frag grenade": "mp_weapon_frag_grenade", + "g2": "mp_weapon_g2", + "spitfire": "mp_weapon_lmg", + "smr": "mp_weapon_smr", + "softball": "mp_weapon_softball", + "firestar": "mp_weapon_thermite_grenade", + "melee": "melee_pilot_emptyhanded", + "masstiff": "mp_weapon_mastiff", + "mgl": "mp_weapon_mgl", + "r-101": "mp_weapon_rspn101_og", + "wingman": "mp_weapon_wingman", + "invalid": "invalid", + "thunderbolt": "mp_weapon_arc_launcher", + "dmr": "mp_weapon_dmr", + "electric smoke": "mp_weapon_grenade_electric_smoke", + "cold war": "mp_weapon_pulse_lmg", + "satchel": "mp_weapon_satchel", + "eva-8 auto": "mp_weapon_shotgun", + "mozambique": "mp_weapon_shotgun_pistol", + "wingman elite": "mp_weapon_wingman_n", + "gravity star": "mp_weapon_grenade_gravity", + "pulse blade": "mp_weapon_grenade_sonar", + "archer": "mp_weapon_rocket_launcher", + "outOfBounds": "outOfBounds", + "mind crime": "mind_crime", + "devotion": "mp_weapon_esaw", + "fall": "fall", + "p2016": "mp_weapon_semipistol", + "arc grenade": "mp_weapon_grenade_emp", + "hemlok": "mp_weapon_hemlok", + "phase shift": "phase_shift" + } + weaponid = "" - for i in r: - if(i in weapon_dict.keys()): - if (weaponname.lower() == weapon_dict[i]): - weaponid = i - break + for weapon in weapons: + if(weaponname.lower() in weapon.lower()): + weaponid = weapons[weapon] + weaponname = weapon + break - return weaponid + return weaponid, weaponname def getserver(self, snippet): server = "" @@ -126,11 +159,38 @@ class Stats(commands.Cog): servers = response.keys() for i in servers: - if(snippet in i.lower()): + if(snippet.lower() in i.lower()): server = i + break return server + def getstats(self, playerid, weaponid = "", weaponname = "", server = ""): + payload = {'player': playerid, 'weapon': weaponid, 'server': server} + response = requests.get('https://tone.sleepycat.date/v2/client/players', params=payload).json() + if(response == {}): + errorresponse = requests.get("https://northstar.tf/accounts/get_username", params={"uid": playerid}).json() + if(errorresponse['matches'] != None): + playername = errorresponse['matches'][0] + return str("No stats found for player: " + playername) + + killstats = response[str(playerid)] + + botmessage = str("Playername: " + killstats['username'] + '\n' + "Kills : " + str(killstats['kills']) + '\n' ) + + if(weaponid != ""): + deaths=killstats['deaths_while_equipped'] + if(deaths == 0): + deaths = 1; + botmessage += str("Deaths : " + str(killstats['deaths_while_equipped'])) + '\n' + str("Weapon : " + weaponname) + '\n' + str(str("weapon KD : " + str("{:0.2f}".format(killstats['kills']/deaths)))) + else: + deaths=killstats['deaths'] + if(deaths == 0): + deaths = 1; + botmessage = botmessage + str("Deaths : " + str(killstats['deaths'])) + '\n' + str("KD : " + str("{:0.2f}".format(killstats['kills']/deaths))) + + return botmessage + async def setup(client): await client.add_cog(Stats(client))