Merge pull request #80 from msikma/swshdlc1

Add changes from Sword/Shield DLC 1

contributors.md

@@ -2,16 +2,17 @@
 
 All of the original sprites used in this project were sourced from products by Nintendo/Creatures Inc./GAME FREAK Inc.
 
-All shiny sprites were made by [@Dada78641](https://twitter.com/dada78641) except where otherwise noted. In total, 1636 shiny sprites were made:
+All shiny sprites were made by [@Dada78641](https://twitter.com/dada78641) except where otherwise noted. In total, 1738 shiny Pokémon sprites were made:
 
 * 938 sprites were made for <i title="Pokémon X and Y">X/Y</i>,
 * +29 for the <i title="Pokémon Omega Ruby and Alpha Sapphire">OR/AS</i> update,
 * +203 for the <i title="Pokémon Ultra Sun and Ultra Moon">US/UM</i> update,
-* +466 for the <i title="Pokémon Let's Go, Pikachu! and Let's Go, Eevee!">LP/LE</i> and <i title="Pokémon Sword and Shield">SW/SH</i> update.
+* +466 for the <i title="Pokémon Let's Go, Pikachu! and Let's Go, Eevee!">LP/LE</i> and <i title="Pokémon Sword and Shield">SW/SH</i> update,
+* +102 for the <i title="Pokémon Sword and Shield">SW/SH DLC</i> update.
 
 The [alternate sizes for Pumpkaboo and Gourgeist](https://github.com/msikma/pokesprite/pull/27) were contributed by [@5310](https://github.com/5310). The [Alcremie form variations](https://twitter.com/mattgcn/status/1205639857567141889) were contributed by [@mattgcn](https://twitter.com/mattgcn).
 
-Special thanks to [@koenigderluegner](https://github.com/koenigderluegner) for his help on the <i title="Pokémon Let's Go, Pikachu! and Let's Go, Eevee!">LP/LE</i> and <i title="Pokémon Sword and Shield">SW/SH</i> update and for tagging all the new inventory sprites.
+Special thanks to [@koenigderluegner](https://github.com/koenigderluegner) for his help on the <i title="Pokémon Let's Go, Pikachu! and Let's Go, Eevee!">LP/LE</i> and <i title="Pokémon Sword and Shield">SW/SH</i> update (original and DLC) and for tagging all the new inventory sprites.
 
 Also, special thanks to anyone who reported issues, gave suggestions or sent in contributions.
 

data/item-map.json

@@ -865,5 +865,16 @@
   "item_1269": "key-item/old-letter",
   "item_1270": "key-item/band-autograph",
   "item_1271": "key-item/sonias-book",
-  "item_1278": "key-item/rotom-catalog"
+  "item_1278": "key-item/rotom-catalog",
+  "item_1579": "medicine/max-honey",
+  "item_1580": "battle-item/max-mushrooms",
+  "item_1581": "other-item/galarica-twig",
+  "item_1582": "evo-item/galarica-cuff",
+  "item_1583": "key-item/style-card",
+  "item_1584": "key-item/armor-pass",
+  "item_1585": "key-item/rotom-bike-3",
+  "item_1586": "key-item/rotom-bike-4",
+  "item_1587": "key-item/exp-charm",
+  "item_1588": "other-item/armorite-ore",
+  "item_1589": "key-item/mark-charm"
 }

data/meta.json

@@ -201,6 +201,16 @@
       "name": {
         "eng": "Ribbons"
       }
+    },
+    "mark": {
+      "name": {
+        "eng": "Marks"
+      }
+    },
+    "special-attribute": {
+      "name": {
+        "eng": "Special attributes"
+      }
     }
   }
 }

data/pokemon.json

@@ -89,6 +89,9 @@
         },
         "mega": {
           "is_prev_gen_icon": true
+        },
+        "gmax": {
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -287,6 +290,9 @@
         },
         "mega": {
           "is_prev_gen_icon": true
+        },
+        "gmax": {
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -791,11 +797,13 @@
     "gen-7": {
       "forms": {
         "$": {
-          "has_female": false,
+          "has_female": true,
+          "has_unofficial_female_icon": true,
           "has_right": false
         },
         "alola-cap": {
-          "has_female": false,
+          "has_female": true,
+          "has_unofficial_female_icon": true,
           "has_right": false
         },
         "belle": {
@@ -807,11 +815,13 @@
           "has_right": false
         },
         "hoenn-cap": {
-          "has_female": false,
+          "has_female": true,
+          "has_unofficial_female_icon": true,
           "has_right": false
         },
         "kalos-cap": {
-          "has_female": false,
+          "has_female": true,
+          "has_unofficial_female_icon": true,
           "has_right": false
         },
         "libre": {
@@ -819,11 +829,13 @@
           "has_right": false
         },
         "original-cap": {
-          "has_female": false,
+          "has_female": true,
+          "has_unofficial_female_icon": true,
           "has_right": true
         },
         "partner-cap": {
-          "has_female": false,
+          "has_female": true,
+          "has_unofficial_female_icon": true,
           "has_right": true
         },
         "phd": {
@@ -839,15 +851,23 @@
           "has_right": false
         },
         "sinnoh-cap": {
-          "has_female": false,
+          "has_female": true,
+          "has_unofficial_female_icon": true,
           "has_right": false
         },
         "starter": {
-          "has_female": false,
+          "has_female": true,
+          "has_unofficial_female_icon": true,
           "has_right": false
         },
         "unova-cap": {
-          "has_female": false,
+          "has_female": true,
+          "has_unofficial_female_icon": true,
+          "has_right": false
+        },
+        "world-cap": {
+          "has_female": true,
+          "has_unofficial_female_icon": true,
           "has_right": false
         }
       }
@@ -855,9 +875,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": {
@@ -870,18 +894,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": {
@@ -894,13 +926,24 @@
           "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
         }
       }
     }
