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

603 commits

Author SHA1 Message Date
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è
314b619ba8 refactor: remove unused images 2020-08-12 22:45:23 +02: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
d25b66662e chore: Remove API v1 2018-10-18 23:18:36 -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
Zane Adickes
ec58b95478 images implemented for pokmon, pokemon forms and items 2016-02-16 01:31:19 -05:00
Zane Adickes
fdcfae9c5c merge with phalt 2016-02-12 23:44:08 -05:00
Ben Chauvette
84b8e7c256 Fix leftover merge conflict from stash 2016-02-11 22:36:39 -05:00
Zane Adickes
396bbd45ae adding some images 2016-02-10 08:09:36 -05:00
Zane Adickes
399643aa87 get started 2016-02-09 23:11:37 -05:00
Paul Hallett
1b59324630 Merge pull request #81 from zaneadix/new-ui 
New ui
 2016-01-31 12:03:26 +00:00
Zane Adickes
d6ca4a3f60 had a stash mistake on the last push. this should be a complete push 2016-01-26 21:09:44 -05:00
Zane Adickes
d0909e1cc3 updated data with all of latest veekun updates 2015-12-28 00:00:14 -05:00
Adickes
1f41e3c17f remove templating from strings when building database 2015-12-27 00:42:41 -05:00
nimaje
33ae7a6073 avoid starimports 
don't use starimports so don't use them in examples
 2015-12-07 21:29:39 +01:00
Adickes
b58a5b76c3 a few doc changes 2015-12-07 15:17:33 -05:00
Courtney Strachan
41662657a1 Update build.py - remove duplicate data load 
I noticed that there was a duplicate PokemonGameIndex import in the original build.py for the v2 import. It's still in your updated build.py so I edited it out.
 2015-12-05 18:54:09 -08:00
Benjamin Takacs
35240b3ae5 renamed prozess_csv to process_csv 2015-12-05 13:21:56 +01:00
Benjamin Takacs
5e5854fb7b One function for each group of models¬ 
NOT TESTED YET! Buildscript has not finished yet (needed about 18h until now).

Made `data/v2/__init__.py` and `config/local.py` python3 compatible.

Writen helper functions because of repeating code:
  + `process_csv`
  + `build_generic`
useage demonstrated with `_build_languages`.

Writen `with_iter` for closing files automatical
when the processing has finished.

Writen for each group of models a function (named `build_`groupname)
and a function `build_all` which calls these functions.
 2015-12-05 12:13:46 +01:00
