Snowy weather fix, misc fixes

.gitignore

@@ -6,8 +6,7 @@ data/serverdict
 data/guilddict.txt
 data/guilddict_backup.txt
 meowth/config.py
-meowth/__pycache__
-meowth/exts/__pycache__
+meowth/__pycache__/
+meowth/exts/__pycache__/
 meowth/exts/advanced.py
-
 images/desktop.ini

meowth/exts/advanced.py

@@ -34,7 +34,7 @@ def cog_unload(self):
     async def on_message(self, message):
         if "niandick" in message.content.lower():
             await utils.safe_reaction(message, "\U0001F346")
-
+    
 def setup(bot):
     bot.add_cog(Advanced(bot))
 

meowth/exts/huntr.py

@@ -249,7 +249,7 @@ async def on_huntr(self, ctx, reactuser=None):
                     raidexp = match.group(6)
                     egg_level = 0
                     await utils.safe_delete(message)
-                    egg_level = utils.get_level(Self.bot, entered_raid)
+                    egg_level = utils.get_level(self.bot, entered_raid)
                     if egg_level.isdigit() and int(egg_level) in self.bot.guild_dict[message.guild.id]['configure_dict']['scanners']['raidlvls']:
                         auto_report = True
                     elif egg_level == "EX" and "EX" in self.bot.guild_dict[message.guild.id]['configure_dict']['scanners']['raidlvls']:
@@ -507,7 +507,7 @@ async def on_pokealarm(self, ctx, reactuser=None):
                     egg_level = "0"
                     timeout = int(report_details.get('raidexp', 45))*60
                     expiremsg = _('**This {pokemon} raid has expired!**').format(pokemon=pokemon.title())
-                    egg_level = utils.get_level(Self.bot, pokemon)
+                    egg_level = utils.get_level(self.bot, pokemon)
                     if egg_level.isdigit() and int(egg_level) in self.bot.guild_dict[message.guild.id]['configure_dict']['scanners']['raidlvls']:
                         auto_report = True
                     elif egg_level == "EX" and "EX" in self.bot.guild_dict[message.guild.id]['configure_dict']['scanners']['raidlvls']:

meowth/exts/invasion.py

@@ -260,7 +260,8 @@ async def edit_invasion_messages(self, ctx, message):
         reward_type = invasion_dict.get('reward_type', '')
         gender = invasion_dict.get('gender', '')
         dm_dict = invasion_dict.get('dm_dict', {})
-        invasion_embed = message.embeds[0]
+        old_embed = message.embeds[0]
+        invasion_embed = discord.Embed(colour=ctx.guild.me.colour).set_thumbnail(url=f"https://raw.githubusercontent.com/doonce/Meowth/Rewrite/images/misc/teamrocket{'_male' if gender == 'male' else ''}{'_female' if gender == 'female' else ''}.png?cache=1")
         nearest_stop = invasion_dict.get('location', None)
         complete_emoji = self.bot.custom_emoji.get('invasion_complete', '\U0001f1f7')
         expire_emoji = self.bot.custom_emoji.get('invasion_expired', '\U0001F4A8')
@@ -270,44 +271,39 @@ async def edit_invasion_messages(self, ctx, message):
         author = ctx.guild.get_member(invasion_dict.get('report_author', None))
         if author:
             ctx.author = author
-        if gender:
-            invasion_embed.set_author(name=f"Invasion Report {' (♀)' if gender == 'female' else ''}{' (♂)' if gender == 'male' else ''}", icon_url="https://raw.githubusercontent.com/doonce/Meowth/Rewrite/images/misc/ic_shadow.png?cache=2")
-            invasion_embed.set_thumbnail(url=f"https://raw.githubusercontent.com/doonce/Meowth/Rewrite/images/misc/teamrocket{'_male' if gender == 'male' else ''}{'_female' if gender == 'female' else ''}.png?cache=1")
+        invasion_embed.set_author(name=f"Invasion Report {' (♀)' if gender == 'female' else ''}{' (♂)' if gender == 'male' else ''}", icon_url="https://raw.githubusercontent.com/doonce/Meowth/Rewrite/images/misc/ic_shadow.png?cache=2")
         pokemon = None
         shiny_str = ""
         reward_str = ""
         reward_list = []
         if not reward and not reward_type:
