Add updated sprites for shiny Pikachu (since Gen 8 DLC changed its position slightly, and the old version wasn't perfect anyway), and add some unofficial female versions
@@ -865,9 +865,13 @@
|
||||
"gen-8": {
|
||||
"forms": {
|
||||
"$": {
|
||||
"has_female": true,
|
||||
"has_unofficial_female_icon": true,
|
||||
"is_prev_gen_icon": true
|
||||
},
|
||||
"alola-cap": {
|
||||
"has_female": true,
|
||||
"has_unofficial_female_icon": true,
|
||||
"is_prev_gen_icon": true
|
||||
},
|
||||
"belle": {
|
||||
@@ -880,18 +884,26 @@
|
||||
"is_prev_gen_icon": false
|
||||
},
|
||||
"hoenn-cap": {
|
||||
"has_female": true,
|
||||
"has_unofficial_female_icon": true,
|
||||
"is_prev_gen_icon": true
|
||||
},
|
||||
"kalos-cap": {
|
||||
"has_female": true,
|
||||
"has_unofficial_female_icon": true,
|
||||
"is_prev_gen_icon": true
|
||||
},
|
||||
"libre": {
|
||||
"is_prev_gen_icon": true
|
||||
},
|
||||
"original-cap": {
|
||||
"has_female": true,
|
||||
"has_unofficial_female_icon": true,
|
||||
"is_prev_gen_icon": true
|
||||
},
|
||||
"partner-cap": {
|
||||
"has_female": true,
|
||||
"has_unofficial_female_icon": true,
|
||||
"is_prev_gen_icon": true
|
||||
},
|
||||
"phd": {
|
||||
@@ -904,15 +916,23 @@
|
||||
"is_prev_gen_icon": true
|
||||
},
|
||||
"sinnoh-cap": {
|
||||
"has_female": true,
|
||||
"has_unofficial_female_icon": true,
|
||||
"is_prev_gen_icon": true
|
||||
},
|
||||
"starter": {
|
||||
"has_female": true,
|
||||
"has_unofficial_female_icon": true,
|
||||
"is_prev_gen_icon": true
|
||||
},
|
||||
"unova-cap": {
|
||||
"has_female": true,
|
||||
"has_unofficial_female_icon": true,
|
||||
"is_prev_gen_icon": true
|
||||
},
|
||||
"world-cap": {
|
||||
"has_female": true,
|
||||
"has_unofficial_female_icon": true,
|
||||
"is_prev_gen_icon": false
|
||||
}
|
||||
}
|
||||
|
||||
BIN
pokemon-gen8/regular/female/pikachu-alola-cap.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
pokemon-gen8/regular/female/pikachu-hoenn-cap.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
pokemon-gen8/regular/female/pikachu-kalos-cap.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
pokemon-gen8/regular/female/pikachu-original-cap.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
pokemon-gen8/regular/female/pikachu-partner-cap.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
pokemon-gen8/regular/female/pikachu-sinnoh-cap.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
pokemon-gen8/regular/female/pikachu-starter.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
pokemon-gen8/regular/female/pikachu-unova-cap.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
pokemon-gen8/regular/female/pikachu-world-cap.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
pokemon-gen8/regular/female/pikachu.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 345 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 449 B After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 320 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 349 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 342 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 382 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 414 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 371 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 356 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 401 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 345 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 558 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 314 B After Width: | Height: | Size: 1.5 KiB |
BIN
pokemon-gen8/shiny/female/pikachu-alola-cap.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
pokemon-gen8/shiny/female/pikachu-hoenn-cap.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
pokemon-gen8/shiny/female/pikachu-kalos-cap.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
pokemon-gen8/shiny/female/pikachu-original-cap.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
pokemon-gen8/shiny/female/pikachu-partner-cap.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
pokemon-gen8/shiny/female/pikachu-sinnoh-cap.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
pokemon-gen8/shiny/female/pikachu-starter.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
pokemon-gen8/shiny/female/pikachu-unova-cap.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
pokemon-gen8/shiny/female/pikachu-world-cap.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
pokemon-gen8/shiny/female/pikachu.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 453 B After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 321 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 356 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 348 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 362 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 361 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 386 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 419 B After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 381 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 361 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 411 B After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 469 B After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 314 B After Width: | Height: | Size: 1.5 KiB |
@@ -243,7 +243,7 @@ def read_data():
|
||||
'etc': read_json_file(ETC_JSON)
|
||||
}
|
||||
|
||||
def get_pkm_form(form_name, form_alias, is_unofficial_icon):
|
||||
def get_pkm_form(form_name, form_alias, is_unofficial_icon, is_female, has_unofficial_female_icon):
|
||||
title = []
|
||||
daggers = []
|
||||
|
||||
@@ -254,6 +254,9 @@ def get_pkm_form(form_name, form_alias, is_unofficial_icon):
|
||||
if is_unofficial_icon:
|
||||
title.append('Unofficial icon (see below)')
|
||||
daggers.append('‡')
|
||||
if is_female and has_unofficial_female_icon:
|
||||
title.append('Unofficial female icon (see below)')
|
||||
daggers.append('‡')
|
||||
|
||||
if len(title):
|
||||
title = '; '.join(title)
|
||||
@@ -372,21 +375,21 @@ def determine_form(slug, form_name, form_data):
|
||||
|
||||
return (form_slug_file, form_slug_display, form_alias)
|
||||
|
||||
def append_pkm(cols, base, slug_display, slug_file, form_name, form_alias, has_female, is_female, is_right, is_unofficial_icon, is_prev_gen_icon, docs_gen):
|
||||
def append_pkm(cols, base, slug_display, slug_file, form_name, form_alias, has_female, has_unofficial_female_icon, is_female, is_right, is_unofficial_icon, is_prev_gen_icon, docs_gen):
|
||||
'''Adds a single Pokémon row'''
|
||||
cols.append([
|
||||
get_counter(),
|
||||
get_img_node(get_pkm_url(base, slug_file, False, is_female, is_right), None, form_name, 'p'),
|
||||
get_img_node(get_pkm_url(base, slug_file, True, is_female, is_right), None, form_name, 'p'),
|
||||
[get_pkm_form(form_name, form_alias, is_unofficial_icon), get_pkm_gender(is_female, has_female), get_pkm_gen(is_prev_gen_icon, docs_gen)],
|
||||
[get_pkm_form(form_name, form_alias, is_unofficial_icon, is_female, has_unofficial_female_icon), get_pkm_gender(is_female, has_female), get_pkm_gen(is_prev_gen_icon, docs_gen)],
|
||||
f'<code>{slug_display}</code>'
|
||||
])
|
||||
|
||||
def append_pkm_form(cols, base, slug_display, slug_file, form_name, form_alias, has_female, has_right, add_female, add_right, is_unofficial_icon, is_prev_gen_icon, docs_gen):
|
||||
def append_pkm_form(cols, base, slug_display, slug_file, form_name, form_alias, has_female, has_unofficial_female_icon, has_right, add_female, add_right, is_unofficial_icon, is_prev_gen_icon, docs_gen):
|
||||
'''Adds columns for a single form: at least two, then female sprites, then right-facing sprites'''
|
||||
append_pkm(cols, base, slug_display, slug_file, form_name, form_alias, has_female, False, False, is_unofficial_icon, is_prev_gen_icon, docs_gen)
|
||||
if has_female and add_female: append_pkm(cols, base, slug_display, slug_file, form_name, form_alias, has_female, True, False, is_unofficial_icon, is_prev_gen_icon, docs_gen)
|
||||
if has_right and add_right: append_pkm(cols, base, slug_display, slug_file, form_name, form_alias, has_female, False, True, is_unofficial_icon, is_prev_gen_icon, docs_gen)
|
||||
append_pkm(cols, base, slug_display, slug_file, form_name, form_alias, has_female, has_unofficial_female_icon, False, False, is_unofficial_icon, is_prev_gen_icon, docs_gen)
|
||||
if has_female and add_female: append_pkm(cols, base, slug_display, slug_file, form_name, form_alias, has_female, has_unofficial_female_icon, True, False, is_unofficial_icon, is_prev_gen_icon, docs_gen)
|
||||
if has_right and add_right: append_pkm(cols, base, slug_display, slug_file, form_name, form_alias, has_female, has_unofficial_female_icon, False, True, is_unofficial_icon, is_prev_gen_icon, docs_gen)
|
||||
|
||||
def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]', commit = '[unknown]'):
|
||||
'''Generates a documentation table for miscellaneous sprites'''
|
||||
@@ -629,6 +632,7 @@ def generate_dex_table(dex, etc, gen, gen_dir, curr_page, json_file, add_female
|
||||
form_name_clean,
|
||||
form_alias,
|
||||
form_data.get('has_female', False),
|
||||
form_data.get('has_unofficial_female_icon', False),
|
||||
form_data.get('has_right', False),
|
||||
add_female,
|
||||
add_right,
|
||||
|
||||