Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"python.formatting.provider": "black"
}
23 changes: 11 additions & 12 deletions Objects/PokeObj.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,26 @@
import random
from datetime import datetime


class PokeObj:
def __init__(self, pokeObj, psn):
#print(pokeObj.keys())
self.name = pokeObj['name']
# print(pokeObj.keys())
self.name = pokeObj["name"]
self.nickname = None
self.index = pokeObj['id']
self.type = [type['type']['name'] for type in pokeObj['types']]
if len(pokeObj['moves']) < 4:
self.moves = [item['move'] for item in random.sample(pokeObj['moves'], len(pokeObj['moves']))]
self.index = pokeObj["id"]
self.type = [type["type"]["name"] for type in pokeObj["types"]]
if len(pokeObj["moves"]) < 4:
self.moves = [item["move"] for item in random.sample(pokeObj["moves"], len(pokeObj["moves"]))]
else:
self.moves = [item['move'] for item in random.sample(pokeObj['moves'], 4)]
self.moves = [item["move"] for item in random.sample(pokeObj["moves"], 4)]

self.lvl = 5
self.exp = 0

self.caughtInfo = (datetime.now().strftime("%a, %b %d, %Y - %I:%M %p"), psn.display_name, psn.id)

def __repr__(self):
return "{}#{}".format(self.name,self.index)
return "{}#{}".format(self.name, self.index)

def __eq__(self, other):
if self.nickname == None or other.nickname == None:
Expand All @@ -43,15 +44,15 @@ def name(self, PokeName):
@property
def nickname(self):
return self._nickname

@nickname.setter
def nickname(self, new_name):
self._nickname = new_name

@property
def index(self):
return self._index

@index.setter
def index(self, index):
self._index = index
Expand All @@ -63,5 +64,3 @@ def moves(self):
@moves.setter
def moves(self, moves):
self._moves = moves


21 changes: 11 additions & 10 deletions Objects/user.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
from config import *
from Objects.PokeObj import *


class User:
def __init__(self, user, poke):
self.user = user.id
self.pokeList = {poke['name'] : [PokeObj(poke, user)]}
self.pokeList = {poke["name"]: [PokeObj(poke, user)]}
self.items = []

def __repr__(self):
prnt_str = "__{}'s Pokemon__: include **{}/802** Pokemon:\n".format(self.user.name, len(self.pokeList.keys()))
for PokeName in self.pokeList.keys():
prnt_str += "{} *x{}*\n".format(PokeName.capitalize(),len(self.pokeList[PokeName]))
prnt_str += "{} *x{}*\n".format(PokeName.capitalize(), len(self.pokeList[PokeName]))
return prnt_str

@property
def items(self):
return self._items

@items.setter
def items(self, value):
print(value)
Expand All @@ -27,13 +28,13 @@ def items(self, value):

def getPokeList(self):
return self._pokeList.keys()

def addPokeList(self, value, user):
#print(value)
if value['name'] in self.pokeList.keys():
self.pokeList[value['name']].append(PokeObj(value, user))
# print(value)
if value["name"] in self.pokeList.keys():
self.pokeList[value["name"]].append(PokeObj(value, user))
else:
self.pokeList[value['name']] = [PokeObj(value, user)]
self.pokeList[value["name"]] = [PokeObj(value, user)]

def removePokemon(self, name):
if name in self.pokeList.keys():
Expand All @@ -59,7 +60,7 @@ def embed_list(self, user):
embed = discord.Embed(type="rich", title=str_title, color=0xEEE8AA)
str_desc = ""
for PokeName in self.pokeList.keys():
str_desc += "{} *x{}*\n".format(PokeName.capitalize(),len(self.pokeList[PokeName]))
embed.description = str_desc[:2048 - len(str_title + str_footer)]
str_desc += "{} *x{}*\n".format(PokeName.capitalize(), len(self.pokeList[PokeName]))
embed.description = str_desc[: 2048 - len(str_title + str_footer)]
embed.set_footer(text=str_footer)
return embed
Loading