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

@@ -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

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

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

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

utils/config.py

@@ -45,14 +45,16 @@ 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")
         if config.has_option("Discord", "MessageLimit"):
             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__))

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