From 5a2e199181c4fdcb503f1f8eb4999bca5794fd0f Mon Sep 17 00:00:00 2001 From: Ice Date: Thu, 2 May 2024 23:51:22 -0500 Subject: [PATCH] Cleanup --- package-lock.json | 2 +- package.json | 2 +- src/data/move.ts | 4 ++++ src/data/pokemon-level-moves.ts | 2 ++ src/data/pokemon-species.ts | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7db944a4533..a4e40a2cb57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "phaser3spectorjs": "^0.0.8", "pokenode-ts": "^1.20.0", "typescript": "^5.0.3", - "vite": "^4.5.0", + "vite": "^4.5.3", "vite-plugin-fs": "^0.4.4", "vitest": "^1.4.0", "vitest-canvas-mock": "^0.3.3" diff --git a/package.json b/package.json index d5ffb651f54..c004c3f8095 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "phaser3spectorjs": "^0.0.8", "pokenode-ts": "^1.20.0", "typescript": "^5.0.3", - "vite": "^4.5.0", + "vite": "^4.5.3", "vite-plugin-fs": "^0.4.4", "vitest": "^1.4.0", "vitest-canvas-mock": "^0.3.3" diff --git a/src/data/move.ts b/src/data/move.ts index 48ee93a3092..d9a6742f6e4 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -3376,7 +3376,11 @@ export class ReducePpMoveAttr extends MoveEffectAttr { } const movesetMove = target.getMoveset().find(m => m.moveId === lastMove.move); const lastPpUsed = movesetMove.ppUsed; +<<<<<<< Updated upstream if (!lastMove || lastPpUsed < 1) { +======= + if (lastPpUsed < 1) { +>>>>>>> Stashed changes return false; } else { diff --git a/src/data/pokemon-level-moves.ts b/src/data/pokemon-level-moves.ts index 0b545d1bd63..ac123e4ffa3 100644 --- a/src/data/pokemon-level-moves.ts +++ b/src/data/pokemon-level-moves.ts @@ -15330,6 +15330,8 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [Species.LECHONK]: [ [ 1, Moves.TACKLE ], [ 1, Moves.TAIL_WHIP ], + [ 1, Moves.EERIE_SPELL ], + [ 1, Moves.SPITE ], [ 5, Moves.DISARMING_VOICE ], [ 8, Moves.ECHOED_VOICE ], [ 12, Moves.MUD_SHOT ], diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts index c67f0c14b47..3b2079cc4b8 100644 --- a/src/data/pokemon-species.ts +++ b/src/data/pokemon-species.ts @@ -835,7 +835,7 @@ export function initSpecies() { new PokemonSpecies(Species.NIDORAN_F, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.4, 7, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 275, 55, 47, 52, 40, 40, 41, 235, 50, 55, GrowthRate.MEDIUM_SLOW, 0, false), new PokemonSpecies(Species.NIDORINA, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.8, 20, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 365, 70, 62, 67, 55, 55, 56, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 0, false), new PokemonSpecies(Species.NIDOQUEEN, 1, false, false, false, "Drill Pokémon", Type.POISON, Type.GROUND, 1.3, 60, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.SHEER_FORCE, 505, 90, 92, 87, 75, 85, 76, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 0, false), - new PokemonSpecies(Species.NIDORAN_M, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.5, 9, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 273, 46, 57, 40, 40, 40, 50, 235, 50, 55, GrowthRate.MEDIUM_SLOW, 100, false), + new PokemonSpecies(Species.NIDORAN_M, 1, false, false, false, "Poison Pin Pokémon", Type.PSYCHIC, null, 0.5, 9, Abilities.ICE_SCALES, Abilities.RIVALRY, Abilities.HUSTLE, 273, 46, 57, 40, 40, 40, 50, 235, 50, 55, GrowthRate.MEDIUM_SLOW, 100, false), new PokemonSpecies(Species.NIDORINO, 1, false, false, false, "Poison Pin Pokémon", Type.POISON, null, 0.9, 19.5, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.HUSTLE, 365, 61, 72, 57, 55, 55, 65, 120, 50, 128, GrowthRate.MEDIUM_SLOW, 100, false), new PokemonSpecies(Species.NIDOKING, 1, false, false, false, "Drill Pokémon", Type.POISON, Type.GROUND, 1.4, 62, Abilities.POISON_POINT, Abilities.RIVALRY, Abilities.SHEER_FORCE, 505, 81, 102, 77, 85, 75, 85, 45, 50, 253, GrowthRate.MEDIUM_SLOW, 100, false), new PokemonSpecies(Species.CLEFAIRY, 1, false, false, false, "Fairy Pokémon", Type.FAIRY, null, 0.6, 7.5, Abilities.CUTE_CHARM, Abilities.MAGIC_GUARD, Abilities.FRIEND_GUARD, 323, 70, 45, 48, 60, 65, 35, 150, 140, 113, GrowthRate.FAST, 25, false),