Merge branch 'master' into master

.circleci/config.yml

@@ -8,10 +8,10 @@ jobs:
       - checkout
       - run:
           name: Install deps
-          command: sudo make install && sudo make dev-install
+          command: sudo make dev-install
       - run:
           name: Linting
-          command: make lint
+          command: make format-check
       - run:
           name: Run tests
           command: make test

Makefile

@@ -1,29 +1,38 @@
-install:
+.PHONY: help
+
+help:
+	@grep -E '^[a-zA-Z_-]+:.*?# .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?# "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+
+install:  # Install base requirements to run project
 	pip install -r requirements.txt
 
-dev-install:
+dev-install:  # Install developer requirements + base requirements
 	pip install -r test-requirements.txt
 
-lint:
-	pylint config data pokemon_v2 --load-plugins pylint_django
-
-setup:
+setup:  # Set up the project database
 	python manage.py migrate --settings=config.local
 
-wipe_db:
+wipe_db:  # Delete's the project database
 	rm -rf db.sqlite3
 
-serve:
+serve:  # Run the project locally
 	python manage.py runserver --settings=config.local
 
-test:
+test:  # Run tests
 	python manage.py test --settings=config.local
 
-clean:
+clean:  # Remove any pyc files
 	find . -type f -name '*.pyc' -delete
 
-migrate:
+migrate:  # run any outstanding migrations
 	python manage.py migrate --settings=config.local
 
-shell:
+shell:  # Load a shell
 	python manage.py shell --settings=config.local
+
+format:  # Format the source code
+	black .
+
+format-check:  # Check the source code has been formatted
+	black . --check

README.md

@@ -1,45 +1,27 @@
-# PokéAPI [![build status](https://img.shields.io/circleci/project/github/PokeAPI/pokeapi/master.svg)](https://circleci.com/gh/PokeAPI/pokeapi) [![License](https://img.shields.io/github/license/PokeAPI/pokeapi.svg)](https://github.com/PokeAPI/pokeapi/blob/master/LICENSE.rst)
+<br/>
 