Adickes
3d8e9a7649 tests now handling all convenience attributes in all apis 2015-11-26 02:18:35 +01:00
Adickes
1f480cedac tests covering all endpoints. working on adding some convenience attributes to api resources to help connect them two way style. tests will probably need some small tweaks 2015-11-15 22:29:30 -05:00
Adickes
75e39ba530 cleaned up the berry mess 2015-11-10 14:20:06 -05:00
Adickes
aa1d7d9939 fished serving almost all data (with the exception of machines and some csv files that didnt have data yet but have been updated in veekuns repo. TESTS STILL NEED TO BE DONE. 2015-11-08 16:26:02 -05:00
Adickes
c1f1f9ace7 apis for locations, location areas, encounters, encounter rates, characteristics, contests, super contests 2015-11-05 09:55:14 -05:00
Adickes
db91f73085 fix build steps 2015-10-29 15:09:28 -04:00
Adickes
b099558de2 starting a few more api endpoints (locations and encounters) 2015-10-29 13:46:15 -04:00
Zane Adickes
ede6577c17 whoops I commented a bunch of crap out 2015-10-28 00:28:21 -04:00
Adickes
44151e1963 Finished tests for all current API endpoints (34 of them) 2015-10-27 09:36:33 -04:00
Adickes
f3654c3458 half of api tests are done 2015-10-23 00:56:01 -04:00
Adickes
f175d6323f Merge branch 'master' of https://github.com/phalt/pokeapi into safe-merge 2015-10-06 18:42:03 -04:00
Adickes
df503e3424 About 80% of data is being served 2015-10-06 13:09:07 -04:00
Adickes
5de650ebea got some functions working. issue with egg groups though 2015-10-03 00:36:39 -04:00
Adickes
6d7fd53ece little more work on pokemon evolution chains 2015-10-02 23:40:21 -04:00
Adickes
163e29c527 Renamed PokemonMoveMethod models to MoveLearnMethod because it just damn well makes more sense when I'm reading the code and I assume anyone else will feel the same way. Also, progress on many api resources. 2015-09-26 23:20:19 -05:00
Zane Adickes
3b8b1a6cf0 Pokedex resources. Getting closer to Pokemon resources 2015-09-15 08:26:47 -04:00
Adickes
b8cf2128a3 Serving Language, Generation, Version, Ability, Type 2015-09-12 00:53:46 -04:00
Zane Adickes
8eff28a872 Getting started with the APIs. A few serving lists and details by name or pk 2015-09-09 00:28:33 -04:00
Zane Adickes
e830c8c47f Merge branch 'New-Data' into Complete-Models 2015-05-18 22:29:10 -04:00
Paul Hallett
b7e6145bce Merge pull request #40 from zaneadix/Complete-Models 
Complete models and improved build script
 2015-05-18 09:12:09 +01:00
Zane Adickes
bd508937ae Additional Data 
Filling out remaining data so Models have complete associations.
Data and models added for:
Pokemon
Moves
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Encounters
Locations
 2015-04-20 23:38:33 -04:00
Zane Adickes
49926dc026 Completed Models/Build Script 
-Added models for Pokemon, Moves, and all other remaining models.

-Added new models to build script

-Build script will now clean and reset auto-incrementers for each table
in pokeapi_co_db

-Build script now runs against both postgres and sqlite (dev)

-Added all models to admin site registry

-Added instructions for building out db in README
 2015-04-20 23:31:59 -04:00
Zane Adickes
5ad1cb0ea5 Revert "Pokemon/Move Models" 
This reverts commit 1882c47f90.
 2015-04-20 21:46:34 -04:00
Zane Adickes
5e9296f948 Revert "Added Remaining Data and Models" 
This reverts commit b069ee991b.
 2015-04-20 21:43:55 -04:00
Zane Adickes
87b53aadbf Revert b069ee9..28035e5 
This rolls back to commit b069ee991b.
 2015-04-20 21:43:18 -04:00
Zane Adickes
28035e5aeb Merge remote-tracking branch 'origin/master' 
Conflicts:
	data/v2/build.py
 2015-04-19 22:26:20 -04:00
Zane Adickes
b069ee991b Added Remaining Data and Models 
Data and models added for:
Pal Park
Berries
Regions
Pokeathlon
Contests
SuperContests
Items
Encounters
Locations
 2015-04-19 22:24:14 -04:00
Zane Adickes
4890407482 Just adding instructions 
really complicated things
 2015-04-12 22:48:28 -04:00
Zane Adickes
1882c47f90 Pokemon/Move Models 
-Added models for Pokemon, Moves, and all other remaining models.

-Added new models to build script

-Build script will now clean and reset auto-incrementers for each table
in pokeapi_co_db

-Build script now runs against both postgres and sqlite (dev)

-Some v2 cvs files had no data in them. Pulled in the data from veekun
where necessary.

-Added all models to admin site registry

-Added instructions for building out db in README
 2015-04-12 22:29:36 -04:00
Zane Adickes
b6b6ff0938 Move Models 
Created models for all move related models and added build steps for
each
 2015-04-09 00:45:23 -04:00
Zane Adickes
fc4fe24270 More of the same for now 2015-04-07 08:14:31 -04:00
Zane Adickes
9a255298fc More Models 
Whole bunch of modelin’ goin’ on around here
 2015-04-06 00:27:59 -04:00
Zane Adickes
d9720665b8 more ability stuff 2015-04-03 08:03:02 -04:00
Zane Adickes
7a7c2d9737 ability stuff 2015-04-02 08:21:39 -04:00
phalt
ab3276ecd1 explain myself 2014-12-04 19:55:38 +00:00
phalt
21a1d4bf46 initial commit 2014-12-04 11:11:46 +00:00