Skip to content

Commit

Permalink
Merge branch 'master' into issue1024
Browse files Browse the repository at this point in the history
  • Loading branch information
SKCwillie committed Feb 19, 2024
2 parents 99f2131 + e4e2cd6 commit 567e6a1
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 15 deletions.
30 changes: 15 additions & 15 deletions data/v2/csv/pokemon_forms.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10192,beedrill-mega,mega,10090,16,1,1,1,2,20
10193,rattata-alola,alola,10091,17,1,0,0,2,26
10194,raticate-alola,alola,10092,17,1,0,0,2,28
10195,raticate-totem-alola,totem-alola,10093,17,1,1,0,3,29
10195,raticate-totem-alola,totem-alola,10093,17,1,0,0,3,29
10196,pikachu-original-cap,original-cap,10094,17,1,0,0,8,43
10197,pikachu-hoenn-cap,hoenn-cap,10095,17,1,0,0,9,44
10198,pikachu-sinnoh-cap,sinnoh-cap,10096,17,1,0,0,10,45
Expand All @@ -1245,16 +1245,16 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10219,greninja-ash,ash,10117,17,1,1,0,3,853
10220,zygarde-10-power-construct,10-power-construct,10118,17,1,0,0,3,1002
10221,zygarde-50-power-construct,50-power-construct,10119,17,1,0,0,4,1003
10222,zygarde-complete,complete,10120,17,1,0,0,5,1004
10223,gumshoos-totem,totem,10121,17,1,1,0,2,1024
10224,vikavolt-totem,totem,10122,17,1,1,0,2,1028
10222,zygarde-complete,complete,10120,17,1,1,0,5,1004
10223,gumshoos-totem,totem,10121,17,1,0,0,2,1024
10224,vikavolt-totem,totem,10122,17,1,0,0,2,1028
10225,oricorio-pom-pom,pom-pom,10123,17,1,0,0,2,1032
10226,oricorio-pau,pau,10124,17,1,0,0,3,1033
10227,oricorio-sensu,sensu,10125,17,1,0,0,4,1034
10228,lycanroc-midnight,midnight,10126,17,1,0,0,2,1041
10229,wishiwashi-school,school,10127,17,1,1,0,2,1044
10230,lurantis-totem,totem,10128,17,1,1,0,2,1054
10231,salazzle-totem,totem,10129,17,1,1,0,2,1059
10230,lurantis-totem,totem,10128,17,1,0,0,2,1054
10231,salazzle-totem,totem,10129,17,1,0,0,2,1059
10232,silvally-fighting,fighting,773,17,0,0,0,2,1075
10233,silvally-flying,flying,773,17,0,0,0,3,1076
10234,silvally-poison,poison,773,17,0,0,0,4,1077
Expand Down Expand Up @@ -1286,9 +1286,9 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10260,minior-indigo,indigo,10141,17,1,0,0,13,1104
10261,minior-violet,violet,10142,17,1,0,0,14,1105
10262,mimikyu-busted,busted,10143,17,1,1,0,2,1111
10263,mimikyu-totem-disguised,totem-disguised,10144,17,1,1,0,3,1112
10263,mimikyu-totem-disguised,totem-disguised,10144,17,1,0,0,3,1112
10264,mimikyu-totem-busted,totem-busted,10145,17,1,1,0,4,1113
10265,kommo-o-totem,totem,10146,17,1,1,0,2,1120
10265,kommo-o-totem,totem,10146,17,1,0,0,2,1120
10266,magearna-original,original,10147,17,1,0,0,2,1141
10267,pikachu-partner-cap,partner-cap,10148,18,1,0,0,14,49
10268,marowak-totem,totem,10149,18,1,0,0,3,167
Expand Down Expand Up @@ -1360,12 +1360,12 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10334,linoone-galar,galar,10175,20,1,0,0,2,392
10335,darumaka-galar,galar,10176,20,1,0,0,2,725
10336,darmanitan-galar-standard,galar-standard,10177,20,1,0,0,3,728
10337,darmanitan-galar-zen,galar-zen,10178,20,1,0,0,4,729
10337,darmanitan-galar-zen,galar-zen,10178,20,1,1,0,4,729
10338,yamask-galar,galar,10179,20,1,0,0,2,737
10339,stunfisk-galar,galar,10180,20,1,0,0,2,800
10340,zygarde-10,10,10181,17,1,0,0,2,1001
10341,cramorant-gulping,gulping,10182,20,1,0,0,2,1186
10342,cramorant-gorging,gorging,10183,20,1,0,0,3,1187
10341,cramorant-gulping,gulping,10182,20,1,1,0,2,1186
10342,cramorant-gorging,gorging,10183,20,1,1,0,3,1187
10343,toxtricity-low-key,low-key,10184,20,1,0,0,2,1192
10344,sinistea-antique,antique,854,20,0,0,0,2,1198
10345,polteageist-antique,antique,855,20,0,0,0,2,1200
Expand All @@ -1377,11 +1377,11 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
10351,alcremie-ruby-swirl,ruby-swirl,869,20,0,0,0,7,1220
10352,alcremie-caramel-swirl,caramel-swirl,869,20,0,0,0,8,1221
10353,alcremie-rainbow-swirl,rainbow-swirl,869,20,0,0,0,9,1222
10354,eiscue-noice,noice,10185,20,1,0,0,2,1229
10354,eiscue-noice,noice,10185,20,1,1,0,2,1229
10355,indeedee-female,female,10186,20,1,0,0,2,1231
10356,morpeko-hangry,hangry,10187,20,1,0,0,2,1233
10357,zacian-crowned,crowned,10188,20,1,0,0,2,1245
10358,zamazenta-crowned,crowned,10189,20,1,0,0,2,1247
10356,morpeko-hangry,hangry,10187,20,1,1,0,2,1233
10357,zacian-crowned,crowned,10188,20,1,1,0,2,1245
10358,zamazenta-crowned,crowned,10189,20,1,1,0,2,1247
10359,eternatus-eternamax,eternamax,10190,20,1,0,0,2,1249
10360,urshifu-rapid-strike,rapid-strike,10191,20,1,0,0,2,1252
10361,zarude-dada,dada,10192,20,1,0,0,2,1254
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ object_relationships:
- name: pokemon_v2_pokemon
using:
foreign_key_constraint_on: pokemon_id
select_permissions:
- role: anon
permission:
columns: '*'
filter: {}
limit: 100000
allow_aggregations: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
table:
name: pokemon_v2_pokemoncries
schema: public
object_relationships:
- name: pokemon_v2_pokemon
using:
foreign_key_constraint_on: pokemon_id
select_permissions:
- role: anon
permission:
columns: '*'
filter: {}
limit: 100000
allow_aggregations: true
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ object_relationships:
- name: pokemon_v2_type
using:
foreign_key_constraint_on: damage_type_id
select_permissions:
- role: anon
permission:
columns: '*'
filter: {}
limit: 100000
allow_aggregations: true

0 comments on commit 567e6a1

Please sign in to comment.