Merge branch 'master' of https://github.com/msikma/pokesprite

2026-09-09 02:45:11 -05:00 · 2020-02-24 19:55:52 +01:00
parent fbcd16771b 69a93a0cb0
commit 1cda034c43
7 changed files with 32 additions and 32 deletions
--- a/docs/index.html
+++ b/docs/index.html
@@ -6,7 +6,7 @@
    <title>PokéSprite - Index</title>
    <!--
    PokéSprite - Documentation page
-    pokesprite-images v2.0.0 master-300 [bcf2b039]
+    pokesprite-images v2.0.0 master-302 [2e6b5fd9]

    (；ﾟ～ﾟ)ゝ”
    -->
--- a/docs/overview/dex-gen7.html
+++ b/docs/overview/dex-gen7.html
@@ -6,7 +6,7 @@
    <title>PokéSprite - Gen 7</title>
    <!--
    PokéSprite - Documentation page
-    pokesprite-images v2.0.0 master-300 [bcf2b039]
+    pokesprite-images v2.0.0 master-302 [2e6b5fd9]

    (；ﾟ～ﾟ)ゝ”
    -->
@@ -18,7 +18,7 @@
      <div class="text-section">
        <h1 class="title"><img class="p" src="https://raw.githubusercontent.com/msikma/pokesprite/master/pokemon-gen8/shiny/venusaur.png" alt="Shiny Venusaur" />PokéSprite</h1>
        <h2 class="subtitle">Database project of box and inventory sprites from the Pokémon core series games</h2>
-        <ul class="menu"><li><a href="https://msikma.github.io/pokesprite/index.html" class="">Index</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen7.html" class="">Gen 7</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8.html" class="">Gen 8</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8-new.html" class="">Gen 8 (New sprites)</a></li><li><a href="https://msikma.github.io/pokesprite/overview/inventory.html" class="">Inventory</a></li></ul>
+        <ul class="menu"><li><a href="https://msikma.github.io/pokesprite/index.html" class="">Index</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen7.html" class="curr">Gen 7</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8.html" class="">Gen 8</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8-new.html" class="">Gen 8 (New sprites)</a></li><li><a href="https://msikma.github.io/pokesprite/overview/inventory.html" class="">Inventory</a></li></ul>
        
    <p>This table lists all Pokémon box sprites for <strong>Gen 7</strong>, which can be found in the <a href="https://raw.githubusercontent.com/msikma/pokesprite/master/pokemon-gen7x"><code>pokemon-gen7x</code></a> directory. The list is up-to-date as of Pokémon Sword/Shield, and some of the sprites are from an earlier generation. All shiny sprites were custom-made and are not found in-game.</p>
    <p>All box sprites are 68×56 as of Gen 8; the old Gen 7 sprites have been updated to the new size and contrast. (The original 40×30 sprites from Gen 7 are still available <a href="https://github.com/msikma/pokesprite/tree/master/icons">in the legacy sprites directory</a>.)</p>
@@ -31,7 +31,7 @@
      </div>
      <table class="pokesprite gen7">
        <thead>
-<tr class="title"><th></th><th colspan="10">Gen 7 sprite overview table<br /><span>pokesprite-images v2.0.0 master-300 [bcf2b039]</span></th></tr>
+<tr class="title"><th></th><th colspan="10">Gen 7 sprite overview table<br /><span>pokesprite-images v2.0.0 master-302 [2e6b5fd9]</span></th></tr>
 <tr class="header"><th>#</th><th>Dex</th><th>Name</th><th colspan="2">名前/ローマ字</th><th colspan="2">Sprites</th><th colspan="3">Form</th><th>Slug</th></tr>
 </thead>
 <tbody>
--- a/docs/overview/dex-gen8-new.html
+++ b/docs/overview/dex-gen8-new.html
@@ -6,7 +6,7 @@
    <title>PokéSprite - Gen 8 (new sprites only)</title>
    <!--
    PokéSprite - Documentation page
