From db983a5ea70e31c1dc9753df2d91a194cddb95ab Mon Sep 17 00:00:00 2001 From: iiLarsH Date: Sat, 22 Jul 2023 15:57:17 +0200 Subject: [PATCH] added double barrel shotgun --- .gitignore | 1 - Reuse/getLeaderboard.py | 4 +++- Reuse/getWeapon.py | 3 ++- Reuse/images/mp_weapon_shotgun_doublebarrel.png | Bin 0 -> 4834 bytes slashcogs/slashleaderboard.py | 2 +- slashcogs/slashstats.py | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 Reuse/images/mp_weapon_shotgun_doublebarrel.png diff --git a/.gitignore b/.gitignore index 14dba18..f2e64de 100644 --- a/.gitignore +++ b/.gitignore @@ -162,7 +162,6 @@ cython_debug/ # token /discordtoken #images -/Reuse/images Reuse/images/legend.png Reuse/images/player_weapons_used.png Reuse/images/leaderboard.png diff --git a/Reuse/getLeaderboard.py b/Reuse/getLeaderboard.py index d3fc9ea..5504ea1 100644 --- a/Reuse/getLeaderboard.py +++ b/Reuse/getLeaderboard.py @@ -13,7 +13,9 @@ def getleaderboard(board:str, weaponid="", server="", mapid = "", gamemodeid = " board = "max_distance" if(board.lower() == "kd"): - handler = lambda p : response[p]['kills'] / max(response[p]["deaths_while_equipped"], 1) + if(weaponid != ""): + handler = lambda p : response[p]['kills'] / max(response[p]["deaths_while_equipped"], 1) + handler = lambda p : response[p]['kills'] / max(response[p]["deaths"], 1) elif(board.lower() == "avgd"): handler = lambda p : response[p]['total_distance'] / max(response[p]["kills"], 1) else: diff --git a/Reuse/getWeapon.py b/Reuse/getWeapon.py index eec2a1a..2464662 100644 --- a/Reuse/getWeapon.py +++ b/Reuse/getWeapon.py @@ -44,7 +44,8 @@ def getweaponid(givenweapon): "p2016": "mp_weapon_semipistol", "arc grenade": "mp_weapon_grenade_emp", "hemlok": "mp_weapon_hemlok", - "phase shift": "phase_shift" + "phase shift": "phase_shift", + "double barrel shotgun": "mp_weapon_shotgun_doublebarrel" } weaponid = "" diff --git a/Reuse/images/mp_weapon_shotgun_doublebarrel.png b/Reuse/images/mp_weapon_shotgun_doublebarrel.png new file mode 100644 index 0000000000000000000000000000000000000000..2346f7a0534271c6731a94c6d04cdb9086c81e90 GIT binary patch literal 4834 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 literal 0 HcmV?d00001 diff --git a/slashcogs/slashleaderboard.py b/slashcogs/slashleaderboard.py index 38177ef..9778e6b 100644 --- a/slashcogs/slashleaderboard.py +++ b/slashcogs/slashleaderboard.py @@ -52,7 +52,7 @@ class SlashLeaderboard(commands.Cog): @leaderboard.autocomplete("weapon") async def autocomplete_weapon(self, interaction: discord.Interaction, current: str) -> list[app_commands.Choice[str]]: data = [] - weaponlist = ['execution', 'car', 'charge rifle', 'double take', 'epg', 'volt', 'lstar', 'r97', 'r-201', 'smart pistol', 'kraber', 'flatline', 're-45 auto', 'alternator', 'frag grenade', 'g2', 'spitfire', 'smr', 'softball', 'firestar', 'melee', 'mastiff', 'mgl', 'r-101', 'wingman', 'invalid', 'thunderbolt', 'dmr', 'electric smoke', 'cold war', 'satchel', 'eva-8 auto', 'mozambique', 'wingman elite', 'gravity star', 'pulse blade', 'archer', 'outOfBounds', 'mind crime', 'devotion', 'fall', 'p2016', 'arc grenade', 'hemlok', 'phase shift'] + weaponlist = ['execution', 'car', 'charge rifle', 'double take', 'epg', 'volt', 'lstar', 'r97', 'r-201', 'smart pistol', 'kraber', 'flatline', 're-45 auto', 'alternator', 'frag grenade', 'g2', 'spitfire', 'smr', 'softball', 'firestar', 'melee', 'mastiff', 'mgl', 'r-101', 'wingman', 'invalid', 'thunderbolt', 'dmr', 'electric smoke', 'cold war', 'satchel', 'eva-8 auto', 'mozambique', 'wingman elite', 'gravity star', 'pulse blade', 'archer', 'outOfBounds', 'mind crime', 'devotion', 'fall', 'p2016', 'arc grenade', 'hemlok', 'phase shift', 'double barrel shotgun'] for weapon_choice in weaponlist: if(current.lower() in weapon_choice.lower()): data.append(app_commands.Choice(name=weapon_choice, value=weapon_choice)) diff --git a/slashcogs/slashstats.py b/slashcogs/slashstats.py index a400a53..a7af776 100644 --- a/slashcogs/slashstats.py +++ b/slashcogs/slashstats.py @@ -79,7 +79,7 @@ class SlashStats(commands.Cog): @stats.autocomplete("weapon") async def autocomplete_weapon(self, interaction: discord.Interaction, current: str) -> list[app_commands.Choice[str]]: data = [] - weaponlist = ['execution', 'car', 'charge rifle', 'double take', 'epg', 'volt', 'lstar', 'r97', 'r-201', 'smart pistol', 'kraber', 'flatline', 're-45 auto', 'alternator', 'frag grenade', 'g2', 'spitfire', 'smr', 'softball', 'firestar', 'melee', 'mastiff', 'mgl', 'r-101', 'wingman', 'invalid', 'thunderbolt', 'dmr', 'electric smoke', 'cold war', 'satchel', 'eva-8 auto', 'mozambique', 'wingman elite', 'gravity star', 'pulse blade', 'archer', 'outOfBounds', 'mind crime', 'devotion', 'fall', 'p2016', 'arc grenade', 'hemlok', 'phase shift'] + weaponlist = ['execution', 'car', 'charge rifle', 'double take', 'epg', 'volt', 'lstar', 'r97', 'r-201', 'smart pistol', 'kraber', 'flatline', 're-45 auto', 'alternator', 'frag grenade', 'g2', 'spitfire', 'smr', 'softball', 'firestar', 'melee', 'mastiff', 'mgl', 'r-101', 'wingman', 'invalid', 'thunderbolt', 'dmr', 'electric smoke', 'cold war', 'satchel', 'eva-8 auto', 'mozambique', 'wingman elite', 'gravity star', 'pulse blade', 'archer', 'outOfBounds', 'mind crime', 'devotion', 'fall', 'p2016', 'arc grenade', 'hemlok', 'phase shift', 'double barrel shotgun'] for weapon_choice in weaponlist: if(current.lower() in weapon_choice.lower()): data.append(app_commands.Choice(name=weapon_choice, value=weapon_choice))