Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 alwayscompiling
|
5155744ec5 | ||
|
alwayscompiling
|
fedc8be778 | ||
|
alwayscompiling
|
125939e5b3 | ||
|
alwayscompiling
|
3b410b5f90 | ||
|
alwayscompiling
|
d7bac2048f |
@@ -28,11 +28,16 @@ class SubmissionListener(commands.Cog, name="Message Listener"):
|
||||
if proof_message.channel.id == highscores_data["submission_channel_id"]:
|
||||
|
||||
embed = submission_message.embeds[0]
|
||||
embed.add_field(name="Score", value=proof_message.content, inline=False)
|
||||
await submission_message.edit(
|
||||
files=[await attch.to_file() for attch in proof_message.attachments],
|
||||
embed=embed,
|
||||
)
|
||||
if proof_message.content:
|
||||
embed.add_field(name="Score", value=proof_message.content, inline=False)
|
||||
await submission_message.edit(
|
||||
embed=embed,
|
||||
)
|
||||
if len(proof_message.attachments) > 0:
|
||||
await submission_message.edit(
|
||||
files=[await attch.to_file() for attch in proof_message.attachments],
|
||||
)
|
||||
|
||||
await proof_message.delete()
|
||||
|
||||
|
||||
|
||||
@@ -37,8 +37,10 @@ class PostHighscores(commands.Cog, name="Post Highscores"):
|
||||
Register with "?register" command.'
|
||||
assert channel is not None, await ctx.send(error_response)
|
||||
|
||||
for boss in highscores_config["bosses"]:
|
||||
message: nextcord.Message = await send_highscore_message(channel, boss["boss"])
|
||||
for boss, categories in highscores_config[ # pylint: disable=unused-variable
|
||||
"highscore_table"
|
||||
].items():
|
||||
message: nextcord.Message = await send_highscore_message(channel, boss)
|
||||
await message.edit(view=SubmissionButton(self.bot))
|
||||
|
||||
save_highscores_data(highscores_data)
|
||||
|
||||
@@ -5,6 +5,7 @@ Cog for creating submission process.
|
||||
from nextcord.ext import commands
|
||||
|
||||
from .submission_views import SubmissionButton
|
||||
from .verification_view import VerificationView
|
||||
|
||||
|
||||
class SubmissionCog(commands.Cog, name="Submission Cog"):
|
||||
@@ -17,6 +18,7 @@ class SubmissionCog(commands.Cog, name="Submission Cog"):
|
||||
async def on_ready(self):
|
||||
"""Called when cog is loaded"""
|
||||
self.bot.add_view(SubmissionButton(self.bot))
|
||||
self.bot.add_view(VerificationView())
|
||||
|
||||
|
||||
# This function will be called when this extension is loaded.
|
||||
|
||||
@@ -1,203 +1,324 @@
|
||||
{
|
||||
"bosses": [
|
||||
{
|
||||
"boss": "The Ambassador",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Araxxi",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Arch-Glacor",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Astellarn",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "The Barrows Brothers",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "The Barrows: Rise of the Six",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Beastmaster Durzag",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Black Stone Dragon",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Chaos Elemental",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Commander Zilyana",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Corporeal Beast",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Crassian Leviathan",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Croesus",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Dagannoth Kings",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "General Graardor",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Giant Mole",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Gregorovic",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Har-Aken",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Helwyr",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Kalphite King",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Kalphite Queen",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Kerapac",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "King Black Dragon",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Kree'arra",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "K'ril Tsutsaroth",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Legiones",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "The Magister",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Masuta the Ascended",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Nex",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Nex - Angel of Death",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Queen Black Dragon",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Raksha",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Rex Matriarchs",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "The Sanctum Guardian",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Seiryu the Azure Serpent",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Solak",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Taraket the Necromancer",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Telos",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "The Twin Furies",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "TzKal-Zuk",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "TzTok-Jad",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Verak Lith",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Vindicta & Gorvek",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Vorago",
|
||||
"hardmode": true
|
||||
},
|
||||
{
|
||||
"boss": "Yakamaru",
|
||||
"hardmode": false
|
||||
},
|
||||
{
|
||||
"boss": "Zamorak, Lord of Chaos",
|
||||
"hardmode": true
|
||||
}
|
||||
],
|
||||
"highscore_table": {
|
||||
"The Ambassador": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Araxxi": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Arch-Glacor": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Enrage",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Astellarn": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"The Barrows Brothers": [
|
||||
"Kill Count",
|
||||
"Spooned Log"
|
||||
],
|
||||
"The Barrows: Rise of the Six": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Beastmaster Durzag": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Black Stone Dragon": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Chaos Elemental": [
|
||||
"Kill Count",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Commander Zilyana": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Corporeal Beast": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Crassian Leviathan": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Croesus": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Dagannoth Kings": [
|
||||
"Kill Count",
|
||||
"Spooned Log"
|
||||
],
|
||||
"General Graardor": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Giant Mole": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Gregorovic": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Har-Aken": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Helwyr": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Kalphite King": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Kalphite Queen": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Kerapac": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"King Black Dragon": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Kree'arra": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"K'ril Tsutsaroth": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Legiones": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"The Magister": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Masuta the Ascended": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Nex": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Nex - Angel of Death": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Queen Black Dragon": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Raksha": [
|
||||
"Solo Kill Count",
|
||||
"Solo Kill Time",
|
||||
"Duo Kill Count",
|
||||
"Duo Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Rex Matriarchs": [
|
||||
"Kill Count",
|
||||
"Spooned Log"
|
||||
],
|
||||
"The Sanctum Guardian": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Seiryu the Azure Serpent": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Solak": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Taraket the Necromancer": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Telos": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Enrage",
|
||||
"Spooned Log"
|
||||
],
|
||||
"The Twin Furies": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"TzKal-Zuk": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"TzTok-Jad": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Verak Lith": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Group Kill Count",
|
||||
"Group Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Vindicta & Gorvek": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Vorago": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Hardmode Kill Count",
|
||||
"Hardmode Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Yakamaru": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Zamorak, Lord of Chaos (solo)": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Enrage",
|
||||
"Spooned Log"
|
||||
],
|
||||
"Zamorak, Lord of Chaos (group)": [
|
||||
"Kill Count",
|
||||
"Kill Time",
|
||||
"Enrage"
|
||||
]
|
||||
},
|
||||
"categories": {
|
||||
"Duo Kill Count": {
|
||||
"ascending": false,
|
||||
"is_time_record": false
|
||||
},
|
||||
"Duo Kill Time": {
|
||||
"ascending": true,
|
||||
"is_time_record": true
|
||||
},
|
||||
"Enrage": {
|
||||
"ascending": false,
|
||||
"is_time_record": false
|
||||
},
|
||||
"Group Kill Count": {
|
||||
"ascending": false,
|
||||
"is_time_record": false
|
||||
},
|
||||
"Group Kill Time": {
|
||||
"ascending": true,
|
||||
"is_time_record": true
|
||||
},
|
||||
"Hardmode Kill Count": {
|
||||
"ascending": false,
|
||||
"is_time_record": false
|
||||
},
|
||||
"Hardmode Kill Time": {
|
||||
"ascending": true,
|
||||
"is_time_record": true
|
||||
},
|
||||
"Kill Count": {
|
||||
"hardmode": true,
|
||||
"ascending": false,
|
||||
"is_time_record": false
|
||||
},
|
||||
"Kill Time": {
|
||||
"hardmode": true,
|
||||
"ascending": true,
|
||||
"is_time_record": true
|
||||
},
|
||||
"Spooned Log": {
|
||||
"hardmode": false,
|
||||
"ascending": true,
|
||||
"is_time_record": false
|
||||
}
|
||||
|
||||
@@ -29,17 +29,14 @@ def open_highscores_data():
|
||||
else:
|
||||
# create the json object
|
||||
data = {"highscore_channel_id": -1, "verification_channel_id": -1}
|
||||
config = open_highscores_config()
|
||||
for boss in config["bosses"]:
|
||||
data[boss["boss"]] = {"message_id": 0}
|
||||
config: dict = open_highscores_config()
|
||||
for boss, categories in config["highscore_table"].items():
|
||||
data[boss] = {"message_id": 0}
|
||||
boss_categories = {}
|
||||
for key, value in config["categories"].items():
|
||||
for category in categories: # pylint: disable=unused-variable
|
||||
rank_list = []
|
||||
boss_categories[key] = rank_list
|
||||
if boss["hardmode"] and value["hardmode"]:
|
||||
rank_list = []
|
||||
boss_categories["Hardmode " + key] = rank_list
|
||||
data[boss["boss"]]["categories"] = boss_categories
|
||||
boss_categories[category] = rank_list
|
||||
data[boss]["categories"] = boss_categories
|
||||
return data
|
||||
|
||||
|
||||
|
||||
+4
-9
@@ -74,13 +74,8 @@ async def submit_score(
|
||||
@param user: user who submitted score
|
||||
@param score: score to add
|
||||
"""
|
||||
# TODO update user submission to not have dupe users
|
||||
|
||||
# hardmode category, must have different category variable for config access.
|
||||
if category.find("Hardmode ") != -1:
|
||||
config_category = category.replace("Hardmode ", "")
|
||||
else:
|
||||
config_category = category
|
||||
boss_category_config = highscores_config["categories"][category]
|
||||
|
||||
# capping to 12 characters because runescape names are 12 characters long.
|
||||
# Splitting on pipe. My discord has multiple names on account split by pipe.
|
||||
@@ -91,7 +86,7 @@ async def submit_score(
|
||||
|
||||
# create score tuple for either time or int
|
||||
# define sort index
|
||||
if highscores_config["categories"][config_category]["is_time_record"]:
|
||||
if boss_category_config["is_time_record"]:
|
||||
if score.find(":") == -1:
|
||||
score_seconds = float(score)
|
||||
else:
|
||||
@@ -117,7 +112,7 @@ async def submit_score(
|
||||
# sort users_scores
|
||||
users_scores.sort(
|
||||
key=lambda x: x[sort_index],
|
||||
reverse=not highscores_config["categories"][config_category]["ascending"],
|
||||
reverse=not boss_category_config["ascending"],
|
||||
)
|
||||
|
||||
for index, tup in enumerate(users_scores):
|
||||
@@ -133,7 +128,7 @@ async def submit_score(
|
||||
# sort scores.
|
||||
scores.sort(
|
||||
key=lambda x: x[sort_index],
|
||||
reverse=not highscores_config["categories"][config_category]["ascending"],
|
||||
reverse=not boss_category_config["ascending"],
|
||||
)
|
||||
|
||||
# enforce highscore size
|
||||
|
||||
Reference in New Issue
Block a user