-    pokesprite-images v2.0.0 master-300 [bcf2b039]
+    pokesprite-images v2.0.0 master-302 [2e6b5fd9]

    (；ﾟ～ﾟ)ゝ”
    -->
@@ -18,7 +18,7 @@
      <div class="text-section">
        <h1 class="title"><img class="p" src="https://raw.githubusercontent.com/msikma/pokesprite/master/pokemon-gen8/shiny/venusaur.png" alt="Shiny Venusaur" />PokéSprite</h1>
        <h2 class="subtitle">Database project of box and inventory sprites from the Pokémon core series games</h2>
-        <ul class="menu"><li><a href="https://msikma.github.io/pokesprite/index.html" class="">Index</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen7.html" class="">Gen 7</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8.html" class="">Gen 8</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8-new.html" class="">Gen 8 (New sprites)</a></li><li><a href="https://msikma.github.io/pokesprite/overview/inventory.html" class="">Inventory</a></li></ul>
+        <ul class="menu"><li><a href="https://msikma.github.io/pokesprite/index.html" class="">Index</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen7.html" class="">Gen 7</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8.html" class="">Gen 8</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8-new.html" class="curr">Gen 8 (New sprites)</a></li><li><a href="https://msikma.github.io/pokesprite/overview/inventory.html" class="">Inventory</a></li></ul>
        
    <p>This table lists all Pokémon box sprites for <strong>Gen 8 (new sprites only)</strong>, which can be found in the <a href="https://raw.githubusercontent.com/msikma/pokesprite/master/pokemon-gen8"><code>pokemon-gen8</code></a> directory. The list is up-to-date as of Pokémon Sword/Shield, and some of the sprites are from an earlier generation. All shiny sprites were custom-made and are not found in-game.</p>
    <p>All box sprites are 68×56 as of Gen 8; the old Gen 7 sprites have been updated to the new size and contrast. (The original 40×30 sprites from Gen 7 are still available <a href="https://github.com/msikma/pokesprite/tree/master/icons">in the legacy sprites directory</a>.)</p>
@@ -31,7 +31,7 @@
      </div>
      <table class="pokesprite gen8">
        <thead>
-<tr class="title"><th></th><th colspan="10">Gen 8 sprite overview table (new sprites only)<br /><span>pokesprite-images v2.0.0 master-300 [bcf2b039]</span></th></tr>
+<tr class="title"><th></th><th colspan="10">Gen 8 sprite overview table (new sprites only)<br /><span>pokesprite-images v2.0.0 master-302 [2e6b5fd9]</span></th></tr>
 <tr class="header"><th>#</th><th>Dex</th><th>Name</th><th colspan="2">名前/ローマ字</th><th colspan="2">Sprites</th><th colspan="3">Form</th><th>Slug</th></tr>
 </thead>
 <tbody>
--- a/docs/overview/dex-gen8.html
+++ b/docs/overview/dex-gen8.html
@@ -6,7 +6,7 @@
    <title>PokéSprite - Gen 8</title>
    <!--
    PokéSprite - Documentation page
-    pokesprite-images v2.0.0 master-300 [bcf2b039]
+    pokesprite-images v2.0.0 master-302 [2e6b5fd9]

    (；ﾟ～ﾟ)ゝ”
    -->
@@ -18,7 +18,7 @@
      <div class="text-section">
        <h1 class="title"><img class="p" src="https://raw.githubusercontent.com/msikma/pokesprite/master/pokemon-gen8/shiny/venusaur.png" alt="Shiny Venusaur" />PokéSprite</h1>
        <h2 class="subtitle">Database project of box and inventory sprites from the Pokémon core series games</h2>
