From c3244cfdc3fb1aa3fb3d36157152443e5a0685c3 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 8 Dec 2023 18:01:30 -0500 Subject: [PATCH] Fix Furfrou sprite names --- public/images/pokemon/{676_1.json => 676.json} | 2 +- public/images/pokemon/{676_1.png => 676.png} | Bin .../images/pokemon/{676_1b.json => back/676.json} | 2 +- public/images/pokemon/{676_1b.png => back/676.png} | Bin .../pokemon/{676_1sb.json => back/shiny/676.json} | 2 +- .../pokemon/{676_1sb.png => back/shiny/676.png} | Bin .../images/pokemon/{676_1s.json => shiny/676.json} | 2 +- public/images/pokemon/{676_1s.png => shiny/676.png} | Bin src/data/pokemon-species.ts | 7 ------- src/ui/pokemon-icon-anim-handler.ts | 1 - 10 files changed, 4 insertions(+), 12 deletions(-) rename public/images/pokemon/{676_1.json => 676.json} (96%) rename public/images/pokemon/{676_1.png => 676.png} (100%) rename public/images/pokemon/{676_1b.json => back/676.json} (96%) rename public/images/pokemon/{676_1b.png => back/676.png} (100%) rename public/images/pokemon/{676_1sb.json => back/shiny/676.json} (96%) rename public/images/pokemon/{676_1sb.png => back/shiny/676.png} (100%) rename public/images/pokemon/{676_1s.json => shiny/676.json} (96%) rename public/images/pokemon/{676_1s.png => shiny/676.png} (100%) diff --git a/public/images/pokemon/676_1.json b/public/images/pokemon/676.json similarity index 96% rename from public/images/pokemon/676_1.json rename to public/images/pokemon/676.json index cf4eb0531..f1672679c 100644 --- a/public/images/pokemon/676_1.json +++ b/public/images/pokemon/676.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "676_1.png", + "image": "676.png", "format": "RGBA8888", "size": { "w": 62, diff --git a/public/images/pokemon/676_1.png b/public/images/pokemon/676.png similarity index 100% rename from public/images/pokemon/676_1.png rename to public/images/pokemon/676.png diff --git a/public/images/pokemon/676_1b.json b/public/images/pokemon/back/676.json similarity index 96% rename from public/images/pokemon/676_1b.json rename to public/images/pokemon/back/676.json index cd3b698e5..bb83924c2 100644 --- a/public/images/pokemon/676_1b.json +++ b/public/images/pokemon/back/676.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "676_1b.png", + "image": "676.png", "format": "RGBA8888", "size": { "w": 62, diff --git a/public/images/pokemon/676_1b.png b/public/images/pokemon/back/676.png similarity index 100% rename from public/images/pokemon/676_1b.png rename to public/images/pokemon/back/676.png diff --git a/public/images/pokemon/676_1sb.json b/public/images/pokemon/back/shiny/676.json similarity index 96% rename from public/images/pokemon/676_1sb.json rename to public/images/pokemon/back/shiny/676.json index 9bc0b5982..36e4e0274 100644 --- a/public/images/pokemon/676_1sb.json +++ b/public/images/pokemon/back/shiny/676.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "676_1sb.png", + "image": "676.png", "format": "RGBA8888", "size": { "w": 62, diff --git a/public/images/pokemon/676_1sb.png b/public/images/pokemon/back/shiny/676.png similarity index 100% rename from public/images/pokemon/676_1sb.png rename to public/images/pokemon/back/shiny/676.png diff --git a/public/images/pokemon/676_1s.json b/public/images/pokemon/shiny/676.json similarity index 96% rename from public/images/pokemon/676_1s.json rename to public/images/pokemon/shiny/676.json index 21f211b31..bc805fd4b 100644 --- a/public/images/pokemon/676_1s.json +++ b/public/images/pokemon/shiny/676.json @@ -1,7 +1,7 @@ { "textures": [ { - "image": "676_1s.png", + "image": "676.png", "format": "RGBA8888", "size": { "w": 62, diff --git a/public/images/pokemon/676_1s.png b/public/images/pokemon/shiny/676.png similarity index 100% rename from public/images/pokemon/676_1s.png rename to public/images/pokemon/shiny/676.png diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index f252ac43f..af81c7fe9 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -2108,13 +2108,6 @@ export function initSpecies() { ), new PokemonSpecies(Species.PALDEA_WOOPER, "Wooper", 9, false, false, false, "Water Fish Pokémon", Type.POISON, Type.GROUND, 0.4, 11, Abilities.POISON_POINT, Abilities.WATER_ABSORB, Abilities.UNAWARE, 210, 55, 45, 45, 25, 25, 15, 255, 50, null, GrowthRate.MEDIUM_FAST, 50, true), ); - - var s = ''; - - for (let species of allSpecies.filter(s => s.generation >= 6 && !pokemonPrevolutions.hasOwnProperty(s.speciesId))) { - s += ` [Species.${Species[species.speciesId]}]: 3,\n` - } - console.log(s) } export const speciesStarters = { diff --git a/src/ui/pokemon-icon-anim-handler.ts b/src/ui/pokemon-icon-anim-handler.ts index 6bf5a5224..c9d383957 100644 --- a/src/ui/pokemon-icon-anim-handler.ts +++ b/src/ui/pokemon-icon-anim-handler.ts @@ -57,7 +57,6 @@ export default class PokemonIconAnimHandler { : 0; const yDelta = this.getModeYDelta(mode); i.y += yDelta + lastYDelta; - console.log(yDelta - lastYDelta) } this.icons.set(i, mode); }