Skip to content

Commit

Permalink
Add Christmas 2023 Pokémon (#23)
Browse files Browse the repository at this point in the history
  - Santa H. Zorua
  - Reindeer Deerling
  - Pyjama Minccino
  - Train Varoom
  - Conductor Dragonite
  - Pyjama Plusle & Minun
  - Christmas Tree Smoliv
  - Christmas Tree Dolliv
  - Christmas Tree Arboliva
  - Fireworks Cosmog
  • Loading branch information
WitherredAway authored Dec 23, 2023
1 parent c78d7dc commit a8ff3bb
Show file tree
Hide file tree
Showing 24 changed files with 28 additions and 9 deletions.
4 changes: 3 additions & 1 deletion constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
611659645760831506: "@dagger_mace",
850079219681722398: "@foxrii_",
712521240602214400: "@blubambii",
979108831118364774: "@yushiyoto",
979108831118364774: "@clumsy.kenji",
745825974880436294: "@jasreetdhillon",
690194873650905155: "@notchri",
676169170400051201: "Misfortune#8519",
Expand All @@ -155,4 +155,6 @@
512697200879468549: "@asuka03",
118587743746916353: "@taz989",
874420399608332370: "@angeljanin",
286902705115627520: "@not_zack",
449792537272516628: "@jynxerso",
}
2 changes: 2 additions & 0 deletions csv/evolution.csv
Original file line number Diff line number Diff line change
Expand Up @@ -495,3 +495,5 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
,10234,1,,50,,,,,,,,,,,,,,0,0
,10160,1,,40,,,,,,,,,,,,,,,
,10172,1,,20,,,,,,,,,,,,,,,
,50153,1,,25,,,,,,,,,,,,,,0,0
,50154,1,,35,,,,,,,,,,,,,,0,0
20 changes: 15 additions & 5 deletions csv/pokemon.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1322,7 +1322,7 @@ id,dex_number,region,slug,description,credit,enabled,catchable,abundance,gender_
50040,549,unova,lilligant-festive,Essential oils made from Lilligant poinsettia flowers have a sublime scent. These are in a lot of homes during Christmas.,285861483412193280,1,,96,8,0,,,,Poinsettia Lilligant,Festive Lilligant,,,Grass,,,,,1,11,163,,,70,60,75,110,75,90,,,,,
50041,722,alola,rowlet-festive,"During the day, it builds up energy via photosynthesis. At night, it flies silenty through the sky, scouting for the santa to bring his presents.",711892049842012190,1,,512,-1,0,,,,Christmas Rowlet,Festive Rowlet,,,Grass,Flying,,,,1,3,15,,,68,55,55,50,50,42,,,,,
50042,764,alola,comfey-festive,"This Pokémon smells very nice. All comfey wear different kinds of wreaths, so each one has its own individual Christmas scent.",444692790689923072 | 285861483412193280,1,,96,6,0,,,,Wreath Comfey,Festive Comfey,,,Fairy,,,,,1,1,3,,,51,52,90,82,110,100,,,,,
50043,771,alola,pyukumuku-festive,They will get on land during Christmas eve to shine its lights on the back. They go back to the sea after New Year’s eve.,550289905079812106 | 285861483412193280,1,,96,4,0,,,,Lights Pyukumuku,Festive Pyukumuku,,,Water,,,,,1,3,12,,,55,60,130,30,130,5,,,,,
50043,771,alola,pyukumuku-festive,They will get on land during Christmas eve to shine its lights on the back. They go back to the sea after New Year’s eve.,550289905079812106,1,,96,4,0,,,,Lights Pyukumuku,Festive Pyukumuku,,,Water,,,,,1,3,12,,,55,60,130,30,130,5,,,,,
50044,775,alola,komala-festive,It remains asleep from birth to death as a result of the sedative music of Christmas that it hears all year long.,810031895190306816 | 285861483412193280,1,,96,4,0,,,,Presents Komala,Festive Komala,,,Normal,,,,,1,4,199,,,65,115,65,75,95,65,,,,,
50045,830,galar,eldegoss-festive,"The ornament on the head of this Pokémon can be hung in the Christmas tree, shining bright.",285861483412193280,1,,96,4,0,,,,Ornament Eldegoss,Festive Eldegoss,,,Grass,,,,,1,5,25,,,60,50,90,80,120,60,,,,,
50046,842,galar,appletun-festive,"Its body is covered with icing, and the skin on its back is especially yummy. Children used to have it as a snack at Christmas.",285861483412193280,1,,96,4,0,,,,Cake Appletun,Festive Appletun,,,Grass,Dragon,,,,1,4,130,,,110,85,80,100,80,30,,,,,
Expand Down Expand Up @@ -1350,7 +1350,7 @@ id,dex_number,region,slug,description,credit,enabled,catchable,abundance,gender_
50068,143,kanto,snorlax-summer,,285861483412193280,1,,,1,0,,,,Grilling Snorlax,Summer Snorlax,,,Normal,,,,,1,21,4600,,,160,110,65,65,110,30,,,,,
50069,147,kanto,dratini-summer,,285861483412193280,1,,,4,0,,,,Martini Dratini,Summer Dratini,,,Dragon,,,,,1,18,33,,,41,64,45,50,50,50,,,,,
50070,25,kanto,pikachu-summer,,285861483412193280,1,,,4,0,,,,Surf Pikachu,Summer Pikachu,,,Electric,,,,,1,4,60,,,35,55,40,50,50,90,,,,,
50071,152,johto,chikorita-autumn,,979108831118364774 | 285861483412193280,1,,6144,1,0,,,,Autumn Chikorita,,,,Grass,,,,,1,9,64,,,45,49,65,49,65,45,,,,,
50071,152,johto,chikorita-autumn,,979108831118364774,1,,6144,1,0,,,,Autumn Chikorita,,,,Grass,,,,,1,9,64,,,45,49,65,49,65,45,,,,,
50072,78,kanto,rapidash-autumn,,285861483412193280,1,,1152,4,0,,,,Autumn Rapidash,,,,Fire,,,,,1,17,950,,,65,100,70,80,80,105,,,,,
50073,495,unova,snivy-autumn,,285861483412193280,1,,6144,1,0,,,,Autumn Snivy,,,,Grass,,,,,1,6,81,,,45,45,55,45,55,63,,,,,
50074,511,unova,pansage-autumn,,711892049842012190,1,,4608,1,0,,,,Autumn Pansage,,,,Grass,,,,,1,6,105,,,50,53,48,53,48,64,,,,,
Expand All @@ -1360,10 +1360,10 @@ id,dex_number,region,slug,description,credit,enabled,catchable,abundance,gender_
50078,755,alola,morelull-halloween,,285861483412193280,1,,4608,4,0,,,,Halloween Morelull,,,,Grass,Ghost,,,,1,2,15,,,40,35,55,65,75,15,,,,,
50079,92,kanto,gastly-christmas,,285861483412193280,1,,4608,4,0,,,,Snowball Gastly,Christmas Gastly,,,Ghost,Poison,,,,1,13,1,,,30,35,30,100,35,80,,,,,
50080,281,hoenn,kirlia-christmas,,611659645760831506,1,,1152,4,0,,,,Ice Princess Kirlia,Christmas Kirlia,,,Psychic,Fairy,,,,1,8,202,,,38,35,35,65,55,50,,,,,
50081,868,galar,milcery-christmas,,979108831118364774,1,,1152,8,0,,,,Choco Milcery,Christmas Milcery,,,Fairy,,,,,1,2,3,,,45,40,40,50,61,34,,,,,
50081,868,galar,milcery-christmas,,745825974880436294,1,,1152,8,0,,,,Choco Milcery,Christmas Milcery,,,Fairy,,,,,1,2,3,,,45,40,40,50,61,34,,,,,
50082,151,kanto,mew-christmas,,711892049842012190,1,,72,-1,0,,,,Lights Mew,Christmas Mew,,,Psychic,,1,,,1,4,40,,,100,100,100,100,100,100,,,,,
50083,361,hoenn,snorunt-christmas,,285861483412193280,1,,1152,4,0,,,,Christmas Tree Snorunt,Christmas Snorunt,,,Ice,,,,,1,7,168,,,50,50,50,50,50,50,,,,,
50084,417,sinnoh,pachirisu-christmas,,979108831118364774,1,,288,4,0,,,,Lights Pachirisu,Christmas Pachirisu,,,Electric,,,,,1,4,39,,,60,45,70,45,90,95,,,,,
50084,417,sinnoh,pachirisu-christmas,,745825974880436294,1,,288,4,0,,,,Lights Pachirisu,Christmas Pachirisu,,,Electric,,,,,1,4,39,,,60,45,70,45,90,95,,,,,
50085,865,galar,sirfetchd-christmas,,285861483412193280,1,,36,4,0,,,,Nutcrack Sirfetch'd,Christmas Sirfetch'd,,,Fighting,,,,,1,8,1170,,,62,135,95,68,82,65,,,,,
50086,875,galar,eiscue-ice-christmas,,690194873650905155,1,,288,4,0,,,,Ice Present Eiscue,Christmas Eiscue,,,Ice,,,,,1,14,890,,,75,80,110,65,90,50,,,,,
50087,837,galar,rolycoly-christmas,,285861483412193280,1,,,4,0,,,,Coal Rolycoly,Christmas Rolycoly,,,Rock,,,,,1,3,120,,,30,40,50,40,50,30,,,,,
Expand All @@ -1375,7 +1375,7 @@ id,dex_number,region,slug,description,credit,enabled,catchable,abundance,gender_
50093,115,kanto,kangaskhan-spring,There are records of Kangaskhan hiding chocolate eggs for their children to find on Easter.,285861483412193280,1,,,8,0,,,,Egg Hunter Kangaskhan,Spring Kangaskhan,,,Normal,,,,,1,22,800,,,105,95,80,40,80,90,,,,,
50094,267,hoenn,beautifly-spring,"Beautifly has a long mouth like a coiled needle, which is very convenient searching for hidden chocolate eggs in gardens. It rides the spring winds as it flits around gathering eggs.",285861483412193280,1,,,4,0,,,,Hatching Beautifly,Spring Beautifly,,,Bug,Flying,,,,1,10,284,,,60,70,50,100,50,65,,,,,
50095,274,hoenn,nuzleaf-spring,They live in holes bored in large trees. The sound of Nuzleaf's grass flute lets birds whistle in joy.,285861483412193280,1,,,4,0,,,,Bird Nest Nuzleaf,Spring Nuzleaf,,,Grass,Dark,,,,1,10,280,,,70,70,40,60,40,60,,,,,
50096,427,sinnoh,buneary-spring,Buneary can crack eggs by rolling up their ears and then striking with the force created by unrolling them. This attack is useful for hard boiled eggs.,979108831118364774,1,,,4,0,,,,Egg Basket Buneary,Spring Buneary,,,Normal,,,,,1,4,55,,,55,66,44,44,56,85,,,,,
50096,427,sinnoh,buneary-spring,Buneary can crack eggs by rolling up their ears and then striking with the force created by unrolling them. This attack is useful for hard boiled eggs.,745825974880436294,1,,,4,0,,,,Egg Basket Buneary,Spring Buneary,,,Normal,,,,,1,4,55,,,55,66,44,44,56,85,,,,,
50097,719,kalos,diancie-spring,It can instantly create many flowers by shaking its head to throw out seeds from the big flower on its head.,285861483412193280,1,,,-1,0,,,,Spring Blooming Diancie,Spring Diancie,,,Rock,Fairy,1,,,1,7,88,,,50,100,150,100,150,50,,,,,
50098,762,alola,steenee-spring,Any Corvisquire that pecks at this Pokémon will be greeted with a smack from the bag its wearing.,285861483412193280,1,,,8,0,,,,Egg Searching Steenee,Spring Steenee,,,Grass,,,,,1,7,82,,,52,40,48,40,48,62,,,,,
50099,795,alola,pheromosa-spring,"Although it's alien to this world, It's enjoying the sunny fashion for this Spring.",676169170400051201 | 285861483412193280,1,,,-1,0,,,,Flower Pheromosa,Spring Pheromosa,,,Bug,Fighting,,,1,1,18,250,,,71,137,37,137,37,151,,,,,
Expand Down Expand Up @@ -1424,3 +1424,13 @@ id,dex_number,region,slug,description,credit,enabled,catchable,abundance,gender_
50142,650,kalos,chespin-thanksgiving,"The quills on its head are usually sprouts. Nearing winter, the sprouts turn yellow, announcing the harvest season.",285861483412193280,1,,2445,1,0,,,,Cooking Chespin,Thanksgiving Chespin,,,Grass,,,,,1,4,90,,,56,61,65,48,45,38,,,,,
50143,659,kalos,bunnelby-thanksgiving,It’s very sensitive to smell. It knows where the best carrots are found.,874420399608332370 | 285861483412193280,1,,3680,4,0,,,,Nibbling Bunnelby,Thanksgiving Bunnelby,,,Normal,,,,,1,4,50,,,38,36,38,32,36,57,,,,,
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,,,,,
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,,,,,
50151,965,paldea,varoom-christmas,The steel section is Train Varoom’s actual body. This Pokémon pulls The Poké Express to the North Pole during Christmas!,285861483412193280,1,,,4,0,,,,Train Varoom,Christmas Varoom,,,Steel,Fairy,,,,1,10,350,,,45,70,63,30,45,47,,,,,
50152,928,paldea,smoliv-christmas,"This Pokémon converts snowflakes into baubles, which it stores in pine trees. It can easily go a whole week dancing around Christmas trees out of joy.",745825974880436294,1,,,4,0,,,,Christmas Tree Smoliv,Christmas Smoliv,,,Grass,,,,,1,3,65,50153,,41,35,45,58,51,30,,,,,
50153,929,paldea,dolliv-christmas,"It basks in the light of the stars to its heart’s content until the star on its head shines bright. After that, Christmas Tree Dolliv places the star on top of a decorated pine tree and goes on a journey for a new star.",745825974880436294,1,,,4,0,,,,Christmas Tree Dolliv,Christmas Dolliv,,,Grass,,,,,1,6,119,50154,50152,52,53,60,78,78,33,,,,,
50154,930,paldea,arboliva-christmas,"This Pokémon gathers friends by launching its rich, shiny lights at them and pulling them closer to itself.",745825974880436294,1,,,4,0,,,,Christmas Tree Arboliva,Christmas Arboliva,,,Grass,Fairy,,,,1,14,482,,50153,78,69,90,125,109,39,,,,,
Binary file added images/50145.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/50146.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/50147.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/50148.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/50149.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/50150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/50151.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/50152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/50153.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/50154.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 8 additions & 3 deletions models.py
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ class Species:
catchable: bool
types: typing.List[str]
abundance: int
gender_rate: int
gender_rate: int
has_gender_differences: int
description: str = None
mega_id: int = None
Expand Down Expand Up @@ -563,7 +563,7 @@ def image_url(self):
@cached_property
def shiny_image_url(self):
return self.instance.asset(f"/shiny/{self.id}.png")

@cached_property
def image_url_female(self):
if self.has_gender_differences == 1:
Expand All @@ -590,6 +590,10 @@ def correct_guesses(self):
extra.extend(self.instance.pokemon[655].correct_guesses)
extra.append("pride gardevoir")
extra.append("pride delphox")
if self.id == 50149:
# can't set two dex_numbers
extra.extend(self.instance.pokemon[312].correct_guesses)
extra.append("christmas minun")
return extra + [deaccent(x.lower()) for _, x in self.names] + [self.slug]

@cached_property
Expand Down Expand Up @@ -623,7 +627,7 @@ def evolution_text(self):

def __repr__(self):
return f"<Species: {self.name}>"

def get_gender_image_url(self, shiny, gender):
if shiny:
return self.image_url if gender in ["♂", "male"] else self.image_url_female
Expand Down Expand Up @@ -714,6 +718,7 @@ def list_hisuian(self):
10237,
10238,
10239,
50145,
]

@cached_property
Expand Down
Binary file added shiny/50145.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shiny/50146.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shiny/50147.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shiny/50148.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shiny/50149.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shiny/50150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shiny/50151.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shiny/50152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shiny/50153.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shiny/50154.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a8ff3bb

Please sign in to comment.