-            reward_str = "Unknown Pokemon"
-            weakness_str = "Unknown"
+            invasion_embed.add_field(name=_("**Possible Rewards:**"), value="Unknown Pokemon", inline=True)
         elif not reward and reward_type:
-            reward_str = f"{reward_type.title()} Invasion {self.bot.config.type_id_dict[reward_type.lower()]}"
-            weakness_str = utils.weakness_to_emoji(self.bot, utils.get_weaknesses(self.bot, [reward_type.title()]))
+            invasion_embed.add_field(name=_("**Possible Rewards:**"), value=f"{reward_type.title()} Invasion {self.bot.config.type_id_dict[reward_type.lower()]}", inline=True)
+            invasion_embed.add_field(name=_("**Weaknesses:**"), value=f"{utils.weakness_to_emoji(self.bot, utils.get_weaknesses(self.bot, [reward_type.title()]))}\u200b", inline=True)
         else:
             for pokemon in reward:
                 pokemon = await pkmn_class.Pokemon.async_get_pokemon(self.bot, pokemon)
-                if pokemon:
-                    pokemon.shiny = False
-                    pokemon.shadow = "shadow"
-                    if pokemon.id in self.bot.shiny_dict:
-                        if pokemon.alolan and "alolan" in self.bot.shiny_dict.get(pokemon.id, {}) and "shadow" in self.bot.shiny_dict.get(pokemon.id, {}).get("alolan", []):
-                            shiny_str = self.bot.custom_emoji.get('shiny_chance', '\u2728') + " "
-                        elif str(pokemon.form).lower() in self.bot.shiny_dict.get(pokemon.id, {}) and "shadow" in self.bot.shiny_dict.get(pokemon.id, {}).get(str(pokemon.form).lower(), []):
-                            shiny_str = self.bot.custom_emoji.get('shiny_chance', '\u2728') + " "
-                    reward_str += f"{shiny_str}{pokemon.name.title()} {pokemon.emoji}\n"
-                    reward_list.append(str(pokemon))
-            weakness_str = pokemon.weakness_emoji
+                if not pokemon:
+                    continue
+                pokemon.shiny = False
+                pokemon.shadow = "shadow"
+                if pokemon.id in self.bot.shiny_dict:
+                    if pokemon.alolan and "alolan" in self.bot.shiny_dict.get(pokemon.id, {}) and "shadow" in self.bot.shiny_dict.get(pokemon.id, {}).get("alolan", []):
+                        shiny_str = self.bot.custom_emoji.get('shiny_chance', '\u2728') + " "
+                    elif str(pokemon.form).lower() in self.bot.shiny_dict.get(pokemon.id, {}) and "shadow" in self.bot.shiny_dict.get(pokemon.id, {}).get(str(pokemon.form).lower(), []):
+                        shiny_str = self.bot.custom_emoji.get('shiny_chance', '\u2728') + " "
+                reward_str += f"{shiny_str}{pokemon.name.title()} {pokemon.emoji}\n"
+                reward_list.append(str(pokemon))
             if not reward_list:
-                reward_str = "Unknown Pokemon"
+                invasion_embed.add_field(name=_("**Possible Rewards:**"), value="Unknown Pokemon", inline=True)
             else:
+                invasion_embed.add_field(name=_("**Possible Rewards:**"), value=f"{reward_str}", inline=True)
                 invasion_embed.set_thumbnail(url=pokemon.img_url)