-[![Backers on Open Collective](https://opencollective.com/pokeapi/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/pokeapi/sponsors/badge.svg)](#sponsors)
+<div align="center">
+	<img height="200" src="https://raw.githubusercontent.com/PokeAPI/media/master/logo/pokeapi.svg?sanitize=true" alt="PokeAPI">
 
-A RESTful API for Pokémon - [pokeapi.co](http://pokeapi.co)
+[![build status](https://img.shields.io/circleci/project/github/PokeAPI/pokeapi/master.svg)](https://circleci.com/gh/PokeAPI/pokeapi) [![License](https://img.shields.io/github/license/PokeAPI/pokeapi.svg)](https://github.com/PokeAPI/pokeapi/blob/master/LICENSE.rst) [![Backers on Open Collective](https://opencollective.com/pokeapi/backers/badge.svg)](https://opencollective.com/pokeapi) [![Sponsors on Open Collective](https://opencollective.com/pokeapi/sponsors/badge.svg)](https://opencollective.com/pokeapi)
 
-## Fair use policy
+<br/>
 
-PokéAPI is open and free to use. However, we will ban IP addresses that abuse this privilege. This API is used primarily for educational purposes, and we do not want people inhibiting the education of others. See the fair use guide on the docs for more information. Moreover, we strongly suggest to cache request made, see the [Wrapper section](#official-wrappers) below.
+</div>
+
+<br/>
+
+A RESTful API for Pokémon - [pokeapi.co](https://pokeapi.co)
 
 ## Join Us On Slack!
 
 Have a question or just want to discuss new ideas and improvements? Hit us up on slack. Consider talking with us here before creating new issue.
 This way we can keep issues here a bit more organized and helpful in the long run. Be excellent to each other :smile:
 
-[Sign up easily](https://pokeapi-slack-invite.herokuapp.com/)!
+[Sign up](https://pokeapi-slack-invite.herokuapp.com/) easily!
 
 Once you've signed up visit [PokéAPI on Slack](https://pokeapi.slack.com)
 
-## Donations
-
-Help to keep PokéAPI running! If you're using PokéAPI as a teaching resource or for a project, consider sending us a $10 donation to help keep the server up. We get over 2 million requests a month and it's quite costly!
-
-Thank you to all our backers! [Become a backer](https://opencollective.com/pokeapi#backer)
-
-<a href="https://opencollective.com/pokeapi#backers" target="_blank"><img src="https://opencollective.com/pokeapi/backers.svg?width=890"></a>
-
-## Sponsors
-
-Ask your company to also support this open source project by [becoming a sponsor](https://opencollective.com/pokeapi#sponsor).
-
-<a href="https://opencollective.com/pokeapi/sponsor/0/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/0/avatar.svg"></a>
-<a href="https://opencollective.com/pokeapi/sponsor/1/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/1/avatar.svg"></a>
-<a href="https://opencollective.com/pokeapi/sponsor/2/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/2/avatar.svg"></a>
-<a href="https://opencollective.com/pokeapi/sponsor/3/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/3/avatar.svg"></a>
-<a href="https://opencollective.com/pokeapi/sponsor/4/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/pokeapi/sponsor/5/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/5/avatar.svg"></a>
-<a href="https://opencollective.com/pokeapi/sponsor/6/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/pokeapi/sponsor/7/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/7/avatar.svg"></a>
-<a href="https://opencollective.com/pokeapi/sponsor/8/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/pokeapi/sponsor/9/website" target="_blank"><img src="https://opencollective.com/pokeapi/sponsor/9/avatar.svg"></a>
-
 ## Official Wrappers
 
 * Node server-side [PokeAPI/pokedex-promise-v2](https://github.com/PokeAPI/pokedex-promise-v2) | _Auto caching_
@@ -47,11 +29,12 @@ Ask your company to also support this open source project by [becoming a sponsor
 * Java/Kotlin [PokeAPI/pokekotlin](https://github.com/PokeAPI/pokekotlin)
 * Python 3 [GregHilmes/pokebase](https://github.com/GregHilmes/pokebase) | _Auto caching_
 * Python 2/3 [PokeAPI/pokepy](https://github.com/PokeAPI/pokepy) | _Auto caching_
-* PHP [lmerotta/phpokeapi](https://github.com/lmerotta/phpokeapi) | _Auto caching, lazy-loading_
+* PHP [lmerotta/phpokeapi](https://github.com/lmerotta/phpokeapi) | _Auto caching, lazy loading_
 * Ruby [rdavid1099/poke-api-v2](https://github.com/rdavid1099/poke-api-v2)
 * .Net Standard [mtrdp642/PokeApiNet](https://github.com/mtrdp642/PokeApiNet) | _Auto caching_
 * Go [mtslzr/pokeapi-go](https://github.com/mtslzr/pokeapi-go) | _Auto caching_
 * Flutter [prathanbomb/pokedart](https://github.com/prathanbomb/pokedart)
+* Rust [lunik1/pokerust](https://gitlab.com/lunik1/pokerust) | _Auto caching_
 
 ## Setup [![pyVersion37](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/download/releases/3.7/)
 
@@ -59,35 +42,26 @@ Ask your company to also support this open source project by [becoming a sponsor
 
 - Install the requirements using pip:
 
-```sh
-make install
-```
+    ```sh
+    make install
+    # This will install all the required packages and libraries for using PokeAPI
+    ```
 
-This will install all the required packages and libraries for using PokeAPI
+- Set up the local development environment using the following command:
 
-- Set up the local developer environment using the following command:
-
-```sh
-make setup
-```
+    ```sh
+    make setup
+    ```
 
 - Run the server using the following command:
 
-```sh
-make serve
-```
-
-Visit localhost:8000 to see the running website!
-
-If you ever need to wipe the database use this command:
-
-```sh
-make wipe_db
-```
+    ```sh
+    make serve
+    ```
 
 ## Database setup
 
-Start Django shell
+Start the Django shell by
 
 ```sh
 python manage.py shell --settings=config.local
@@ -100,12 +74,20 @@ from data.v2.build import build_all
 build_all()
 ```
 
+Visit [localhost:8000/api/v2/](localhost:8000/api/v2/) to see the running API!
+
 Each time the build script is run, it will iterate over each table in the database, wipe it, and rewrite each row using the data found in data/v2/csv.
 
 In informal tests on a Windows PC with a SSD and a 2.50 GHz processor, building against a PostgresQL database took approximately 6 minutes, and building against a SQLite database took about 7.5 minutes or longer, with some varying results.
 
 The option to build individual portions of the database was removed in order to increase performance of the build script.
 
+If you ever need to wipe the database use this command:
+
+```sh
+make wipe_db
+```
+
 ## Docker Compose
 
 There is also a multi-container setup, managed by [Docker Compose](https://docs.docker.com/compose/). This setup allow you to deploy a production-like environment, with separate containers for each services.
@@ -140,28 +122,22 @@ build_all()
 
 Browse [localhost/api/v2/](http://localhost/api/v2/) or [localhost/api/v2/pokemon/bulbasaur/](http://localhost/api/v2/pokemon/bulbasaur/)
 
-For the moment, this setup doesn't allow you to use the `scale` command.
+This setup doesn't allow you to use the `scale` command.
 
-## Docker (obsolete)
+## Donations
 
-The application can be built and run as a Docker container for easy deployments
+Help to keep PokéAPI running! If you're using PokéAPI as a teaching resource or for a project, consider sending us a $10 donation to help keep the service up. We get almost 20 million requests a month!
 
-From the root directory of the cloned repo
+Thank you to all our backers! [Become a backer](https://opencollective.com/pokeapi#backer)
 
-```sh
-docker build -t pokeapi .
-```
-
-Run the container on host port 8000
-
-```sh
-docker run -d -p 8000:8000 pokeapi
-```
+<a href="https://opencollective.com/pokeapi#backers" target="_blank"><img src="https://opencollective.com/pokeapi/backers.svg?width=890"></a>
 
 ## Contributing
 
-This project exists thanks to all the people who contribute. [[Contribute]](https://github.com/PokeAPI/pokeapi/blob/master/CONTRIBUTING.md).
+This project exists thanks to all the people who [contribute](https://github.com/PokeAPI/pokeapi/blob/master/CONTRIBUTING.md)
+
 <a href="graphs/contributors"><img src="https://opencollective.com/pokeapi/contributors.svg?width=890" /></a>
+
 All contributions are welcome: bug fixes, data contributions, recommendations.
 
 Please see the [issues on GitHub](https://github.com/PokeAPI/pokeapi/issues) before you submit a pull request or raise an issue, someone else might have beat you to it.
@@ -170,7 +146,7 @@ To contribute to this repository:
 
 - [Fork the project to your own GitHub profile](https://help.github.com/articles/fork-a-repo/)
 
-- Download the project using git clone:
+- Download the forked project using git clone:
 
     ```sh
     git clone git@github.com:<YOUR_USERNAME>/pokeapi.git
@@ -192,6 +168,6 @@ To contribute to this repository:
 
 Simple!
 
-## DEPRECATION
+## Deprecation
 
 As of October 2018, the v1 API has been removed from PokéAPI. For more information, see [pokeapi.co/docs/v1.html](https://pokeapi.co/docs/v1.html).

Resources/docker/app/Dockerfile

@@ -10,8 +10,8 @@ VOLUME /code
 
 ADD requirements.txt /code/
 RUN \
-    apk add --no-cache postgresql-libs && \
-    apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev && \
+    apk add --no-cache postgresql-libs libstdc++ && \
+    apk add --no-cache --virtual .build-deps gcc g++ musl-dev postgresql-dev && \
     python3 -m pip install -r requirements.txt --no-cache-dir && \
     apk --purge del .build-deps
 ADD . /code/

Resources/nginx/nginx.conf

@@ -38,8 +38,6 @@ http {
         server app:8000 fail_timeout=0;
     }
 
-    limit_req_zone $binary_remote_addr zone=api:10m rate=2r/s;
-
     server {
         listen 80 deferred;
         server_name _;
@@ -72,8 +70,6 @@ http {
             add_header Cache-Control "public";
             add_header Pragma public;
 
-            limit_req zone=api burst=10;
-
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header Host $http_host;

config/docker-compose.py

@@ -2,13 +2,13 @@
 from .settings import *
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'pokeapi',
-        'USER': 'ash',
-        'PASSWORD': 'pokemon',
-        'HOST': 'db',
-        'PORT': 5432,
+    "default": {
+        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "NAME": "pokeapi",
+        "USER": "ash",
+        "PASSWORD": "pokemon",
+        "HOST": "db",
+        "PORT": 5432,
     }
 }
 
@@ -17,9 +17,7 @@ CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
         "LOCATION": "redis://cache:6379/1",
-        "OPTIONS": {
-            "CLIENT_CLASS": "django_redis.client.DefaultClient",
-        }
+        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient",},
     }
 }
 

config/docker.py

@@ -2,13 +2,13 @@
 from .settings import *
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'pokeapi',
-        'USER': 'ash',
-        'PASSWORD': 'pokemon',
-        'HOST': 'localhost',
-        'PORT': '',
+    "default": {
+        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "NAME": "pokeapi",
+        "USER": "ash",
+        "PASSWORD": "pokemon",
+        "HOST": "localhost",
+        "PORT": "",
     }
 }
 
@@ -17,9 +17,7 @@ CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
         "LOCATION": "redis://127.0.0.1:6379/1",
-        "OPTIONS": {
-            "CLIENT_CLASS": "django_redis.client.DefaultClient",
-        }
+        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient",},
     }
 }
 

config/local.py

@@ -1,17 +1,13 @@
 from .settings import *
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(PROJECT_ROOT, 'db.sqlite3'),
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": os.path.join(PROJECT_ROOT, "db.sqlite3"),
     }
 }
 
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
-    }
-}
+CACHES = {"default": {"BACKEND": "django.core.cache.backends.dummy.DummyCache",}}
 
 DEBUG = True
 TASTYPIE_FULL_DEBUG = True

config/settings.py

@@ -8,23 +8,21 @@ DEBUG = False
 
 TEMPLATE_DEBUG = DEBUG
 
-ADMINS = (
-    ('Paul Hallett', 'paulandrewhallett@gmail.com'),
-)
+ADMINS = (("Paul Hallett", "paulandrewhallett@gmail.com"),)
 
-EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
 MANAGERS = ADMINS
 
-BASE_URL = 'http://pokeapi.co'
+BASE_URL = "http://pokeapi.co"
 
 # Hosts/domain names that are valid for this site; required if DEBUG is False
 # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = ['.pokeapi.co', 'localhost', '127.0.0.1']
+ALLOWED_HOSTS = [".pokeapi.co", "localhost", "127.0.0.1"]
 
-TIME_ZONE = 'Europe/London'
+TIME_ZONE = "Europe/London"
 
-LANGUAGE_CODE = 'en-gb'
+LANGUAGE_CODE = "en-gb"
 
 SITE_ID = 1
 
@@ -40,33 +38,33 @@ USE_L10N = True
 USE_TZ = True
 
 # Explicitly define test runner to avoid warning messages on test execution
-TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+TEST_RUNNER = "django.test.runner.DiscoverRunner"
 
-SECRET_KEY = '4nksdock439320df*(^x2_scm-o$*py3e@-awu-n^hipkm%2l$sw$&2l#'
+SECRET_KEY = "4nksdock439320df*(^x2_scm-o$*py3e@-awu-n^hipkm%2l$sw$&2l#"
 
 MIDDLEWARE = [
-    'corsheaders.middleware.CorsMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    "corsheaders.middleware.CorsMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = 'config.urls'
+ROOT_URLCONF = "config.urls"
 
-WSGI_APPLICATION = 'config.wsgi.application'
+WSGI_APPLICATION = "config.wsgi.application"
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'pokeapi_co_db',
-        'USER': 'root',
-        'PASSWORD': 'pokeapi',
-        'HOST': 'localhost',
-        'PORT': '',
-        'CONN_MAX_AGE': 30
+    "default": {
+        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "NAME": "pokeapi_co_db",
+        "USER": "root",
+        "PASSWORD": "pokeapi",
+        "HOST": "localhost",
+        "PORT": "",
+        "CONN_MAX_AGE": 30,
     }
 }
 
@@ -74,63 +72,46 @@ CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
         "LOCATION": "redis://127.0.0.1:6379/1",
-        "OPTIONS": {
-            "CLIENT_CLASS": "django_redis.client.DefaultClient",
-        }
+        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient",},
     }
 }
 
 SECRET_KEY = os.environ.get(
-    'SECRET_KEY',
-    'ubx+22!jbo(^x2_scm-o$*py3e@-awu-n^hipkm%2l$sw$&2l#')
+    "SECRET_KEY", "ubx+22!jbo(^x2_scm-o$*py3e@-awu-n^hipkm%2l$sw$&2l#"
+)
 
 CUSTOM_APPS = (
-    'tastypie',
-    'pokemon_v2',
+    "tastypie",
+    "pokemon_v2",
 )
 
 INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.admin',
-    'django.contrib.humanize',
-    'corsheaders',
-    'rest_framework',
-    'cachalot'
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.sites",
+    "django.contrib.admin",
+    "django.contrib.humanize",
+    "corsheaders",
+    "rest_framework",
+    "cachalot",
 ) + CUSTOM_APPS
 
 
 API_LIMIT_PER_PAGE = 1
 
-TASTYPIE_DEFAULT_FORMATS = ['json']
+TASTYPIE_DEFAULT_FORMATS = ["json"]
 
 CORS_ORIGIN_ALLOW_ALL = True
 
-CORS_ALLOW_METHODS = (
-    'GET'
-)
+CORS_ALLOW_METHODS = "GET"
 
-CORS_URLS_REGEX = r'^/api/.*$'
+CORS_URLS_REGEX = r"^/api/.*$"
 
 REST_FRAMEWORK = {
-    'DEFAULT_RENDERER_CLASSES': (
-        'drf_ujson.renderers.UJSONRenderer',
-    ),
-    'DEFAULT_PARSER_CLASSES': (
-        'drf_ujson.renderers.UJSONRenderer',
-    ),
-
-    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination',
-
-    'PAGE_SIZE': 20,
-
-    'PAGINATE_BY': 20,
-    'DEFAULT_THROTTLE_CLASSES': (
-        'rest_framework.throttling.AnonRateThrottle',
-    ),
-    'DEFAULT_THROTTLE_RATES': {
-        'anon': '1000/hour'
-    }
+    "DEFAULT_RENDERER_CLASSES": ("drf_ujson.renderers.UJSONRenderer",),
+    "DEFAULT_PARSER_CLASSES": ("drf_ujson.renderers.UJSONRenderer",),
+    "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.LimitOffsetPagination",
+    "PAGE_SIZE": 20,
+    "PAGINATE_BY": 20,
 }

config/urls.py

@@ -4,5 +4,5 @@ from pokemon_v2 import urls as pokemon_v2_urls
 # pylint: disable=invalid-name
 
 urlpatterns = [
-    url(r'^', include(pokemon_v2_urls)),
+    url(r"^", include(pokemon_v2_urls)),
 ]

data/v2/build.py

@@ -118,7 +118,11 @@ def scrub_str(string):
         if group[0]:
             sub = group[0]
         else:
-            sub = group[1].split(":")[1]
+            sub = group[1].split(":")
+            if len(sub) >= 2:
+                sub = sub[1]
+            else:
+                sub = sub[0]
             sub = sub.replace("-", " ")
         string = re.sub(SUB_RGX, sub, string, 1)
     return string

data/v2/csv/ability_changelog_prose.csv

@@ -1,53 +1,105 @@
 ability_changelog_id,local_language_id,effect
+1,6,Hat im Kampf keinen Effekt.
 1,9,Has no effect in battle.
+2,6,Verhindert keine regulären K.O. bei vollen []{mechanic:hp}.
 2,9,Does not prevent regular KOs from full [HP]{mechanic:hp}.
+3,6,Hat außerhalb vom Kampf keinen Effekt.
 3,9,Has no overworld effect.
+4,6,"[]{type:electric}-Attacken die keinen Schaden anrichten, wie []{move:thunder-wave}, werden nicht absorbiert."
 4,9,"Does not absorb non-damaging []{type:electric} moves, i.e. []{move:thunder-wave}."
+5,6,Löst bei Attacken die mehrmals Treffen bei jedem Treffer aus.
 5,9,Triggers on every hit of multiple-hit moves.
+6,6,[]{move:will-o-wisp} triggert die Fähigkeit nicht bei Pokémon die immun gegen []{mechanic:burn} sind.
 6,9,[]{move:will-o-wisp} does not trigger this ability for Pokémon immune to [burns]{mechanic:burn}.
+7,6,Hat außerhalb vom Kampf keinen Effekt.
 7,9,Has no overworld effect.
+8,6,Hat außerhalb vom Kampf keinen Effekt.
 8,9,Has no overworld effect.
+9,6,"Hat keinen Effekt, wenn die Fähigkeit nach Kampfbeginn erlangt wurde."
 9,9,Does not take effect if acquired after entering battle.
+10,6,Betrifft andere Pokémon mit dieser Fähigkeit.
 10,9,Affects other Pokémon with this ability.
+11,6,Verursacht nur 1/16 der maximalen []{mechanic:hp} des Angreifers Schaden.
 11,9,Inflicts only 1/16 of the attacker's maximum [HP]{mechanic:hp} in damage.
+12,6,"[]{move:fire-fang} und Attacken die [typenlosen Schaden]{mechanic:typeless-damage} verursachen, ignorieren diese Fähigkeit unabhängig von ihrem Typ."
 12,9,[]{move:fire-fang} and moves that inflict [typeless damage]{mechanic:typeless-damage} ignore this ability regardless of type.
+13,6,Hat außerhalb vom Kampf keinen Effekt.
 13,9,Has no overworld effect.
+14,6,Kann das Wesen von Pokémon mit denen in der Spielwelt interagiert wird nicht verändern.
 14,9,Cannot influence the natures of Pokémon encountered by interacting with them on the overworld.
+15,6,Gibt schwere []{mechanic:poison} als normale []{mechanic:poison} zurück.
 15,9,Passes back bad [poison]{mechanic:poison} as regular poison.
+16,6,Hat außerhalb vom Kampf keinen Effekt.
 16,9,Has no overworld effect.
+17,6,"Betrifft keine []{type:electric}-Attacken die keinen Schaden anrichten, wie []{move:thunder-wave}. Erhöht die Anzahl an Trainer-Anrufen wenn irgendein Pokémon im Team diese Fähigkeit hat."
 17,9,"Does not affect non-damaging []{type:electric} moves, i.e. []{move:thunder-wave}.  Increases the frequency of Match Call calls on the overworld if any party Pokémon has this ability."
+18,6,"Leitet []{type:electric}-Attacken um, ohne ihre Effekte zu deaktivieren oder einen []{mechanic:special-attack} Bonus zu gewähren. Leitet []{move:hidden-power} nicht um."
 18,9,Redirects []{type:electric} moves without negating them or granting any [Special Attack]{mechanic:special-attack} boost.  Does not redirect []{move:hidden-power}.
+19,6,Hat außerhalb vom Kampf keinen Effekt.
 19,9,Has no overworld effect.
+20,6,Hat außerhalb vom Kampf keinen Effekt.
 20,9,Has no overworld effect.
+21,6,"Hindert []{move:heal-bell} daran, das Pokémon zu heilen, auch außerhalb vom Kampf."
 21,9,"Prevents []{move:heal-bell} from curing the Pokémon, whether or not it is in battle."
+22,6,Hat außerhalb vom Kampf keinen Effekt.
 22,9,Has no overworld effect.
+23,6,Betrifft keine Attacken von Teammitgliedern die alle anderen Pokémon als Ziel haben. Diese Fähigkeit wird im Kampf nicht angekündigt.
 23,9,Does not affect friendly Pokémon's moves that target all other Pokémon.  This ability's presence is not announced upon entering battle.
+24,6,Hat außerhalb vom Kampf keinen Effekt.
 24,9,Has no overworld effect.
+25,6,Hat außerhalb vom Kampf keinen Effekt.
 25,9,Has no overworld effect.
+26,6,Hat außerhalb vom Kampf keinen Effekt.
 26,9,Has no overworld effect.
+27,6,"Verdoppelt den Radius in dem []{move:cut} Gras entfernt, wenn irgendein Pokémon im Team diese Fähigkeit hat."
 27,9,Doubles []{move:cut}'s grass-cutting radius on the overworld if any party Pokémon has this ability.
+28,6,Hat im Kampf keinen Effekt.
 28,9,Has no effect in battle.
+29,6,Hat außerhalb vom Kampf keinen Effekt.
 29,9,Has no overworld effect.
+30,6,Hat außerhalb vom Kampf keinen Effekt.
 30,9,Has no overworld effect.
+31,6,Hat außerhalb vom Kampf keinen Effekt.
 31,9,Has no overworld effect.
+32,6,Hat keinen Effekt während das Pokémon [schläft]{mechanic:sleep}.
 32,9,Does not take effect during [sleep]{mechanic:sleep}.
+33,6,Hat außerhalb vom Kampf keinen Effekt.
 33,9,Has no overworld effect.
+34,6,"Erhöht die Anzahl an Rufen die man außerhalb vom Kampf hört, wenn irgendein Pokémon im Team diese Fähigkeit hat."
 34,9,Increases the frequency of cries heard on the overworld if any party Pokémon has this ability.
+35,6,Hat außerhalb vom Kampf keinen Effekt.
 35,9,Has no overworld effect.
+36,6,Hat außerhalb vom Kampf keinen Effekt.
 36,9,Has no overworld effect.
+37,6,Hat außerhalb vom Kampf keinen Effekt.
 37,9,Has no overworld effect.
+38,6,[]{mechanic:poison} schadet dem Pokémon außerhalb vom Kampf.
 38,9,[Poison]{mechanic:poison} still damages the Pokémon outside of battle.
+39,6,"[]{mechanic:paralysis} hindert das Pokémon nicht daran sich zu bewegen, aber der []{mechanic:speed} Malus bleibt. []{mechanic:poison} schadet dem Pokémon außerhalb vom Kampf."
 39,9,"[Paralysis]{mechanic:paralysis} cannot prevent the Pokémon from moving, though the [Speed]{mechanic:speed} cut is unaffected.  [Poison]{mechanic:poison} still damages the Pokémon outside of battle."
+40,6,Wegen eines Glitches haben Attacken die von dieser Fähigkeit beeinflusst sind eine (100 - Genauigkeit)% Chance durch den []{move:detect} oder []{move:protect} zu treffen.
 40,9,"Due to a glitch, moves affected by this ability have a (100 - accuracy)% chance to hit through []{move:detect} or []{move:protect}."
+41,6,[]{move:rest} funktioniert normal bei [starkem Sonnenlicht]{mechanic:strong-sunlight}.
 41,9,[]{move:rest} works as usual during [strong sunlight]{mechanic:strong-sunlight}.
+42,6,[]{move:fling} kann normal benutzt werden.
 42,9,[]{move:fling} can be used as usual.
+43,6,Leitet []{type:water}-Attacken um ohne den []{mechanic:special-attack} Bonus zu gewähren. Leitet []{move:hidden-power} nicht um.
 43,9,Redirects []{type:water} moves without negating them or granting any [Special Attack]{mechanic:special-attack} boost.  Does not redirect []{move:hidden-power}.
+44,6,Kann []{ability:flower-gift} und []{ability:wonder-guard} kopieren.
 44,9,Can copy []{ability:flower-gift} and []{ability:wonder-guard}.
+45,6,Kann []{ability:forecast} und []{ability:trace} kopieren.
 45,9,Can copy []{ability:forecast} and []{ability:trace}.
+46,6,Funktioniert nur wenn es mit []{ability:minus} kombiniert wird.
 46,9,Powers up only when paired with []{ability:minus}.
+47,6,Funktioniert nur wenn es mit []{ability:plus} kombiniert wird.
 47,9,Powers up only when paired with []{ability:plus}.
+48,6,"Die Chance, dass der Effekt eintritt, beträgt 30%."
 48,9,Chance of taking effect is 30%.
+49,6,[]{move:triple-kick} wird nicht beeinflusst.
 49,9,[]{move:triple-kick} is unaffected.
+50,6,[]{move:struggle} wird nicht beeinflusst. []{move:helping-hand} und []{move:defense-curl} werden nicht beachtet.
 50,9,[]{move:struggle} is unaffected.  []{move:helping-hand} and []{move:defense-curl} are not taken into account.
+51,6,Hat außerhalb vom Kampf keinen Effekt.
 51,9,Has no overworld effect.
+52,6,"Die Chance, dass der Effekt eintritt, beträgt 33%."
 52,9,Chance of taking effect is 33%.

data/v2/csv/egg_group_prose.csv

@@ -1,89 +1,104 @@
 egg_group_id,local_language_id,name
 1,1,かいじゅう
+1,3,괴수
 1,5,Monstrueux
 1,6,Monster
 1,7,Monstruo
 1,8,Mostro
 1,9,Monster
 2,1,すいちゅう１
+2,3,수중 1
 2,5,Aquatique 1
 2,6,Wasser 1
 2,7,Agua 1
 2,8,Acqua 1
 2,9,Water 1
 3,1,むし
+3,3,벌레
 3,5,Insectoïde
 3,6,Käfer
 3,7,Bicho
 3,8,Coleottero
 3,9,Bug
 4,1,ひこう
+4,3,비행
 4,5,Aérien
 4,6,Flug
 4,7,Volador
 4,8,Volante
 4,9,Flying
 5,1,りくじょう
+5,3,육상
 5,5,Terrestre
 5,6,Feld
 5,7,Campo
 5,8,Campo
 5,9,Field
 6,1,ようせい
+6,3,요정
 6,5,Féerique
 6,6,Fee
 6,7,Hada
 6,8,Magico
 6,9,Fairy
 7,1,しょくぶつ
+7,3,식물
 7,5,Végétal
 7,6,Pflanze
 7,7,Planta
 7,8,Erba
 7,9,Grass
 8,1,ひとがた
+8,3,인간형
 8,5,Humanoïde
 8,6,Humanotyp
 8,7,Humanoide
 8,8,Umanoide
 8,9,Human-Like
 9,1,すいちゅう３
+9,3,수중 3
 9,5,Aquatique 3
 9,6,Wasser 3
 9,7,Agua 3
 9,8,Acqua 3
 9,9,Water 3
 10,1,こうぶつ
+10,3,광물
 10,5,Minéral
 10,6,Mineral
 10,7,Mineral
 10,8,Minerale
 10,9,Mineral
 11,1,ふていけい
+11,3,부정형
 11,5,Amorphe
 11,6,Amorph
 11,7,Amorfo
 11,8,Amorfo
 11,9,Amorphous
 12,1,すいちゅう２
+12,3,수중 2
 12,5,Aquatique 2
 12,6,Wasser 2
 12,7,Agua 2
 12,8,Acqua 2
 12,9,Water 2
 13,1,メタモン
+13,3,메타몽
 13,5,Métamorph
 13,6,Ditto
 13,7,Ditto
 13,8,Ditto
 13,9,Ditto
 14,1,ドラゴン
+14,3,드래곤
 14,5,Draconique
 14,6,Drache
 14,7,Dragón
 14,8,Drago
 14,9,Dragon
 15,1,タマゴみはっけん
+15,3,알미발견
 15,5,Inconnu
 15,6,Unbekannt
 15,7,Desconocido

data/v2/csv/encounter_method_prose.csv

@@ -33,3 +33,5 @@ encounter_method_id,local_language_id,name
 16,9,Walking in red flowers
 17,6,Auf unwegsamen Gelände laufen
 17,9,Walking on rough terrain
+18,9,Receive as a gift
+19,9,Receive egg as a gift

data/v2/csv/encounter_methods.csv

@@ -16,3 +16,5 @@ id,identifier,order
 15,purple-flowers,7
 16,red-flowers,8
 17,rough-terrain,9
+18,gift,18
+19,gift-egg,19

data/v2/csv/encounter_slots.csv

@@ -488,3 +488,28 @@ id,version_group_id,encounter_method_id,slot,rarity
 487,15,4,0,60
 488,15,4,1,35
 489,15,4,2,5
+490,1,18,,100
+491,2,18,,100
+492,3,18,,100
+493,4,18,,100
+494,5,18,,100
+495,6,18,,100
+496,7,18,,100
+497,8,18,,100
+498,9,18,,100
+499,10,18,,100
+500,11,18,,100
+501,14,18,,100
+502,15,18,,100
+503,16,18,,100
+504,3,19,,100
+505,4,19,,100
+506,5,19,,100
+507,6,19,,100
+508,7,19,,100
+509,8,19,,100
+510,9,19,,100
+511,10,19,,100
+512,11,19,,100
+513,14,19,,100
+514,16,19,,100

data/v2/csv/encounters.csv

@@ -46577,3 +46577,258 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 50287,11,343,228,19,26,26
 50288,11,343,229,37,32,32
 50289,11,343,230,19,26,26
+50290,1,285,490,1,5,5
+50291,2,285,490,1,5,5
+50292,1,285,490,4,5,5
+50293,2,285,490,4,5,5
+50294,1,285,490,7,5,5
+50295,2,285,490,7,5,5
+50296,3,285,491,25,5,5
+50297,3,281,491,1,10,10
+50298,3,314,491,4,10,10
+50299,3,282,491,7,10,10
+50300,1,761,490,129,5,5
+50301,2,761,490,129,5,5
+50302,3,761,491,129,5,5
+50303,1,762,490,106,30,30
+50304,2,762,490,106,30,30
+50305,3,762,491,106,30,30
+50306,1,762,490,107,30,30
+50307,2,762,490,107,30,30
+50308,3,762,491,107,30,30
+50309,1,763,490,133,25,25
+50310,2,763,490,133,25,25
+50311,3,763,491,133,25,25
+50312,1,764,490,131,15,15
+50313,2,764,490,131,15,15
+50314,3,764,491,131,15,15
+50315,4,184,492,152,5,5
+50316,5,184,492,152,5,5
+50317,6,184,493,152,5,5
+50318,4,184,492,155,5,5
+50319,5,184,492,155,5,5
+50320,6,184,493,155,5,5
+50321,4,184,492,158,5,5
+50322,5,184,492,158,5,5
+50323,6,184,493,158,5,5
+50324,4,765,492,21,10,10
+50325,5,765,492,21,10,10
+50326,6,765,493,21,10,10
+50327,4,766,492,133,20,20
+50328,5,766,492,133,20,20
+50329,6,766,493,133,20,20
+50330,4,767,492,213,15,15
+50331,5,767,492,213,15,15
+50332,6,767,493,213,15,15
+50333,6,250,493,147,15,15
+50334,4,240,492,236,10,10
+50335,5,240,492,236,10,10
+50336,6,240,493,236,10,10
+50337,7,393,494,252,5,5
+50338,8,393,494,252,5,5
+50339,9,393,495,252,5,5
+50340,7,393,494,255,5,5
+50341,8,393,494,255,5,5
+50342,9,393,495,255,5,5
+50343,7,393,494,258,5,5
+50344,8,393,494,258,5,5
+50345,9,393,495,258,5,5
+50346,7,768,494,351,25,25
+50347,8,768,494,351,25,25
+50348,9,768,495,351,25,25
+50349,7,769,494,374,5,5
+50350,8,769,494,374,5,5
+50351,9,769,495,374,5,5
+50352,9,770,495,152,5,5
+50353,9,770,495,155,5,5
+50354,9,770,495,158,5,5
+50355,10,285,496,1,5,5
+50356,11,285,496,1,5,5
+50357,10,285,496,4,5,5
+50358,11,285,496,4,5,5
+50359,10,285,496,7,5,5
+50360,11,285,496,7,5,5
+50361,10,761,496,129,5,5
+50362,11,761,496,129,5,5
+50363,10,762,496,106,25,25
+50364,11,762,496,106,25,25
+50365,10,762,496,107,25,25
+50366,11,762,496,107,25,25
+50367,10,763,496,133,25,25
+50368,11,763,496,133,25,25
+50369,10,764,496,131,25,25
+50370,11,764,496,131,25,25
+50371,12,135,497,387,5,5
+50372,13,135,497,387,5,5
+50373,12,135,497,390,5,5
+50374,13,135,497,390,5,5
+50375,12,135,497,393,5,5
+50376,13,135,497,393,5,5
+50377,14,141,498,387,5,5
+50378,14,141,498,390,5,5
+50379,14,141,498,393,5,5
+50380,12,771,497,133,5,5
+50381,13,771,497,133,5,5
+50382,14,771,498,133,20,20
+50383,14,772,498,137,25,25
+50384,15,184,499,152,5,5
+50385,16,184,499,152,5,5
+50386,15,184,499,155,5,5
+50387,16,184,499,155,5,5
+50388,15,184,499,158,5,5
+50389,16,184,499,158,5,5
+50390,15,765,499,21,20,20
+50391,16,765,499,21,20,20
+50392,15,766,499,133,5,5
+50393,16,766,499,133,5,5
+50394,15,773,499,213,15,15
+50395,16,773,499,213,15,15
+50396,15,250,499,147,15,15
+50397,16,250,499,147,15,15
+50398,15,240,499,236,10,10
+50399,16,240,499,236,10,10
+50400,15,285,499,1,5,5
+50401,16,285,499,1,5,5
+50402,15,285,499,4,5,5
+50403,16,285,499,4,5,5
+50404,15,285,499,7,5,5
+50405,16,285,499,7,5,5
+50406,15,764,499,252,5,5
+50407,16,764,499,252,5,5
+50408,15,764,499,255,5,5
+50409,16,764,499,255,5,5
+50410,15,764,499,258,5,5
+50411,16,764,499,258,5,5
+50412,17,774,500,495,5,5
+50413,18,774,500,495,5,5
+50414,17,774,500,498,5,5
+50415,18,774,500,498,5,5
+50416,17,774,500,501,5,5
+50417,18,774,500,501,5,5
+50418,17,579,500,511,10,10
+50419,18,579,500,511,10,10
+50420,17,579,500,513,10,10
+50421,18,579,500,513,10,10
+50422,17,579,500,515,10,10
+50423,18,579,500,515,10,10
+50424,17,775,500,570,10,10
+50425,18,775,500,570,10,10
+50426,17,622,500,129,5,5
+50427,18,622,500,129,5,5
+50428,21,657,501,495,5,5
+50429,22,657,501,495,5,5
+50430,21,657,501,498,5,5
+50431,22,657,501,498,5,5
+50432,21,657,501,501,5,5
+50433,22,657,501,501,5,5
+50434,21,577,501,570,25,25
+50435,22,577,501,570,25,25
+50436,21,776,501,585,30,30
+50437,22,776,501,585,30,30
+50438,21,656,501,133,10,10
+50439,22,656,501,133,10,10
+50440,21,622,501,129,5,5
+50441,22,622,501,129,5,5
+50442,22,777,501,147,1,1
+50443,21,777,501,443,1,1
+50444,23,778,502,650,5,5
+50445,24,778,502,650,5,5
+50446,23,778,502,653,5,5
+50447,24,778,502,653,5,5
+50448,23,778,502,656,5,5
+50449,24,778,502,656,5,5
+50450,23,779,502,1,10,10
+50451,24,779,502,1,10,10
+50452,23,779,502,4,10,10
+50453,24,779,502,4,10,10
+50454,23,779,502,7,10,10
+50455,24,779,502,7,10,10
+50456,23,736,502,696,20,20
+50457,24,736,502,696,20,20
+50458,23,736,502,698,20,20
+50459,24,736,502,698,20,20
+50460,23,780,502,448,32,32
+50461,24,780,502,448,32,32
+50462,23,723,502,131,30,30
+50463,24,723,502,131,30,30
+50464,25,393,503,252,5,5
+50465,26,393,503,252,5,5
+50466,25,393,503,255,5,5
+50467,26,393,503,255,5,5
+50468,25,393,503,258,5,5
+50469,26,393,503,258,5,5
+50470,25,781,503,25,20,20
+50471,26,781,503,25,20,20
+50472,25,782,503,25,20,20
+50473,26,782,503,25,20,20
+50474,25,783,503,25,20,20
+50475,26,783,503,25,20,20
+50476,25,784,503,25,20,20
+50477,26,784,503,25,20,20
+50478,25,785,503,381,30,30
+50479,26,785,503,380,30,30
+50480,25,768,503,351,30,30
+50481,26,768,503,351,30,30
+50482,25,393,503,152,5,5
+50483,26,393,503,152,5,5
+50484,25,393,503,155,5,5
+50485,26,393,503,155,5,5
+50486,25,393,503,158,5,5
+50487,26,393,503,158,5,5
+50488,25,393,503,495,5,5
+50489,26,393,503,495,5,5
+50490,25,393,503,498,5,5
+50491,26,393,503,498,5,5
+50492,25,393,503,501,5,5
+50493,26,393,503,501,5,5
+50494,25,769,503,374,1,1
+50495,26,769,503,374,1,1
+50496,25,393,503,387,5,5
+50497,26,393,503,387,5,5
+50498,25,393,503,390,5,5
+50499,26,393,503,390,5,5
+50500,25,393,503,393,5,5
+50501,26,393,503,393,5,5
+50502,25,786,503,323,40,40
+50503,26,786,503,323,40,40
+50504,25,786,503,319,40,40
+50505,26,786,503,319,40,40
+50506,4,189,504,175,5,5
+50507,5,189,504,175,5,5
+50508,6,189,505,175,5,5
+50509,6,205,505,172,5,5
+50510,6,205,505,173,5,5
+50511,6,205,505,174,5,5
+50512,6,205,505,236,5,5
+50513,6,205,505,238,5,5
+50514,6,205,505,239,5,5
+50515,6,205,505,240,5,5
+50516,7,787,506,360,5,5
+50517,8,787,506,360,5,5
+50518,9,787,507,360,5,5
+50519,10,518,508,175,5,5
+50520,11,518,508,175,5,5
+50521,12,788,509,175,1,1
+50522,13,788,509,175,1,1
+50523,14,788,510,175,1,1
+50524,12,789,509,440,1,1
+50525,13,789,509,440,1,1
+50526,12,124,509,447,1,1
+50527,13,124,509,447,1,1
+50528,14,124,510,447,1,1
+50529,15,790,511,175,1,1
+50530,16,790,511,175,1,1
+50531,15,791,511,179,1,1
+50532,16,791,511,179,1,1
+50533,15,791,511,194,1,1
+50534,16,791,511,194,1,1
+50535,15,791,511,218,1,1
+50536,16,791,511,218,1,1
+50537,17,653,512,636,1,1
+50538,18,653,512,636,1,1
+50539,21,792,513,440,1,1
+50540,22,792,513,440,1,1
+50541,25,787,514,360,1,1
+50542,26,787,514,360,1,1
+50543,25,787,514,175,1,1
+50544,26,787,514,175,1,1

data/v2/csv/generation_names.csv

@@ -1,35 +1,42 @@
 generation_id,local_language_id,name
-1,1,だいいっせだい
+1,1,だいいちせだい
+1,3,1세대
 1,5,Génération I
 1,6,Generation I
 1,9,Generation I
 1,11,第一世代
 2,1,だいにせだい
+2,3,2세대
 2,5,Génération II
 2,6,Generation II
 2,9,Generation II
 2,11,第二世代
 3,1,だいさんせだい
+3,3,3세대
 3,5,Génération III
 3,6,Generation III
 3,9,Generation III
 3,11,第三世代
 4,1,だいよんせだい
+4,3,4세대
 4,5,Génération IV
 4,6,Generation IV
 4,9,Generation IV
 4,11,第四世代
 5,1,だいごせだい
+5,3,5세대
 5,5,Génération V
 5,6,Generation V
 5,9,Generation V
 5,11,第五世代
 6,1,だいろくせだい
+6,3,6세대
 6,5,Génération VI
 6,6,Generation VI
 6,9,Generation VI
 6,11,第六世代
 7,1,だいななせだい
+7,3,7세대
 7,5,Génération VII
 7,6,Generation VII
 7,9,Generation VII

data/v2/csv/language_names.csv

@@ -1,41 +1,51 @@
 language_id,local_language_id,name
 1,1,日本語
+1,3,일본어
 1,5,Japonais
 1,6,Japanisch
 1,9,Japanese
 2,1,正式ローマジ
+2,3,정식 로마자
 2,5,Romaji
 2,6,Rōmaji
 2,9,Official roomaji
 3,1,韓国語
+3,3,한국어
 3,5,Coréen
 3,6,Koreanisch
 3,9,Korean
 4,1,中国語
+4,3,중국어
 4,5,Chinois
 4,6,Chinesisch
 4,9,Chinese
 5,1,フランス語
+5,3,프랑스어
 5,5,Français
 5,6,Französisch
 5,9,French
 6,1,ドイツ語
+6,3,도이치어
 6,5,Allemand
 6,6,Deutsch
 6,9,German
 7,1,西語
+7,3,스페인어
 7,5,Espagnol
 7,6,Spanisch
 7,9,Spanish
 8,1,伊語
+8,3,이탈리아어
 8,5,Italien
 8,6,Italienisch
 8,9,Italian
 9,1,英語
+9,3,영어
 9,5,Anglais
 9,6,Englisch
 9,9,English
 10,1,チェコ語
+10,3,체코어
 10,5,Tchèque
 10,6,Tschechisch
 10,9,Czech

data/v2/csv/languages.csv

@@ -11,3 +11,4 @@ id,iso639,iso3166,identifier,official,order
 10,cs,cz,cs,0,12
 11,ja,jp,ja,1,2
 12,zh,cn,zh-Hans,1,6
+13,pt-BR,br,pt-BR,0,13

data/v2/csv/location_area_prose.csv

@@ -618,3 +618,35 @@ location_area_id,local_language_id,name
 756,9,Unknown Area 345
 757,9,Unknown Area 347
 758,9,Unknown Area 348
+761,9,Pokemon Center
+762,9,Fighting Dojo
+763,9,Celadon Mansion rooftop
+764,9,Silph Co. 7F
+765,9,North Gate
+766,9,Bill's house
+767,9,Mania's house
+768,9,Weather Institute
+769,9,Steven's house
+770,9,
+771,9,
+772,9,
+773,9,Kirk's house
+774,9,
+775,9,Game Freak HQ 1F
+776,9,Weather Institute
+777,9,
+778,9,
+779,9,
+780,9,
+781,9,Contest Hall
+782,9,Contest Hall
+783,9,Contest Hall
+784,9,Contest Hall
+785,9,
+786,9,
+787,9,
+788,9,West Gate
+789,9,West Gate
+790,9,Poke Mart
+791,9,Pokemon Center
+792,9,West Gate

data/v2/csv/location_areas.csv

@@ -650,3 +650,35 @@ id,location_id,game_index,identifier
 758,676,0,unknown-area-348
 759,677,0,
 760,661,0,
+761,120,0,pokemon-center
+762,234,0,fighting-dojo
+763,67,0,celadon-mansion
+764,234,0,silph-co-7f
+765,229,0,north-gate
+766,229,0,bills-house
+767,70,0,manias-house
+768,467,0,weather-institute
+769,432,0,stevens-house
+770,567,0,
+771,169,0,
+772,170,0,
+773,70,0,kirks-house
+774,346,0,
+775,350,0,game-freak-hq-1f
+776,361,0,weather-institute
+777,536,0,
+778,590,0,
+779,599,0,
+780,625,0,
+781,430,0,contest-hall
+782,571,0,contest-hall
+783,570,0,contest-hall
+784,431,0,contest-hall
+785,578,0,
+786,695,0,
+787,569,0,
+788,2,0,west-gate
+789,169,0,west-gate
+790,153,0,poke-mart
+791,153,0,pokemon-center
+792,349,0,west-gate

data/v2/csv/pokedex_prose.csv

@@ -41,3 +41,13 @@ pokedex_id,local_language_id,name,description
 15,5,Hoenn amélioré,"Pokédex régional d'Hoenn dans Rubis Oméga/Saphir Alpha, mis à jour pour les nouvelles évolutions"
 15,6,Neue Hoenn,Omega Rubin/Alpha Saphir Hoenn Dex — Dex aus Rubin/Saphir/Smaragd um Neue Entwicklungen erweitert
 15,9,New Hoenn,"Omega Ruby/Alpha Sapphire Hoenn Dex—Ruby/Sapphire/Emerald's, updated to add new evolutions"
+16,9,Original Alola,Sun/Moon Alola dex
+17,9,Original Melemele,Sun/Moon Melemele dex
+18,9,Original Akala,Sun/Moon Akala dex
+19,9,Original Ula'ula,Sun/Moon Ula'ula dex
+20,9,Original Poni,Sun/Moon Poni dex
+21,9,Updated Alola,Ultra Sun/Ultra Moon Alola dex
+22,9,Updated Melemele,Ultra Sun/Ultra Moon Melemele dex
+23,9,Updated Akala,Ultra Sun/Ultra Moon Akala dex
+24,9,Updated Ula'ula,Ultra Sun/Ultra Moon Ula'ula dex
+25,9,Updated Poni,Ultra Sun/Ultra Moon Poni dex

data/v2/csv/pokedex_version_groups.csv

@@ -15,3 +15,13 @@ pokedex_id,version_group_id
 13,15
 14,15
 15,16
+16,17
+17,17
+18,17
+19,17
+20,17
+21,18
+22,18
+23,18
+24,18
+25,18

data/v2/csv/pokedexes.csv

@@ -13,3 +13,13 @@ id,region_id,identifier,is_main_series
 13,6,kalos-coastal,1
 14,6,kalos-mountain,1
 15,3,updated-hoenn,1
+16,7,original-alola,1
+17,7,original-melemele,1
+18,7,original-akala,1
+19,7,original-ulaula,1
+20,7,original-poni,1
+21,7,updated-alola,1
+22,7,updated-melemele,1
+23,7,updated-akala,1
+24,7,updated-ulaula,1
+25,7,updated-poni,1

data/v2/csv/pokemon_evolution.csv

@@ -381,7 +381,7 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 381,735,1,,20,,,,day,,,,,,,,,,0,0
 382,737,1,,20,,,,,,,,,,,,,,0,0
 383,738,1,,,,,,,,,,,,,,,,0,0
-384,740,1,,,,,,,,,,,,,,,,0,0
+384,740,1,,,,775,,,,,,,,,,,,0,0
 385,743,1,,25,,,,,,,,,,,,,,0,0
 386,745,1,,25,,,,day,,,,,,,,,,0,0
 387,745,1,,25,,,,night,,,,,,,,,,0,0

data/v2/csv/pokemon_species_names.csv

@@ -8534,31 +8534,31 @@ pokemon_species_id,local_language_id,name,genus
 804,12,四颚针龙,毒针宝可梦
 805,1,ツンデツンデ,いしがきポケモン
 805,3,차곡차곡,돌담포켓몬
-805,4,石,石牆寶可夢
+805,4,壘磊石,石牆寶可夢
 805,5,Ama-Ama,Pokémon Muraille
 805,6,Muramura,Steinmauer
 805,7,Stakataka,Pokémon Muro
 805,8,Stakataka,Pokémon Bastione
 805,9,Stakataka,Rampart Pokémon
 805,11,ツンデツンデ,いしがきポケモン
-805,12,石,石墙宝可梦
+805,12,垒磊石,石墙宝可梦
 806,1,ズガドーン,はなびポケモン
 806,3,두파팡,불꽃놀이포켓몬
-806,4,頭小,煙火寶可夢
+806,4,砰頭小丑,煙火寶可夢
 806,5,Pierroteknik,Pokémon Artificier
 806,6,Kopplosio,Feuerwerk
 806,7,Blacephalon,Pokémon Pirotecnia
 806,8,Blacephalon,Pokémon Pirotecnico
 806,9,Blacephalon,Fireworks Pokémon
 806,11,ズガドーン,はなびポケモン
-806,12,头小丑,烟火宝可梦
+806,12,砰头小丑,烟火宝可梦
 807,1,ゼラオラ,じんらいポケモン
 807,3,제라오라,신뢰포켓몬
-807,4,捷拉拉,奔雷寶可夢
+807,4,捷拉奥拉,奔雷寶可夢
 807,5,Zeraora,Pokémon Vif Éclair
 807,6,Zeraora,Blitzsturm
 807,7,Zeraora,Pokémon Fulgor
 807,8,Zeraora,Pokémon Fulmirapido
 807,9,Zeraora,Thunderclap Pokémon
 807,11,ゼラオラ,じんらいポケモン
-807,12,捷拉拉,奔雷宝可梦
+807,12,捷拉奥拉,奔雷宝可梦

data/v2/csv/region_names.csv

@@ -1,30 +1,36 @@
 region_id,local_language_id,name
 1,1,カントー地方
+1,3,관동지방
 1,5,Kanto
 1,6,Kanto
 1,8,Kanto
 1,9,Kanto
 2,1,ジョウト地方
+2,3,성도지방
 2,5,Johto
 2,6,Johto
 2,8,Johto
 2,9,Johto
 3,1,ホウエン地方
+3,3,호연지방
 3,5,Hoenn
 3,6,Hoenn
 3,8,Hoenn
 3,9,Hoenn
 4,1,シンオウ地方
+4,3,신오지방
 4,5,Sinnoh
 4,6,Sinnoh
 4,8,Sinnoh
 4,9,Sinnoh
 5,1,イッシュ地方
+5,3,하나지방
 5,5,Unys
 5,6,Einall
 5,8,Unima
 5,9,Unova
 6,1,カロス地方
+6,3,칼로스지방
 6,5,Kalos
 6,6,Kalos
 6,8,Kalos

data/v2/csv/stat_names.csv

@@ -1,47 +1,55 @@
 stat_id,local_language_id,name
 1,1,HP
+1,3,HP
 1,5,PV
 1,6,KP
 1,7,PS
 1,8,PS
 1,9,HP
 2,1,こうげき
+2,3,공격
 2,5,Attaque
 2,6,Angriff
 2,7,Ataque
 2,8,Attacco
 2,9,Attack
 3,1,ぼうぎょ
+3,3,방어
 3,5,Défense
 3,6,Verteidigung
 3,7,Defensa
 3,8,Difesa
 3,9,Defense
 4,1,とくこう
+4,3,특수공격
 4,5,Attaque Spéciale
 4,6,Spezialangriff
 4,7,Ataque Especial
 4,8,Attacco Speciale
 4,9,Special Attack
 5,1,とくぼう
+5,3,특수방어
 5,5,Défense Spéciale
 5,6,Spezialverteidigung
 5,7,Defensa Especial
 5,8,Difesa Speciale
 5,9,Special Defense
 6,1,すばやさ
+6,3,스피드
 6,5,Vitesse
 6,6,Initiative
 6,7,Velocidad
 6,8,Velocità
 6,9,Speed
 7,1,めいちゅう
+7,3,명중률
 7,5,Précision
 7,6,Genauigkeit
 7,7,Precisión
 7,8,precisione
 7,9,accuracy
 8,1,かいひ
+8,3,회피율
 8,5,Esquive
 8,6,Fluchtwert
 8,7,Evasión

data/v2/csv/type_names.csv

@@ -126,12 +126,14 @@ type_id,local_language_id,name
 18,8,Folletto
 18,9,Fairy
 10001,1,？？？
+10001,3,???
 10001,5,???
 10001,6,???
 10001,7,???
 10001,8,???
 10001,9,???
 10002,1,ダーク
+10002,3,다크
 10002,5,Obscur
 10002,6,Crypto
 10002,8,Ombra

data/v2/csv/version_names.csv

@@ -1,135 +1,181 @@
 version_id,local_language_id,name
 1,1,赤
+1,3,레드
 1,5,Rouge
 1,6,Rot
 1,8,Rossa
 1,9,Red
 2,1,緑
+2,3,블루
 2,5,Bleu
 2,6,Blau
 2,8,Blu
 2,9,Blue
 3,1,ピカチュウ
+3,3,피카츄
 3,5,Jaune
 3,6,Gelb
 3,8,Gialla
 3,9,Yellow
 4,1,金
+4,3,골드
 4,5,Or
 4,6,Gold
 4,8,Oro
 4,9,Gold
 5,1,銀
+5,3,실버
 5,5,Argent
 5,6,Silber
 5,8,Argento
 5,9,Silver
 6,1,クリスタル
+6,3,크리스탈
 6,5,Cristal
 6,6,Kristall
 6,8,Cristallo
 6,9,Crystal
 7,1,ルビー
+7,3,루비
 7,5,Rubis
 7,6,Rubin
 7,8,Rubino
 7,9,Ruby
 8,1,サファイア
+8,3,사파이어
 8,5,Saphir
 8,6,Saphir
 8,8,Zaffiro
 8,9,Sapphire
 9,1,エメラルド
+9,3,에메랄드
 9,5,Émeraude
 9,6,Smaragd
 9,8,Smeraldo
 9,9,Emerald
 10,1,ファイアレッド
+10,3,파이어레드
 10,5,Rouge Feu
 10,6,Feuerrot
 10,8,Rosso Fuoco
 10,9,FireRed
 11,1,リーフグリーン
+11,3,리프그린
 11,5,Vert Feuille
 11,6,Blattgrün
 11,8,Verde Foglia
 11,9,LeafGreen
 12,1,ダイヤモンド
+12,3,디아루가
 12,5,Diamant
 12,6,Diamant
 12,8,Diamante
 12,9,Diamond
 13,1,パール
+13,3,펄기아
 13,5,Perle
 13,6,Perl
 13,8,Perla
 13,9,Pearl
 14,1,プラチナ
+14,3,기라티나
 14,5,Platine
 14,6,Platin
 14,8,Platino
 14,9,Platinum
 15,1,ハートゴールド
+15,3,하트골드
 15,5,Or HeartGold
 15,6,HeartGold
 15,8,Oro HeartGold
 15,9,HeartGold
 16,1,ソウルシルバー
+16,3,소울실버
 16,5,Argent SoulSilver
 16,6,SoulSilver
 16,8,Argento SoulSilver
 16,9,SoulSilver
 17,1,ブラック
+17,3,블랙
 17,5,Noir
 17,6,Schwarz
 17,8,Nera
 17,9,Black
 18,1,ホワイト
+18,3,화이트
 18,5,Blanc
 18,6,Weiß
 18,8,Bianca
 18,9,White
 19,1,コロシアム
+19,3,콜로세움
 19,5,Colosseum
 19,6,Colosseum
 19,8,Colosseum
 19,9,Colosseum
 20,1,XD
+20,3,XD
 20,5,XD
 20,6,XD
 20,8,XD
 20,9,XD
 21,1,ブラック2
+21,3,블랙 2
 21,5,Noir 2
 21,6,Schwarz 2
 21,8,Nera 2
 21,9,Black 2
 22,1,ホワイト2
+22,3,화이트 2
 22,5,Blanc 2
 22,6,Weiß 2
 22,8,Bianca 2
 22,9,White 2
 23,1,X
+23,3,X
 23,5,X
 23,6,X
 23,8,X
 23,9,X
 24,1,Y
+24,3,Y
 24,5,Y
 24,6,Y
 24,8,Y
 24,9,Y
 25,1,オメガルビー
+25,3,오메가루비
 25,5,Rubis Oméga
 25,6,Omega Rubin
 25,8,Rubino Omega
 25,9,Omega Ruby
 26,1,アルファサファイア
+26,3,알파사파이어
 26,5,Saphir Alpha
 26,6,Alpha Saphir
 26,8,Zaffiro Alpha
 26,9,Alpha Sapphire
+27,1,サン
+27,3,썬
+27,5,Soleil
+27,6,Sonne
+27,8,Sole
 27,9,Sun
+28,1,ムーン
+28,3,문
+28,5,Lune
+28,6,Mond
+28,8,Luna
 28,9,Moon
+29,1,ウルトラサン
+29,3,울트라썬
+29,5,Ultra-Soleil
+29,6,Ultrasonne
+29,8,Ultrasole
 29,9,Ultra Sun
+30,1,ウルトラムーン
+30,3,울트라문
+30,5,Ultra-Lune
+30,6,Ultramond
+30,8,Ultraluna
 30,9,Ultra Moon