@@ -1005,7 +1048,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "alola": {
           "is_prev_gen_icon": true
@@ -1370,7 +1413,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -2616,6 +2659,9 @@
         },
         "mega": {
           "is_prev_gen_icon": true
+        },
+        "galar": {
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -2673,7 +2719,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -3391,18 +3437,18 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "alola": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "totem": {
           "is_alias_of": "alola",
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "totem-alola": {
           "is_alias_of": "alola",
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -3876,7 +3922,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -5773,7 +5819,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -5831,7 +5877,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -6208,7 +6254,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -6609,7 +6655,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -6794,7 +6840,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "mega": {
           "is_prev_gen_icon": true
@@ -6859,7 +6905,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "mega": {
           "is_prev_gen_icon": true
@@ -7242,7 +7288,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -7336,7 +7382,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -7423,7 +7469,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -7655,7 +7701,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -7684,7 +7730,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -9262,7 +9308,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -9997,7 +10043,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "mega": {
           "is_prev_gen_icon": true
@@ -12647,7 +12693,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -13439,7 +13485,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "mega": {
           "is_prev_gen_icon": true
@@ -14451,7 +14497,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -14480,7 +14526,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -14538,7 +14584,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -14799,7 +14845,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -15996,7 +16042,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -17077,7 +17123,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -17193,7 +17239,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -17325,7 +17371,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -17878,7 +17924,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -18402,7 +18448,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -18518,7 +18564,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -19364,7 +19410,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -19393,7 +19439,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -19538,7 +19584,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -19857,7 +19903,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -20756,7 +20802,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -22278,7 +22324,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -22336,7 +22382,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -22597,7 +22643,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -22742,7 +22788,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -24048,17 +24094,17 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "dusk": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "midday": {
           "is_alias_of": "$",
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "midnight": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -24349,7 +24395,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "totem": {
           "is_alias_of": "$",
@@ -24652,7 +24698,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -24826,7 +24872,7 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -26162,10 +26208,10 @@
     "gen-8": {
       "forms": {
         "$": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         },
         "original": {
-          "is_prev_gen_icon": true
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -26477,6 +26523,9 @@
       "forms": {
         "$": {
           "is_prev_gen_icon": false
+        },
+        "gmax": {
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -26543,6 +26592,9 @@
       "forms": {
         "$": {
           "is_prev_gen_icon": false
+        },
+        "gmax": {
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -26609,6 +26661,9 @@
       "forms": {
         "$": {
           "is_prev_gen_icon": false
+        },
+        "gmax": {
+          "is_prev_gen_icon": false
         }
       }
     }
@@ -28564,5 +28619,84 @@
         }
       }
     }
+  },
+  "891": {
+    "idx": "891",
+    "name": {
+      "eng": "Kubfu",
+      "chs": "熊徒弟",
+      "jpn": "ダクマ",
+      "jpn_ro": "Dakuma"
+    },
+    "slug": {
+      "eng": "kubfu",
+      "jpn": "dakuma",
+      "jpn_ro": "dakuma"
+    },
+    "gen-7": {},
+    "gen-8": {
+      "forms": {
+        "$": {
+          "is_prev_gen_icon": false
+        }
+      }
+    }
+  },
+  "892": {
+    "idx": "892",
+    "name": {
+      "eng": "Urshifu",
+      "chs": "武道熊師",
+      "jpn": "ウーラオス",
+      "jpn_ro": "Wulaosu"
+    },
+    "slug": {
+      "eng": "urshifu",
+      "jpn": "wulaosu",
+      "jpn_ro": "wulaosu"
+    },
+    "gen-7": {},
+    "gen-8": {
+      "forms": {
+        "$": {
+          "is_prev_gen_icon": false
+        },
+        "gmax": {
+          "is_prev_gen_icon": false
+        },
+        "rapid-strike-gmax": {
+          "is_prev_gen_icon": false
+        },
+        "single-strike-gmax": {
+          "is_prev_gen_icon": false,
+          "is_alias_of": "gmax"
+        }
+      }
+    }
+  },
+  "893": {
+    "idx": "893",
+    "name": {
+      "eng": "Zarude",
+      "chs": "薩戮德",
+      "jpn": "ザルード",
+      "jpn_ro": "Zarude"
+    },
+    "slug": {
+      "eng": "zarude",
+      "jpn": "zarude",
+      "jpn_ro": "zarude"
+    },
+    "gen-7": {},
+    "gen-8": {
+      "forms": {
+        "$": {
+          "is_prev_gen_icon": false
+        },
+        "dada": {
+          "is_prev_gen_icon": false
+        }
+      }
+    }
   }
 }

docs/notes/modifications.md

@@ -30,8 +30,7 @@ Note: when converting, make sure to prevent ImageMagick from adding a `gAMA` blo
 Replacing a color can be done with the following ImageMagick command (e.g. `#202020` → `#000000` in this example):
 
 ```sh
-# where $i is a file
-magick convert -fill "#000000" -define png:exclude-chunk=gAMA -opaque "#202020" $i -depth 32 PNG32:$i
+magick convert -fill "#000000" -opaque "#202020" -define png:exclude-chunk=gAMA $i -depth 32 PNG32:$i
 ```
 
 ### LPLE minor updates
@@ -44,3 +43,11 @@ The following minor updates were part of LPLE:
 * Wartortle icon: properly closed the outline on its head
 
 These updates have been backported to the 40×30 icons.
+
+## Gen 8 modifications
+
+The Gen 8 sprites seem to come in 2× upscaled format now, 136×112 instead of 68×56. For downscaling them:
+
+```sh
+magick convert -interpolate Nearest -filter point -resize 50% -define png:exclude-chunk=gAMA $i -depth 32 PNG32:$i
+```

docs/notes/ribbon-notes.md

@@ -1,8 +1,11 @@
-## Ribbon notes
+## Notes on Ribbons and Marks
 
-Ribbon descriptions have been taken from [Bulbapedia's *List of Ribbons in the games* page](https://bulbapedia.bulbagarden.net/wiki/List_of_Ribbons_in_the_games). They were requested in [issue #8](https://github.com/msikma/pokesprite/issues/8) and merged with [PR #59](https://github.com/msikma/pokesprite/pull/59).
+The data for Ribbons and Marks has been taken from Bulbapedia:
 
-Each item in the [`misc.json`](https://github.com/msikma/pokesprite/blob/master/data/misc.json) data file has the following structure:
+* the [*List of Ribbons in the games*](https://bulbapedia.bulbagarden.net/wiki/List_of_Ribbons_in_the_games) page for Ribbons,
+* the [*Mark*](https://bulbapedia.bulbagarden.net/wiki/Mark) page for Marks.
+
+Items in the [`misc.json`](https://github.com/msikma/pokesprite/blob/master/data/misc.json) data file have roughly the following structure (varying depending on the item type):
 
 ```js
 {
@@ -20,17 +23,17 @@ Each item in the [`misc.json`](https://github.com/msikma/pokesprite/blob/master/
     "gen-6": "ribbon/training-ribbon.png",
     "gen-8": "ribbon/gen8/training-ribbon.png"
   }
-},
+}
 ```
 
-A brief description of what each item is:
+A description of each item:
 
 | Key | Meaning |
 |:----|:--------|
 | `name` | Official names in various languages |
-| `origin_gen` | The generation in which this ribbon was originally introduced |
-| `description` | A description of the ribbon from a specific generation |
-| `files` | Object containing paths to the sprites from various generations |
+| `origin_gen` | The generation in which this item was originally introduced |
+| `description` | A description of the item from a specific generation (absent in some items) |
+| `files` | Object containing paths to the sprites from various generations; either a string, or an array of strings |
 
 Note that `files` may have multiple entries, such as the *Training Ribbon* which has an image for Gen 6 and Gen 8.
 

docs/resources/pokesprite-docs.css

@@ -56,8 +56,15 @@
 .markdown-body .pokesprite tbody:not(.alternating) tr td[rowspan] {
   background: var(--shade-0);
 }
-.markdown-body .pokesprite tbody tr td.group {
+.markdown-body .pokesprite tbody tr th.group {
   font-weight: 500;
+  text-align: left;
+}
+.markdown-body .pokesprite tbody tr th.group:hover {
+  background: var(--shade-0);
+}
+.markdown-body .pokesprite tbody:not(:nth-child(3)) tr th.group {
+  padding-top: 25px;
 }
 .markdown-body .pokesprite tbody tr td.item-id {
   padding-bottom: 0;
@@ -66,6 +73,9 @@
   display: inline-block;
   padding-top: 1px;
 }
+.markdown-body .pokesprite tbody tr td.last-item {
+  border-right-width: 0;
+}
 .markdown-body .pokesprite tbody tr.variable-height td {
   vertical-align: middle;
 }