Merge branch 'master' into master

This commit is contained in:
Alessandro Pezzè 2020-08-24 11:37:22 +02:00 committed by GitHub
commit 9cf9541942
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions

View file

@ -1362,6 +1362,7 @@ def _build_pokemons():
gen_v = "versions/generation-v/{0}"
gen_vi = "versions/generation-vi/{0}"
gen_vii = "versions/generation-vii/{0}"
gen_viii = "versions/generation-viii/{0}"
sprites = {
"front_default": file_path_or_none(poke_sprites.format(file_name_png)),
"front_female": file_path_or_none(
@ -1923,6 +1924,32 @@ def _build_pokemons():
)
)
),
},
"icons": {
"front_default": file_path_or_none(
poke_sprites.format(
gen_vii.format("icons/" + file_name_png)
)
),
"front_female": file_path_or_none(
poke_sprites.format(
gen_vii.format("icons/female/" + file_name_png)
)
),
},
},
"generation-viii": {
"icons": {
"front_default": file_path_or_none(
poke_sprites.format(
gen_viii.format("icons/" + file_name_png)
)
),
"front_female": file_path_or_none(
poke_sprites.format(
gen_viii.format("icons/female/" + file_name_png)
)
),
}
},
},

@ -1 +1 @@
Subproject commit 6c9d4efd1662ad363a5b2b64b64d048a7f394013
Subproject commit 146c91287ad01f6e15315bbd733fd7442c91fe6d