diff --git a/.cli/sprite/__001_copy.ts b/.cli/__001_copy.ts similarity index 100% rename from .cli/sprite/__001_copy.ts rename to .cli/__001_copy.ts diff --git a/.cli/__002_addframe.ts b/.cli/__002_addframe.ts index c96b76d..27f9fa7 100644 --- a/.cli/__002_addframe.ts +++ b/.cli/__002_addframe.ts @@ -10,6 +10,7 @@ async function run() { for (let index = 0; index < fileList.length; index++) { const fileName = fileList[index] + console.log(fileName) const icon = await Jimp.read(`./.data/sprites/${fileName}`) const frame = new Jimp(70, 58, '#f5f5f5') frame.blit(icon, 0, 0).write(`./.data/framed/${fileName}`) diff --git a/src/analyzer/compare.ts b/src/analyzer/compare.ts index 7eb8463..7108e33 100644 --- a/src/analyzer/compare.ts +++ b/src/analyzer/compare.ts @@ -5,8 +5,8 @@ const ImagePHash = require('@jimp/core/es/modules/phash') type Result = { width: number; height: number; slug: string; distance: number } -const CHUNKS = 8 -const PROCESS_PER_CHUNK = 155 +const CHUNKS = 10 +const PROCESS_PER_CHUNK = 125 const FOREACH_BASE = new Array(CHUNKS).fill(0) const workers: Worker[] = [] diff --git a/src/analyzer/config/dex.ts b/src/analyzer/config/dex.ts index 5a10b46..6ba3eba 100644 --- a/src/analyzer/config/dex.ts +++ b/src/analyzer/config/dex.ts @@ -1393,6 +1393,13 @@ export const dex: Pokemon[] = [ name_jpn: 'カビゴン', slug: 'snorlax', }, + { + idx: 144, + dex: 144, + name_eng: 'Articuno', + name_jpn: 'フリーザー', + slug: 'articuno-galar', + }, { idx: 144, dex: 144, @@ -1400,6 +1407,13 @@ export const dex: Pokemon[] = [ name_jpn: 'フリーザー', slug: 'articuno', }, + { + idx: 145, + dex: 145, + name_eng: 'Zapdos', + name_jpn: 'サンダー', + slug: 'zapdos-galar', + }, { idx: 145, dex: 145, @@ -1407,6 +1421,13 @@ export const dex: Pokemon[] = [ name_jpn: 'サンダー', slug: 'zapdos', }, + { + idx: 146, + dex: 146, + name_eng: 'Moltres', + name_jpn: 'ファイヤー', + slug: 'moltres-galar', + }, { idx: 146, dex: 146, @@ -1785,6 +1806,13 @@ export const dex: Pokemon[] = [ name_jpn: 'ヤミカラス', slug: 'murkrow', }, + { + idx: 199, + dex: 199, + name_eng: 'Slowking', + name_jpn: 'ヤドキング', + slug: 'slowking-galar', + }, { idx: 199, dex: 199, @@ -2331,6 +2359,13 @@ export const dex: Pokemon[] = [ name_jpn: 'バンギラス', slug: 'tyranitar', }, + { + idx: 249, + dex: 249, + name_eng: 'Lugia', + name_jpn: 'ルギア', + slug: 'lugia-shadow', + }, { idx: 249, dex: 249, @@ -5614,13 +5649,6 @@ export const dex: Pokemon[] = [ name_jpn: 'メロエッタ', slug: 'meloetta', }, - { - idx: 649, - dex: 649, - name_eng: 'Genesect', - name_jpn: 'ゲノセクト', - slug: 'genesect-standard', - }, { idx: 649, dex: 649, @@ -8687,4 +8715,53 @@ export const dex: Pokemon[] = [ name_jpn: 'ザルード', slug: 'zarude', }, + { + idx: 894, + dex: 894, + name_eng: 'Regieleki', + name_jpn: 'レジエレキ', + slug: 'regieleki', + }, + { + idx: 895, + dex: 895, + name_eng: 'Regidrago', + name_jpn: 'レジドラゴ', + slug: 'regidrago', + }, + { + idx: 896, + dex: 896, + name_eng: 'Glastrier', + name_jpn: 'ブリザポス', + slug: 'glastrier', + }, + { + idx: 897, + dex: 897, + name_eng: 'Spectrier', + name_jpn: 'レイスポス', + slug: 'spectrier', + }, + { + idx: 898, + dex: 898, + name_eng: 'Calyrex', + name_jpn: 'バドレックス', + slug: 'calyrex-shadow-rider', + }, + { + idx: 898, + dex: 898, + name_eng: 'Calyrex', + name_jpn: 'バドレックス', + slug: 'calyrex-ice-rider', + }, + { + idx: 898, + dex: 898, + name_eng: 'Calyrex', + name_jpn: 'バドレックス', + slug: 'calyrex', + }, ] diff --git a/src/analyzer/config/v2_hash.ts b/src/analyzer/config/v2_hash.ts index f4ea5c6..c5fb709 100644 --- a/src/analyzer/config/v2_hash.ts +++ b/src/analyzer/config/v2_hash.ts @@ -338,8 +338,8 @@ export default [ { slug: 'nidoqueen', w: 35, - h: 36, - hash: '1110111000100000110001000001010010100000110000000000000000001000', + h: 35, + hash: '1110110000100000110000010001010010100000110000000001010100000000', }, { slug: 'nidoran-m', @@ -357,7 +357,7 @@ export default [ slug: 'nidoking', w: 42, h: 33, - hash: '1010111000001100101001000000000010110000110010000100001001001000', + hash: '1010111000001100101001000000000010110000110010000100011000001000', }, { slug: 'clefairy', @@ -1045,21 +1045,21 @@ export default [ }, { slug: 'jynx', - w: 36, - h: 34, - hash: '1110000010110001101100010001000000000000010010101000000100001000', + w: 44, + h: 33, + hash: '1110001000010000101000100000000000000000000000010100000000000000', }, { slug: 'electabuzz', - w: 32, - h: 36, - hash: '1110111000100000100000000100010010000000000000010000100011001000', + w: 33, + h: 35, + hash: '1110101000000000100010001100000010000000000000000001100010010000', }, { slug: 'magmar', w: 36, - h: 38, - hash: '1110100000000100100001000100000110010001000000000000100000110000', + h: 36, + hash: '1110100000000100100001000100000110000000000010000101100000110000', }, { slug: 'pinsir', @@ -1153,9 +1153,9 @@ export default [ }, { slug: 'omastar', - w: 22, - h: 22, - hash: '1110001010000000111000000000010110000100001110001000010000010000', + w: 39, + h: 34, + hash: '1110101001000000110000000000000010000000001010000001000010000000', }, { slug: 'kabuto', @@ -1165,15 +1165,15 @@ export default [ }, { slug: 'kabutops', - w: 32, - h: 33, - hash: '1110111010000011100001000110000010001100010000001000001000000000', + w: 33, + h: 32, + hash: '1110111010000001110010000100000110001010010000001000001000100101', }, { slug: 'aerodactyl', w: 47, - h: 30, - hash: '1110111000000000100011010000001010000000100010001100000011000100', + h: 31, + hash: '1110111000000000100011010000001010000000100010001100001011000100', }, { slug: 'snorlax-gmax', @@ -1187,23 +1187,41 @@ export default [ h: 40, hash: '1100101010010000111010000000010110001000001110101110000100100000', }, + { + slug: 'articuno-galar', + w: 35, + h: 43, + hash: '1110000001001000111001000000000100010100101001000000100001000000', + }, { slug: 'articuno', - w: 45, - h: 48, + w: 44, + h: 46, hash: '1110100110000000101011011100110011010000001000101000000000000101', }, + { + slug: 'zapdos-galar', + w: 42, + h: 40, + hash: '1111100010010010100001010110100011000100001000000000000000000000', + }, { slug: 'zapdos', - w: 44, - h: 43, - hash: '1011101000001000100001011101000011000001100000000001100000010000', + w: 46, + h: 38, + hash: '1011111000000000100001110000000010000001100000001100100010110000', + }, + { + slug: 'moltres-galar', + w: 41, + h: 42, + hash: '1010110000000100100000010000100011001010000011001011001011010000', }, { slug: 'moltres', - w: 42, - h: 44, - hash: '1010010000100000100010110000000011001000100110001010000010000010', + w: 47, + h: 43, + hash: '1010110000000000100001010010000111001000000110001000000010000000', }, { slug: 'dratini', @@ -1339,9 +1357,9 @@ export default [ }, { slug: 'crobat', - w: 30, - h: 23, - hash: '1010100000001101100111001101010011001000101000001001000000000010', + w: 46, + h: 30, + hash: '1011101001000000100111010001010011000000100000011001000011000000', }, { slug: 'chinchou', @@ -1523,6 +1541,12 @@ export default [ h: 21, hash: '1010110000011000101000001100010000000000100000000100111000000001', }, + { + slug: 'slowking-galar', + w: 29, + h: 40, + hash: '1110100000110000111100000001000010000000001100001000010000000000', + }, { slug: 'slowking', w: 27, @@ -1957,21 +1981,21 @@ export default [ }, { slug: 'raikou', - w: 30, - h: 25, - hash: '1011100001001000111000100000101010000010010000100100001010000000', + w: 41, + h: 35, + hash: '1011100001100100101100000010001010100000110000000000000110000000', }, { slug: 'entei', - w: 25, - h: 24, - hash: '1010100000000010101010001011011001010000000000011001000000100000', + w: 39, + h: 35, + hash: '1111101001000010100100000110001010000100000100000000010010000000', }, { slug: 'suicune', - w: 29, - h: 25, - hash: '1011100011100010111001100010000011010000000000001000010001101101', + w: 42, + h: 38, + hash: '1011111011000000100000001100100001000010000010000000010001011000', }, { slug: 'larvitar', @@ -1991,17 +2015,23 @@ export default [ h: 38, hash: '1110100000000010100000010111010010000100100000000000000010000000', }, + { + slug: 'lugia-shadow', + w: 45, + h: 40, + hash: '1011001000110010000111000111000110000010000100000101000100101000', + }, { slug: 'lugia', - w: 32, - h: 29, - hash: '1010000000100000000001010100000000010010010000100011000100100110', + w: 45, + h: 40, + hash: '1010000000010000000001000000000010000010010010000101100000110000', }, { slug: 'ho-oh', - w: 29, - h: 30, - hash: '1110000000000000000110010001000010010000010000101100000010101100', + w: 46, + h: 49, + hash: '1010101010000000000110010000110011000000001000101100000011000000', }, { slug: 'celebi', @@ -2023,9 +2053,9 @@ export default [ }, { slug: 'sceptile', - w: 28, - h: 26, - hash: '1110001000010010101001001100010010100000000010001100000000000010', + w: 37, + h: 34, + hash: '1110011000100101111001001100000100011001010010000000000000000000', }, { slug: 'torchic', @@ -2041,9 +2071,9 @@ export default [ }, { slug: 'blaziken', - w: 25, - h: 26, - hash: '1110001110100010110000001000000010100010010011000000000000001001', + w: 34, + h: 34, + hash: '1010100000000110100001001100010010000000000001000101000111110000', }, { slug: 'mudkip', @@ -2059,9 +2089,9 @@ export default [ }, { slug: 'swampert', - w: 26, - h: 25, - hash: '1110100010001001111000011000001011100000110000000000010000000000', + w: 37, + h: 34, + hash: '1010101010001001111000001101000111001010110010000000010000010000', }, { slug: 'poochyena', @@ -2347,9 +2377,9 @@ export default [ }, { slug: 'aggron', - w: 29, - h: 24, - hash: '1110000010000000101000011001010110101000110011001101000101000010', + w: 42, + h: 33, + hash: '1110100000000000100000011111000110001100010010001101010011001000', }, { slug: 'meditite', @@ -2527,9 +2557,9 @@ export default [ }, { slug: 'altaria', - w: 20, - h: 24, - hash: '1001101001100001111010010000000100000100000001000000010100010010', + w: 36, + h: 30, + hash: '1110001000101000111010011000000000000100000000000000100011000100', }, { slug: 'zangoose', @@ -2611,9 +2641,9 @@ export default [ }, { slug: 'armaldo', - w: 26, - h: 23, - hash: '1110111000001001100000000100000110010000100000111100001000100001', + w: 32, + h: 30, + hash: '1110111000001001100000001100100010000001100010001000010000000001', }, { slug: 'feebas', @@ -2695,9 +2725,9 @@ export default [ }, { slug: 'absol', - w: 23, - h: 25, - hash: '1011101000010010101111001111100011010100001100001000000000100000', + w: 34, + h: 35, + hash: '1111001000000100100110001000100010111100100100001000001001100000', }, { slug: 'wynaut', @@ -2731,9 +2761,9 @@ export default [ }, { slug: 'walrein', - w: 28, - h: 22, - hash: '1010101000001010101100000100000010010001100000001001000010000100', + w: 36, + h: 27, + hash: '1110001000000010101100000101010010000101001000101001010100001001', }, { slug: 'clamperl', @@ -2755,9 +2785,9 @@ export default [ }, { slug: 'relicanth', - w: 25, - h: 21, - hash: '1110101011000000101010000000000011100010000001000000000011001100', + w: 30, + h: 25, + hash: '1110101011000000101000010000000011110100000001000000010001101100', }, { slug: 'luvdisc', @@ -2779,9 +2809,9 @@ export default [ }, { slug: 'salamence', - w: 32, - h: 23, - hash: '1010101000000010111000010001001110000001001000001000010100000000', + w: 40, + h: 28, + hash: '1011101010000010100000001001001110100000000010001100000101000000', }, { slug: 'beldum', @@ -2797,39 +2827,39 @@ export default [ }, { slug: 'metagross', - w: 32, - h: 23, - hash: '1011110010000000101101000101000010100001000000011100000000100000', + w: 46, + h: 25, + hash: '1110101000100000010000000111000011000010010000101000000000000001', }, { slug: 'regirock', - w: 27, - h: 23, - hash: '1110100010000000101000001100010011000001000000101000000000000101', + w: 36, + h: 32, + hash: '1110101010001000100100001100000011001000100000010000000000000001', }, { slug: 'regice', - w: 25, - h: 23, - hash: '1110100011100100101001000000010011000000000010100100110000110000', + w: 41, + h: 32, + hash: '1110100011000000111001000010010010000000000010000000100001010000', }, { slug: 'registeel', - w: 23, - h: 22, - hash: '1110111010001001111010001100010010000000000000101100000101000110', + w: 36, + h: 30, + hash: '1110100010101001110010011000000000000000000100100100000000000100', }, { slug: 'latias', - w: 27, - h: 21, - hash: '1111001000000010101110010110000110010100001000000010100001100000', + w: 39, + h: 28, + hash: '1011101000000001100111000110000010010000000100000000110010100000', }, { slug: 'latios', - w: 28, - h: 22, - hash: '1111101010000010101110011110000010010000011000011000100001000000', + w: 45, + h: 30, + hash: '1011101000000010100100000100000010010100001100010000000010000000', }, { slug: 'kyogre-primal', @@ -2839,9 +2869,9 @@ export default [ }, { slug: 'kyogre', - w: 33, - h: 21, - hash: '1011100010100100100100000001001010000000000010000100110011100000', + w: 58, + h: 27, + hash: '1011100010000100100100000000101110001100110000000100000001100000', }, { slug: 'groudon-primal', @@ -2851,15 +2881,15 @@ export default [ }, { slug: 'groudon', - w: 33, - h: 24, - hash: '1110101100001100101000001101000011000100110010111100000000000000', + w: 47, + h: 35, + hash: '1010101000001100100000001100010010110000110000101101000000010000', }, { slug: 'rayquaza', - w: 31, - h: 27, - hash: '1111000010100110100100000010000011000011011000001110000001100000', + w: 45, + h: 49, + hash: '1111001000110001100101000010001000000001000000000010100110000000', }, { slug: 'jirachi', @@ -3265,9 +3295,9 @@ export default [ }, { slug: 'spiritomb', - w: 21, - h: 20, - hash: '1010010000111000101011000001000111100000000010000001000000010001', + w: 29, + h: 27, + hash: '1110001010010001101000000000000011110000000000000000001001100000', }, { slug: 'gible', @@ -3283,9 +3313,9 @@ export default [ }, { slug: 'garchomp', - w: 29, - h: 22, - hash: '1110100000001001100000000101000110010101101110001001000000000100', + w: 35, + h: 31, + hash: '1110101000001011100001000100100010000111101011001101100001000100', }, { slug: 'munchlax', @@ -3421,15 +3451,15 @@ export default [ }, { slug: 'electivire', - w: 26, - h: 23, - hash: '1010000010100100101100001101010011000011101000001100001000000101', + w: 35, + h: 31, + hash: '1100101100000100100010001100000110001010110000000000000001000000', }, { slug: 'magmortar', - w: 25, - h: 22, - hash: '1010101000001010101000000000110110110100101000001000000011000000', + w: 37, + h: 31, + hash: '1110100000010010101010000001100010001100000010001000010000011100', }, { slug: 'togekiss', @@ -3535,63 +3565,63 @@ export default [ }, { slug: 'uxie', - w: 26, - h: 22, - hash: '1110100010000000101000000001110010010001000000100001000000001000', + w: 33, + h: 29, + hash: '1110001000011000101110010111000110000110000100000000010000000000', }, { slug: 'mesprit', - w: 29, - h: 22, - hash: '1011100010010001101100010101100010010000010010000000000000100000', + w: 36, + h: 27, + hash: '1011101010010000101100010111000110000000000000000100000000000001', }, { slug: 'azelf', - w: 26, - h: 24, - hash: '1110000000010000101000010111000010010000000000000101000000100001', + w: 33, + h: 30, + hash: '1110000000010000101000010101000110000000000000001100010000000001', }, { slug: 'dialga', - w: 30, - h: 27, - hash: '1010101000010000101101100000110110000000000010000100000001000000', + w: 41, + h: 43, + hash: '1110100000010010100100001111000010000100000000001000000010000000', }, { slug: 'palkia', - w: 30, - h: 26, - hash: '1010101110111011100100010001100100000010010010000000001000001000', + w: 45, + h: 38, + hash: '1010111000010000100001000001000010000100010000000110000000000001', }, { slug: 'heatran', - w: 33, - h: 20, - hash: '1010010110100100111000000101001011000000000000001000010000000010', + w: 48, + h: 28, + hash: '1110101010000000110010000101010010000000000000000001010100000010', }, { slug: 'regigigas', - w: 32, - h: 23, - hash: '1111101010110000111000000011010010000000000000000100010000000000', + w: 51, + h: 30, + hash: '1110100000100000111010000010010011000000000000100000010000000000', }, { slug: 'giratina-origin', - w: 28, - h: 25, - hash: '1110101001001000101000010110110010000000000000000000011100100100', + w: 44, + h: 39, + hash: '1011101010100000101000010001000011010000000000000000001000101000', }, { slug: 'giratina', - w: 30, - h: 24, - hash: '1011101010000010101100001001000010000000000010000000000101100000', + w: 42, + h: 34, + hash: '1011101000000000100110001001010110000000000010001010000000000000', }, { slug: 'cresselia', - w: 25, - h: 26, - hash: '1110101010000010110100001100001010010010000001010000000000000000', + w: 32, + h: 34, + hash: '1111101010000010101100101100000110000000000001000000000000000000', }, { slug: 'phione', @@ -3733,9 +3763,9 @@ export default [ }, { slug: 'victini', - w: 18, - h: 22, - hash: '1011100000100011101011000110000011100100000000010000011000000000', + w: 22, + h: 29, + hash: '1111100000000010100001100110000011100100111000000000001000000100', }, { slug: 'snivy', @@ -3961,9 +3991,9 @@ export default [ }, { slug: 'audino', - w: 22, - h: 22, - hash: '1011101000010000101010000011010110010001100000000000000001000000', + w: 28, + h: 29, + hash: '1011000000010000101010000010101110010000100000000001000000001000', }, { slug: 'timburr', @@ -4201,9 +4231,9 @@ export default [ }, { slug: 'carracosta', - w: 25, - h: 22, - hash: '1010101010100001111000000101010010100000000000000100010010010010', + w: 36, + h: 31, + hash: '1110101000000000110010000101110010000000000000001100010001100001', }, { slug: 'archen', @@ -4213,9 +4243,9 @@ export default [ }, { slug: 'archeops', - w: 26, - h: 21, - hash: '1010110011110000100000011101000010000000001000111001000101000000', + w: 36, + h: 38, + hash: '1011101100000000100100010010001111000000010100000110000010111000', }, { slug: 'trubbish', @@ -4555,9 +4585,9 @@ export default [ }, { slug: 'cryogonal', - w: 19, - h: 20, - hash: '1010101000000101101110000000010010000000010000001000001001010110', + w: 27, + h: 30, + hash: '1110101000001000101110010000000010000001000001001000000101000001', }, { slug: 'shelmet', @@ -4717,27 +4747,27 @@ export default [ }, { slug: 'tornadus-therian', - w: 30, - h: 27, - hash: '1010101101001000101000000000000011110110000100001010000010100000', + w: 41, + h: 41, + hash: '1011111000010000101100000000000100011011000011100000100000000000', }, { slug: 'tornadus', - w: 30, - h: 26, - hash: '1110110001101000101000001000000110000101001100100100000000000000', + w: 34, + h: 36, + hash: '1110100011000000101000000000010110000111001000001000010000100000', }, { slug: 'thundurus-therian', - w: 32, - h: 26, - hash: '1110110000101001110000000010010000000000010000000000101001000100', + w: 42, + h: 38, + hash: '1110101000001001100010010101001010000000010000001000010000100000', }, { slug: 'thundurus', - w: 31, - h: 27, - hash: '1111000001100010101000101000011010000100000101101000000100010000', + w: 40, + h: 37, + hash: '1110100001100000101000000010010110000010010000001001000000001100', }, { slug: 'reshiram', @@ -4753,15 +4783,15 @@ export default [ }, { slug: 'landorus-therian', - w: 27, - h: 28, - hash: '1011101011000000101100000000010011010000010001000000000000001010', + w: 37, + h: 41, + hash: '1110101101100000101110000000001010010100010000111000000000010000', }, { slug: 'landorus', - w: 31, - h: 26, - hash: '1010110000101010101110111001000010010000000100000001000000000010', + w: 37, + h: 35, + hash: '1110100011000000101000101010000110000111000001001000010010000000', }, { slug: 'kyurem-white', @@ -4805,41 +4835,35 @@ export default [ h: 21, hash: '1110111010100100101100001100011011010010110001001000001000000100', }, - { - slug: 'genesect-standard', - w: 22, - h: 24, - hash: '1010111010100000110101001010000010000000010000100000100100000101', - }, { slug: 'genesect-shock', - w: 22, - h: 24, - hash: '1010111010100000110101001010000010000000010000100000100100000101', + w: 29, + h: 34, + hash: '1010100010000010111101000100010110100000010000000100000010001000', }, { slug: 'genesect-douse', - w: 22, - h: 24, - hash: '1010111010100000110101001010000010000000010000100000100100000101', + w: 29, + h: 34, + hash: '1010100010000000111101000100010110100000010000000100000010001000', }, { slug: 'genesect-chill', - w: 22, - h: 24, - hash: '1010111010100000110101001010000010000000010000100000100100000101', + w: 29, + h: 34, + hash: '1010100010000010111101000100010110100000010000000100000010001000', }, { slug: 'genesect-burn', - w: 22, - h: 24, - hash: '1010111010100000110101001010000010000000010000100000100100000111', + w: 29, + h: 34, + hash: '1010110010000000111101000100010111100000010000000100000010001000', }, { slug: 'genesect', - w: 22, - h: 24, - hash: '1010111010100000110101001011000010000000010000100000100100000101', + w: 29, + h: 34, + hash: '1010100010000010111101000100010110100000010000000100000010001000', }, { slug: 'chespin', @@ -5395,9 +5419,9 @@ export default [ }, { slug: 'tyrantrum', - w: 30, - h: 22, - hash: '1010111000100000101101000110000010001000101100101100010010000000', + w: 41, + h: 34, + hash: '1011101000100110101100000100000010000000001100000100001110000000', }, { slug: 'amaura', @@ -5407,9 +5431,9 @@ export default [ }, { slug: 'aurorus', - w: 24, - h: 27, - hash: '1011000000000011101100000000100010010001010000001100000100111100', + w: 32, + h: 36, + hash: '1110001100010000101000001000100010000100010000000101001000100000', }, { slug: 'sylveon', @@ -5527,27 +5551,27 @@ export default [ }, { slug: 'xerneas-active', - w: 29, - h: 30, - hash: '1010001010011000100000100100100111010011011000101010000110000000', + w: 38, + h: 47, + hash: '1010111110011001100100100100110011010000010000101000100010100001', }, { slug: 'xerneas', - w: 29, - h: 30, - hash: '1010011010011000100000000100100011010011001000101010000010110100', + w: 38, + h: 46, + hash: '1010111110011001100000000100110011010000010000101000100000100001', }, { slug: 'yveltal', - w: 30, - h: 27, - hash: '1011001011110000101001000100111011010010000110101000000000000000', + w: 48, + h: 44, + hash: '1011001010011000101000000000010001000010000000011000101110000000', }, { slug: 'zygarde-complete', - w: 32, - h: 30, - hash: '1110101000100101110000001010010011001001110010100001000000001000', + w: 50, + h: 45, + hash: '1110101010000000110010000011000011000001000000001000000001010000', }, { slug: 'zygarde-10', @@ -5557,15 +5581,15 @@ export default [ }, { slug: 'zygarde', - w: 28, - h: 30, - hash: '1011111000110100100011000011101000000001100000001000010010000100', + w: 37, + h: 45, + hash: '1011101000001100100000000010000010000000100101001000000000000000', }, { slug: 'diancie', - w: 21, - h: 22, - hash: '1110101100000000101011000010010011000000000000000000100000011010', + w: 33, + h: 39, + hash: '1010001000000010101001001000000001000000000001000000000000001000', }, { slug: 'hoopa-unbound', @@ -5581,9 +5605,9 @@ export default [ }, { slug: 'volcanion', - w: 25, - h: 27, - hash: '1110101110001000110010010100010110000000000100101101001100110000', + w: 38, + h: 41, + hash: '1110101010010000110000100101010010000000000000001001000110000000', }, { slug: 'rowlet', @@ -6151,27 +6175,27 @@ export default [ }, { slug: 'tapu-koko', - w: 28, - h: 26, - hash: '1110000001110000101000010000000000010000100000000001000100000000', + w: 39, + h: 38, + hash: '1110001001110000101100010000000100010000001010000000001001000000', }, { slug: 'tapu-lele', - w: 20, - h: 25, - hash: '1111001000000100101000000000100010000101100000001001011000000000', + w: 27, + h: 37, + hash: '1110000100100000101000000001000000000101000000100000111000000000', }, { slug: 'tapu-bulu', - w: 22, - h: 26, - hash: '1010110000011100101001000101100010010000100000000000001010010100', + w: 32, + h: 37, + hash: '1010100000001100101000000100100010010100100100000000101010100010', }, { slug: 'tapu-fini', - w: 22, - h: 26, - hash: '1111100010110000100000000000010011011110011000000000000001100001', + w: 27, + h: 37, + hash: '1110101010011101100000100000011111000100000000001001001000100000', }, { slug: 'cosmog', @@ -6199,45 +6223,45 @@ export default [ }, { slug: 'nihilego', - w: 21, - h: 24, - hash: '1110101010101000101110010101000010000000000000001000000100000001', + w: 29, + h: 31, + hash: '1111000000001000101110010000000010010000000000000010000100000000', }, { slug: 'buzzwole', - w: 25, - h: 29, - hash: '1110101000010000101001000110000010010100001001111000001000000000', + w: 33, + h: 39, + hash: '1110100000010010101001000100000010000101000000110000001001010010', }, { slug: 'pheromosa', - w: 28, - h: 30, - hash: '1010100100100000101001000001010001110000101100000000000000110000', + w: 43, + h: 40, + hash: '1110101000000000101000000000000001110000101101000110000000011000', }, { slug: 'xurkitree', - w: 18, - h: 29, - hash: '1110101010110000100110001001010011000000000000001000010100001000', + w: 36, + h: 35, + hash: '1110100100000011100010000101100001000100110001000000010000100100', }, { slug: 'celesteela', - w: 32, - h: 30, - hash: '1111101000101000110010000010100010000001000001010000101000000100', + w: 42, + h: 39, + hash: '1110101010101000110010000000000000000000000010001000100000000001', }, { slug: 'kartana', - w: 31, - h: 29, - hash: '1010000000010010101000000100000010000110000000100100000000000000', + w: 44, + h: 37, + hash: '1011000000010000110000000001000000000011000000000100000001000000', }, { slug: 'guzzlord', - w: 37, - h: 28, - hash: '1011100000000000100100000101000010011000100000000001100010000000', + w: 55, + h: 38, + hash: '1011101010000000100100010111000010011000000001000000000100000000', }, { slug: 'necrozma-ultra', @@ -6295,21 +6319,21 @@ export default [ }, { slug: 'naganadel', - w: 33, - h: 29, - hash: '1010101100001100100101000101101011000010100100010000010000000000', + w: 39, + h: 41, + hash: '1011100000001100100100001010100100000010100100001000100001000000', }, { slug: 'stakataka', - w: 28, - h: 30, - hash: '1010100110000000110011110101000011000000101000001100000000000000', + w: 40, + h: 38, + hash: '1010110000000000110011100000000001000000000000001010000001000000', }, { slug: 'blacephalon', - w: 22, - h: 25, - hash: '1110010000000010101101100001000011000000000000100100011000000001', + w: 33, + h: 33, + hash: '1110010010000010101001000000000010000000000000000001010000000000', }, { slug: 'zeraora', @@ -7439,4 +7463,46 @@ export default [ h: 29, hash: '1110101000001100100000100100100010000000110000101101000001010000', }, + { + slug: 'regieleki', + w: 54, + h: 30, + hash: '1010010000000100100000000000000001000000010000000001010000110010', + }, + { + slug: 'regidrago', + w: 40, + h: 37, + hash: '1110101000101000110000001110000110001000000000001000000000001101', + }, + { + slug: 'glastrier', + w: 33, + h: 37, + hash: '1111001000010000101001001100001010110000000000001000000100000001', + }, + { + slug: 'spectrier', + w: 35, + h: 34, + hash: '1110001000110100100100101100000010100000111110000001100000000001', + }, + { + slug: 'calyrex-shadow-rider', + w: 36, + h: 50, + hash: '1010110001100001101001000000000010000000000001000000000000000000', + }, + { + slug: 'calyrex-ice-rider', + w: 37, + h: 49, + hash: '1010110001000010110011000010000010000000000010001000000000000000', + }, + { + slug: 'calyrex', + w: 33, + h: 36, + hash: '1011101000000000100111000000000011000000000100000100000000000000', + }, ] diff --git a/src/layouts/default.vue b/src/layouts/default.vue index cdf6092..1acf124 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -2,7 +2,7 @@

- 11/01 冠の雪原の画像解析は現在対応中となります。手動での画像修正による対戦データの登録は可能となります。 + 11/21 冠の雪原の画像解析に対応しました！

diff --git a/yarn.lock b/yarn.lock index e892d0d..4c0c369 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10774,8 +10774,8 @@ pngjs@^3.0.0, pngjs@^3.3.3: integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w== pokesprite-images@msikma/pokesprite#master: - version "2.1.0" - resolved "https://codeload.github.com/msikma/pokesprite/tar.gz/d7db467c49432ca669da9766a16e1baff6465c7a" + version "2.5.0" + resolved "https://codeload.github.com/msikma/pokesprite/tar.gz/20a6d204210a6649461dd05dc62698613bd097ed" portal-vue@^2.1.7: version "2.1.7"