-        <ul class="menu"><li><a href="https://msikma.github.io/pokesprite/index.html" class="">Index</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen7.html" class="">Gen 7</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8.html" class="">Gen 8</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8-new.html" class="">Gen 8 (New sprites)</a></li><li><a href="https://msikma.github.io/pokesprite/overview/inventory.html" class="">Inventory</a></li></ul>
+        <ul class="menu"><li><a href="https://msikma.github.io/pokesprite/index.html" class="">Index</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen7.html" class="">Gen 7</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8.html" class="curr">Gen 8</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8-new.html" class="">Gen 8 (New sprites)</a></li><li><a href="https://msikma.github.io/pokesprite/overview/inventory.html" class="">Inventory</a></li></ul>
        
    <p>This table lists all Pokémon box sprites for <strong>Gen 8</strong>, which can be found in the <a href="https://raw.githubusercontent.com/msikma/pokesprite/master/pokemon-gen8"><code>pokemon-gen8</code></a> directory. The list is up-to-date as of Pokémon Sword/Shield, and some of the sprites are from an earlier generation. All shiny sprites were custom-made and are not found in-game.</p>
    <p>All box sprites are 68×56 as of Gen 8; the old Gen 7 sprites have been updated to the new size and contrast. (The original 40×30 sprites from Gen 7 are still available <a href="https://github.com/msikma/pokesprite/tree/master/icons">in the legacy sprites directory</a>.)</p>
@@ -31,7 +31,7 @@
      </div>
      <table class="pokesprite gen8">
        <thead>
-<tr class="title"><th></th><th colspan="10">Gen 8 sprite overview table<br /><span>pokesprite-images v2.0.0 master-300 [bcf2b039]</span></th></tr>
+<tr class="title"><th></th><th colspan="10">Gen 8 sprite overview table<br /><span>pokesprite-images v2.0.0 master-302 [2e6b5fd9]</span></th></tr>
 <tr class="header"><th>#</th><th>Dex</th><th>Name</th><th colspan="2">名前/ローマ字</th><th colspan="2">Sprites</th><th colspan="3">Form</th><th>Slug</th></tr>
 </thead>
 <tbody>
--- a/docs/overview/inventory.html
+++ b/docs/overview/inventory.html
@@ -6,7 +6,7 @@
    <title>PokéSprite - Gen None</title>
    <!--
    PokéSprite - Documentation page
-    pokesprite-images v2.0.0 master-300 [bcf2b039]
+    pokesprite-images v2.0.0 master-302 [2e6b5fd9]

    (；ﾟ～ﾟ)ゝ”
    -->
@@ -18,7 +18,7 @@
      <div class="text-section">
        <h1 class="title"><img class="p" src="https://raw.githubusercontent.com/msikma/pokesprite/master/pokemon-gen8/shiny/venusaur.png" alt="Shiny Venusaur" />PokéSprite</h1>
        <h2 class="subtitle">Database project of box and inventory sprites from the Pokémon core series games</h2>
-        <ul class="menu"><li><a href="https://msikma.github.io/pokesprite/index.html" class="">Index</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen7.html" class="">Gen 7</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8.html" class="">Gen 8</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8-new.html" class="">Gen 8 (New sprites)</a></li><li><a href="https://msikma.github.io/pokesprite/overview/inventory.html" class="">Inventory</a></li></ul>
+        <ul class="menu"><li><a href="https://msikma.github.io/pokesprite/index.html" class="">Index</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen7.html" class="">Gen 7</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8.html" class="">Gen 8</a></li><li><a href="https://msikma.github.io/pokesprite/overview/dex-gen8-new.html" class="">Gen 8 (New sprites)</a></li><li><a href="https://msikma.github.io/pokesprite/overview/inventory.html" class="curr">Inventory</a></li></ul>
        
    <p>This table lists all inventory item sprites. These items are from the last several games and is up-to-date as of Pokémon Sword/Shield. The sprites are from Gen 3 through 8.</p>
    <p>All sprites are 32×32 in size. There are sets of sprites: one with a Sword/Shield style white outline around the sprites, and one without (as all previous games). Both sets contain the same number of sprites.</p>
