Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-11-29 23:00:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
962 commits 12 branches 8 tags 53 MiB
Commit graph

296 commits

Author SHA1 Message Date
Alessandro Pezzè
16d18d7af0 sync: https://github.com/PokeAPI/pokedex/pull/78 2021-12-27 11:08:39 +01:00
Alessandro Pezzè
05cb9d846e sync: https://github.com/PokeAPI/pokedex/pull/74 2021-12-18 20:11:40 +01:00
Alessandro Pezzè
52439d1927 fix: https://github.com/PokeAPI/pokedex/pull/75 2021-12-16 23:51:59 +01:00
Alessandro Pezzè
36ad7a3d45 sync: https://github.com/PokeAPI/pokedex/pull/73 2021-12-15 19:21:31 +01:00
Alessandro Pezzè
b2aa4baff5 fix(#533): sync data from veekun 2021-12-07 11:38:06 +01:00
Alessandro Pezzè
2dcb787ff8 feat: bring in new data 2021-12-06 21:40:17 +01:00
Christian Garza
e4affb50c9 Add transparent sprites for gen-i and gen-ii 2021-11-15 17:57:00 -08:00
Christian Garza
7e85f9139b Update sprites submodule 2021-11-14 19:48:10 -08:00
Alessandro Pezzè
bcd290be71 fix: format code 2021-10-25 19:27:41 +02:00
Rolf
eb4d313c1d Added Pokémon Home images support. 2021-10-04 20:53:15 +02:00
Umesh
cf104bf2de Fixed typo on species 186 2021-09-06 22:14:17 +05:30
stormonster
36b8e98d87 Actually removed soft hyphen properly this time 2021-09-06 12:45:30 +02:00
stormonster
acd398ce5f Fixed typo on species 236. Fixes issue #646 2021-09-06 11:02:53 +02:00
prof64
2ec8c2a47d Update pokemon_species_names.csv 
Changed the apostrophe in Farfetch'd's species name from (’) to (') in English, Spanish, & Italian as per Sword and Shield.
 2021-07-28 03:26:04 -04:00
Julian Lawrance
206af8a6fd Remove order column from Generation model and use ID column instead 2021-07-19 19:00:40 +01:00
Julian Lawrance
0d9bc4f2b9 Run formatter 2021-07-16 22:32:06 +01:00
Julian Lawrance
1173b43ad1 Add order field to Generation model 2021-07-16 22:29:55 +01:00
Julian Lawrance
8b9e4f171c Merge remote-tracking branch 'upstream/master' into feature/past-type-efficacy 2021-07-14 22:23:11 +01:00
Alessandro Pezzè
d0a4397d41 data: remove hp stat change 2021-07-04 19:32:41 +02:00
Alessandro Pezzè
a6d6632abd data: remove HP stat change for ancient power 2021-07-03 20:03:24 +02:00
Alessandro Pezzè
4fa15f979f sync(sprites) 2021-05-17 16:48:30 +02:00
Alessandro Pezzè
fef9cd6efc data: fix id 2021-05-13 21:03:06 +02:00
Alessandro Pezzè
ed8ccbe7e0 data: add missing move 2021-05-13 20:45:36 +02:00
Alessandro Pezzè
14af88ff3a sync: https://github.com/PokeAPI/pokedex/pull/29 2021-05-12 19:20:28 +02:00
Alessandro Pezzè
60583d8882 feat: brings in https://github.com/PokeAPI/pokedex/pull/43 2021-04-18 18:06:17 +02:00
SimplyBLGDev
0e98f90051 Add missing encounters underwater, regies 
- Replaced the encounter method on the underwater encounters in RSE from 'surf' to 'seaweed'
- Added missing location areas for island cave, desert ruins and ancient tomb
- Added missing encounters for the legendary regies (Regirock, Regice and Registeel)
- Added missing encounters for Latios and Latias at Southern Island
 2021-03-14 18:49:24 -03:00
SimplyBLGDev
e61049558f Add missing encounters Gen 3 edition 
Added encounter methods and slots for:
- Squirt Bottle
- Wailmer Pail

Added missing locations and their areas where applicable:
- Two island
- Three island
- Three isle path
- Six island
- Seven island
- Birth island
- Navel rock
- Faraway island
- Hoenn Battle Frontier

Added missing encounters:
- Deoxis in Birth Island (FR LG & E)
- Lugia and Ho-Oh in Navel Rock (FR LG & E)
- Mew in Faraway island (E)
- Sudowoodo in Johto Route 36 (G S C HG & SS)
- Sudowoodo in Hoenn Battle Frontier (E)
 2021-03-11 19:41:29 -03:00
SimplyBLGDev
2102fa319f Fix encounter slots for crystal's Pokémon encounters 
Some wrong encoutner slots ID were being used bby Pokémon crystal's headbutt encounters, this resulted in erroneous chances which didn't add up to 100% in an area.
 2021-03-09 18:28:21 +00:00
SimplyBLGDev
f5f3d508a5 Encounter corrections 
Due to an error the headbutt importer script used the wrong tables for gold and silver, this commit re-run this tool with the correct data and solved the inconsistencies that were present in the previous commits.

- Replaced all headbutt encounters with their correct counterparts
- Relocated some encounter's IDs
- Created location area Bell Tower 1f
- Moved Pokémon Crystal's Suicune encounter from Bell Tower Roof to Bell Tower 1f (it's correct position)
 2021-03-09 17:49:41 +00:00
Simply BLG
682b362983
Typo corrections on encounter_methods 2021-03-07 23:32:42 -03:00
Simply BLG
79841f2358
Typo corrections for encounter_method_prose 2021-03-07 23:32:06 -03:00
SimplyBLGDev
8b11fda6f8 Add missing special encounters 
- Snorlax in GSC, HGSS
- Groudon, Kyogre and Rayquaza in RSE
- Removed unused Goldenrod city area location area
- Changed location area prose to some areas to correct duplicate location name in display
- Added proper default values for story-progress condition
- Added new condition 'other' for weirder conditions
- Added missing areas for legendary encounters in Hoenn
- Added missing locations for legendary encounters in Hoenn
 2021-03-08 01:51:18 +00:00
SimplyBLGDev
13a36e6b9e Add heabutt encounters 
Add:
- Encounter methods: Headbutt low encounter rate tree, Headbutt normal encounter rate tree, Headbutt high encounter rate tree
- Location: Azalea Town and it's area (Required for headbutt encounters)
- Encounter Slots: Encounter slots for heabutt low, normal and high for Gold, Silver and Crystal, along with their respective and correct chances
- Encounters: 1682 new encounters corresponding to every missing headbutt encounter from Pokémon Gold Silver and Crystal

PS: The source of all this data is the Pokémon decompilations by pret on github (https://github.com/pret/pokecrystal)[Pokémon Crystal decompilation], (https://github.com/pret/pokegold)[Pokémon Gold and Pokémon Silver Decompilation]
The data is as accurate as these decompilations are.
 2021-03-08 00:11:03 +00:00
SimplyBLGDev
94869bcd65 Add missing special encounters to GSC, RSE, FRLG, HGSS 
Added:
- Encounter conditions for beat elite four, beat elite four round 2
- Added locations and areas for roaming Pokémon (One for each region)
- Added area for Bell Tower Roof
- Added encounters for Lugia, Ho-Oh, Articuno, Zapdos, Moltres, Mewtwo, Raikou, Entei, Suicune, Latios and Latias to GSC, HGSS, FRLG and RSE where applicable.
- Bound encounter conditions where applicable.
 2021-03-07 00:13:20 +00:00
SimplyBLGDev
9489eaff88 Add special encounters for Gold Silver Crystal 
Added encounters for Lugia, Ho-Oh and Suicune in GSC.
 2021-03-06 22:45:05 +00:00
SimplyBLGDev
04a1f5848c Add special encounter for Fire Red/Leaf Green 
Added encounters for Electrode, Snorlax, Articuno, Zapdos, Moltres and Mewtwo for FR/LG.
 2021-03-06 21:44:46 +00:00
SimplyBLGDev
01827cd63c Add special encounters for Red/Blue/Yellow 
Added encounters method "Only One" and "Pokéflute".
Added encounters for Voltorb, Electrode, Snorlax, Articuno, Zapdos, Moltres and Mewtwo for Red/Blue and yellow versions.
 2021-03-06 21:29:40 +00:00
SimplyBLGDev
8a0f5a7a5d Added encounter methods, encounter methods values for new encounters 2021-03-06 20:19:53 +00:00
Alessandro Pezzè
c37e9c8c1e sync: update sprites https://github.com/PokeAPI/sprites/pull/44 2021-02-25 21:22:01 +01:00
Julian Lawrance
44f14a0118 Merge remote-tracking branch 'upstream/master' into feature/past-type-efficacy 2021-02-24 13:41:20 +00:00
Julian Lawrance
48c27bb8b6 Merge remote-tracking branch 'upstream/master' into feature/pokemon-form-types 2021-02-21 12:20:56 +00:00
Alessandro Pezzè
6f79bf0e0e sync: update sprites from https://github.com/PokeAPI/sprites/pull/43 2021-02-19 21:34:41 +01:00
Julian Lawrance
0aeb047677 Merge branch 'master' into feature/past-type-efficacy 2021-02-13 22:22:41 +00:00
Julian Lawrance
88a0cfb999 Remove Pokemon form type data for all default forms 2021-02-13 21:38:21 +00:00
Julian Lawrance
a159550aed Merge remote-tracking branch 'upstream/master' into feature/pokemon-form-types 2021-02-13 18:51:47 +00:00
Alessandro Pezzè
cf1a2d4f51 chore: update sprites/add make command to destroy the db 
fix: run flush non interactively
 2021-02-13 19:27:58 +01:00
Alessandro Pezzè
b5f014af82
Merge branch 'master' into past-pokemon-types 2021-02-10 20:41:02 +01:00
Alessandro Pezzè
ffea952902 refactor: change var names 2021-02-08 19:56:35 +01:00
Alessandro Pezzè
84b5a1874a fix: use string name when not default 2021-02-08 19:54:08 +01:00
Julian L
c273a42f98
Merge branch 'master' into past-pokemon-types 2021-02-06 21:56:50 +00:00
Julian Lawrance
76ba2ae00e Format source code 2021-02-06 21:52:36 +00:00
Julian Lawrance
6ce7ca413d Merge branch 'master' into past-pokemon-types 2021-02-06 21:29:40 +00:00
Alessandro Pezzè
92213330b3 chore: format wih black 2021-02-05 22:59:44 +01:00
Alessandro Pezzè
46f210ab81 feat: polish code/add female forms sprites 2021-02-05 22:58:23 +01:00
Alessandro Pezzè
06f78e6fd2 feat: build more image sprites 2021-02-05 22:58:23 +01:00
Alessandro Pezzè
2fdbe865f6 sync: update sprites 2021-02-05 22:57:57 +01:00
Alessandro Pezzè
1ce88ff23d sync: https://github.com/PokeAPI/pokedex/pull/28 2021-01-25 21:51:14 +01:00
Alessandro Pezzè
9b1bb9593d sync(data): https://github.com/PokeAPI/pokedex/pull/23 2021-01-11 19:46:03 +01:00
Alessandro Pezzè
3c63270fa2 sync: update sprites 2021-01-07 18:10:34 +01:00
zacbullard
5c6aac10d9 Added missing type data for toxtricity-low-key-gmax (10220) 2020-12-28 17:10:34 -05:00
Alessandro Pezzè
56931b967d data: add order 2020-12-11 17:07:35 +01:00
Alessandro Pezzè
63ee471a14 feat: update submodule [ci skip] 2020-12-05 14:48:17 +01:00
matthieu
b96bf59964 Merge branch 'empty_lines' of https://github.com/maleclercq/pokeapi into empty_lines 2020-12-03 23:59:01 +01:00
matthieu
33f708a149 update leafeon and glaceon 2020-12-03 23:58:30 +01:00
maleclercq
31d6c1add5
Merge branch 'master' into empty_lines 2020-12-03 09:56:36 +01:00
Alessandro Pezzè
da9c4c5b99 data: fix abilities as per https://github.com/PokeAPI/api-data/pull/62#issuecomment-736749492 2020-12-01 21:24:10 +01:00
matthieu
10b20624f0 Remove 4 empty lines (when trigger evolution was the location) 2020-12-01 08:57:25 +01:00
Alessandro Pezzè
b9844c8c1b sync: data 
Contains data from @myoKun345 (https://github.com/PokeAPI/pokedex/pull/18) and @tomi-912 (https://github.com/PokeAPI/pokedex/pull/19)
 2020-11-30 20:44:37 +01:00
Alessandro Pezzè
fa4c09675a bug: increment order 2020-11-23 21:22:04 +01:00
Alessandro Pezzè
d6a5568280 fix: 1 2020-11-23 21:04:19 +01:00
Alessandro Pezzè
4b346086da fix: add evolution trigger 2020-11-23 20:37:44 +01:00
Alessandro Pezzè
8f5b45b96b fix: add rain info 2020-11-23 19:57:33 +01:00
Alessandro Pezzè
d3f87bdfd7 feat: sync data 
most of it is from @myoKun345 (https://github.com/PokeAPI/pokedex/pull/17) plus some leftovers I forgot
 2020-11-23 19:37:38 +01:00
Alessandro Pezzè
5e803da514 fix: update ability description 2020-10-03 18:43:49 +02:00
Alessandro Pezzè
6b33ed2bc6 play: allow null values 2020-09-02 19:57:00 +02:00
Alessandro Pezzè
f6512caa72 feat: add missing commas 2020-09-02 19:42:48 +02:00
Alessandro Pezzè
e76b278774
Merge branch 'master' into lgpe-movenames 2020-09-02 15:35:30 +02:00
André Sousa
e1644f7d31 Add generated move data 2020-09-01 12:02:37 -03:00
Alessandro Pezzè
955fb8c209 feat: sync data 2020-08-31 18:58:23 +02:00
André Sousa
a7191d0f72 Adding info about the new attacks 2020-08-25 15:12:43 -03:00
Alessandro Pezzè
ca97f3528a
Merge branch 'master' into lgpe-movenames 2020-08-25 17:25:58 +02:00
Alessandro Pezzè
cec70507e3 fix: add is_baby 2020-08-25 00:20:05 +02:00
André Sousa
6da10edb15 Add move names for LGPE 2020-08-24 18:49:59 -03:00
Alessandro Pezzè
d3b5d6e0dc fix: remove 0 2020-08-24 19:06:26 +02:00
Alessandro Pezzè
7a09776475 data: add 808 809 and legendary/mythical 2020-08-24 19:03:43 +02:00
Alessandro Pezzè
9cf9541942
Merge branch 'master' into master 2020-08-24 11:37:22 +02:00
Christian Garza
4e8b0da539 Extend pokemon sprites to include gen-vii and gen-viii icons 2020-08-23 20:05:22 -07:00
Christian Garza
089a5e3947 Update sprite submodule 2020-08-23 19:47:29 -07:00
Ashley Craddock
1ce9fa35c5 chore(data): added some gen 8 data. 2020-08-19 10:51:01 -07:00
Alessandro Pezzè
b2c381a89e
Merge branch 'master' into master 2020-08-15 21:32:56 +02:00
Alessandro Pezzè
6e9f123060
Merge branch 'master' into staging 2020-08-15 21:22:36 +02:00
Raghav Nair
02465f4ac4 Removing lineneding 2020-08-14 22:16:25 -07:00
Raghav Nair
1068c5b069 Adding empty line ending for csv 2020-08-14 22:15:37 -07:00
Raghav Nair
25e026cc6a Removing ultrabeast column and only updating is_legendary and is_mythical 2020-08-14 22:14:09 -07:00
Christian Garza
afd4b6d9ec Extend pokemon sprites to include gen-v animated sprites 2020-08-14 17:29:19 -07:00
Christian Garza
3f10a8ae95 Update sprite submodule 2020-08-14 16:58:59 -07:00
Alessandro Pezzè
41f6c39682 Merge branch 'master' into gen-8 2020-08-11 19:28:20 +02:00
Alessandro Pezzè
d36408c14b feat: add pokemon stats 2020-08-10 20:06:11 +02:00
Alessandro Pezzè
a0a4701b2c feat: add 3 pokemons 2020-08-10 20:06:01 +02:00
Alessandro Pezzè
028ae7f9d9 fix: @C-Garza fix 2020-08-10 20:05:39 +02:00
Raghav Nair
99dabe387c Updating PokemonSpecies serializer, fields, tests 2020-08-09 12:35:45 -07:00
Christian Garza
03c7cb7f33 Update build.py 2020-08-08 14:12:34 -07:00
Raghav Nair
38b51c90fe Adding is_ultra_beast to pokemon_species 2020-08-08 10:32:40 -07:00
Alessandro Pezzè
f91b6b6b1a feat: add latest Veekun data 2020-08-05 22:33:31 +02:00
Christian Garza
0bc8f09e1f Extend pokemon sprites to include gen-ii to gen-vii and official artwork images 2020-08-04 03:17:48 -07:00
Christian Garza
c4b71bdeb0 Update sprite submodule 2020-08-04 01:56:59 -07:00
Alessandro Pezzè
6c307583b9 fix: use False for gender_diff 2020-08-01 12:57:57 +02:00
Alessandro Pezzè
7ceba2f1b1 refactor: apply black 2020-08-01 12:24:38 +02:00
Alessandro Pezzè
047575ff41 play: add some pokemon 2020-08-01 12:00:09 +02:00
Christian Garza
e45a9a6570 Extend pokemon sprites to include gray gen-i images 2020-07-28 02:48:01 -07:00
Christian Garza
7f19263e75 Extend pokemon sprites to include gen-i images 2020-07-27 17:22:15 -07:00
Alessandro Pezzè
c671ab264f feat: update sprites 2020-07-26 16:44:03 +02:00
Alessandro Pezzè
1c67ac45a4 feat: allow null values in pokemon.csv 2020-07-25 21:18:10 +02:00
Alessandro Pezzè
be946f27b9 feat: remove pokemon not ready 2020-07-25 20:34:07 +02:00
Alessandro Pezzè
87cf85babb fix: assign to regieleki an id 2020-07-25 20:25:56 +02:00
Alessandro Pezzè
c698ee33d9 feat: update pokemon.csv 2020-07-25 20:16:49 +02:00
Christian Garza
f44da153fb Fix linting errors 2020-07-10 02:59:05 -07:00
Christian Garza
a14271a67a Extend pokemon sprites to include dream-world images from submodule 2020-07-09 23:58:11 -07:00
Alessandro Pezzè
3fe176c99e refactor: add sprites submodule 2020-07-08 21:37:04 +02:00
Alessandro Pezzè
0f1a68140b refactor: remove sprites 2020-07-08 21:28:22 +02:00
Julian Lawrance
0180a15092 Add type data for Arceus and Silvally forms 2020-04-25 14:58:30 +01:00
Julian Lawrance
98d67b19ed Create model, serialiser and migration for Pokemon form types 2020-04-25 14:10:50 +01:00
Julian Lawrance
5ce6547f74 Create CSV data for Pokemon form types 2020-04-25 14:10:42 +01:00
Alessandro Pezzè
4a6e519b39 feat: fix rare cases where description is ill formatted 2019-12-17 17:25:50 +01:00
Alessandro Pezzè
3d116fef9c feat: update pokemon sprites 2019-12-17 12:38:39 +01:00
Alessandro Pezzè
f9f8a9bc1d feat: update items sprites 2019-12-17 12:38:39 +01:00
Alessandro Pezzè
122f2519d7 feat: update CSVs 2019-12-17 12:38:39 +01:00
Julian Lawrance
e847276e9b Add build step for past type efficacy 2019-12-01 12:39:30 +00:00
Julian Lawrance
c923d8844a Create data for past type efficacy 2019-12-01 12:32:49 +00:00
Julian Lawrance
734d69d9d6 Add past type entries for Rotom forms 
They were all Electric-Ghost type prior to Generation V
 2019-11-30 23:03:00 +00:00
Julian Lawrance
385a2d62cc Add build step for past Pokemon types 2019-11-30 20:49:55 +00:00
Julian Lawrance
eb5b0968eb Create data for past Pokemon types 2019-11-30 20:42:34 +00:00
Alessandro Pezzè
46134774fc feat: add updated data from Veekun 2018-10-29 23:29:45 +01:00
Charles Marttinen
63b4f9040b chore: Configure PyLint and correct code formatting 2018-10-20 11:35:11 -04:00
Charles Marttinen
8832c819e3 chore: Remove python2 compatibility code 2018-10-20 11:35:11 -04:00
Charles Marttinen
3d64938a3f chore: Upgrade to Python 3 and update Django to 2.0 2018-10-20 11:35:11 -04:00
Charles Marttinen
2cb886eee3 Implement suggested naming changes 2018-09-10 06:25:02 +10:00
Charles Marttinen
9d4f893a69 Improve performance of database build script 
The remainder of the build script has been converted to use
`bulk_create()`. Running the build script on my machine with a
PostgresQL database took only 5 minutes 40 seconds, and with
SQLite 26 minutes 18 seconds.
 2018-09-10 06:25:02 +10:00
Charles Marttinen
def70662f1 Modify database build script to use bulk_create (WIP) 2018-09-10 06:25:02 +10:00
Charles Marttinen
b12d8576d9 Fix v2 database build script to work on Windows 
Image sprite paths should be Unix-style, but the build script used the
OS default, so the process failed on Windows.
 2018-06-02 19:29:18 -04:00
Alessandro Pezzè
9203a0d286 Sun and moon data (#305) 
* badges

* Added CSV from Veekun

* added sprites from Veekun website

* quick fixes for an Exception

* bumped dependencies version

* add comment on how to upgrade to Django 1.11

* added some reminds to caching, our official wrappers and the true cost of the server

* remove index.html from sprites

* update to conform django-rest-framework 3.3.0 guidelines

* lint
 2017-10-21 13:21:23 +00:00
Peter Jeschke
4803d224ed Fix wrong heights (#219) 
See here: b5e4038f2d
Original commit by AxeBane
 2016-06-28 11:27:28 +01:00
Akhil Indurti
9f61b53782 Added missing sprites for pokemon ids 10064-10090. (#157) 2016-06-05 22:17:30 -04:00
phalt
944af0455d build script fixes 2016-03-05 12:25:50 +00:00
phalt
4bbb7b0a44 final lints 2016-03-05 11:40:41 +00:00
Zane Adickes
552ae130d1 sprites for v2-images 2016-02-25 00:09:40 -05:00
Zane Adickes
77c69889e1 clean merge 2016-02-25 00:02:51 -05:00
Paul Hallett
c9661531b0 Merge pull request #79 from zaneadix/New-Data 
updated data with all of latest veekun updates
 2016-02-23 10:06:21 +00:00
Zane Adickes
08c4e351e2 remove images for now 2016-02-18 00:04:49 -05:00
Zane Adickes
791d6853d6 forgot to uncomment some things 2016-02-16 01:47:05 -05:00