From 4168e559fe3fe626f518181803edc974f3d7fc83 Mon Sep 17 00:00:00 2001 From: Enrique Sandoval Date: Mon, 29 Apr 2019 17:22:43 -0700 Subject: [PATCH] FEH and April Update, added limited icon Updated to include the new adventurers and wyrmprints Updated the wyrmprints in accordance with the April update Added a new reaction for the additional level added to prints Added a limited icon to the view --- controller.py | 6 ++++-- master.db | Bin 536576 -> 536576 bytes models/adventurer.py | 2 ++ models/dragon.py | 2 ++ models/wyrmprint.py | 6 ++++-- utils/config.py | 4 +++- view.py | 15 ++++++++++++--- 7 files changed, 27 insertions(+), 8 deletions(-) diff --git a/controller.py b/controller.py index cd2726c..d204b59 100644 --- a/controller.py +++ b/controller.py @@ -87,7 +87,7 @@ def query_adventurers(criteria): def query_wyrmprints(criteria): ability = None rarity = None - level = 2 + level = 3 if "ability" in criteria: ability = criteria["ability"] if "rarity" in criteria: @@ -142,7 +142,7 @@ async def process_wyrmprint(name, level=None, message=None): if name is None or name == "": await view.show_invalid_name() - wyrmprint = Wyrmprint(name, level or 2) + wyrmprint = Wyrmprint(name, level or 3) if wyrmprint is None: await view.show_wyrmprint_not_found(name) else: @@ -185,6 +185,8 @@ async def process_wyrmprint_reaction(emoji, wyrmprint, message): await process_wyrmprint(wyrmprint.name, 1, message) elif emoji == "\U0001F509": # 2 unbinds await process_wyrmprint(wyrmprint.name, 2, message) + elif emoji == "\U0001F50A": # 3 unbinds + await process_wyrmprint(wyrmprint.name, 3, message) async def process_dragon_reaction(emoji, dragon, message): if emoji == "\U0001F5BC": # Full picture diff --git a/master.db b/master.db index 9156cb4a06824126a4789f296c2b18b48bf78ee7..db0e97d4078134f9214715d4ad052520f3609210 100644 GIT binary patch delta 38774 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 delta 33239 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 diff --git a/models/adventurer.py b/models/adventurer.py index 2694e9a..3dac3eb 100644 --- a/models/adventurer.py +++ b/models/adventurer.py @@ -85,6 +85,7 @@ def _get_adventurer(self, db): self.releasedate = result[9] self.unittype = result[10].lower() self.name = result[11] + self.limited = result[12] return True def _get_skills(self, db, level=None): @@ -118,6 +119,7 @@ def _get_abilities(self, db, level=None): , A.ReleaseDate , UT.Name AS "UnitType" , A.Name + , A.Limited FROM Adventurers A INNER JOIN ElementTypes ET ON ET.ElementTypeID = A.ElementTypeID INNER JOIN WeaponTypes WT ON WT.WeaponTypeID = A.WeaponTypeID diff --git a/models/dragon.py b/models/dragon.py index 9864635..35c2a7b 100644 --- a/models/dragon.py +++ b/models/dragon.py @@ -81,6 +81,7 @@ def _get_dragon(self, db): self.maxstr = result[4] self.releasedate = result[5] self.name = result[6] + self.limited = result[7] return True def _get_skills(self, db, level): @@ -105,6 +106,7 @@ def _get_abilities(self, db, level): , D.STR , D.ReleaseDate , D.Name + , D.Limited FROM Dragons D INNER JOIN ElementTypes ET ON ET.ElementTypeID = D.ElementTypeID WHERE D.Name LIKE '%' || ? || '%' COLLATE NOCASE diff --git a/models/wyrmprint.py b/models/wyrmprint.py index cab524c..568082c 100644 --- a/models/wyrmprint.py +++ b/models/wyrmprint.py @@ -27,7 +27,7 @@ class Wyrmprint: @staticmethod - def find_wyrmprints(ability=None, rarity=None, level=2): + def find_wyrmprints(ability=None, rarity=None, level=3): wyrmprints = [] params = () full_query = Wyrmprint.wyrmprint_search_query_text @@ -50,7 +50,7 @@ def find_wyrmprints(ability=None, rarity=None, level=2): wyrmprints.append(Wyrmprint(wyrmprint[0], wyrmprint[1])) return wyrmprints - def __init__(self, name, level=2): + def __init__(self, name, level=3): self.name = name with Database("master.db") as db: if not(self._get_wyrmprint(db)): @@ -70,6 +70,7 @@ def _get_wyrmprint(self, db): self.maxstr = result[3] self.releasedate = result[4] self.name = result[5] + self.limited = result[6] return True def _get_abilities(self, db, level): @@ -86,6 +87,7 @@ def _get_abilities(self, db, level): , W.MaxSTR , W.ReleaseDate , W.Name + , W.Limited FROM Wyrmprints W WHERE W.Name LIKE '%' || ? || '%' COLLATE NOCASE ORDER BY W.ReleaseDate ASC diff --git a/utils/config.py b/utils/config.py index 1646d6d..92709a6 100644 --- a/utils/config.py +++ b/utils/config.py @@ -45,7 +45,8 @@ def update(self): self.picture_server = config["Other"]["PictureServer"] self.adventurer_reactions = ["\U0001F5BC", "\U0001F508", "\U0001F509", "\U0001F50A"] - self.wyrmprint_reactions = ["\U0001F5BC", "\U0001F508", "\U0001F509"] + self.wyrmprint_reactions = ["\U0001F5BC", "\U0001F508", + "\U0001F509", "\U0001F50A"] self.dragon_reactions = ["\U0001F5BC", "\U0001F508", "\U0001F509"] self.authorized_ids = config["Discord"]["AuthorizedIds"].split(',') self.streaming = config.getboolean("Discord", "Streaming") @@ -53,6 +54,7 @@ def update(self): self.message_limit = config.getint("Discord", "MessageLimit") else: self.message_limit = 1 + self.limited_emoji = "<:limited:571981149497196575>" def set_config_file(self, config_file): project_root = dirname(dirname(__file__)) diff --git a/view.py b/view.py index 52d66b7..30f2129 100644 --- a/view.py +++ b/view.py @@ -145,7 +145,8 @@ async def show_adventurer(adventurer, message=None): e.add_field(name="Unit Type", value=get_emoji_element(adventurer.elementtype) + get_emoji_weapon(adventurer.weapontype) + - get_emoji_unit(adventurer.unittype), + get_emoji_unit(adventurer.unittype) + + get_emoji_limited(adventurer.limited), inline=True) e.add_field(name="Rarity", value=get_emoji_rarity(adventurer.rarity), inline=True) @@ -192,7 +193,8 @@ async def show_wyrmprint(wyrmprint, message=None): value="{0}/{1}".format(wyrmprint.maxhp, wyrmprint.maxstr), inline=True) e.add_field(name="Release Date", - value=convert_ISO_date_to_string(wyrmprint.releasedate), + value=convert_ISO_date_to_string(wyrmprint.releasedate) + + get_emoji_limited(wyrmprint.limited), inline=True) ability_format = "Ability: {0}" for ability in wyrmprint.abilities: @@ -213,7 +215,8 @@ async def show_dragon(dragon, message=None): sub_portrait_URL = "dragons/portraits/{0}.png".format(url_name) portrait_URL = config.picture_server + sub_portrait_URL e.set_thumbnail(url=portrait_URL) - e.add_field(name="Element", value=get_emoji_element(dragon.elementtype), + e.add_field(name="Element", value=get_emoji_element(dragon.elementtype) + + get_emoji_limited(dragon.limited), inline=True) e.add_field(name="Rarity", value=get_emoji_rarity(dragon.rarity), inline=True) @@ -285,6 +288,12 @@ def get_emoji_rarity(rarity): return config.rarity_emoji[rarity] * rarity +def get_emoji_limited(limited): + if limited == 1: + return config.limited_emoji + return "" + + @client.event async def on_reaction_add(reaction, user): if (reaction.message.id in active_adventurer_messages and