fix kyurem, no hatched egg icons, update aiomysql

ccev · Dec 24, 2021 · 6bee7f6 · 6bee7f6
1 parent 865fd4f
commit 6bee7f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-aiomysql==0.0.21
+aiomysql==0.0.22
 arrow==1.1.0
 dateparser==1.0.0
 fuzzywuzzy==0.18.0

diff --git a/taubsi/core/pogo.py b/taubsi/core/pogo.py
@@ -8,8 +8,8 @@
 import arrow
 import discord
 from PIL import Image, ImageDraw
-from pogodata.objects import Move
 
+from taubsi.pogodata import Move
 from taubsi.utils.utils import asyncget, calculate_cp
 from taubsi.core.logging import log
 from taubsi.pogodata import Pokemon

diff --git a/taubsi/core/uicons.py b/taubsi/core/uicons.py
@@ -59,8 +59,8 @@ def pokemon(self, pokemon: Pokemon, shiny: bool = False, iconset: Optional[IconS
 
     def egg(self, raid: Raid, iconset: Optional[IconSet] = None) -> str:
         args = [("", raid.level)]
-        if raid.has_hatched:
-            args.append(("h", ""))
+        # if raid.has_hatched:
+        #     args.append(("h", ""))
         return self.get(UIconCategory.RAID_EGG, iconset, args)
 
     def raid(self, raid: Raid, shiny_chance: int = 0, iconset: Optional[IconSet] = None) -> str:

diff --git a/taubsi/pogodata/pokemon.py b/taubsi/pogodata/pokemon.py
@@ -113,6 +113,10 @@ def __bool__(self):
 
     @property
     def name(self):
+        # Niantic kinda messed up Kyurem form names
+        if self.id == 646:
+            return self.form_name
+
         if not self.form_name:
             return self.mon_name
         else: