fuck man i dont know
This commit is contained in:
parent
17d5add2fd
commit
207ba676a9
@ -30,14 +30,14 @@ class Tarkov(commands.Cog):
|
|||||||
# Wait until the bot is ready before we actually start executing code
|
# Wait until the bot is ready before we actually start executing code
|
||||||
await self.bot.wait_until_ready()
|
await self.bot.wait_until_ready()
|
||||||
|
|
||||||
spawn_file = "/tmp/boss_spawns.json"
|
local_spawn_rates = "/tmp/boss_spawns.json"
|
||||||
spawns_from_api = tarkov.tarkov_boss_info()
|
spawns_from_api = tarkov.get_tarkov_boss_info()
|
||||||
|
|
||||||
if os.path.exists(spawn_file):
|
if os.path.exists(local_spawn_rates):
|
||||||
embed = discord.Embed(
|
embed = discord.Embed(
|
||||||
description="-------", color=discord.Color.blue(), type="rich"
|
description="-------", color=discord.Color.blue(), type="rich"
|
||||||
)
|
)
|
||||||
with open(spawn_file, "r") as f:
|
with open(local_spawn_rates, "r") as f:
|
||||||
known_spawns = json.load(f)
|
known_spawns = json.load(f)
|
||||||
|
|
||||||
if spawns_from_api != known_spawns:
|
if spawns_from_api != known_spawns:
|
||||||
@ -46,19 +46,19 @@ class Tarkov(commands.Cog):
|
|||||||
changes_dict = tarkov.compare_boss_spawns(known_spawns, spawns_from_api)
|
changes_dict = tarkov.compare_boss_spawns(known_spawns, spawns_from_api)
|
||||||
|
|
||||||
for level, boss in changes_dict.items():
|
for level, boss in changes_dict.items():
|
||||||
for mob, change in boss.items():
|
for boss_name, change in boss.items():
|
||||||
embed.add_field(
|
embed.add_field(
|
||||||
name=level,
|
name=level,
|
||||||
value=f"{mob}: {change}",
|
value=f"{boss_name}: {change}",
|
||||||
inline=False,
|
inline=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
await self.bot.get_channel(channel_id).send(embed=embed)
|
await self.bot.get_channel(channel_id).send(embed=embed)
|
||||||
with open(spawn_file, "w") as f:
|
with open(local_spawn_rates, "w") as f:
|
||||||
json.dump(spawns_from_api, f)
|
json.dump(spawns_from_api, f)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
with open(spawn_file, "w") as f:
|
with open(local_spawn_rates, "w") as f:
|
||||||
json.dump(spawns_from_api, f)
|
json.dump(spawns_from_api, f)
|
||||||
|
|
||||||
async def get_all_bosses(ctx: discord.AutocompleteContext):
|
async def get_all_bosses(ctx: discord.AutocompleteContext):
|
||||||
@ -208,7 +208,7 @@ class Tarkov(commands.Cog):
|
|||||||
embed.set_author(name="🎲 Boss Spawn chances by map 🎲")
|
embed.set_author(name="🎲 Boss Spawn chances by map 🎲")
|
||||||
embed.set_thumbnail(url="https://i.ytimg.com/vi/Yis5rmgo_bM/maxresdefault.jpg")
|
embed.set_thumbnail(url="https://i.ytimg.com/vi/Yis5rmgo_bM/maxresdefault.jpg")
|
||||||
|
|
||||||
levels = tarkov.tarkov_boss_info()
|
levels = tarkov.get_tarkov_boss_info()
|
||||||
|
|
||||||
for key, value in levels.items():
|
for key, value in levels.items():
|
||||||
embed.add_field(
|
embed.add_field(
|
||||||
@ -245,7 +245,7 @@ class Tarkov(commands.Cog):
|
|||||||
response = requests.get(wiki_url + boss_name).text
|
response = requests.get(wiki_url + boss_name).text
|
||||||
soup = BeautifulSoup(response, "html.parser")
|
soup = BeautifulSoup(response, "html.parser")
|
||||||
|
|
||||||
# boss_info = tarkov.tarkov_boss_info()
|
# boss_info = tarkov.get_tarkov_boss_info()
|
||||||
# for k, v in boss_info.items():
|
# for k, v in boss_info.items():
|
||||||
# if boss_name in v:
|
# if boss_name in v:
|
||||||
# print(k, v)
|
# print(k, v)
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
from bs4 import BeautifulSoup
|
from bs4 import BeautifulSoup
|
||||||
import requests
|
import requests
|
||||||
import random
|
import random
|
||||||
|
import json
|
||||||
|
|
||||||
|
|
||||||
def request_wiki(url, heading):
|
def request_wiki(url, heading):
|
||||||
@ -30,7 +31,7 @@ def query_tarkov_api(query):
|
|||||||
).json()["data"]
|
).json()["data"]
|
||||||
|
|
||||||
|
|
||||||
def tarkov_boss_info():
|
def get_tarkov_boss_info():
|
||||||
"""
|
"""
|
||||||
Returns a dict of boss spawn chances per map, and their escorts
|
Returns a dict of boss spawn chances per map, and their escorts
|
||||||
"""
|
"""
|
||||||
@ -85,6 +86,9 @@ def tarkov_boss_info():
|
|||||||
|
|
||||||
|
|
||||||
def compare_boss_spawns(known_spawns: dict, spawns_from_api: dict) -> dict:
|
def compare_boss_spawns(known_spawns: dict, spawns_from_api: dict) -> dict:
|
||||||
|
print(known_spawns)
|
||||||
|
print("\n\n\n\n\n\n\n")
|
||||||
|
print(spawns_from_api)
|
||||||
changes = {} # To store the changes
|
changes = {} # To store the changes
|
||||||
|
|
||||||
# diff = DeepDiff(known_spawns, spawns_from_api, ignore_order=True, verbose_level=2)
|
# diff = DeepDiff(known_spawns, spawns_from_api, ignore_order=True, verbose_level=2)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user