-        index = 0
-        for field in invasion_embed.fields:
-            if "reward" in field.name.lower():
-                invasion_embed.set_field_at(index, name=field.name, value=reward_str)
-            elif "weakness" in field.name.lower():
-                invasion_embed.set_field_at(index, name=field.name, value=f"{weakness_str}\u200b")
-            index += 1
+                invasion_embed.add_field(name=_("**Weaknesses:**"), value=f"{pokemon.weakness_emoji}\u200b", inline=True)
+        for field in old_embed.fields:
+            if "expire" in field.name.lower():
+                invasion_embed.add_field(name=field.name, value=field.value)
         if pokemon:
             invasion_msg = f"Meowth! {pokemon.name.title()} Invasion reported by {author.mention}! Details: {nearest_stop}\n\nUse {complete_emoji} if completed, {info_emoji} to edit details, {report_emoji} to report new, or {list_emoji} to list all invasions!"
         elif reward_type:
@@ -541,7 +537,6 @@ async def send_invasion(self, ctx, location, reward=None, gender=None, timer=Non
         if not reward:
             reward = []
             invasion_embed.add_field(name=_("**Possible Rewards:**"), value="Unknown Pokemon", inline=True)
-            invasion_embed.add_field(name=_("**Weaknesses:**"), value="Unknown", inline=True)
         elif isinstance(reward, str) and reward.lower() in self.bot.type_list:
             invasion_embed.add_field(name=_("**Possible Rewards:**"), value=f"{reward.title()} Invasion {self.bot.config.type_id_dict[reward.lower()]}", inline=True)
             invasion_embed.add_field(name=_("**Weaknesses:**"), value=f"{utils.weakness_to_emoji(self.bot, utils.get_weaknesses(self.bot, [reward.title()]))}\u200b", inline=True)

meowth/exts/raid.py

@@ -4262,9 +4262,9 @@ async def _counters(self, ctx, args):
             url += "levels/30/"
             userstr = _("Level 30")
         weather_list = [_('none'), _('extreme'), _('clear'), _('sunny'), _('rainy'),
-                        _('partlycloudy'), _('cloudy'), _('windy'), _('snow'), _('fog')]
+                        _('partlycloudy'), _('cloudy'), _('windy'), _('snow'), _('snowy'), _('fog'), _('foggy')]
         match_list = ['NO_WEATHER', 'NO_WEATHER', 'CLEAR', 'CLEAR', 'RAINY',
-                            'PARTLY_CLOUDY', 'OVERCAST', 'WINDY', 'SNOW', 'FOG']
+                            'PARTLY_CLOUDY', 'OVERCAST', 'WINDY', 'SNOW', 'SNOW', 'FOG', 'FOG']
         if not weather:
             index = 0
         else:
@@ -4364,9 +4364,9 @@ async def _get_generic_counters(self, guild, pkmn, weather=None):
         img_url = pokemon.img_url
         level = utils.get_level(self.bot, str(pokemon)) if utils.get_level(self.bot, str(pokemon)).isdigit() else "5"
         weather_list = [_('none'), _('extreme'), _('clear'), _('sunny'), _('rainy'),
-                        _('partlycloudy'), _('cloudy'), _('windy'), _('snow'), _('fog'), _('foggy')]
+                        _('partlycloudy'), _('cloudy'), _('windy'), _('snow'), _('snowy'), _('fog'), _('foggy')]
         match_list = ['NO_WEATHER', 'NO_WEATHER', 'CLEAR', 'CLEAR', 'RAINY',
-                            'PARTLY_CLOUDY', 'OVERCAST', 'WINDY', 'SNOW', 'FOG', 'FOG']
+                            'PARTLY_CLOUDY', 'OVERCAST', 'WINDY', 'SNOW', 'SNOW', 'FOG', 'FOG']
         if not weather:
             index = 0
         else:

meowth/exts/utilities.py

@@ -934,7 +934,7 @@ async def about(self, ctx):
         embed.add_field(name='Your Server', value=yourguild)
         embed.add_field(name='Your Members', value=yourmembers)
         embed.add_field(name='Uptime', value=uptime_str)
-        embed.set_footer(text="Running Meowth v19.11.11.0 | Built with discord.py")
+        embed.set_footer(text="Running Meowth v19.11.12.0 | Built with discord.py")
         try:
             await channel.send(embed=embed)
         except discord.HTTPException: