diff --git a/data/pokemon.json b/data/pokemon.json index 9b217e9a..1c9ef48f 100644 --- a/data/pokemon.json +++ b/data/pokemon.json @@ -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 } } diff --git a/pokemon-gen8/regular/female/pikachu-alola-cap.png b/pokemon-gen8/regular/female/pikachu-alola-cap.png new file mode 100644 index 00000000..a79c1b60 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-alola-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-hoenn-cap.png b/pokemon-gen8/regular/female/pikachu-hoenn-cap.png new file mode 100644 index 00000000..c9b3c371 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-kalos-cap.png b/pokemon-gen8/regular/female/pikachu-kalos-cap.png new file mode 100644 index 00000000..3db6bf57 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-kalos-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-original-cap.png b/pokemon-gen8/regular/female/pikachu-original-cap.png new file mode 100644 index 00000000..25775593 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-original-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-partner-cap.png b/pokemon-gen8/regular/female/pikachu-partner-cap.png new file mode 100644 index 00000000..e3bd4086 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-partner-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-sinnoh-cap.png b/pokemon-gen8/regular/female/pikachu-sinnoh-cap.png new file mode 100644 index 00000000..d1363e6c Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-starter.png b/pokemon-gen8/regular/female/pikachu-starter.png new file mode 100644 index 00000000..0a5442df Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-starter.png differ diff --git a/pokemon-gen8/regular/female/pikachu-unova-cap.png b/pokemon-gen8/regular/female/pikachu-unova-cap.png new file mode 100644 index 00000000..d22a96bf Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-unova-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu-world-cap.png b/pokemon-gen8/regular/female/pikachu-world-cap.png new file mode 100644 index 00000000..51b89fb4 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu-world-cap.png differ diff --git a/pokemon-gen8/regular/female/pikachu.png b/pokemon-gen8/regular/female/pikachu.png new file mode 100644 index 00000000..09e2bd62 Binary files /dev/null and b/pokemon-gen8/regular/female/pikachu.png differ diff --git a/pokemon-gen8/regular/pikachu-alola-cap.png b/pokemon-gen8/regular/pikachu-alola-cap.png index 340a86ce..3eb35990 100644 Binary files a/pokemon-gen8/regular/pikachu-alola-cap.png and b/pokemon-gen8/regular/pikachu-alola-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-belle.png b/pokemon-gen8/regular/pikachu-belle.png index b626770c..42f7fdf4 100644 Binary files a/pokemon-gen8/regular/pikachu-belle.png and b/pokemon-gen8/regular/pikachu-belle.png differ diff --git a/pokemon-gen8/regular/pikachu-cosplay.png b/pokemon-gen8/regular/pikachu-cosplay.png index 52737454..a0f4badd 100644 Binary files a/pokemon-gen8/regular/pikachu-cosplay.png and b/pokemon-gen8/regular/pikachu-cosplay.png differ diff --git a/pokemon-gen8/regular/pikachu-hoenn-cap.png b/pokemon-gen8/regular/pikachu-hoenn-cap.png index b150af63..2d521c78 100644 Binary files a/pokemon-gen8/regular/pikachu-hoenn-cap.png and b/pokemon-gen8/regular/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-kalos-cap.png b/pokemon-gen8/regular/pikachu-kalos-cap.png index cbe5ab9f..ae675198 100644 Binary files a/pokemon-gen8/regular/pikachu-kalos-cap.png and b/pokemon-gen8/regular/pikachu-kalos-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-libre.png b/pokemon-gen8/regular/pikachu-libre.png index e1f41396..ecf18530 100644 Binary files a/pokemon-gen8/regular/pikachu-libre.png and b/pokemon-gen8/regular/pikachu-libre.png differ diff --git a/pokemon-gen8/regular/pikachu-original-cap.png b/pokemon-gen8/regular/pikachu-original-cap.png index 9b5ba3f5..1cc7e6c2 100644 Binary files a/pokemon-gen8/regular/pikachu-original-cap.png and b/pokemon-gen8/regular/pikachu-original-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-partner-cap.png b/pokemon-gen8/regular/pikachu-partner-cap.png index b05751ae..ab8d3ed1 100644 Binary files a/pokemon-gen8/regular/pikachu-partner-cap.png and b/pokemon-gen8/regular/pikachu-partner-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-phd.png b/pokemon-gen8/regular/pikachu-phd.png index b1a7f6c7..28c0c8b1 100644 Binary files a/pokemon-gen8/regular/pikachu-phd.png and b/pokemon-gen8/regular/pikachu-phd.png differ diff --git a/pokemon-gen8/regular/pikachu-pop-star.png b/pokemon-gen8/regular/pikachu-pop-star.png index d95a0e44..be187d62 100644 Binary files a/pokemon-gen8/regular/pikachu-pop-star.png and b/pokemon-gen8/regular/pikachu-pop-star.png differ diff --git a/pokemon-gen8/regular/pikachu-rock-star.png b/pokemon-gen8/regular/pikachu-rock-star.png index 362240ea..545c1888 100644 Binary files a/pokemon-gen8/regular/pikachu-rock-star.png and b/pokemon-gen8/regular/pikachu-rock-star.png differ diff --git a/pokemon-gen8/regular/pikachu-sinnoh-cap.png b/pokemon-gen8/regular/pikachu-sinnoh-cap.png index 60e1514b..751139ab 100644 Binary files a/pokemon-gen8/regular/pikachu-sinnoh-cap.png and b/pokemon-gen8/regular/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-starter.png b/pokemon-gen8/regular/pikachu-starter.png index 1ad4e3bb..b838a42a 100644 Binary files a/pokemon-gen8/regular/pikachu-starter.png and b/pokemon-gen8/regular/pikachu-starter.png differ diff --git a/pokemon-gen8/regular/pikachu-unova-cap.png b/pokemon-gen8/regular/pikachu-unova-cap.png index 20e4520b..d140b0fe 100644 Binary files a/pokemon-gen8/regular/pikachu-unova-cap.png and b/pokemon-gen8/regular/pikachu-unova-cap.png differ diff --git a/pokemon-gen8/regular/pikachu-world-cap.png b/pokemon-gen8/regular/pikachu-world-cap.png index 39ba4a9c..589d8634 100644 Binary files a/pokemon-gen8/regular/pikachu-world-cap.png and b/pokemon-gen8/regular/pikachu-world-cap.png differ diff --git a/pokemon-gen8/regular/pikachu.png b/pokemon-gen8/regular/pikachu.png index 04a713f6..e8e88d7b 100644 Binary files a/pokemon-gen8/regular/pikachu.png and b/pokemon-gen8/regular/pikachu.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-alola-cap.png b/pokemon-gen8/shiny/female/pikachu-alola-cap.png new file mode 100644 index 00000000..8f4165b7 Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-alola-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-hoenn-cap.png b/pokemon-gen8/shiny/female/pikachu-hoenn-cap.png new file mode 100644 index 00000000..361527ac Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-kalos-cap.png b/pokemon-gen8/shiny/female/pikachu-kalos-cap.png new file mode 100644 index 00000000..5e5b072e Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-kalos-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-original-cap.png b/pokemon-gen8/shiny/female/pikachu-original-cap.png new file mode 100644 index 00000000..1137d4cc Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-original-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-partner-cap.png b/pokemon-gen8/shiny/female/pikachu-partner-cap.png new file mode 100644 index 00000000..61cf6c5b Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-partner-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-sinnoh-cap.png b/pokemon-gen8/shiny/female/pikachu-sinnoh-cap.png new file mode 100644 index 00000000..57dc71a1 Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-starter.png b/pokemon-gen8/shiny/female/pikachu-starter.png new file mode 100644 index 00000000..3e7d140f Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-starter.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-unova-cap.png b/pokemon-gen8/shiny/female/pikachu-unova-cap.png new file mode 100644 index 00000000..0a81d96e Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-unova-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu-world-cap.png b/pokemon-gen8/shiny/female/pikachu-world-cap.png new file mode 100644 index 00000000..c4d963b7 Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu-world-cap.png differ diff --git a/pokemon-gen8/shiny/female/pikachu.png b/pokemon-gen8/shiny/female/pikachu.png new file mode 100644 index 00000000..437af99e Binary files /dev/null and b/pokemon-gen8/shiny/female/pikachu.png differ diff --git a/pokemon-gen8/shiny/pikachu-alola-cap.png b/pokemon-gen8/shiny/pikachu-alola-cap.png index dc71d526..107d8608 100644 Binary files a/pokemon-gen8/shiny/pikachu-alola-cap.png and b/pokemon-gen8/shiny/pikachu-alola-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-belle.png b/pokemon-gen8/shiny/pikachu-belle.png index 4d0449dd..8567d8fe 100644 Binary files a/pokemon-gen8/shiny/pikachu-belle.png and b/pokemon-gen8/shiny/pikachu-belle.png differ diff --git a/pokemon-gen8/shiny/pikachu-cosplay.png b/pokemon-gen8/shiny/pikachu-cosplay.png index fe0eb344..3b6d2406 100644 Binary files a/pokemon-gen8/shiny/pikachu-cosplay.png and b/pokemon-gen8/shiny/pikachu-cosplay.png differ diff --git a/pokemon-gen8/shiny/pikachu-hoenn-cap.png b/pokemon-gen8/shiny/pikachu-hoenn-cap.png index 29bdc040..07c6f431 100644 Binary files a/pokemon-gen8/shiny/pikachu-hoenn-cap.png and b/pokemon-gen8/shiny/pikachu-hoenn-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-kalos-cap.png b/pokemon-gen8/shiny/pikachu-kalos-cap.png index 100620b8..b76700ff 100644 Binary files a/pokemon-gen8/shiny/pikachu-kalos-cap.png and b/pokemon-gen8/shiny/pikachu-kalos-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-libre.png b/pokemon-gen8/shiny/pikachu-libre.png index 98dd6ab6..5df25c10 100644 Binary files a/pokemon-gen8/shiny/pikachu-libre.png and b/pokemon-gen8/shiny/pikachu-libre.png differ diff --git a/pokemon-gen8/shiny/pikachu-original-cap.png b/pokemon-gen8/shiny/pikachu-original-cap.png index adba5b72..5b43d58e 100644 Binary files a/pokemon-gen8/shiny/pikachu-original-cap.png and b/pokemon-gen8/shiny/pikachu-original-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-partner-cap.png b/pokemon-gen8/shiny/pikachu-partner-cap.png index 8ef25888..2ba8ef9e 100644 Binary files a/pokemon-gen8/shiny/pikachu-partner-cap.png and b/pokemon-gen8/shiny/pikachu-partner-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-phd.png b/pokemon-gen8/shiny/pikachu-phd.png index ad57551a..57007537 100644 Binary files a/pokemon-gen8/shiny/pikachu-phd.png and b/pokemon-gen8/shiny/pikachu-phd.png differ diff --git a/pokemon-gen8/shiny/pikachu-pop-star.png b/pokemon-gen8/shiny/pikachu-pop-star.png index 11e2c02e..c25bb561 100644 Binary files a/pokemon-gen8/shiny/pikachu-pop-star.png and b/pokemon-gen8/shiny/pikachu-pop-star.png differ diff --git a/pokemon-gen8/shiny/pikachu-rock-star.png b/pokemon-gen8/shiny/pikachu-rock-star.png index 215d32fb..e08e4038 100644 Binary files a/pokemon-gen8/shiny/pikachu-rock-star.png and b/pokemon-gen8/shiny/pikachu-rock-star.png differ diff --git a/pokemon-gen8/shiny/pikachu-sinnoh-cap.png b/pokemon-gen8/shiny/pikachu-sinnoh-cap.png index 9d1df4ae..b1fae7a5 100644 Binary files a/pokemon-gen8/shiny/pikachu-sinnoh-cap.png and b/pokemon-gen8/shiny/pikachu-sinnoh-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-starter.png b/pokemon-gen8/shiny/pikachu-starter.png index 476e0281..4a0e71ec 100644 Binary files a/pokemon-gen8/shiny/pikachu-starter.png and b/pokemon-gen8/shiny/pikachu-starter.png differ diff --git a/pokemon-gen8/shiny/pikachu-unova-cap.png b/pokemon-gen8/shiny/pikachu-unova-cap.png index 8938d1f6..eb2d33ae 100644 Binary files a/pokemon-gen8/shiny/pikachu-unova-cap.png and b/pokemon-gen8/shiny/pikachu-unova-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu-world-cap.png b/pokemon-gen8/shiny/pikachu-world-cap.png index 3de43813..b84c981f 100644 Binary files a/pokemon-gen8/shiny/pikachu-world-cap.png and b/pokemon-gen8/shiny/pikachu-world-cap.png differ diff --git a/pokemon-gen8/shiny/pikachu.png b/pokemon-gen8/shiny/pikachu.png index 5ba1dfc9..2f688e09 100644 Binary files a/pokemon-gen8/shiny/pikachu.png and b/pokemon-gen8/shiny/pikachu.png differ diff --git a/scripts/gen_docs.py b/scripts/gen_docs.py index 63e20da4..aef0dfd8 100755 --- a/scripts/gen_docs.py +++ b/scripts/gen_docs.py @@ -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'{slug_display}' ]) -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,