phixxy/sparkytron3000
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

starting rewrite, not sure what to do honestly

Browse source
This commit is contained in:
phixxy 2024-01-28 23:08:18 -08:00
parent 90acde7e28
commit ffc463a5e3
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
extensions/pokemon.py
View file

@ -7,8 +7,20 @@ import json
import math import math
import time import time
async def get_json(self, url):
async with self.bot.http_session.get(url) as resp:
json_data = await resp.json()
return json_data
class Pokemon: class Pokemon:
pass async def __init__(self, id: int, generate: bool = True) -> None:
if generate: # Should I even do it this way?
self.json_data = await self.get_pkmn_from_id(id: int)
async def get_pkmn_from_id(id):
url = 'https://pokeapi.co/api/v2/pokemon/' + str(id)
json_data = await get_json(url)
return json_data
class PokemonGame(commands.Cog): class PokemonGame(commands.Cog):
@ -27,11 +39,6 @@ class PokemonGame(commands.Cog):
except: except:
self.bot.logger.exception("PokemonGame failed to make directories") self.bot.logger.exception("PokemonGame failed to make directories")
async def get_json(self, url):
async with self.bot.http_session.get(url) as resp:
json_data = await resp.json()
return json_data
@commands.command( @commands.command(
description="Pokemon", description="Pokemon",
help="Pokemon game", help="Pokemon game",
@ -42,7 +49,7 @@ class PokemonGame(commands.Cog):
async def pokemon(self, ctx, *args): async def pokemon(self, ctx, *args):
async def starter_picker(id): #id = pokedex number async def starter_picker(id): #id = pokedex number
url = "https://pokeapi.co/api/v2/pokemon-species/" + str(id) url = "https://pokeapi.co/api/v2/pokemon-species/" + str(id)
json_data = await self.get_json(url) json_data = await get_json(url)
if (json_data["evolves_from_species"] == None) and (not json_data['is_mythical']) and (not json_data['is_legendary']): if (json_data["evolves_from_species"] == None) and (not json_data['is_mythical']) and (not json_data['is_legendary']):
return True return True
else: else:
@ -69,7 +76,7 @@ class PokemonGame(commands.Cog):
async def generate_starter(discord_id): async def generate_starter(discord_id):
random.seed(discord_id) random.seed(discord_id)
json_data = await self.get_json('https://pokeapi.co/api/v2/pokemon-species/') json_data = await get_json('https://pokeapi.co/api/v2/pokemon-species/')
pokemon_count = json_data['count'] pokemon_count = json_data['count']
base_pokemon = False base_pokemon = False
while not base_pokemon: while not base_pokemon:
@ -80,7 +87,7 @@ class PokemonGame(commands.Cog):
async def get_pkmn_from_id(id): async def get_pkmn_from_id(id):
url = 'https://pokeapi.co/api/v2/pokemon/' + str(id) url = 'https://pokeapi.co/api/v2/pokemon/' + str(id)
json_data = await self.get_json(url) json_data = await get_json(url)
return json_data return json_data
async def give_buddy_food(pkmn_data): async def give_buddy_food(pkmn_data):
@ -145,7 +152,7 @@ class PokemonGame(commands.Cog):
json_data = await get_pkmn_from_id(starter_id) json_data = await get_pkmn_from_id(starter_id)
is_shiny = await shiny_roll() is_shiny = await shiny_roll()
nature = random.randint(0,19) nature = random.randint(0,19)
nature_data = await self.get_json('https://pokeapi.co/api/v2/nature/') nature_data = await get_json('https://pokeapi.co/api/v2/nature/')
nature = nature_data['results'][nature]['name'] nature = nature_data['results'][nature]['name']
json_data['shiny'] = is_shiny json_data['shiny'] = is_shiny
json_data['nickname'] = None json_data['nickname'] = None