Skip to content
This repository has been archived by the owner on Oct 2, 2023. It is now read-only.

Hisui #95

Merged
merged 18 commits into from
Jun 22, 2022
Merged

Hisui #95

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1d73943
feat: adding new gen 8 data from Legends: Arceus
anhthang Mar 1, 2022
f8d48fc
feat: adding 16 new hisuian forms, new forms for dialga, palkia, basc…
anhthang Mar 1, 2022
8ffb6e2
feat: add pokemon forms
anhthang Mar 2, 2022
6bd29fa
fix: update Basculegion Female, Enamorus Therian
anhthang Mar 2, 2022
897ec35
feat: add pokemon name in ko,fr,de. version name in other languages
anhthang Mar 2, 2022
d24039d
fix: gender rate
anhthang Mar 5, 2022
5ae01ee
Merge branch 'master-pokeapi' into hisui
anhthang May 7, 2022
1cb7a6d
fix: update versions, version groups
anhthang May 15, 2022
960a2d1
fix: flavor text
anhthang May 17, 2022
21cb732
fix: remove additional flavor text
anhthang May 23, 2022
dcab074
fix: update shape_id, has_gender_differences, forms_switchable
anhthang May 25, 2022
5f24c48
feat: add missing flavor text
anhthang May 25, 2022
5caf8e2
fix: double quotes
anhthang May 26, 2022
1f194f7
fix: add form order
anhthang Jun 14, 2022
77fb639
feat: add version names for newly added versions
anhthang Jun 17, 2022
1fe327a
fix: add missing form order
anhthang Jun 22, 2022
3ccd8c5
fix: overqwil ability
anhthang Jun 22, 2022
c142c8f
fix: trim space
anhthang Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions pokedex/data/csv/pokemon.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,13 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
896,glastrier,896,22,8000,290,1088,1
897,spectrier,897,20,445,290,1089,1
898,calyrex,898,11,77,250,1090,1
899,wyrdeer,899,18,951,,,1
900,kleavor,900,18,890,,,1
901,ursaluna,901,24,2900,,,1
902,basculegion-male,902,30,1100,,,1
903,sneasler,903,13,430,,,1
904,overqwil,904,25,605,,,1
905,enamorus-incarnate,905,16,480,,,1
10001,deoxys-attack,386,17,608,270,515,0
10002,deoxys-defense,386,17,608,270,516,0
10003,deoxys-speed,386,17,608,270,517,0
Expand Down Expand Up @@ -1125,3 +1132,24 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
10226,urshifu-single-strike-gmax,892,290,10000,275,,0
10227,urshifu-rapid-strike-gmax,892,260,10000,275,,0
10228,toxtricity-low-key-gmax,849,240,10000,176,,0
10229,growlithe-hisui,58,8,227,,,0
10230,arcanine-hisui,59,20,1680,,,0
10231,voltorb-hisui,100,5,130,,,0
10232,electrode-hisui,101,12,710,,,0
10233,typhlosion-hisui,157,16,698,,,0
10234,qwilfish-hisui,211,5,39,,,0
10235,sneasel-hisui,215,9,270,,,0
10236,samurott-hisui,503,15,582,,,0
10237,lilligant-hisui,549,12,192,,,0
10238,zorua-hisui,570,7,125,,,0
10239,zoroark-hisui,571,16,730,,,0
10240,braviary-hisui,628,17,434,,,0
10241,sliggoo-hisui,705,7,685,,,0
10242,goodra-hisui,706,17,3341,,,0
10243,avalugg-hisui,713,14,2624,,,0
10244,decidueye-hisui,724,16,370,,,0
10245,dialga-origin,483,70,8487,,,0
10246,palkia-origin,484,63,6590,,,0
10247,basculin-white-striped,550,10,180,,,0
10248,basculegion-female,902,30,1100,,,0
10249,enamorus-therian,905,16,480,,,0
68 changes: 68 additions & 0 deletions pokedex/data/csv/pokemon_abilities.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2142,6 +2142,22 @@ pokemon_id,ability_id,is_hidden,slot
896,264,0,1
897,265,0,1
898,127,0,1
899,22,0,1
899,119,0,2
899,157,1,3
900,68,0,1
900,125,0,2
900,80,1,3
902,155,0,1
902,91,0,2
902,104,1,3
903,46,0,1
903,143,1,3
904,38,0,1
904,33,0,2
904,33,1,3
905,131,0,1
905,126,1,3
10001,46,0,1
10002,46,0,1
10003,46,0,1
Expand Down Expand Up @@ -2532,3 +2548,55 @@ pokemon_id,ability_id,is_hidden,slot
10228,244,0,1
10228,58,0,2
10228,101,1,3
10229,22,0,1
10229,18,0,2
10229,154,1,3
10230,22,0,1
10230,18,0,2
10230,154,1,3
10231,43,0,1
10231,9,0,2
10231,106,1,3
10232,43,0,1
10232,9,0,2
10232,106,1,3
10233,66,0,1
10233,18,1,3
10234,38,0,1
10234,33,0,2
10234,22,1,3
10235,39,0,1
10235,51,0,2
10235,143,1,3
10236,67,0,1
10236,75,1,3
10237,34,0,1
10237,55,0,2
10237,102,1,3
10238,149,0,1
10239,149,0,1
10240,51,0,1
10240,125,0,2
10240,128,1,3
10241,157,0,1
10241,142,0,2
10241,183,1,3
10242,157,0,1
10242,142,0,2
10242,183,1,3
10243,173,0,1
10243,115,0,2
10243,5,1,3
10244,65,0,1
10244,203,1,3
10245,46,0,1
10245,140,1,3
10246,46,0,1
10246,140,1,3
10247,155,0,1
10247,91,0,2
10247,104,1,3
10248,155,0,1
10248,91,0,2
10248,104,1,3
10249,142,0,1
7 changes: 7 additions & 0 deletions pokedex/data/csv/pokemon_egg_groups.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,3 +1153,10 @@ species_id,egg_group_id
896,15
897,15
898,15
899,5
900,3
901,5
902,12
903,5
904,12
905,15
28 changes: 28 additions & 0 deletions pokedex/data/csv/pokemon_form_generations.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4123,6 +4123,13 @@ pokemon_form_id,generation_id,game_index
896,8,0
897,8,0
898,8,0
899,8,0
900,8,0
901,8,0
902,8,0
903,8,0
904,8,0
905,8,0
10001,2,1
10001,3,1
10001,4,1
Expand Down Expand Up @@ -4947,3 +4954,24 @@ pokemon_form_id,generation_id,game_index
10361,8,0
10362,8,0
10363,8,0
10398,8,0
10399,8,0
10400,8,0
10401,8,0
10402,8,0
10403,8,0
10404,8,0
10405,8,0
10406,8,0
10407,8,0
10408,8,0
10409,8,0
10410,8,0
10411,8,0
10412,8,0
10413,8,0
10414,8,0
10415,8,0
10416,8,0
10417,8,0
10418,8,0
23 changes: 23 additions & 0 deletions pokedex/data/csv/pokemon_form_names.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,8 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
892,9,Single Strike Style,Single Strike Urshifu
892,11,いちげきのかた,
892,12,一击流,
902,9,Male, Male Basculegion
905,9,Incarnate Forme, Incarnate Enamorus
10001,1,Ｂ,
10001,3,B,
10001,5,B,Zarbi B
Expand Down Expand Up @@ -3203,3 +3205,24 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
10395,9,Gigantamax Form,Gigantamax Single Strike Urshifu
10396,9,Gigantamax Form,Gigantamax Rapid Strike Urshifu
10397,9,Gigantamax Form,Gigantamax Low Key Toxtricity
10398,9,Hisuian Form, Hisuian Growlithe
10399,9,Hisuian Form, Hisuian Arcanine
10400,9,Hisuian Form, Hisuian Voltorb
10401,9,Hisuian Form, Hisuian Electrode
10402,9,Hisuian Form, Hisuian Typhlosion
10403,9,Hisuian Form, Hisuian Qwilfish
10404,9,Hisuian Form, Hisuian Sneasel
10405,9,Hisuian Form, Hisuian Samurott
10406,9,Hisuian Form, Hisuian Lilligant
10407,9,Hisuian Form, Hisuian Zorua
10408,9,Hisuian Form, Hisuian Zoroark
10409,9,Hisuian Form, Hisuian Braviary
10410,9,Hisuian Form, Hisuian Sliggoo
10411,9,Hisuian Form, Hisuian Goodra
10412,9,Hisuian Form, Hisuian Avalugg
10413,9,Hisuian Form, Hisuian Decidueye
10414,9,Origin Forme, Origin Dialga
10415,9,Origin Forme, Origin Palkia
10416,9,White-Striped Form, White-Striped Basculin
10417,9,Female, Female Basculegion
10418,9,Therian Forme, Therian Enamorus
28 changes: 28 additions & 0 deletions pokedex/data/csv/pokemon_forms.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,13 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
896,glastrier,,896,20,1,0,0,1,1257
897,spectrier,,897,20,1,0,0,1,1258
898,calyrex,,898,20,1,0,0,1,1259
899,wyrdeer,,899,20,1,0,0,1,
900,kleavor,,900,20,1,0,0,1,
901,ursaluna,,901,20,1,0,0,1,
902,basculegion-male,male,902,20,1,0,0,1,
903,sneasler,,903,20,1,0,0,1,
904,overqwil,,904,20,1,0,0,1,
905,enamorus-incarnate,incarnate,905,20,1,0,0,1,
10001,unown-b,b,201,3,0,0,0,2,299
10002,unown-c,c,201,3,0,0,0,3,300
10003,unown-d,d,201,3,0,0,0,4,301
Expand Down Expand Up @@ -1294,3 +1301,24 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10395,urshifu-single-strike-gmax,gmax,10226,20,1,1,0,1,1281
10396,urshifu-rapid-strike-gmax,gmax,10227,20,1,1,0,1,1282
10397,toxtricity-low-key-gmax,gmax,10228,20,1,1,0,1,1283
10398,growlithe-hisui,hisui,10229,24,1,1,0,1,
10399,arcanine-hisui,hisui,10230,24,1,1,0,1,
10400,voltorb-hisui,hisui,10231,24,1,1,0,1,
10401,electrode-hisui,hisui,10232,24,1,1,0,1,
10402,typhlosion-hisui,hisui,10233,24,1,1,0,1,
10403,qwilfish-hisui,hisui,10234,24,1,1,0,1,
10404,sneasel-hisui,hisui,10235,24,1,1,0,1,
10405,samurott-hisui,hisui,10236,24,1,1,0,1,
10406,lilligant-hisui,hisui,10237,24,1,1,0,1,
10407,zorua-hisui,hisui,10238,24,1,1,0,1,
10408,zoroark-hisui,hisui,10239,24,1,1,0,1,
10409,braviary-hisui,hisui,10240,24,1,1,0,1,
10410,sliggoo-hisui,hisui,10241,24,1,1,0,1,
10411,goodra-hisui,hisui,10242,24,1,1,0,1,
10412,avalugg-hisui,hisui,10243,24,1,1,0,1,
10413,decidueye-hisui,hisui,10244,24,1,1,0,1,
10414,dialga-origin,origin,10245,24,1,1,0,1,
10415,palkia-origin,origin,10246,24,1,1,0,1,
10416,basculin-white-striped,white-striped,10247,24,1,1,0,1,
10417,basculegion-female,female,902,24,1,1,0,1,
10418,enamorus-therian,therian,905,24,1,1,0,1,
7 changes: 7 additions & 0 deletions pokedex/data/csv/pokemon_species.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,3 +897,10 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
896,glastrier,8,,474,9,8,,-1,3,35,0,120,0,1,0,1,0,896,
897,spectrier,8,,475,1,8,,-1,3,35,0,120,0,1,0,1,0,897,
898,calyrex,8,,476,5,12,,-1,3,100,0,120,0,1,0,1,0,898,
899,wyrdeer,8,234,,4,,,4,,,0,,,1,,0,0,899,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, here the data lacks information. By building the DB I get that:

null value in column "forms_switchable" of relation "pokemon_v2_pokemonspecies" violates not-null constraint

I guess we should try to fill all the columns.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here the build: https://app.circleci.com/pipelines/github/PokeAPI/pokeapi/511/workflows/19090bb7-cda9-40cb-8187-9002a65fca2a/jobs/1228

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Naramsim updated in last commit

900,kleavor,8,123,,3,,,4,75,,0,,,2,,0,0,900,
901,ursaluna,8,217,,3,,,4,,,0,,,2,,0,0,901,
902,basculegion,8,550,,5,,,4,,,0,,,2,,0,0,902,
903,sneasler,8,215,,4,,,4,135,,0,,,4,,0,0,903,
904,overqwil,8,211,,1,,,4,135,,0,,,2,,0,0,904,
905,enamorus,8,,,6,,,8,,,0,,,1,,1,0,905,
Loading