diff --git a/csv/pokemon.csv b/csv/pokemon.csv index 51f80fd..31fa6ae 100644 --- a/csv/pokemon.csv +++ b/csv/pokemon.csv @@ -1426,7 +1426,7 @@ id,dex_number,region,slug,description,credit,enabled,catchable,abundance,gender_ 50144,841,galar,flapple-thanksgiving,"During the harvest season when an Applin evolves, it chooses the best fruit of the season. Humans watch evolving Applins carefully to determine what the fruit of the year will be.",285861483412193280,1,,1524,4,0,,,,Pear Flapple,Thanksgiving Flapple,,,Grass,Dragon,,,,1,3,10,,,70,110,80,95,60,70,,,,, 50145,570,hisui,zorua-hisui-christmas,"It changes into the forms of others to disguise itself while bringing presents. Apparently, its true form is Santa Claus!",286902705115627520 | 285861483412193280,1,1,614,1,0,,,,Santa H. Zorua,Santa Hisuian Zorua,,,Normal,Ghost,,,,1,7,125,,,35,60,40,85,40,70,,,,, 50146,572,unova,minccino-christmas,These Pokémon like things neat and tidy during Christmas. They are always watching the house and helping decorate the Christmas tree.,874420399608332370,1,1,1522,6,0,,,,Pyjama Minccino,Christmas Minccino,,,Ice,,,,,1,4,58,,,55,50,40,40,40,75,,,,, -50147,585,unova,deerling-christmas,The color and scent of their fur change to match the Christmas celebration. People use it to mark the Christmas days.,449792537272516628 | 285861483412193280,1,1,1522,4,0,,,,Reindeer Deerling,Christmas Deerling,,,Normal,Grass,,,,1,6,195,,,60,60,50,40,50,75,,,,, +50147,585,unova,deerling-christmas,The color and scent of their fur change to match the Christmas celebration. People use it to mark the Christmas days.,449792537272516628 | 285861483412193280,1,1,1522,4,0,,,,Reindeer Deerling,Reindeerling,,,Normal,Grass,,,,1,6,195,,,60,60,50,40,50,75,,,,, 50148,149,kanto,dragonite-christmas,It can fly despite its big and bulky physique. It circles the North Pole in just half an hour.,285861483412193280,1,,,4,0,,,,Conductor Dragonite,Christmas Dragonite,,,Dragon,Flying,,,,1,22,2100,,,91,134,95,100,100,80,,,,, 50149,311,hoenn,plusle-minun-christmas,"During the Winter, Plusle & Minun use their sparks to light candles and start a cozy fire to gather around.",285861483412193280,1,,,4,0,,,,Pyjama Plusle & Minun,Christmas Plusle,,,Electric,,,,,1,4,84,,,60,50,40,85,75,95,,,,, 50150,789,alola,cosmog-christmas,"Its body is gaseous and frail. During the Holiday celebrations, it grows fast as it collects all the firework dust from the atmosphere.",118587743746916353 | 285861483412193280,1,,,-1,0,,,,Fireworks Cosmog,New Year's Eve Cosmog,,,Psychic,Fire,,1,,1,2,1,,,43,29,31,29,31,37,,,,, diff --git a/models.py b/models.py index 7c27375..a6d21de 100644 --- a/models.py +++ b/models.py @@ -577,23 +577,43 @@ def shiny_image_url_female(self): @cached_property def correct_guesses(self): extra = [] + if self.is_form or self.event: extra.extend(self.instance.pokemon[self.dex_number].correct_guesses) + if "nidoran" in self.slug: extra.append("nidoran") + + # Elsa Galarian Ponyta if self.id == 50053: extra.extend(self.instance.pokemon[10159].correct_guesses) + + # Halloween Alolan Ninetales if self.id == 50076: extra.extend(self.instance.pokemon[10104].correct_guesses) + + # Pride Gardevoir & Delphox if self.id == 50107: # can't set two dex_numbers extra.extend(self.instance.pokemon[655].correct_guesses) extra.append("pride gardevoir") extra.append("pride delphox") + + # Pyjama Plusle & Minun if self.id == 50149: # can't set two dex_numbers extra.extend(self.instance.pokemon[312].correct_guesses) extra.append("christmas minun") + + # Santa Hisuian Zorua + if self.id == 50145: + extra.extend(self.instance.pokemon[10230].correct_guesses) + extra.append("christmas zorua") + + # Reindeer Deerling + if self.id == 50147: + extra.append("christmas deerling") + return extra + [deaccent(x.lower()) for _, x in self.names] + [self.slug] @cached_property