From eb14031bdd645d6d729de8084fc5c813bb23e3f9 Mon Sep 17 00:00:00 2001 From: Madmadness65 Date: Wed, 27 Mar 2024 22:15:35 -0500 Subject: [PATCH] Replace some egg moves These egg moves were some of the moves marked as problematic on the sheet. They have been changed out for either suggestions or more fitting moves. --- src/data/egg-moves.ts | 18 +++++++++--------- src/data/enums/moves.ts | 2 +- src/data/move.ts | 4 ++-- src/data/pokemon-level-moves.ts | 14 +++++++------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/data/egg-moves.ts b/src/data/egg-moves.ts index ca5b1cfa375..10a35f84afe 100644 --- a/src/data/egg-moves.ts +++ b/src/data/egg-moves.ts @@ -10,9 +10,9 @@ export const speciesEggMoves = { [Species.SQUIRTLE]: [ Moves.BODY_PRESS, Moves.FLIP_TURN, Moves.BOUNCY_BUBBLE, Moves.RECOVER ], [Species.CATERPIE]: [ Moves.STRUGGLE_BUG, Moves.ELECTROWEB, Moves.STICKY_WEB, Moves.TAIL_GLOW ], [Species.WEEDLE]: [ Moves.BUG_BITE, Moves.SWORDS_DANCE, Moves.BANEFUL_BUNKER, Moves.BARB_BARRAGE ], - [Species.PIDGEY]: [ Moves.DUAL_WINGBEAT, Moves.COVET, Moves.U_TURN, Moves.BOOMBURST ], + [Species.PIDGEY]: [ Moves.DUAL_WINGBEAT, Moves.COVET, Moves.U_TURN, Moves.RAZOR_WIND ], [Species.RATTATA]: [ Moves.TRAILBLAZE, Moves.POISON_FANG, Moves.JAW_LOCK, Moves.EXTREME_SPEED ], - [Species.SPEAROW]: [ Moves.SUCKER_PUNCH, Moves.RAPID_SPIN, Moves.PARTING_SHOT, Moves.HYPER_DRILL ], + [Species.SPEAROW]: [ Moves.FEATHER_DANCE, Moves.SNARL, Moves.PARTING_SHOT, Moves.HYPER_DRILL ], [Species.EKANS]: [ Moves.POISON_TAIL, Moves.SCALE_SHOT, Moves.LEECH_LIFE, Moves.SHED_TAIL ], [Species.SANDSHREW]: [ Moves.DRILL_RUN, Moves.SPIKY_SHIELD, Moves.SHORE_UP, Moves.SPIN_OUT ], [Species.NIDORAN_F]: [ Moves.SLUDGE_WAVE, Moves.SCORCHING_SANDS, Moves.CALM_MIND, Moves.METEOR_BEAM ], @@ -28,7 +28,7 @@ export const speciesEggMoves = { [Species.MANKEY]: [ Moves.BEAT_UP, Moves.FORESIGHT, Moves.U_TURN, Moves.PLAY_ROUGH ], [Species.GROWLITHE]: [ Moves.RAGING_FURY, Moves.BOUNCE, Moves.NOBLE_ROAR, Moves.FLARE_BLITZ ], [Species.POLIWAG]: [ Moves.BOUNCY_BUBBLE, Moves.FREEZE_DRY, Moves.ZEN_HEADBUTT, Moves.SURGING_STRIKES ], - [Species.ABRA]: [ Moves.MYSTICAL_FIRE, Moves.SKILL_SWAP, Moves.CALM_MIND, Moves.MYSTICAL_POWER ], + [Species.ABRA]: [ Moves.MYSTICAL_FIRE, Moves.HEX, Moves.EXPANDING_FORCE, Moves.MYSTICAL_POWER ], [Species.MACHOP]: [ Moves.BULLET_PUNCH, Moves.KNOCK_OFF, Moves.COACHING, Moves.WICKED_BLOW ], [Species.BELLSPROUT]: [ Moves.SUNNY_DAY, Moves.WEATHER_BALL, Moves.COIL, Moves.STRENGTH_SAP ], [Species.TENTACOOL]: [ Moves.KNOCK_OFF, Moves.FREEZE_DRY, Moves.ACUPRESSURE, Moves.MALIGNANT_CHAIN ], @@ -156,7 +156,7 @@ export const speciesEggMoves = { [Species.ILLUMISE]: [ Moves.FIRE_BLAST, Moves.MOONBLAST, Moves.HEALING_WISH, Moves.TAIL_GLOW ], [Species.GULPIN]: [ Moves.MORTAL_SPIN, Moves.LEECH_LIFE, Moves.MIRROR_COAT, Moves.MALIGNANT_CHAIN ], [Species.CARVANHA]: [ Moves.WAVE_CRASH, Moves.SCALE_SHOT, Moves.FILLET_AWAY, Moves.FISHIOUS_REND ], - [Species.WAILMER]: [ Moves.CURSE, Moves.BRAVE_BIRD, Moves.FREEZE_DRY, Moves.RECOVER ], + [Species.WAILMER]: [ Moves.CURSE, Moves.STEAMROLLER, Moves.FREEZE_DRY, Moves.RECOVER ], [Species.NUMEL]: [ Moves.SPIKES, Moves.STEALTH_ROCK, Moves.SHORE_UP, Moves.THOUSAND_WAVES ], [Species.TORKOAL]: [ Moves.IRON_DEFENSE, Moves.SPIKES, Moves.BODY_PRESS, Moves.EXPLOSION ], [Species.SPOINK]: [ Moves.THUNDER_WAVE, Moves.RECOVER, Moves.SIMPLE_BEAM, Moves.PSYCHO_BOOST ], @@ -231,7 +231,7 @@ export const speciesEggMoves = { [Species.HIPPOPOTAS]: [ Moves.BODY_PRESS, Moves.HARD_PRESS, Moves.SCORCHING_SANDS, Moves.LANDS_WRATH ], [Species.SKORUPI]: [ Moves.COIL, Moves.DIRE_CLAW, Moves.PARTING_SHOT, Moves.WICKED_BLOW ], [Species.CROAGUNK]: [ Moves.GUNK_SHOT, Moves.LASH_OUT, Moves.MACH_PUNCH, Moves.SWORDS_DANCE ], - [Species.CARNIVINE]: [ Moves.SNAP_TRAP, Moves.JAW_LOCK, Moves.RAGE_POWDER, Moves.FISHIOUS_REND ], + [Species.CARNIVINE]: [ Moves.SNAP_TRAP, Moves.JAW_LOCK, Moves.RAGE_POWDER, Moves.FLOWER_TRICK ], [Species.FINNEON]: [ Moves.QUIVER_DANCE, Moves.BOUNCY_BUBBLE, Moves.MOONBLAST, Moves.MOONGEIST_BEAM ], [Species.MANTYKE]: [ Moves.BOUNCY_BUBBLE, Moves.ICY_WIND, Moves.TAILWIND, Moves.RECOVER ], [Species.SNOVER]: [ Moves.DRUM_BEATING, Moves.ICE_HAMMER, Moves.AURORA_VEIL, Moves.IVY_CUDGEL ], @@ -240,7 +240,7 @@ export const speciesEggMoves = { [Species.MESPRIT]: [ Moves.REVELATION_DANCE, Moves.LUNAR_DANCE, Moves.MOONBLAST, Moves.PRISMATIC_LASER ], [Species.AZELF]: [ Moves.REVELATION_DANCE, Moves.DRAGON_DANCE, Moves.PHANTOM_FORCE, Moves.PRISMATIC_LASER ], [Species.DIALGA]: [ Moves.SPACIAL_REND, Moves.EXTREME_SPEED, Moves.GEAR_GRIND, Moves.FREEZING_GLARE ], - [Species.PALKIA]: [ Moves.LIQUIDATION, Moves.ROAR_OF_TIME, Moves.AQUA_CUTTER, Moves.DRAGON_ENERGY ], + [Species.PALKIA]: [ Moves.ROAR_OF_TIME, Moves.LIQUIDATION, Moves.AQUA_CUTTER, Moves.DRAGON_ENERGY ], [Species.HEATRAN]: [ Moves.FIRE_LASH, Moves.HEAVY_SLAM, Moves.FIERY_DANCE, Moves.BEHEMOTH_BASH ], [Species.REGIGIGAS]: [ Moves.MIGHTY_CLEAVE, Moves.PRECIPICE_BLADES, Moves.EXTREME_SPEED, Moves.SKILL_SWAP ], [Species.GIRATINA]: [ Moves.DRAGON_HAMMER, Moves.SPACIAL_REND, Moves.SPIRIT_SHACKLE, Moves.ASTRAL_BARRAGE ], @@ -304,7 +304,7 @@ export const speciesEggMoves = { [Species.TYNAMO]: [ Moves.PARABOLIC_CHARGE, Moves.LEECH_LIFE, Moves.DRAGON_DANCE, Moves.FUSION_BOLT ], [Species.ELGYEM]: [ Moves.MYSTICAL_POWER, Moves.METEOR_BEAM, Moves.COSMIC_POWER, Moves.MOONGEIST_BEAM ], [Species.LITWICK]: [ Moves.NASTY_PLOT, Moves.SCORCHING_SANDS, Moves.TORCH_SONG, Moves.MOONGEIST_BEAM ], - [Species.AXEW]: [ Moves.STONE_AXE, Moves.GLAIVE_RUSH, Moves.BEHEMOTH_BLADE, Moves.VICTORY_DANCE ], + [Species.AXEW]: [ Moves.STONE_AXE, Moves.GLAIVE_RUSH, Moves.TEMPER_FLARE, Moves.VICTORY_DANCE ], [Species.CUBCHOO]: [ Moves.MOUNTAIN_GALE, Moves.DRAIN_PUNCH, Moves.SWORDS_DANCE, Moves.WAVE_CRASH ], [Species.CRYOGONAL]: [ Moves.SURF, Moves.EARTH_POWER, Moves.NASTY_PLOT, Moves.BLEAKWIND_STORM ], [Species.SHELMET]: [ Moves.SHED_TAIL, Moves.LEECH_LIFE, Moves.SILK_TRAP, Moves.CEASELESS_EDGE ], @@ -343,8 +343,8 @@ export const speciesEggMoves = { [Species.SKIDDO]: [ Moves.STOMPING_TANTRUM, Moves.GRASSY_GLIDE, Moves.GRASSY_TERRAIN, Moves.HEAD_SMASH ], [Species.PANCHAM]: [ Moves.DRAIN_PUNCH, Moves.FAKE_OUT, Moves.ENDEAVOR, Moves.WICKED_BLOW ], [Species.FURFROU]: [ Moves.POPULATION_BOMB, Moves.JAW_LOCK, Moves.FAKE_OUT, Moves.GIGA_IMPACT ], - [Species.ESPURR]: [ Moves.GLARE, Moves.DRAINING_KISS, Moves.PSYSTRIKE, Moves.BLOOD_MOON ], - [Species.HONEDGE]: [ Moves.TACHYON_CUTTER, Moves.SACRED_SWORD, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ], + [Species.ESPURR]: [ Moves.GLARE, Moves.DRAINING_KISS, Moves.TWIN_BEAM, Moves.PSYSTRIKE ], + [Species.HONEDGE]: [ Moves.TACHYON_CUTTER, Moves.PSYCHO_CUT, Moves.BITTER_BLADE, Moves.BEHEMOTH_BLADE ], [Species.SPRITZEE]: [ Moves.STRANGE_STEAM, Moves.PSYSTRIKE, Moves.MOONBLAST, Moves.RELIC_SONG ], [Species.SWIRLIX]: [ Moves.TEATIME, Moves.RECYCLE, Moves.SPIRIT_BREAK, Moves.BELLY_DRUM ], [Species.INKAY]: [ Moves.KNOCK_OFF, Moves.LEECH_LIFE, Moves.PARTING_SHOT, Moves.HAMMER_ARM ], diff --git a/src/data/enums/moves.ts b/src/data/enums/moves.ts index 1a4ad4ace78..7f323201db3 100644 --- a/src/data/enums/moves.ts +++ b/src/data/enums/moves.ts @@ -10,7 +10,7 @@ export enum Moves { ICE_PUNCH, THUNDER_PUNCH, SCRATCH, - VICE_GRIP, + VISE_GRIP, GUILLOTINE, RAZOR_WIND, SWORDS_DANCE, diff --git a/src/data/move.ts b/src/data/move.ts index adf35c17dd1..501da12f25a 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -2637,7 +2637,7 @@ export function initMoves() { .attr(StatusEffectAttr, StatusEffect.PARALYSIS) .punchingMove(), new AttackMove(Moves.SCRATCH, "Scratch", Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 35, "Hard, pointed, sharp claws rake the target to inflict damage.", -1, 0, 1), - new AttackMove(Moves.VICE_GRIP, "Vise Grip", Type.NORMAL, MoveCategory.PHYSICAL, 55, 100, 30, "The target is gripped and squeezed from both sides to inflict damage.", -1, 0, 1), + new AttackMove(Moves.VISE_GRIP, "Vise Grip", Type.NORMAL, MoveCategory.PHYSICAL, 55, 100, 30, "The target is gripped and squeezed from both sides to inflict damage.", -1, 0, 1), new AttackMove(Moves.GUILLOTINE, "Guillotine", Type.NORMAL, MoveCategory.PHYSICAL, -1, 30, 5, "A vicious, tearing attack with big pincers. The target faints instantly if this attack hits.", -1, 0, 1) .attr(OneHitKOAttr) .attr(OneHitKOAccuracyAttr), @@ -3963,7 +3963,7 @@ export function initMoves() { .target(MoveTarget.ALL), new StatusMove(Moves.STICKY_WEB, "Sticky Web (N)", Type.BUG, -1, 20, "The user weaves a sticky net around the opposing team, which lowers their Speed stats upon switching into battle.", -1, 0, 6) .target(MoveTarget.ENEMY_SIDE), - new AttackMove(Moves.FELL_STINGER, "Fell Stinger (N)", Type.BUG, MoveCategory.PHYSICAL, 50, 100, 25, "When the user knocks out a target with this move, the user's Attack stat rises drastically.", -1, 0, 6), + new AttackMove(Moves.FELL_STINGER, "Fell Stinger (P)", Type.BUG, MoveCategory.PHYSICAL, 50, 100, 25, "When the user knocks out a target with this move, the user's Attack stat rises drastically.", -1, 0, 6), new AttackMove(Moves.PHANTOM_FORCE, "Phantom Force", Type.GHOST, MoveCategory.PHYSICAL, 90, 100, 10, "The user vanishes somewhere, then strikes the target on the next turn. This move hits even if the target protects itself.", -1, 0, 6) .attr(ChargeAttr, ChargeAnim.PHANTOM_FORCE_CHARGING, 'vanished\ninstantly!', BattlerTagType.HIDDEN) .ignoresProtect() diff --git a/src/data/pokemon-level-moves.ts b/src/data/pokemon-level-moves.ts index 865c9f04f08..3c7dfc8095e 100644 --- a/src/data/pokemon-level-moves.ts +++ b/src/data/pokemon-level-moves.ts @@ -2084,7 +2084,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 64, Moves.HYPER_BEAM ], ], [Species.PINSIR]: [ - [ 1, Moves.VICE_GRIP ], + [ 1, Moves.VISE_GRIP ], [ 1, Moves.HARDEN ], [ 4, Moves.FOCUS_ENERGY ], [ 8, Moves.BIND ], @@ -9992,7 +9992,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 56, Moves.EXPLOSION ], ], [Species.KLINK]: [ - [ 1, Moves.VICE_GRIP ], + [ 1, Moves.VISE_GRIP ], [ 1, Moves.THUNDER_SHOCK ], [ 4, Moves.BIND ], [ 8, Moves.CHARGE ], @@ -10008,7 +10008,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 48, Moves.HYPER_BEAM ], ], [Species.KLANG]: [ - [ 1, Moves.VICE_GRIP ], + [ 1, Moves.VISE_GRIP ], [ 1, Moves.BIND ], [ 1, Moves.THUNDER_SHOCK ], [ 1, Moves.CHARGE ], @@ -10024,7 +10024,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 54, Moves.HYPER_BEAM ], ], [Species.KLINKLANG]: [ - [ 1, Moves.VICE_GRIP ], + [ 1, Moves.VISE_GRIP ], [ 1, Moves.BIND ], [ 1, Moves.THUNDER_SHOCK ], [ 1, Moves.CHARGE ], @@ -10565,7 +10565,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [Species.DURANT]: [ [ 1, Moves.SAND_ATTACK ], [ 1, Moves.FURY_CUTTER ], - [ 4, Moves.VICE_GRIP ], + [ 4, Moves.VISE_GRIP ], [ 8, Moves.METAL_CLAW ], [ 12, Moves.BEAT_UP ], [ 16, Moves.BUG_BITE ], @@ -12341,7 +12341,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { [ 52, Moves.REST ], ], [Species.GRUBBIN]: [ - [ 1, Moves.VICE_GRIP ], + [ 1, Moves.VISE_GRIP ], [ 1, Moves.MUD_SLAP ], [ 5, Moves.STRING_SHOT ], [ 10, Moves.BUG_BITE ], @@ -12354,7 +12354,7 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = { ], [Species.CHARJABUG]: [ [ 0, Moves.CHARGE ], - [ 1, Moves.VICE_GRIP ], + [ 1, Moves.VISE_GRIP ], [ 1, Moves.STRING_SHOT ], [ 1, Moves.MUD_SLAP ], [ 1, Moves.BUG_BITE ],