Skip to content

Commit

Permalink
z!pk e fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
kaesekaiser committed Dec 29, 2024
1 parent 7e83d20 commit 82ad0c5
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions bot/pkmn.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import datetime
import discord
import json
import random
import re
import time
from classes.bot import Zeph
Expand Down Expand Up @@ -422,10 +423,10 @@ def type2bac(self):

@property
def image(self):
if (self.type1 or self.type2) and (self.initial_mon.types_with_none == [str(self.type1), str(self.type2)]):
if (self.type1 or self.type2) and (self.initial_mon.types_with_none == (str(self.type1), str(self.type2))):
return self.initial_mon.dex_image
try:
return pk.find_mon(choice(pk.exemplary_mons[frozenset([self.type1, self.type2])])).dex_image
return pk.find_mon(random.choice(pk.exemplary_mons[frozenset([self.type1, self.type2])])).dex_image
except KeyError:
return None

Expand Down Expand Up @@ -1318,7 +1319,7 @@ async def _eff(self, *args):
else:
types = ["Normal"]

return await EffNavigator(*types, initial_mon=mon).run(self.ctx)
return await EffNavigator(self.bot, *types, initial_mon=mon).run(self.ctx)

async def _test(self, *args):
admin_check(self.ctx)
Expand Down

0 comments on commit 82ad0c5

Please sign in to comment.