@@ -27,7 +27,7 @@
      </div>
      <table class="pokesprite genNone">
        <thead>
-<tr class="title"><th></th><th colspan="10">Inventory sprite overview table<br /><span>pokesprite-images v2.0.0 master-300 [bcf2b039]</span></th></tr>
+<tr class="title"><th></th><th colspan="10">Inventory sprite overview table<br /><span>pokesprite-images v2.0.0 master-302 [2e6b5fd9]</span></th></tr>
 <tr class="header"><th>#</th><th>Item ID</th><th>Name</th><th colspan="2">Sprites</th><th>Group</th><th>Filename</th></tr>
 </thead>
 <tbody>
--- a/readme.md
+++ b/readme.md
@@ -16,10 +16,10 @@ This project contains both Pokémon box sprites and item sprites. For Pokémon,

 | Directory | Example | Size | Type | Description |
 |:----------|:-------:|:----------|:-----|:------------|
-| `/pokemon‑gen7x` | ![/pokemon-gen7x/ example](pokemon-gen7x/shiny/venusaur.png) | 68×56 | Pokémon | [Gen 7 sprites](https://msikma.github.io/pokesprite/docs/dex-gen7.html), updated to Gen 8 size and contrast |
-| `/pokemon‑gen8` | ![/pokemon-gen8/ example](pokemon-gen8/shiny/venusaur.png) | 68×56 | Pokémon | [Gen 8 sprites](https://msikma.github.io/pokesprite/docs/dex-gen7.html) (plus older Gen 7 sprites where needed) |
-| `/items` | ![/items/ example](items/evo-item/thunder-stone.png) | 32×32 | Items | [Gen 3–8 inventory items](https://msikma.github.io/pokesprite/docs/inventory.html) |
-| `/items‑outline` | ![/items-outline/ example](items-outline/evo-item/thunder-stone.png) | 32×32 | Items | [Gen 3–8 inventory items](https://msikma.github.io/pokesprite/docs/inventory.html) with *Sword/Shield* style outline |
+| `/pokemon‑gen7x` | ![/pokemon-gen7x/ example](pokemon-gen7x/shiny/venusaur.png) | 68×56 | Pokémon | [Gen 7 sprites](https://msikma.github.io/pokesprite/overview/dex-gen7.html), updated to Gen 8 size and contrast |
+| `/pokemon‑gen8` | ![/pokemon-gen8/ example](pokemon-gen8/shiny/venusaur.png) | 68×56 | Pokémon | [Gen 8 sprites](https://msikma.github.io/pokesprite/overview/dex-gen7.html) (plus older Gen 7 sprites where needed) |
+| `/items` | ![/items/ example](items/evo-item/thunder-stone.png) | 32×32 | Items | [Gen 3–8 inventory items](https://msikma.github.io/pokesprite/overview/inventory.html) |
+| `/items‑outline` | ![/items-outline/ example](items-outline/evo-item/thunder-stone.png) | 32×32 | Items | [Gen 3–8 inventory items](https://msikma.github.io/pokesprite/overview/inventory.html) with *Sword/Shield* style outline |

 The item sprites are separated by type in subdirectories (e.g. *"berry", "evo-item", "valuable-item",* etc).

--- a/scripts/gen_docs.py
+++ b/scripts/gen_docs.py
@@ -136,13 +136,13 @@ def wrap_docs_page(table_content, gen, gen_dir, curr_page, json_file, is_items_p

 def get_menu_links(curr_page):
  menu = [
-    ['index', 'Index'],
-    ['overview/dex-gen7', 'Gen 7'],
-    ['overview/dex-gen8', 'Gen 8'],
-    ['overview/dex-gen8-new', 'Gen 8 (New sprites)'],
-    ['overview/inventory', 'Inventory']
+    ['index', 'index', 'Index'],
+    ['overview/dex-gen7', 'dex-gen7', 'Gen 7'],
+    ['overview/dex-gen8', 'dex-gen8', 'Gen 8'],
+    ['overview/dex-gen8-new', 'dex-gen8-new', 'Gen 8 (New sprites)'],
+    ['overview/inventory', 'inventory', 'Inventory']
  ]
-  menu_links = ['<li><a href="%s" class="%s">%s</a></li>' % (docs_url(item[0]), 'curr' if item[0] == curr_page else '', item[1]) for item in menu]
+  menu_links = ['<li><a href="%s" class="%s">%s</a></li>' % (docs_url(item[0]), 'curr' if item[1] == curr_page else '', item[2]) for item in menu]
  return ''.join(menu_links)

 def get_title_venusaur():
@@ -193,7 +193,7 @@ def read_repo_state():
    version = package['version']
  except:
    pass
-  
+
  # In case this fails (e.g. Git is not installed, or this isn't a repo).
  commit = '[unknown]'
  try:
@@ -227,7 +227,7 @@ def get_pkm_form(form_name, form_alias, is_unofficial_icon):
  if is_unofficial_icon:
    title.append('Unofficial icon (see below)')
    daggers.append('‡')
-  
+
  if len(title):
    title = '; '.join(title)
    daggers = ''.join(daggers)
@@ -299,7 +299,7 @@ def get_td_node(td):
      else:
        cols.append(f'<td class="min">{col}</td>')
    return ''.join(cols)
-  
+
  # Otherwise it's a string, and we'll check if it contains an image.
  attr = ' class="image"' if str(td)[:4] == '<img' else ''
  return f'<td{attr}>{td}</td>'
@@ -372,7 +372,7 @@ def generate_items_table(itm, etc, dirs, curr_page, json_file, version = '[unkno
    if not item_dict.get(group):
      item_dict[group] = []
    item_dict[group].append({ 'name': name, 'id': id })
-  
+
  for group, items in item_dict.items():
    buffer.append(f'<tr><td></td><td colspan="6" class="group">{group.title()}</td></tr>')
    for item in items:
@@ -390,7 +390,7 @@ def generate_items_table(itm, etc, dirs, curr_page, json_file, version = '[unkno
      buffer.append(f'<td class="item-id"><code>{filename}</code></td>')
      buffer.append('</tr>')
      sprites_counter += 1
-  
+
  buffer.append('</tbody>')

  buffer.append('<tfoot>')
@@ -436,7 +436,7 @@ def generate_dex_table(dex, etc, gen, gen_dir, curr_page, json_file, add_female

    if not 'forms' in gen_data:
      continue
-    
+
    for form_name, form_data in gen_data['forms'].items():
      form_slug_file, form_slug_display, form_alias = determine_form(slug_en, form_name, form_data)
      form_name_clean = EMPTY_PLACEHOLDER if form_name == '$' else form_name
@@ -458,7 +458,7 @@ def generate_dex_table(dex, etc, gen, gen_dir, curr_page, json_file, add_female
        form_data.get('is_prev_gen_icon', False),
        gen
      )
-    
+
    if not form_cols:
      continue
    first_col = form_cols[0]
@@ -480,7 +480,7 @@ def generate_dex_table(dex, etc, gen, gen_dir, curr_page, json_file, add_female
      for col in row:
        buffer.append(get_td_node(col))
      buffer.append('</tr>')
-  
+
  # Add the remaining other icons.
  if not new_sprites_only:
    buffer.append('<tr class="header">')
@@ -502,7 +502,7 @@ def generate_dex_table(dex, etc, gen, gen_dir, curr_page, json_file, add_female
        <td colspan="4"><code>{file}.png</code></td>
      ''')
      buffer.append('</tr>')
-  
+
  buffer.append('</tbody>')

  buffer.append('<tfoot>')